Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
[GH-1608] Release WFL v0.14.0 (#570)
Browse files Browse the repository at this point in the history
GH-1607 wfl.log/stdout-logger should handle JSON-incompatible edn (#569)
DDO-1920 Configure GKE LB Backend Service timeout in Helm (#564)
GH-1598 Update TerraExecutor documentation (#566)
  • Loading branch information
okotsopoulos authored Feb 11, 2022
1 parent 8eddacd commit 0c17566
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Release 0.14.0
- [GH-1607] wfl.log/stdout-logger should handle JSON-incompatible edn ([#569](https://github.com/broadinstitute/wfl/pull/569))
- [DDO-1920] Configure GKE LB Backend Service timeout in Helm ([#564](https://github.com/broadinstitute/wfl/pull/564))
- [GH-1598] Update TerraExecutor documentation ([#566](https://github.com/broadinstitute/wfl/pull/566))

# Release 0.13.0
- [GH-1539] Stop started workloads in system tests ([#562](https://github.com/broadinstitute/wfl/pull/562))
- [GH-1563] [GH-1573] TerraDataRepoSource polls row metadata table ([#559](https://github.com/broadinstitute/wfl/pull/559))
Expand Down
17 changes: 12 additions & 5 deletions api/src/wfl/log.clj
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,18 @@
(def stdout-logger
"A logger to write to standard output"
(reify Logger
(-write [logger edn]
(-> edn
(json/write-str :escape-slash false
:key-fn key-fn)
println))))
(-write [_logger edn]
(let [json-write-str
#(json/write-str
%
:escape-slash false
:key-fn key-fn)
to-log
(try (json-write-str edn)
(catch Throwable t
(json-write-str {:tried-to-log (str edn)
:cause (str t)})))]
(println to-log)))))

(def ^:dynamic *logger*
"The logger now."
Expand Down
15 changes: 14 additions & 1 deletion api/test/wfl/unit/logging_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,17 @@
(is (= "INFO" (get-in log [:severity])))
(is (= "I did it again." (get-in log [:message :via 0 :data :why])))
(is (= "Oh baby, baby." (get-in log [:message :cause])))
(is (= "I'm sent from above." (get-in log [:message :data :that]))))))
(is (= "I'm sent from above." (get-in log [:message :data :that])))))
(testing "JSON-incompatible input is stringified"
(let [x
(ex-info "Try to log non-JSON" {:bad (tagged-literal 'object :fnord)})
{:keys [tried-to-log cause] :as _log}
(json/read-str (with-out-str (log/info x)) :key-fn keyword)]
(is (string? tried-to-log))
(is (str/includes? tried-to-log ":cause \"Try to log non-JSON\""))
(is (str/includes? tried-to-log ":data {:bad #object :fnord}"))
(is (string? cause))
(is (= (str/join \space ["java.lang.Exception:"
"Don't know how to write JSON"
"of class clojure.lang.TaggedLiteral"])
cause)))))
2 changes: 1 addition & 1 deletion docs/md/executor.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ in the Terra UI.
Prerequisites:

- The workspace must exist prior to workload creation.
- `[email protected]` must be a workspace "Owner" in order to
- `[email protected]` must be a workspace "Writer" in order to
import snapshots to the workspace.
- The workspace must be compatible with any downstream processing stage that
consumes its workflows.
Expand Down
2 changes: 1 addition & 1 deletion helm/wfl/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A Helm chart for deploy WorkFlow Launcher on Kubernetes

type: application

version: 0.3.36
version: 0.3.37

home: https://github.com/broadinstitute/wfl
appVersion: 0.5.2
Expand Down
10 changes: 10 additions & 0 deletions helm/wfl/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
{{- $fullName := include "wfl.fullname" . -}}
{{- $servicePort := .Values.ingress.servicePort -}}

apiVersion: cloud.google.com/v1
kind: BackendConfig
metadata:
name: {{ $fullName }}-backend-config
spec:
timeoutSec: {{ .Values.ingress.backendTimeout }}

---

{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
Expand All @@ -15,6 +24,7 @@ metadata:
{{- include "wfl.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
cloud.google.com/backend-config: '{"default": "{{ $fullName }}-backend-config"}'
{{ toYaml . | indent 4 }}
{{- end }}
spec:
Expand Down
2 changes: 2 additions & 0 deletions helm/wfl/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,5 @@ ingress:
annotations: {}
hosts: []
tls: []
# -- Seconds to use for the backend service's timeout, see GH-1601
backendTimeout: 60
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13.0
0.14.0

0 comments on commit 0c17566

Please sign in to comment.