From 6799daadf2885e0c66c377b1831da21a9fe16026 Mon Sep 17 00:00:00 2001 From: Andras Jaky Date: Mon, 31 Jan 2022 17:27:03 +0100 Subject: [PATCH 1/3] feat(pkg/sdk,Cadence): updated client 0.18->0.19 --- pkg/sdk/go.mod | 3 +-- pkg/sdk/go.sum | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/sdk/go.mod b/pkg/sdk/go.mod index 051f16dcf..c6d53469d 100644 --- a/pkg/sdk/go.mod +++ b/pkg/sdk/go.mod @@ -7,10 +7,9 @@ require ( github.com/apache/thrift v0.13.0 // indirect github.com/aws/aws-sdk-go v1.34.4 github.com/mitchellh/mapstructure v1.1.2 - github.com/sirupsen/logrus v1.6.0 // indirect github.com/stretchr/testify v1.6.1 github.com/uber/tchannel-go v1.18.0 // indirect - go.uber.org/cadence v0.18.5 + go.uber.org/cadence v0.19.0 go.uber.org/zap v1.14.1 // indirect google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect gopkg.in/yaml.v2 v2.4.0 diff --git a/pkg/sdk/go.sum b/pkg/sdk/go.sum index 3246dfdd0..692f9df9c 100644 --- a/pkg/sdk/go.sum +++ b/pkg/sdk/go.sum @@ -91,6 +91,8 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cristalhq/jwt/v3 v3.1.0 h1:iLeL9VzB0SCtjCy9Kg53rMwTcrNm+GHyVcz2eUujz6s= +github.com/cristalhq/jwt/v3 v3.1.0/go.mod h1:XOnIXst8ozq/esy5N1XOlSyQqBd+84fxJ99FK+1jgL8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -303,8 +305,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= @@ -427,8 +427,6 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -466,6 +464,7 @@ github.com/uber-go/mapdecode v1.0.0/go.mod h1:b5nP15FwXTgpjTjeA9A2uTHXV5UJCl4arw github.com/uber-go/tally v3.3.12+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= github.com/uber-go/tally v3.3.15+incompatible h1:9hLSgNBP28CjIaDmAuRTq9qV+UZY+9PcvAkXO4nNMwg= github.com/uber-go/tally v3.3.15+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= +github.com/uber/cadence-idl v0.0.0-20211111101836-d6b70b60eb8c/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws= github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM= github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw= @@ -497,8 +496,8 @@ go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/cadence v0.18.5 h1:nXf2M8IiH0EyUbGQhiF5mS1W/fDiUbKNvwqO1hjZay0= -go.uber.org/cadence v0.18.5/go.mod h1:D0b+ZFwYRBKXNBwjiS+jtTTREbZgSubgIsB2RaC81jQ= +go.uber.org/cadence v0.19.0 h1:EvDXwIJ0lAAxL2i8ne/vG/TeoJM6xkAyqgTRFmIWG+c= +go.uber.org/cadence v0.19.0/go.mod h1:s91dOf0kcJbumPscRIVFV/4Xq/exhefzpXmnDiRRTxs= go.uber.org/dig v1.8.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw= go.uber.org/dig v1.10.0 h1:yLmDDj9/zuDjv3gz8GQGviXMs9TfysIUMUilCpgzUJY= go.uber.org/dig v1.10.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw= From 37fb841fdf6c6a54603cb24753f50138a78345ef Mon Sep 17 00:00:00 2001 From: Andras Jaky Date: Mon, 31 Jan 2022 17:27:32 +0100 Subject: [PATCH 2/3] feat: updated Cadence client, 0.18.5->0.19.0 --- go.mod | 4 ++-- go.sum | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index bef77a8e6..e2917b564 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go v1.37.1 github.com/banzaicloud/anchore-image-validator v0.0.0-20190823121528-918b9fa6af62 github.com/banzaicloud/bank-vaults/pkg/sdk v0.6.0 - github.com/banzaicloud/cadence-aws-sdk v0.5.0 + github.com/banzaicloud/cadence-aws-sdk v0.6.0 github.com/banzaicloud/gin-utilz v0.3.1 github.com/banzaicloud/go-gin-prometheus v0.1.0 github.com/banzaicloud/integrated-service-sdk v0.6.0 @@ -79,7 +79,7 @@ require ( github.com/vmware-tanzu/velero v1.5.1 github.com/vmware/govmomi v0.22.0 go.opencensus.io v0.23.0 - go.uber.org/cadence v0.18.5 + go.uber.org/cadence v0.19.0 go.uber.org/yarpc v1.55.0 go.uber.org/zap v1.18.1 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 diff --git a/go.sum b/go.sum index a3ca3f8a7..7f1ea339f 100644 --- a/go.sum +++ b/go.sum @@ -212,8 +212,8 @@ github.com/banzaicloud/anchore-image-validator v0.0.0-20190823121528-918b9fa6af6 github.com/banzaicloud/anchore-image-validator v0.0.0-20190823121528-918b9fa6af62/go.mod h1:LpX/aNV3ZYLT0UphkpG88OPi5/vHMrScB7TQtQLrjTs= github.com/banzaicloud/bank-vaults/pkg/sdk v0.6.0 h1:SOv7vrvAynnp2vrC26cKWRbj1O0ymswvNOVVGtiL178= github.com/banzaicloud/bank-vaults/pkg/sdk v0.6.0/go.mod h1:qiltQqY61LtTbzichEGinjnAODrbx7Z+gbXmT0tkS4U= -github.com/banzaicloud/cadence-aws-sdk v0.5.0 h1:yxJR+YyMYKOL1I0jquRwZZ1yscqHmw6fOedlls93xhk= -github.com/banzaicloud/cadence-aws-sdk v0.5.0/go.mod h1:DpOLc1agaPRRpB7t35841r9mrFSvU1W4Gqlra8Cn2Zw= +github.com/banzaicloud/cadence-aws-sdk v0.6.0 h1:z0xj9mcJswNdpbci+jRq22AymEVwf3NBnzQZD+9CSp4= +github.com/banzaicloud/cadence-aws-sdk v0.6.0/go.mod h1:QmbwXeLX+lnFnv3JaEXZRYyG/wxyJl1NuQZRcGnyMqE= github.com/banzaicloud/gin-utilz v0.3.1 h1:BnRW3oh6lK3jjyy0epTKDpMCFFR4c6zFHRbIYVEH5M8= github.com/banzaicloud/gin-utilz v0.3.1/go.mod h1:HK5gehB/ipiFw7ousnH335vpkVnqEXysi5wzQhAWByc= github.com/banzaicloud/go-gin-prometheus v0.1.0 h1:zetacN1k3svVc7DtzGfpHA49uO0G8cwsiP5qSuUUQKs= @@ -342,6 +342,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cristalhq/jwt/v3 v3.1.0 h1:iLeL9VzB0SCtjCy9Kg53rMwTcrNm+GHyVcz2eUujz6s= +github.com/cristalhq/jwt/v3 v3.1.0/go.mod h1:XOnIXst8ozq/esy5N1XOlSyQqBd+84fxJ99FK+1jgL8= github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -1321,6 +1323,7 @@ github.com/uber-go/mapdecode v1.0.0/go.mod h1:b5nP15FwXTgpjTjeA9A2uTHXV5UJCl4arw github.com/uber-go/tally v3.3.12+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= github.com/uber-go/tally v3.3.15+incompatible h1:9hLSgNBP28CjIaDmAuRTq9qV+UZY+9PcvAkXO4nNMwg= github.com/uber-go/tally v3.3.15+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= +github.com/uber/cadence-idl v0.0.0-20211111101836-d6b70b60eb8c/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws= github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM= github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw= @@ -1412,8 +1415,8 @@ go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/cadence v0.18.5 h1:nXf2M8IiH0EyUbGQhiF5mS1W/fDiUbKNvwqO1hjZay0= -go.uber.org/cadence v0.18.5/go.mod h1:D0b+ZFwYRBKXNBwjiS+jtTTREbZgSubgIsB2RaC81jQ= +go.uber.org/cadence v0.19.0 h1:EvDXwIJ0lAAxL2i8ne/vG/TeoJM6xkAyqgTRFmIWG+c= +go.uber.org/cadence v0.19.0/go.mod h1:s91dOf0kcJbumPscRIVFV/4Xq/exhefzpXmnDiRRTxs= go.uber.org/dig v1.8.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw= go.uber.org/dig v1.10.0 h1:yLmDDj9/zuDjv3gz8GQGviXMs9TfysIUMUilCpgzUJY= go.uber.org/dig v1.10.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw= From 661d2994a226b506459ed7dc369364a3e90d2fa1 Mon Sep 17 00:00:00 2001 From: Andras Jaky Date: Mon, 31 Jan 2022 17:27:48 +0100 Subject: [PATCH 3/3] build(plz): updated dependencies --- .wollemi.json | 2 ++ third_party/go/BUILD.plz | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.wollemi.json b/.wollemi.json index 22330b56e..1e41c83e9 100644 --- a/.wollemi.json +++ b/.wollemi.json @@ -177,6 +177,7 @@ "github.com/containerd/containerd/version": "//third_party/go:github.com__containerd__containerd__version", "github.com/coreos/go-oidc": "//third_party/go:github.com__coreos__go-oidc", "github.com/cppforlife/go-patch/patch": "//third_party/go:github.com__cppforlife__go-patch__patch", + "github.com/cristalhq/jwt/v3": "//third_party/go:github.com__cristalhq__jwt__v3", "github.com/cyphar/filepath-securejoin": "//third_party/go:github.com__cyphar__filepath-securejoin", "github.com/davecgh/go-spew/spew": "//third_party/go:github.com__davecgh__go-spew__spew", "github.com/deislabs/oras/pkg/artifact": "//third_party/go:github.com__deislabs__oras__pkg__artifact", @@ -568,6 +569,7 @@ "go.uber.org/cadence/encoded": "//third_party/go:go.uber.org__cadence__encoded", "go.uber.org/cadence/internal": "//third_party/go:go.uber.org__cadence__internal", "go.uber.org/cadence/internal/common": "//third_party/go:go.uber.org__cadence__internal__common", + "go.uber.org/cadence/internal/common/auth": "//third_party/go:go.uber.org__cadence__internal__common__auth", "go.uber.org/cadence/internal/common/backoff": "//third_party/go:go.uber.org__cadence__internal__common__backoff", "go.uber.org/cadence/internal/common/cache": "//third_party/go:go.uber.org__cadence__internal__common__cache", "go.uber.org/cadence/internal/common/metrics": "//third_party/go:go.uber.org__cadence__internal__common__metrics", diff --git a/third_party/go/BUILD.plz b/third_party/go/BUILD.plz index 3afa88efb..325673908 100644 --- a/third_party/go/BUILD.plz +++ b/third_party/go/BUILD.plz @@ -1962,7 +1962,7 @@ go_mod_download( name = "github.com__banzaicloud__cadence-aws-sdk", _tag = "download", module = "github.com/banzaicloud/cadence-aws-sdk", - version = "v0.5.0", + version = "v0.6.0", ) go_module( @@ -2774,6 +2774,22 @@ go_module( deps = [":gopkg.in__yaml.v2"], ) +go_mod_download( + name = "github.com__cristalhq__jwt__v3", + _tag = "download", + module = "github.com/cristalhq/jwt/v3", + version = "v3.1.0", +) + +go_module( + name = "github.com__cristalhq__jwt__v3", + download = ":_github.com__cristalhq__jwt__v3#download", + install = ["."], + module = "github.com/cristalhq/jwt/v3", + visibility = ["PUBLIC"], + deps = [], +) + go_mod_download( name = "github.com__cyphar__filepath-securejoin", _tag = "download", @@ -8247,7 +8263,7 @@ go_mod_download( name = "go.uber.org__cadence", _tag = "download", module = "go.uber.org/cadence", - version = "v0.18.5", + version = "v0.19.0", ) go_module( @@ -8384,6 +8400,7 @@ go_module( visibility = ["PUBLIC"], deps = [ ":github.com__apache__thrift__lib__go__thrift", + ":github.com__cristalhq__jwt__v3", ":github.com__facebookgo__clock", ":github.com__golang__mock__gomock", ":github.com__opentracing__opentracing-go", @@ -8397,6 +8414,7 @@ go_module( ":go.uber.org__cadence__.gen__go__shadower", ":go.uber.org__cadence__.gen__go__shared", ":go.uber.org__cadence__internal__common", + ":go.uber.org__cadence__internal__common__auth", ":go.uber.org__cadence__internal__common__backoff", ":go.uber.org__cadence__internal__common__cache", ":go.uber.org__cadence__internal__common__metrics", @@ -8421,6 +8439,19 @@ go_module( ], ) +go_module( + name = "go.uber.org__cadence__internal__common__auth", + download = ":_go.uber.org__cadence#download", + install = ["internal/common/auth"], + module = "go.uber.org/cadence", + visibility = ["PUBLIC"], + deps = [ + ":go.uber.org__cadence__.gen__go__cadence__workflowserviceclient", + ":go.uber.org__cadence__.gen__go__shared", + ":go.uber.org__yarpc", + ], +) + go_module( name = "go.uber.org__cadence__internal__common__backoff", download = ":_go.uber.org__cadence#download", @@ -8511,6 +8542,7 @@ go_module( ":go.uber.org__cadence__.gen__go__shared", ":go.uber.org__cadence__activity", ":go.uber.org__cadence__internal", + ":go.uber.org__cadence__internal__common__auth", ":go.uber.org__cadence__workflow", ":go.uber.org__zap", ],