From 6a17fceda2d7252644b3a1719bf0283febe84fee Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Sun, 20 Oct 2024 10:38:41 -0700 Subject: [PATCH 01/12] remove logrus and add new interfaces for worker # Conflicts: # go.mod # go.sum # sdk/client/api_task_resource.go # sdk/log/logger.go # sdk/worker/task_runner.go --- examples/go.mod | 4 +- go.mod | 26 +- go.sum | 473 +------------------- sdk/authentication/token_helper.go | 2 +- sdk/authentication/token_manager.go | 2 +- sdk/client/task_client.go | 11 +- sdk/concurrency/recover.go | 2 +- sdk/log/logger.go | 12 +- sdk/main/main.go | 155 +++++++ sdk/metrics/provider.go | 8 +- sdk/model/task_execute_function.go | 10 +- sdk/model/task_json_io.go | 157 +++++++ sdk/model/task_result.go | 3 +- sdk/worker/task_context.go | 67 +++ sdk/worker/task_executor.go | 92 ++++ sdk/worker/task_runner.go | 309 +++++++------ sdk/workflow/executor/executor.go | 2 +- sdk/workflow/executor/monitor.go | 2 +- sdk/workflow/workflow.go | 2 +- test/integration_tests/worker_test.go | 5 +- test/integration_tests/workflow_def_test.go | 9 +- test/testdata/util.go | 9 +- test/testdata/worker.go | 8 - 23 files changed, 706 insertions(+), 664 deletions(-) create mode 100644 sdk/main/main.go create mode 100644 sdk/model/task_json_io.go create mode 100644 sdk/worker/task_context.go create mode 100644 sdk/worker/task_executor.go diff --git a/examples/go.mod b/examples/go.mod index 81b7b712..f495c65f 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -13,7 +13,7 @@ require ( github.com/antihax/optional v1.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/prometheus/client_golang v1.12.1 // indirect @@ -21,5 +21,5 @@ require ( github.com/prometheus/common v0.32.1 // indirect github.com/prometheus/procfs v0.7.3 // indirect golang.org/x/sys v0.6.0 // indirect - google.golang.org/protobuf v1.26.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.mod b/go.mod index 56a81332..92b8a177 100644 --- a/go.mod +++ b/go.mod @@ -1,30 +1,32 @@ module github.com/conductor-sdk/conductor-go -go 1.17 +go 1.18 require ( github.com/antihax/optional v1.0.0 github.com/google/uuid v1.3.0 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/prometheus/client_golang v1.12.1 - github.com/sirupsen/logrus v1.8.1 + github.com/prometheus/client_golang v0.9.2 github.com/stretchr/testify v1.8.1 - go.uber.org/zap v1.24.0 + go.uber.org/zap v1.27.0 ) require ( - github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/kr/pretty v0.1.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 // indirect + go.uber.org/multierr v1.10.0 // indirect + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.32.1 // indirect github.com/prometheus/procfs v0.7.3 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.9.0 // indirect golang.org/x/sys v0.6.0 // indirect - google.golang.org/protobuf v1.26.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.sum b/go.sum index 7adbc903..04f651ad 100644 --- a/go.sum +++ b/go.sum @@ -1,507 +1,72 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -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.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 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -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/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= -go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/sdk/authentication/token_helper.go b/sdk/authentication/token_helper.go index e5895cc7..0d228b0c 100644 --- a/sdk/authentication/token_helper.go +++ b/sdk/authentication/token_helper.go @@ -27,9 +27,9 @@ import ( "regexp" "strings" + "github.com/conductor-sdk/conductor-go/sdk/log" "github.com/conductor-sdk/conductor-go/sdk/model" "github.com/conductor-sdk/conductor-go/sdk/settings" - log "github.com/sirupsen/logrus" ) var ( diff --git a/sdk/authentication/token_manager.go b/sdk/authentication/token_manager.go index b3fc2f69..6344d904 100644 --- a/sdk/authentication/token_manager.go +++ b/sdk/authentication/token_manager.go @@ -13,9 +13,9 @@ import ( "net/http" "sync" + "github.com/conductor-sdk/conductor-go/sdk/log" "github.com/conductor-sdk/conductor-go/sdk/settings" "github.com/patrickmn/go-cache" - log "github.com/sirupsen/logrus" ) const ( diff --git a/sdk/client/task_client.go b/sdk/client/task_client.go index 9e45a2c5..317c64ab 100644 --- a/sdk/client/task_client.go +++ b/sdk/client/task_client.go @@ -10,18 +10,19 @@ import ( type TaskClient interface { All(ctx context.Context) (map[string]int64, *http.Response, error) AllVerbose(ctx context.Context) (map[string]map[string]map[string]int64, *http.Response, error) - BatchPoll(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiBatchPollOpts) ([]model.Task, *http.Response, error) + BatchPoll(ctx context.Context, tasktype string, options *TaskResourceApiBatchPollOpts) ([]model.Task, *http.Response, error) + BatchPollTask(ctx context.Context, tasktype string, options *TaskResourceApiBatchPollOpts) ([]model.PolledTask, *http.Response, error) GetAllPollData(ctx context.Context) ([]model.PollData, *http.Response, error) GetExternalStorageLocation1(ctx context.Context, path string, operation string, payloadType string) (model.ExternalStorageLocation, *http.Response, error) GetPollData(ctx context.Context, taskType string) ([]model.PollData, *http.Response, error) GetTask(ctx context.Context, taskId string) (model.Task, *http.Response, error) GetTaskLogs(ctx context.Context, taskId string) ([]model.TaskExecLog, *http.Response, error) Log(ctx context.Context, body string, taskId string) (*http.Response, error) - Poll(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiPollOpts) (model.Task, *http.Response, error) + Poll(ctx context.Context, tasktype string, options *TaskResourceApiPollOpts) (model.Task, *http.Response, error) RequeuePendingTask(ctx context.Context, taskType string) (string, *http.Response, error) - Search(ctx context.Context, localVarOptionals *TaskResourceApiSearch1Opts) (model.SearchResultTaskSummary, *http.Response, error) - SearchV2(ctx context.Context, localVarOptionals *TaskResourceApiSearchV21Opts) (model.SearchResultTask, *http.Response, error) - Size(ctx context.Context, localVarOptionals *TaskResourceApiSizeOpts) (map[string]int32, *http.Response, error) + Search(ctx context.Context, options *TaskResourceApiSearch1Opts) (model.SearchResultTaskSummary, *http.Response, error) + SearchV2(ctx context.Context, options *TaskResourceApiSearchV21Opts) (model.SearchResultTask, *http.Response, error) + Size(ctx context.Context, options *TaskResourceApiSizeOpts) (map[string]int32, *http.Response, error) UpdateTask(ctx context.Context, taskResult *model.TaskResult) (string, *http.Response, error) UpdateTaskByRefName(ctx context.Context, body map[string]interface{}, workflowId string, taskRefName string, status string) (string, *http.Response, error) UpdateTaskByRefNameWithWorkerId(ctx context.Context, body map[string]interface{}, workflowId string, taskRefName string, status string, workerId optional.String) (string, *http.Response, error) diff --git a/sdk/concurrency/recover.go b/sdk/concurrency/recover.go index 84a6a878..8928c4ce 100644 --- a/sdk/concurrency/recover.go +++ b/sdk/concurrency/recover.go @@ -10,8 +10,8 @@ package concurrency import ( + "github.com/conductor-sdk/conductor-go/sdk/log" "github.com/conductor-sdk/conductor-go/sdk/metrics" - log "github.com/sirupsen/logrus" "runtime/debug" ) diff --git a/sdk/log/logger.go b/sdk/log/logger.go index 1583ac87..b2adf3be 100644 --- a/sdk/log/logger.go +++ b/sdk/log/logger.go @@ -7,22 +7,19 @@ var ( ) func init() { - logger, err := zap.NewProduction() - if err != nil { - panic("failed to initialize zap logger: " + err.Error()) // Handle error appropriately - } + logger, _ := zap.NewProduction() defer logger.Sync() // flushes buffer, if any sugar = logger.Sugar() } - func Info(args ...interface{}) { + sugar.Info(args) } func Debug(args ...interface{}) { sugar.Debug(args) } func Trace(args ...interface{}) { - sugar.Debug(args) + //sugar.Debug(args) } func Error(args ...interface{}) { sugar.Error(args) @@ -30,6 +27,3 @@ func Error(args ...interface{}) { func Warning(args ...interface{}) { sugar.Warn(args) } -func Fatalf(format string, args ...interface{}) { - sugar.Fatalf(format, args...) -} diff --git a/sdk/main/main.go b/sdk/main/main.go new file mode 100644 index 00000000..4b97c4c9 --- /dev/null +++ b/sdk/main/main.go @@ -0,0 +1,155 @@ +package main + +import ( + "fmt" + "github.com/conductor-sdk/conductor-go/sdk/client" + "github.com/conductor-sdk/conductor-go/sdk/model" + "github.com/conductor-sdk/conductor-go/sdk/settings" + "github.com/conductor-sdk/conductor-go/sdk/worker" +) + +type Restaurant struct { + Restaurant RestaurantData `json:"restaurant"` +} + +type RestaurantData struct { + Name string `json:"name"` + Owner Owner `json:"owner"` +} + +type Owner struct { + Name string `json:"name"` +} + +func authSettings() *settings.AuthenticationSettings { + key := "api_key_user_03" + secret := "api_key_user_03" + if key != "" && secret != "" { + return settings.NewAuthenticationSettings( + key, + secret, + ) + } + + return nil +} + +func httpSettings() *settings.HttpSettings { + url := "http://localhost:8080/api" + return settings.NewHttpSettings(url) +} + +type Data struct { + InputKey InputKey `json:inputKey` +} + +type InputKey struct { + Headers Headers `json:"headers"` + ReasonPhrase string `json:"reasonPhrase"` + Body Body `json:"body"` + StatusCode int `json:"statusCode"` +} + +type Headers struct { + Date []string `json:"Date"` + ContentType []string `json:"Content-Type"` + ContentLength []string `json:"Content-Length"` + Connection []string `json:"Connection"` + StrictTransportSecurity []string `json:"Strict-Transport-Security"` +} + +type Body struct { + RandomString string `json:"randomString"` + RandomInt int `json:"randomInt"` + HostName string `json:"hostName"` + APIRandomDelay string `json:"apiRandomDelay"` + SleepFor string `json:"sleepFor"` + StatusCode string `json:"statusCode"` + QueryParams map[string]interface{} `json:"queryParams"` +} + +func ProcessBody(body *Data) (*Data, error) { + if body == nil { + fmt.Println("Body is nil") + return nil, nil + } + body.InputKey.Body.HostName = "locally hosting" + fmt.Println("returning", body) + return body, nil +} + +func ProcessBody2(task *model.Task) (interface{}, error) { + fmt.Println("executing", task.TaskId) + return Data{InputKey: InputKey{ + Headers: Headers{}, + ReasonPhrase: "", + Body: Body{}, + StatusCode: 0, + }}, nil +} + +func ProcessBody3(ctx worker.TaskContext, data *Data) (Data, error) { + + fmt.Println("taskId", ctx.GetTaskId()) + + return Data{InputKey: InputKey{ + Headers: Headers{}, + ReasonPhrase: "reason reason reason", + Body: Body{}, + StatusCode: data.InputKey.StatusCode + 2, + }}, nil +} + +func main() { + + apiClient := client.NewAPIClient( + authSettings(), + httpSettings(), + ) + taskRunner := worker.NewTaskRunnerWithApiClient(apiClient) + //taskRunner.StartWorker("hello", ProcessBody2, 1, 100) + //taskRunner.StartWorkerWithDomain("hello", ProcessBody2, 1, 100, "d1") + worker2 := worker.NewWorkerWithCtx("hello", ProcessBody3) + worker2.Options = &worker.TaskWorkerOptions{ + BatchSize: 10, + PollInterval: 100, + } + + //worker.Options.Domain = "d1" + err := worker2.Start(taskRunner) + if err != nil { + return + } + taskRunner.WaitWorkers() + ////worker := worker.NewWorker("hello", ProcessBody) + // + ////taskClient := client.NewTaskClient(apiClient) + ////workerFn, _ := worker.GetWorker(ProcessBody) + ////_ = taskRunner.StartWorker2("hello", workerFn, 1, 1) + // + //opts := &client.TaskResourceApiBatchPollOpts{} + //tasks, _, err := taskClient.BatchPollTask(context.Background(), "hello", opts) + ////task := model.PolledTask{ + //// TaskType: "abcd", + //// InputData: "{}", + //// OutputData: "{}", + ////} + //if err != nil { + // fmt.Println("Got error ", err.Error()) + //} + //fmt.Println("Got", len(tasks)) + + //for i := range tasks { + // fmt.Println("Task.Id", tasks[i].TaskId) + // res, err := te.Execute(&tasks[i]) + // if err != nil { + // fmt.Println("Error executing process body ", err.Error()) + // } else { + // fmt.Println("Response of process body", res) + // } + //} + + //data, _ := json.Marshal(task.InputData) + //jsons := string(data) + //fmt.Println(jsons) +} diff --git a/sdk/metrics/provider.go b/sdk/metrics/provider.go index 221418a5..82125adb 100644 --- a/sdk/metrics/provider.go +++ b/sdk/metrics/provider.go @@ -13,8 +13,8 @@ import ( "net/http" "strconv" + "github.com/conductor-sdk/conductor-go/sdk/log" "github.com/conductor-sdk/conductor-go/sdk/settings" - log "github.com/sirupsen/logrus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -40,14 +40,12 @@ func ProvideMetrics(metricsSettings *settings.MetricsSettings) { prometheus.MustRegister(gaugeByName[metricName]) } collectionEnabled = true - + http.Handle( metricsSettings.ApiEndpoint, promhttp.HandlerFor( prometheus.DefaultGatherer, - promhttp.HandlerOpts{ - EnableOpenMetrics: true, - }, + promhttp.HandlerOpts{}, ), ) portString := strconv.Itoa(metricsSettings.Port) diff --git a/sdk/model/task_execute_function.go b/sdk/model/task_execute_function.go index 638c60d0..af7768bf 100644 --- a/sdk/model/task_execute_function.go +++ b/sdk/model/task_execute_function.go @@ -14,7 +14,7 @@ import ( "os" "sync" - log "github.com/sirupsen/logrus" + "github.com/conductor-sdk/conductor-go/sdk/log" ) var hostname string @@ -24,6 +24,11 @@ type ExecuteTaskFunction func(t *Task) (interface{}, error) type ValidateWorkflowFunction func(w *Workflow) (bool, error) +type TaskResultMaker interface { + ToTaskResult() *TaskResult + ToTaskResultWithError(err error) *TaskResult +} + func NewTaskResultFromTask(task *Task) *TaskResult { return &TaskResult{ TaskId: task.TaskId, @@ -34,6 +39,7 @@ func NewTaskResultFromTask(task *Task) *TaskResult { func NewTaskResultFromTaskWithError(t *Task, err error) *TaskResult { taskResult := NewTaskResultFromTask(t) + //taskResult := t.ToTaskResult(FailedTask) taskResult.ReasonForIncompletion = err.Error() switch err.(type) { case *NonRetryableError: @@ -61,7 +67,7 @@ func GetTaskResultFromTaskExecutionOutput(t *Task, taskExecutionOutput interface if err != nil { return nil, err } - taskResult.OutputData = outputData + taskResult.OutputDataRaw = outputData taskResult.Status = CompletedTask } return taskResult, nil diff --git a/sdk/model/task_json_io.go b/sdk/model/task_json_io.go new file mode 100644 index 00000000..d8846b67 --- /dev/null +++ b/sdk/model/task_json_io.go @@ -0,0 +1,157 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on +// an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the +// specific language governing permissions and limitations under the License. + +package model + +import ( + "encoding/json" +) + +type PolledTask struct { + TaskType string `json:"taskType,omitempty"` + Status TaskResultStatus `json:"status,omitempty"` + InputData json.RawMessage `json:"inputData,omitempty"` + ReferenceTaskName string `json:"referenceTaskName,omitempty"` + RetryCount int32 `json:"retryCount,omitempty"` + Seq int32 `json:"seq,omitempty"` + CorrelationId string `json:"correlationId,omitempty"` + PollCount int32 `json:"pollCount,omitempty"` + TaskDefName string `json:"taskDefName,omitempty"` + ScheduledTime int64 `json:"scheduledTime,omitempty"` + StartTime int64 `json:"startTime,omitempty"` + EndTime int64 `json:"endTime,omitempty"` + UpdateTime int64 `json:"updateTime,omitempty"` + StartDelayInSeconds int32 `json:"startDelayInSeconds,omitempty"` + RetriedTaskId string `json:"retriedTaskId,omitempty"` + Retried bool `json:"retried,omitempty"` + Executed bool `json:"executed,omitempty"` + CallbackFromWorker bool `json:"callbackFromWorker,omitempty"` + ResponseTimeoutSeconds int64 `json:"responseTimeoutSeconds,omitempty"` + WorkflowInstanceId string `json:"workflowInstanceId,omitempty"` + WorkflowType string `json:"workflowType,omitempty"` + TaskId string `json:"taskId,omitempty"` + ReasonForIncompletion string `json:"reasonForIncompletion,omitempty"` + CallbackAfterSeconds int64 `json:"callbackAfterSeconds,omitempty"` + WorkerId string `json:"workerId,omitempty"` + OutputData json.RawMessage `json:"outputData,omitempty"` + WorkflowTask *WorkflowTask `json:"workflowTask,omitempty"` + Domain string `json:"domain,omitempty"` + RateLimitPerFrequency int32 `json:"rateLimitPerFrequency,omitempty"` + RateLimitFrequencyInSeconds int32 `json:"rateLimitFrequencyInSeconds,omitempty"` + ExternalInputPayloadStoragePath string `json:"externalInputPayloadStoragePath,omitempty"` + ExternalOutputPayloadStoragePath string `json:"externalOutputPayloadStoragePath,omitempty"` + WorkflowPriority int32 `json:"workflowPriority,omitempty"` + ExecutionNameSpace string `json:"executionNameSpace,omitempty"` + IsolationGroupId string `json:"isolationGroupId,omitempty"` + Iteration int32 `json:"iteration,omitempty"` + SubWorkflowId string `json:"subWorkflowId,omitempty"` + SubworkflowChanged bool `json:"subworkflowChanged,omitempty"` + QueueWaitTime int64 `json:"queueWaitTime,omitempty"` + TaskDefinition *TaskDef `json:"taskDefinition,omitempty"` + LoopOverTask bool `json:"loopOverTask,omitempty"` +} + +func (task *PolledTask) ToValue(newValue any) (interface{}, error) { + + bytes, err := task.InputData.MarshalJSON() + if err != nil { + return nil, err + } + err = json.Unmarshal(bytes, newValue) + if err != nil { + return nil, err + } + return newValue, nil +} + +func (pt *PolledTask) ToTask() (*Task, error) { + var inputData map[string]interface{} + if err := json.Unmarshal(pt.InputData, &inputData); err != nil { + return nil, err + } + + // Convert OutputData from json.RawMessage to map[string]interface{} + var outputData map[string]interface{} + if err := json.Unmarshal(pt.OutputData, &outputData); err != nil { + return nil, err + } + return &Task{ + TaskType: pt.TaskType, + Status: pt.Status, + InputData: inputData, + ReferenceTaskName: pt.ReferenceTaskName, + RetryCount: pt.RetryCount, + Seq: pt.Seq, + CorrelationId: pt.CorrelationId, + PollCount: pt.PollCount, + TaskDefName: pt.TaskDefName, + ScheduledTime: pt.ScheduledTime, + StartTime: pt.StartTime, + EndTime: pt.EndTime, + UpdateTime: pt.UpdateTime, + StartDelayInSeconds: pt.StartDelayInSeconds, + RetriedTaskId: pt.RetriedTaskId, + Retried: pt.Retried, + Executed: pt.Executed, + CallbackFromWorker: pt.CallbackFromWorker, + ResponseTimeoutSeconds: pt.ResponseTimeoutSeconds, + WorkflowInstanceId: pt.WorkflowInstanceId, + WorkflowType: pt.WorkflowType, + TaskId: pt.TaskId, + ReasonForIncompletion: pt.ReasonForIncompletion, + CallbackAfterSeconds: pt.CallbackAfterSeconds, + WorkerId: pt.WorkerId, + OutputData: outputData, + WorkflowTask: pt.WorkflowTask, + Domain: pt.Domain, + RateLimitPerFrequency: pt.RateLimitPerFrequency, + RateLimitFrequencyInSeconds: pt.RateLimitFrequencyInSeconds, + ExternalInputPayloadStoragePath: pt.ExternalInputPayloadStoragePath, + ExternalOutputPayloadStoragePath: pt.ExternalOutputPayloadStoragePath, + WorkflowPriority: pt.WorkflowPriority, + ExecutionNameSpace: pt.ExecutionNameSpace, + IsolationGroupId: pt.IsolationGroupId, + Iteration: pt.Iteration, + SubWorkflowId: pt.SubWorkflowId, + SubworkflowChanged: pt.SubworkflowChanged, + QueueWaitTime: pt.QueueWaitTime, + TaskDefinition: pt.TaskDefinition, + LoopOverTask: pt.LoopOverTask, + }, nil + +} + +func (task *PolledTask) ToTaskResult() *TaskResult { + return &TaskResult{ + TaskId: task.TaskId, + WorkflowInstanceId: task.WorkflowInstanceId, + WorkerId: getHostname(), + } +} + +func (task *PolledTask) ToTaskResultWithError(err error) *TaskResult { + taskResult := task.ToTaskResult() + taskResult.ReasonForIncompletion = err.Error() + switch err.(type) { + case *NonRetryableError: + taskResult.Status = FailedWithTerminalErrorTask + default: + taskResult.Status = FailedTask + } + return taskResult +} +func (task *PolledTask) ToTaskResultExecutionOutput(taskExecutionOutput interface{}) (*TaskResult, error) { + taskResult, ok := taskExecutionOutput.(*TaskResult) + if !ok { + taskResult = task.ToTaskResult() + taskResult.OutputDataRaw = taskExecutionOutput + taskResult.Status = CompletedTask + } + return taskResult, nil +} diff --git a/sdk/model/task_result.go b/sdk/model/task_result.go index 19a22f00..c1116cdf 100644 --- a/sdk/model/task_result.go +++ b/sdk/model/task_result.go @@ -16,7 +16,8 @@ type TaskResult struct { CallbackAfterSeconds int64 `json:"callbackAfterSeconds,omitempty"` WorkerId string `json:"workerId,omitempty"` Status TaskResultStatus `json:"status,omitempty"` - OutputData map[string]interface{} `json:"outputData,omitempty"` + OutputData map[string]interface{} `json:"-"` + OutputDataRaw interface{} `json:"outputData,omitempty"` Logs []TaskExecLog `json:"logs,omitempty"` ExternalOutputPayloadStoragePath string `json:"externalOutputPayloadStoragePath,omitempty"` SubWorkflowId string `json:"subWorkflowId,omitempty"` diff --git a/sdk/worker/task_context.go b/sdk/worker/task_context.go new file mode 100644 index 00000000..9d7c3be7 --- /dev/null +++ b/sdk/worker/task_context.go @@ -0,0 +1,67 @@ +package worker + +import "context" + +type TaskContext interface { + context.Context + GetRetryCount() int32 + GetCorrelationId() string + GetPollCount() int32 + GetRetriedTaskId() string + GetRetried() bool + GetWorkflowInstanceId() string + GetWorkflowType() string + GetTaskId() string + GetWorkflowPriority() int32 +} + +type TaskContextImpl struct { + context.Context // Embed the standard context.Context + RetryCount int32 + CorrelationId string + PollCount int32 + RetriedTaskId string + Retried bool + WorkflowInstanceId string + WorkflowType string + TaskId string + WorkflowPriority int32 +} + +// Implement the TaskContext interface by providing the getter methods + +func (t *TaskContextImpl) GetRetryCount() int32 { + return t.RetryCount +} + +func (t *TaskContextImpl) GetCorrelationId() string { + return t.CorrelationId +} + +func (t *TaskContextImpl) GetPollCount() int32 { + return t.PollCount +} + +func (t *TaskContextImpl) GetRetriedTaskId() string { + return t.RetriedTaskId +} + +func (t *TaskContextImpl) GetRetried() bool { + return t.Retried +} + +func (t *TaskContextImpl) GetWorkflowInstanceId() string { + return t.WorkflowInstanceId +} + +func (t *TaskContextImpl) GetWorkflowType() string { + return t.WorkflowType +} + +func (t *TaskContextImpl) GetTaskId() string { + return t.TaskId +} + +func (t *TaskContextImpl) GetWorkflowPriority() int32 { + return t.WorkflowPriority +} diff --git a/sdk/worker/task_executor.go b/sdk/worker/task_executor.go new file mode 100644 index 00000000..10ff2e5e --- /dev/null +++ b/sdk/worker/task_executor.go @@ -0,0 +1,92 @@ +package worker + +import ( + "github.com/conductor-sdk/conductor-go/sdk/model" + "time" +) + +type TaskWorker[T any, R any] struct { + taskName string + function func(ctx TaskContext, task *model.PolledTask) (interface{}, error) + Options *TaskWorkerOptions + taskRunner *TaskRunner +} +type TaskWorkerOptions struct { + Domain string + BatchSize int + PollInterval time.Duration +} +type executePolledTaskFunction func(ctx TaskContext, t *model.PolledTask) (interface{}, error) + +func defaultOptions() *TaskWorkerOptions { + return &TaskWorkerOptions{ + BatchSize: 1, + PollInterval: time.Millisecond * 100, + } +} + +func NewWorker[T any, R any](taskName string, f func(T) (R, error)) *TaskWorker[T, R] { + executorFn := func(ctx TaskContext, task *model.PolledTask) (interface{}, error) { + + var value T + _, err := task.ToValue(&value) + if err != nil { + return nil, err + } + result, err := f(value) + if err != nil { + return nil, err + } + // Return the result as an interface{} + return result, nil + } + + return &TaskWorker[T, R]{ + taskName: taskName, + function: executorFn, + Options: defaultOptions(), + } +} + +func NewWorkerWithCtx[T any, R any](taskName string, f func(ctx TaskContext, t T) (R, error)) *TaskWorker[T, R] { + executorFn := func(ctx TaskContext, task *model.PolledTask) (interface{}, error) { + + var value T + _, err := task.ToValue(&value) + if err != nil { + return nil, err + } + result, err := f(ctx, value) + if err != nil { + return nil, err + } + // Return the result as an interface{} + return result, nil + } + + return &TaskWorker[T, R]{ + taskName: taskName, + function: executorFn, + Options: defaultOptions(), + } +} + +func (executor *TaskWorker[T, R]) UpdateBatchSize(batchSize int) error { + executor.Options.BatchSize = batchSize + if executor.taskRunner != nil { + return executor.taskRunner.SetBatchSize(executor.taskName, batchSize) + } + return nil +} +func (executor *TaskWorker[T, R]) UpdatePollInterval(pollInterval time.Duration) error { + executor.Options.PollInterval = pollInterval + if executor.taskRunner != nil { + return executor.taskRunner.SetPollIntervalForTask(executor.taskName, pollInterval) + } + return nil +} + +func (executor *TaskWorker[T, R]) Start(taskRunner *TaskRunner) error { + executor.taskRunner = taskRunner + return taskRunner.StartWorkerWithExecFn(executor.taskName, executor.function, executor.Options) +} diff --git a/sdk/worker/task_runner.go b/sdk/worker/task_runner.go index 2b19bf06..e6bbfe0d 100644 --- a/sdk/worker/task_runner.go +++ b/sdk/worker/task_runner.go @@ -24,7 +24,7 @@ import ( "github.com/conductor-sdk/conductor-go/sdk/settings" "github.com/antihax/optional" - log "github.com/sirupsen/logrus" + "github.com/conductor-sdk/conductor-go/sdk/log" ) const taskUpdateRetryAttemptsLimit = 3 @@ -62,9 +62,8 @@ type TaskRunner struct { pausedWorkersMutex sync.RWMutex pausedWorkers map[string]bool - pollTimeoutMutex sync.RWMutex - pollTimeout time.Duration - pollTimeoutByTaskName map[string]time.Duration + taskWorkerLegayExecutors map[string]model.ExecuteTaskFunction + taskWorkerExecutors map[string]executePolledTaskFunction } // NewTaskRunner returns a new TaskRunner which authenticates via HTTP using the provided settings. @@ -89,8 +88,8 @@ func NewTaskRunnerWithApiClient( runningWorkersByTaskName: make(map[string]int), pollIntervalByTaskName: make(map[string]time.Duration), pausedWorkers: make(map[string]bool), - pollTimeoutByTaskName: make(map[string]time.Duration), - pollTimeout: -1 * time.Millisecond, //If negative, the server will use its default. + taskWorkerLegayExecutors: make(map[string]model.ExecuteTaskFunction), + taskWorkerExecutors: make(map[string]executePolledTaskFunction), } } @@ -106,7 +105,8 @@ func (c *TaskRunner) SetSleepOnGenericError(duration time.Duration) { // // StartWorkerWithDomain(taskName, executeFunction, batchSize, pollInterval, "") func (c *TaskRunner) StartWorkerWithDomain(taskName string, executeFunction model.ExecuteTaskFunction, batchSize int, pollInterval time.Duration, domain string) error { - return c.startWorker(taskName, executeFunction, batchSize, pollInterval, domain) + c.taskWorkerLegayExecutors[taskName+"-"+domain] = executeFunction + return c.startWorker(taskName, batchSize, pollInterval, domain) } // StartWorker starts a worker on a new goroutine, which polls conductor periodically for tasks matching the provided @@ -116,7 +116,17 @@ func (c *TaskRunner) StartWorkerWithDomain(taskName string, executeFunction mode // pollInterval and increases the batch size for the task, which applies to all tasks shared by this TaskRunner with the // same taskName. func (c *TaskRunner) StartWorker(taskName string, executeFunction model.ExecuteTaskFunction, batchSize int, pollInterval time.Duration) error { - return c.startWorker(taskName, executeFunction, batchSize, pollInterval, "") + c.taskWorkerLegayExecutors[taskName+"-"] = executeFunction + return c.startWorker(taskName, batchSize, pollInterval, "") +} + +func (c *TaskRunner) StartWorkerWithExecFn(taskName string, executeFunction executePolledTaskFunction, options *TaskWorkerOptions) error { + batchSize := options.BatchSize + pollInterval := options.PollInterval + domain := options.Domain + + c.taskWorkerExecutors[taskName+"-"+domain] = executeFunction + return c.startWorker(taskName, batchSize, pollInterval, domain) } // SetBatchSize can be used to set the batch size for all workers running the provided task. @@ -208,33 +218,6 @@ func (c *TaskRunner) Resume(taskName string) { c.pausedWorkers[taskName] = false } -// Shutdown the TaskRunner will stop polling for tasks and once all running workers are done, -// a signal will be sent to the WaitGroup to indicate that this worker has completed its work. -// When used in conjunction with TaskRunner.WaitWorkers() it allows a graceful shutdown. -func (c *TaskRunner) Shutdown(taskName string) { - log.Info( - fmt.Sprintf( - "Shutting down workers for task: %s", - taskName, - ), - ) - c.batchSizeByTaskNameMutex.Lock() - delete(c.batchSizeByTaskName, taskName) - c.batchSizeByTaskNameMutex.Unlock() - - c.pausedWorkersMutex.Lock() - delete(c.pausedWorkers, taskName) - c.pausedWorkersMutex.Unlock() - - c.pollIntervalByTaskNameMutex.Lock() - delete(c.pollIntervalByTaskName, taskName) - c.pollIntervalByTaskNameMutex.Unlock() - - c.pollTimeoutMutex.Lock() - delete(c.pollTimeoutByTaskName, taskName) - c.pollTimeoutMutex.Unlock() -} - func (c *TaskRunner) isPaused(taskName string) bool { c.pausedWorkersMutex.RLock() defer c.pausedWorkersMutex.RUnlock() @@ -242,13 +225,16 @@ func (c *TaskRunner) isPaused(taskName string) bool { } // WaitWorkers uses an internal waitgroup to block the calling thread until all workers started by this TaskRunner have -// been shut down. +// been stopped. func (c *TaskRunner) WaitWorkers() { c.workerWaitGroup.Wait() } -func (c *TaskRunner) startWorker(taskName string, executeFunction model.ExecuteTaskFunction, batchSize int, pollInterval time.Duration, taskDomain string) error { - c.SetPollIntervalForTask(taskName, pollInterval) +func (c *TaskRunner) startWorker(taskName string, batchSize int, pollInterval time.Duration, taskDomain string) error { + err := c.SetPollIntervalForTask(taskName, pollInterval) + if err != nil { + return err + } c.Resume(taskName) previousMaxAllowedWorkers, err := c.getMaxAllowedWorkers(taskName) if err != nil { @@ -260,7 +246,7 @@ func (c *TaskRunner) startWorker(taskName string, executeFunction model.ExecuteT } if previousMaxAllowedWorkers < 1 { c.workerWaitGroup.Add(1) - go c.work4ever(taskName, executeFunction, taskDomain) + go c.work4ever(taskName, taskDomain) } log.Info( fmt.Sprintf( @@ -273,15 +259,15 @@ func (c *TaskRunner) startWorker(taskName string, executeFunction model.ExecuteT return nil } -func (c *TaskRunner) work4ever(taskName string, executeFunction model.ExecuteTaskFunction, domain string) { +func (c *TaskRunner) work4ever(taskName string, domain string) { defer c.workerWaitGroup.Done() defer concurrency.HandlePanicError("poll_and_execute") for c.isWorkerRegistered(taskName) { - c.workOnce(taskName, executeFunction, domain) + c.workOnce(taskName, domain) } } -func (c *TaskRunner) workOnce(taskName string, executeFunction model.ExecuteTaskFunction, domain string) { +func (c *TaskRunner) workOnce(taskName string, domain string) { if c.isPaused(taskName) { pauseOnGenericError(taskName, domain, fmt.Errorf("worker is paused")) return @@ -319,112 +305,196 @@ func (c *TaskRunner) workOnce(taskName string, executeFunction model.ExecuteTask time.Sleep(pollInterval) return } + key := taskName + "-" + domain + executeFunction := c.taskWorkerLegayExecutors[key] + typedFunction := c.taskWorkerExecutors[key] for _, task := range tasks { c.increaseRunningWorkers(taskName) - go c.executeAndUpdateTask(taskName, task, executeFunction) + go c.executeAndUpdateTask(taskName, task, executeFunction, typedFunction) } } -func (c *TaskRunner) executeAndUpdateTask(taskName string, task model.Task, executeFunction model.ExecuteTaskFunction) { +func (c *TaskRunner) executeAndUpdateTask(taskName string, task model.PolledTask, + executeFunction model.ExecuteTaskFunction, typedFunction executePolledTaskFunction) { defer c.runningWorkerDone(taskName) defer concurrency.HandlePanicError("execute_and_update_task " + string(task.TaskId) + ": " + string(task.Status)) - taskResult := c.executeTask(&task, executeFunction) + var taskResult *model.TaskResult + if typedFunction != nil { + taskResult = c.executeTaskWithTypedWorker(&task, typedFunction) + } else { + taskResult = c.executeTask(&task, executeFunction) + } err := c.updateTaskWithRetry(taskName, taskResult) if err != nil { log.Error("failed to update task ", taskName, ",taskId = ", task.TaskId, ",workflowId = ", task.WorkflowInstanceId, ",", err) } } -func (c *TaskRunner) batchPoll(taskName string, count int, domain string) ([]model.Task, error) { - timeout, err := c.GetPollTimeoutForTask(taskName) - if err != nil { - return nil, err - } - var domainOptional optional.String - if domain != "" { - domainOptional = optional.NewString(domain) - } - log.Debug("Polling for task: ", taskName, ", in batches of size: ", count, ", with poll timeout: ", timeout) - metrics.IncrementTaskPoll(taskName) +func (c *TaskRunner) executeTask(polledTask *model.PolledTask, executeFunction model.ExecuteTaskFunction) *model.TaskResult { + + log.Trace( + "Executing task of type: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, + ) startTime := time.Now() - opts := &client.TaskResourceApiBatchPollOpts{ - Domain: domainOptional, - Workerid: optional.NewString(hostname), - Count: optional.NewInt32(int32(count)), - } - if timeout >= 0 { - opts.Timeout = optional.NewInt32(int32(timeout.Milliseconds())) + t, err := polledTask.ToTask() + if err != nil { + metrics.IncrementTaskExecuteError(t.TaskDefName, err) + log.Debug( + "failed to execute task", + ", reason: ", err.Error(), + ", taskName: ", t.TaskDefName, + ", taskId: ", t.TaskId, + ", workflowId: ", t.WorkflowInstanceId, + ) + return model.NewTaskResultFromTaskWithError(t, err) } + taskExecutionOutput, err := executeFunction(t) - tasks, response, err := c.conductorTaskResourceClient.BatchPoll( - context.Background(), - taskName, - opts, - ) spentTime := time.Since(startTime) - metrics.RecordTaskPollTime( - taskName, - spentTime.Seconds(), + metrics.RecordTaskExecuteTime( + polledTask.TaskDefName, float64(spentTime.Milliseconds()), ) if err != nil { - metrics.IncrementTaskPollError( - taskName, err, + metrics.IncrementTaskExecuteError(polledTask.TaskDefName, err) + log.Debug( + "failed to execute task", + ", reason: ", err.Error(), + ", taskName: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, ) - return nil, err + if taskExecutionOutput == nil { + return model.NewTaskResultFromTaskWithError(t, err) + } } - if response.StatusCode == 204 { - return nil, nil + taskResult, err := model.GetTaskResultFromTaskExecutionOutput(t, taskExecutionOutput) + if err != nil { + log.Debug( + "Failed to extract taskResult from generated object", + ", reason: ", err.Error(), + ", task type: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, + ", response: ", err, + ) + return model.NewTaskResultFromTaskWithError(t, err) + } + log.Trace( + "Executed task of type: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, + ) + return taskResult +} + +func getContext(task *model.PolledTask) TaskContext { + return &TaskContextImpl{ + Context: context.Background(), + RetryCount: task.RetryCount, + CorrelationId: task.CorrelationId, + PollCount: task.PollCount, + RetriedTaskId: task.RetriedTaskId, + Retried: task.Retried, + WorkflowInstanceId: task.WorkflowInstanceId, + WorkflowType: task.WorkflowType, + TaskId: task.TaskId, + WorkflowPriority: task.WorkflowPriority, } - log.Debug(fmt.Sprintf("Polled %d tasks for taskName: %s", len(tasks), taskName)) - return tasks, nil } +func (c *TaskRunner) executeTaskWithTypedWorker(polledTask *model.PolledTask, executeFunction executePolledTaskFunction) *model.TaskResult { -func (c *TaskRunner) executeTask(t *model.Task, executeFunction model.ExecuteTaskFunction) *model.TaskResult { log.Trace( - "Executing task of type: ", t.TaskDefName, - ", taskId: ", t.TaskId, - ", workflowId: ", t.WorkflowInstanceId, + "Executing task of type: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, ) startTime := time.Now() - taskExecutionOutput, err := executeFunction(t) + + taskExecutionOutput, err := executeFunction(getContext(polledTask), polledTask) + spentTime := time.Since(startTime) metrics.RecordTaskExecuteTime( - t.TaskDefName, float64(spentTime.Milliseconds()), + polledTask.TaskDefName, float64(spentTime.Milliseconds()), ) if err != nil { - metrics.IncrementTaskExecuteError(t.TaskDefName, err) + metrics.IncrementTaskExecuteError(polledTask.TaskDefName, err) log.Debug( "failed to execute task", ", reason: ", err.Error(), - ", taskName: ", t.TaskDefName, - ", taskId: ", t.TaskId, - ", workflowId: ", t.WorkflowInstanceId, + ", taskName: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, ) if taskExecutionOutput == nil { - return model.NewTaskResultFromTaskWithError(t, err) + return polledTask.ToTaskResultWithError(err) } } - taskResult, err := model.GetTaskResultFromTaskExecutionOutput(t, taskExecutionOutput) + taskResult, err := polledTask.ToTaskResultExecutionOutput(taskExecutionOutput) if err != nil { log.Debug( "Failed to extract taskResult from generated object", ", reason: ", err.Error(), - ", task type: ", t.TaskDefName, - ", taskId: ", t.TaskId, - ", workflowId: ", t.WorkflowInstanceId, + ", task type: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, ", response: ", err, ) - return model.NewTaskResultFromTaskWithError(t, err) + return polledTask.ToTaskResultWithError(err) } log.Trace( - "Executed task of type: ", t.TaskDefName, - ", taskId: ", t.TaskId, - ", workflowId: ", t.WorkflowInstanceId, + "Executed task of type: ", polledTask.TaskDefName, + ", taskId: ", polledTask.TaskId, + ", workflowId: ", polledTask.WorkflowInstanceId, ) return taskResult } +func (c *TaskRunner) batchPoll(taskName string, count int, domain string) ([]model.PolledTask, error) { + timeout, err := c.GetPollIntervalForTask(taskName) + if err != nil { + return nil, err + } + var domainOptional optional.String + if domain != "" { + domainOptional = optional.NewString(domain) + } + log.Debug( + "Polling for task: ", taskName, "with domain", domain, + ", in batches of size: ", count, + ) + metrics.IncrementTaskPoll(taskName) + startTime := time.Now() + tasks, response, err := c.conductorTaskResourceClient.BatchPollTask( + context.Background(), + taskName, + &client.TaskResourceApiBatchPollOpts{ + Domain: domainOptional, + Workerid: optional.NewString(hostname), + Count: optional.NewInt32(int32(count)), + Timeout: optional.NewInt32(int32(timeout.Milliseconds())), + }, + ) + spentTime := time.Since(startTime) + metrics.RecordTaskPollTime( + taskName, + spentTime.Seconds(), + ) + if err != nil { + metrics.IncrementTaskPollError( + taskName, err, + ) + return nil, err + } + if response.StatusCode == 204 { + return nil, nil + } + log.Debug(fmt.Sprintf("Polled %d tasks for taskName: %s", len(tasks), taskName)) + return tasks, nil +} + func (c *TaskRunner) updateTaskWithRetry(taskName string, taskResult *model.TaskResult) error { log.Debug( "Updating task of type: ", taskName, @@ -504,7 +574,6 @@ func (c *TaskRunner) increaseRunningWorkers(taskName string) error { c.runningWorkersByTaskNameMutex.Lock() defer c.runningWorkersByTaskNameMutex.Unlock() c.runningWorkersByTaskName[taskName] += 1 - c.workerWaitGroup.Add(1) log.Trace("Increased running workers for task: ", taskName) return nil } @@ -513,7 +582,6 @@ func (c *TaskRunner) runningWorkerDone(taskName string) error { c.runningWorkersByTaskNameMutex.Lock() defer c.runningWorkersByTaskNameMutex.Unlock() c.runningWorkersByTaskName[taskName] -= 1 - c.workerWaitGroup.Done() log.Trace("Running worker done for task: ", taskName) return nil } @@ -531,7 +599,7 @@ func (c *TaskRunner) SetPollIntervalForTask(taskName string, pollInterval time.D c.pollIntervalByTaskNameMutex.Lock() defer c.pollIntervalByTaskNameMutex.Unlock() c.pollIntervalByTaskName[taskName] = pollInterval - log.Info("Updated poll interval for task: ", taskName, " to: ", pollInterval.Milliseconds(), "ms") + log.Info("Updated poll interval for task: ", taskName, ", to: ", pollInterval.Milliseconds(), "ms") return nil } @@ -579,44 +647,3 @@ func pauseOnNoAvailableWorkerError(taskName string, domain string) { log.Trace(fmt.Errorf("no worker available for the task %s, domain %s", taskName, domain)) time.Sleep(sleepForOnNoAvailableWorker) } - -// SetPollTimeout sets the default poll timeout for all tasks. If not explicitly set, -// it defaults to a negative value, indicating that the server's default should be used. -func (c *TaskRunner) SetPollTimeout(pollTimeout time.Duration) error { - c.pollTimeoutMutex.Lock() - defer c.pollTimeoutMutex.Unlock() - c.pollTimeout = pollTimeout - log.Info("Updated poll timeout to: ", pollTimeout.Milliseconds(), "ms") - return nil -} - -// GetPollTimeout gets the default poll timeout for all tasks. The value may be negative. -// In such cases, pollTimeout parameter is not sent, indicating that the server's default should be used. -func (c *TaskRunner) GetPollTimeout() time.Duration { - c.pollTimeoutMutex.Lock() - defer c.pollTimeoutMutex.Unlock() - return c.pollTimeout -} - -// GetPollTimeoutForTask retrieves the poll timeout for all tasks running with the provided taskName. -// If there isn't a specific poll timeout for the task it uses the default timeout TaskRunner.pollTimeout. -func (c *TaskRunner) GetPollTimeoutForTask(taskName string) (time.Duration, error) { - c.pollTimeoutMutex.Lock() - defer c.pollTimeoutMutex.Unlock() - - pollTimeout, ok := c.pollTimeoutByTaskName[taskName] - if !ok { - return c.pollTimeout, nil - } - - return pollTimeout, nil -} - -// SetPollTimeoutForTask sets the pollInterval for all workers running the task with the provided taskName. -func (c *TaskRunner) SetPollTimeoutForTask(taskName string, pollTimeout time.Duration) error { - c.pollTimeoutMutex.Lock() - defer c.pollTimeoutMutex.Unlock() - c.pollTimeoutByTaskName[taskName] = pollTimeout - log.Info("Updated poll timeout for task: ", taskName, " to: ", pollTimeout.Milliseconds(), "ms") - return nil -} diff --git a/sdk/workflow/executor/executor.go b/sdk/workflow/executor/executor.go index c30c1dc2..25b10d34 100644 --- a/sdk/workflow/executor/executor.go +++ b/sdk/workflow/executor/executor.go @@ -23,7 +23,7 @@ import ( "github.com/conductor-sdk/conductor-go/sdk/event/queue" "github.com/conductor-sdk/conductor-go/sdk/model" - log "github.com/sirupsen/logrus" + "github.com/conductor-sdk/conductor-go/sdk/log" ) type WorkflowExecutor struct { diff --git a/sdk/workflow/executor/monitor.go b/sdk/workflow/executor/monitor.go index 8e343282..9232951e 100644 --- a/sdk/workflow/executor/monitor.go +++ b/sdk/workflow/executor/monitor.go @@ -20,7 +20,7 @@ import ( "github.com/conductor-sdk/conductor-go/sdk/concurrency" "github.com/conductor-sdk/conductor-go/sdk/model" - log "github.com/sirupsen/logrus" + "github.com/conductor-sdk/conductor-go/sdk/log" ) type WorkflowMonitor struct { diff --git a/sdk/workflow/workflow.go b/sdk/workflow/workflow.go index 7c533f82..a42bd51a 100644 --- a/sdk/workflow/workflow.go +++ b/sdk/workflow/workflow.go @@ -12,9 +12,9 @@ package workflow import ( "encoding/json" + "github.com/conductor-sdk/conductor-go/sdk/log" "github.com/conductor-sdk/conductor-go/sdk/model" "github.com/conductor-sdk/conductor-go/sdk/workflow/executor" - log "github.com/sirupsen/logrus" ) type TimeoutPolicy string diff --git a/test/integration_tests/worker_test.go b/test/integration_tests/worker_test.go index a83da7e2..0ba27fc0 100644 --- a/test/integration_tests/worker_test.go +++ b/test/integration_tests/worker_test.go @@ -16,7 +16,6 @@ import ( "github.com/conductor-sdk/conductor-go/sdk/model" "github.com/conductor-sdk/conductor-go/sdk/workflow" "github.com/conductor-sdk/conductor-go/test/testdata" - "github.com/sirupsen/logrus" ) func TestWorkerBatchSize(t *testing.T) { @@ -70,7 +69,7 @@ func TestWorkerBatchSize(t *testing.T) { } func TestFaultyWorker(t *testing.T) { - logrus.SetLevel(logrus.ErrorLevel) + taskName := "TEST_GO_FAULTY_TASK" wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). Name("TEST_GO_FAULTY_WORKFLOW"). @@ -96,7 +95,7 @@ func TestFaultyWorker(t *testing.T) { } func TestWorkerWithNonRetryableError(t *testing.T) { - logrus.SetLevel(logrus.ErrorLevel) + taskName := "TEST_GO_NON_RETRYABLE_ERROR_TASK" wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). Name("TEST_GO_NON_RETRYABLE_ERROR_WF"). diff --git a/test/integration_tests/workflow_def_test.go b/test/integration_tests/workflow_def_test.go index df015088..8a925b07 100644 --- a/test/integration_tests/workflow_def_test.go +++ b/test/integration_tests/workflow_def_test.go @@ -11,22 +11,15 @@ package integration_tests import ( "context" - "os" "testing" "github.com/conductor-sdk/conductor-go/sdk/model" "github.com/conductor-sdk/conductor-go/sdk/workflow" "github.com/conductor-sdk/conductor-go/test/testdata" - log "github.com/sirupsen/logrus" + "github.com/stretchr/testify/assert" ) -func init() { - log.SetFormatter(&log.JSONFormatter{}) - log.SetOutput(os.Stdout) - log.SetLevel(log.ErrorLevel) -} - func TestHttpTask(t *testing.T) { httpTaskWorkflow := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). Name("TEST_GO_WORKFLOW_HTTP"). diff --git a/test/testdata/util.go b/test/testdata/util.go index fea681ed..2ffdcc43 100644 --- a/test/testdata/util.go +++ b/test/testdata/util.go @@ -18,12 +18,11 @@ import ( "github.com/conductor-sdk/conductor-go/sdk/authentication" "github.com/conductor-sdk/conductor-go/sdk/client" + "github.com/conductor-sdk/conductor-go/sdk/log" "github.com/conductor-sdk/conductor-go/sdk/model" "github.com/conductor-sdk/conductor-go/sdk/worker" "github.com/conductor-sdk/conductor-go/sdk/workflow" "github.com/conductor-sdk/conductor-go/sdk/workflow/executor" - - log "github.com/sirupsen/logrus" ) var ( @@ -58,12 +57,6 @@ var TaskRunner = worker.NewTaskRunnerWithApiClient(apiClient) var WorkflowExecutor = executor.NewWorkflowExecutor(apiClient) -func init() { - log.SetFormatter(&log.JSONFormatter{}) - log.SetOutput(os.Stdout) - log.SetLevel(log.ErrorLevel) -} - func ValidateWorkflowDaemon(waitTime time.Duration, outputChannel chan error, workflowId string, expectedOutput map[string]interface{}, expectedStatus model.WorkflowStatus) { time.Sleep(waitTime) workflow, _, err := WorkflowClient.GetExecutionStatus( diff --git a/test/testdata/worker.go b/test/testdata/worker.go index 44d71cef..879c9488 100644 --- a/test/testdata/worker.go +++ b/test/testdata/worker.go @@ -11,12 +11,10 @@ package testdata import ( "fmt" - "os" "testing" "time" "github.com/conductor-sdk/conductor-go/sdk/model" - log "github.com/sirupsen/logrus" ) const ( @@ -30,12 +28,6 @@ const ( WorkerPollInterval = 250 * time.Millisecond ) -func init() { - log.SetFormatter(&log.JSONFormatter{}) - log.SetOutput(os.Stdout) - log.SetLevel(log.ErrorLevel) -} - func ExampleWorker(t *model.Task) (interface{}, error) { taskResult := model.NewTaskResultFromTask(t) taskResult.OutputData = map[string]interface{}{ From e08e5fa0565177a791a2a57a81ac5f7ce6d4b310 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Tue, 17 Dec 2024 21:17:34 -0800 Subject: [PATCH 02/12] Update sdk/log/logger.go Co-authored-by: Shailesh Padave --- sdk/log/logger.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/log/logger.go b/sdk/log/logger.go index b2adf3be..fd3bdb19 100644 --- a/sdk/log/logger.go +++ b/sdk/log/logger.go @@ -7,7 +7,9 @@ var ( ) func init() { - logger, _ := zap.NewProduction() + if err != nil { + panic("failed to initialize zap logger: " + err.Error()) // Handle error appropriately + } defer logger.Sync() // flushes buffer, if any sugar = logger.Sugar() } From a6611daa331520e3116e7e8e711ceb651f34ba1a Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Tue, 17 Dec 2024 21:17:47 -0800 Subject: [PATCH 03/12] Update sdk/main/main.go Co-authored-by: Shailesh Padave --- sdk/main/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/main/main.go b/sdk/main/main.go index 4b97c4c9..876585f5 100644 --- a/sdk/main/main.go +++ b/sdk/main/main.go @@ -40,7 +40,7 @@ func httpSettings() *settings.HttpSettings { } type Data struct { - InputKey InputKey `json:inputKey` + InputKey InputKey `json:"inputKey"` } type InputKey struct { From 1781eb4b8438b119e756702836a5dba227a5d555 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Tue, 17 Dec 2024 21:18:03 -0800 Subject: [PATCH 04/12] Update sdk/main/main.go Co-authored-by: Shailesh Padave --- sdk/main/main.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sdk/main/main.go b/sdk/main/main.go index 876585f5..73f04960 100644 --- a/sdk/main/main.go +++ b/sdk/main/main.go @@ -69,10 +69,9 @@ type Body struct { } func ProcessBody(body *Data) (*Data, error) { - if body == nil { - fmt.Println("Body is nil") - return nil, nil - } + if body == nil { + return nil, fmt.Errorf("received nil body") + } body.InputKey.Body.HostName = "locally hosting" fmt.Println("returning", body) return body, nil From 6596f8a9a80a4b141929e95bb8b2d69720e9a76a Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Sat, 3 May 2025 15:05:07 +0530 Subject: [PATCH 05/12] Update go.mod and go.sum --- go.mod | 1 + go.sum | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 92b8a177..413a1fb2 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/google/uuid v1.3.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/prometheus/client_golang v0.9.2 + github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.8.1 go.uber.org/zap v1.27.0 ) diff --git a/go.sum b/go.sum index 04f651ad..eec14bc1 100644 --- a/go.sum +++ b/go.sum @@ -3,7 +3,6 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -21,7 +20,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= @@ -38,6 +36,8 @@ github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7q github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -47,7 +47,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= -go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= @@ -56,6 +55,7 @@ golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= From cee409feff212a1d95467122bbae0a67af923c96 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Sat, 3 May 2025 15:51:14 +0530 Subject: [PATCH 06/12] Few more changes-2 --- sdk/client/api_client.go | 2 +- sdk/log/logger.go | 5 ++- sdk/worker/task_runner.go | 95 +++++++++++++++++++++++++++++++++++---- 3 files changed, 90 insertions(+), 12 deletions(-) diff --git a/sdk/client/api_client.go b/sdk/client/api_client.go index bd927a61..adc28d33 100644 --- a/sdk/client/api_client.go +++ b/sdk/client/api_client.go @@ -76,7 +76,7 @@ func NewAuthenticationSettingsFromEnv() *settings.AuthenticationSettings { func NewHttpSettingsFromEnv() *settings.HttpSettings { url := os.Getenv(CONDUCTOR_SERVER_URL) if url == "" { - log.Fatalf("Error: %s env variable is not set", CONDUCTOR_SERVER_URL) + log.Error("Error: %s env variable is not set", CONDUCTOR_SERVER_URL) } return settings.NewHttpSettings(url) diff --git a/sdk/log/logger.go b/sdk/log/logger.go index fd3bdb19..c420a702 100644 --- a/sdk/log/logger.go +++ b/sdk/log/logger.go @@ -7,21 +7,22 @@ var ( ) func init() { + logger, err := zap.NewProduction() if err != nil { panic("failed to initialize zap logger: " + err.Error()) // Handle error appropriately } defer logger.Sync() // flushes buffer, if any sugar = logger.Sugar() } -func Info(args ...interface{}) { +func Info(args ...interface{}) { sugar.Info(args) } func Debug(args ...interface{}) { sugar.Debug(args) } func Trace(args ...interface{}) { - //sugar.Debug(args) + sugar.Debug(args) } func Error(args ...interface{}) { sugar.Error(args) diff --git a/sdk/worker/task_runner.go b/sdk/worker/task_runner.go index e6bbfe0d..f6f86291 100644 --- a/sdk/worker/task_runner.go +++ b/sdk/worker/task_runner.go @@ -64,6 +64,10 @@ type TaskRunner struct { taskWorkerLegayExecutors map[string]model.ExecuteTaskFunction taskWorkerExecutors map[string]executePolledTaskFunction + + pollTimeoutMutex sync.RWMutex + pollTimeout time.Duration + pollTimeoutByTaskName map[string]time.Duration } // NewTaskRunner returns a new TaskRunner which authenticates via HTTP using the provided settings. @@ -90,6 +94,8 @@ func NewTaskRunnerWithApiClient( pausedWorkers: make(map[string]bool), taskWorkerLegayExecutors: make(map[string]model.ExecuteTaskFunction), taskWorkerExecutors: make(map[string]executePolledTaskFunction), + pollTimeoutByTaskName: make(map[string]time.Duration), + pollTimeout: -1 * time.Millisecond, //If negative, the server will use its default. } } @@ -218,6 +224,33 @@ func (c *TaskRunner) Resume(taskName string) { c.pausedWorkers[taskName] = false } +// Shutdown the TaskRunner will stop polling for tasks and once all running workers are done, +// a signal will be sent to the WaitGroup to indicate that this worker has completed its work. +// When used in conjunction with TaskRunner.WaitWorkers() it allows a graceful shutdown. +func (c *TaskRunner) Shutdown(taskName string) { + log.Info( + fmt.Sprintf( + "Shutting down workers for task: %s", + taskName, + ), + ) + c.batchSizeByTaskNameMutex.Lock() + delete(c.batchSizeByTaskName, taskName) + c.batchSizeByTaskNameMutex.Unlock() + + c.pausedWorkersMutex.Lock() + delete(c.pausedWorkers, taskName) + c.pausedWorkersMutex.Unlock() + + c.pollIntervalByTaskNameMutex.Lock() + delete(c.pollIntervalByTaskName, taskName) + c.pollIntervalByTaskNameMutex.Unlock() + + c.pollTimeoutMutex.Lock() + delete(c.pollTimeoutByTaskName, taskName) + c.pollTimeoutMutex.Unlock() +} + func (c *TaskRunner) isPaused(taskName string) bool { c.pausedWorkersMutex.RLock() defer c.pausedWorkersMutex.RUnlock() @@ -225,7 +258,7 @@ func (c *TaskRunner) isPaused(taskName string) bool { } // WaitWorkers uses an internal waitgroup to block the calling thread until all workers started by this TaskRunner have -// been stopped. +// been shut down. func (c *TaskRunner) WaitWorkers() { c.workerWaitGroup.Wait() } @@ -453,7 +486,7 @@ func (c *TaskRunner) executeTaskWithTypedWorker(polledTask *model.PolledTask, ex } func (c *TaskRunner) batchPoll(taskName string, count int, domain string) ([]model.PolledTask, error) { - timeout, err := c.GetPollIntervalForTask(taskName) + _, err := c.GetPollIntervalForTask(taskName) if err != nil { return nil, err } @@ -461,6 +494,12 @@ func (c *TaskRunner) batchPoll(taskName string, count int, domain string) ([]mod if domain != "" { domainOptional = optional.NewString(domain) } + opts := &client.TaskResourceApiBatchPollOpts{ + Domain: domainOptional, + Workerid: optional.NewString(hostname), + Count: optional.NewInt32(int32(count)), + } + log.Debug( "Polling for task: ", taskName, "with domain", domain, ", in batches of size: ", count, @@ -470,12 +509,7 @@ func (c *TaskRunner) batchPoll(taskName string, count int, domain string) ([]mod tasks, response, err := c.conductorTaskResourceClient.BatchPollTask( context.Background(), taskName, - &client.TaskResourceApiBatchPollOpts{ - Domain: domainOptional, - Workerid: optional.NewString(hostname), - Count: optional.NewInt32(int32(count)), - Timeout: optional.NewInt32(int32(timeout.Milliseconds())), - }, + opts, ) spentTime := time.Since(startTime) metrics.RecordTaskPollTime( @@ -574,6 +608,7 @@ func (c *TaskRunner) increaseRunningWorkers(taskName string) error { c.runningWorkersByTaskNameMutex.Lock() defer c.runningWorkersByTaskNameMutex.Unlock() c.runningWorkersByTaskName[taskName] += 1 + c.workerWaitGroup.Add(1) log.Trace("Increased running workers for task: ", taskName) return nil } @@ -582,6 +617,7 @@ func (c *TaskRunner) runningWorkerDone(taskName string) error { c.runningWorkersByTaskNameMutex.Lock() defer c.runningWorkersByTaskNameMutex.Unlock() c.runningWorkersByTaskName[taskName] -= 1 + c.workerWaitGroup.Done() log.Trace("Running worker done for task: ", taskName) return nil } @@ -599,7 +635,7 @@ func (c *TaskRunner) SetPollIntervalForTask(taskName string, pollInterval time.D c.pollIntervalByTaskNameMutex.Lock() defer c.pollIntervalByTaskNameMutex.Unlock() c.pollIntervalByTaskName[taskName] = pollInterval - log.Info("Updated poll interval for task: ", taskName, ", to: ", pollInterval.Milliseconds(), "ms") + log.Info("Updated poll interval for task: ", taskName, " to: ", pollInterval.Milliseconds(), "ms") return nil } @@ -647,3 +683,44 @@ func pauseOnNoAvailableWorkerError(taskName string, domain string) { log.Trace(fmt.Errorf("no worker available for the task %s, domain %s", taskName, domain)) time.Sleep(sleepForOnNoAvailableWorker) } + +// SetPollTimeout sets the default poll timeout for all tasks. If not explicitly set, +// it defaults to a negative value, indicating that the server's default should be used. +func (c *TaskRunner) SetPollTimeout(pollTimeout time.Duration) error { + c.pollTimeoutMutex.Lock() + defer c.pollTimeoutMutex.Unlock() + c.pollTimeout = pollTimeout + log.Info("Updated poll timeout to: ", pollTimeout.Milliseconds(), "ms") + return nil +} + +// GetPollTimeout gets the default poll timeout for all tasks. The value may be negative. +// In such cases, pollTimeout parameter is not sent, indicating that the server's default should be used. +func (c *TaskRunner) GetPollTimeout() time.Duration { + c.pollTimeoutMutex.Lock() + defer c.pollTimeoutMutex.Unlock() + return c.pollTimeout +} + +// GetPollTimeoutForTask retrieves the poll timeout for all tasks running with the provided taskName. +// If there isn't a specific poll timeout for the task it uses the default timeout TaskRunner.pollTimeout. +func (c *TaskRunner) GetPollTimeoutForTask(taskName string) (time.Duration, error) { + c.pollTimeoutMutex.Lock() + defer c.pollTimeoutMutex.Unlock() + + pollTimeout, ok := c.pollTimeoutByTaskName[taskName] + if !ok { + return c.pollTimeout, nil + } + + return pollTimeout, nil +} + +// SetPollTimeoutForTask sets the pollInterval for all workers running the task with the provided taskName. +func (c *TaskRunner) SetPollTimeoutForTask(taskName string, pollTimeout time.Duration) error { + c.pollTimeoutMutex.Lock() + defer c.pollTimeoutMutex.Unlock() + c.pollTimeoutByTaskName[taskName] = pollTimeout + log.Info("Updated poll timeout for task: ", taskName, " to: ", pollTimeout.Milliseconds(), "ms") + return nil +} From 64e14ba96722714808fdfd3e101d4b05e34b4873 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Sat, 3 May 2025 16:03:18 +0530 Subject: [PATCH 07/12] easy approach to execute call --- Dockerfile | 2 +- go.mod | 3 +-- go.sum | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cfdcfb71..ed73e996 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17 as build +FROM golang:1.19 as build RUN mkdir /package COPY /sdk /package/sdk COPY /go.mod /package/go.mod diff --git a/go.mod b/go.mod index 413a1fb2..9f0b42a2 100644 --- a/go.mod +++ b/go.mod @@ -14,12 +14,10 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/pretty v0.1.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 // indirect go.uber.org/multierr v1.10.0 // indirect - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -28,6 +26,7 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect + go.uber.org/atomic v1.7.0 // indirect golang.org/x/sys v0.6.0 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.sum b/go.sum index eec14bc1..b08b7f4a 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -18,12 +20,14 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= @@ -41,25 +45,60 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= @@ -67,6 +106,9 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From bb8bab66658cdeb2da50dd9b095837916892a271 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Sat, 3 May 2025 22:58:17 +0530 Subject: [PATCH 08/12] updating resources with api client methods --- sdk/client/api_application_resource.go | 62 ++++++-------------------- sdk/client/api_client.go | 5 +++ test/testdata/util.go | 1 - 3 files changed, 19 insertions(+), 49 deletions(-) diff --git a/sdk/client/api_application_resource.go b/sdk/client/api_application_resource.go index 3469afd2..caa98f68 100644 --- a/sdk/client/api_application_resource.go +++ b/sdk/client/api_application_resource.go @@ -32,10 +32,7 @@ func (a *ApplicationResourceApiService) AddRoleToApplicationUser(ctx context.Con var result interface{} path := fmt.Sprintf("/applications/%s/roles/%s", applicationId, role) resp, err := a.Post(ctx, path, nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } /* @@ -52,7 +49,7 @@ func (a *ApplicationResourceApiService) CreateAccessKey(ctx context.Context, id return nil, resp, err } - return &result, resp, nil + return &result, resp, err } /* @@ -69,7 +66,7 @@ func (a *ApplicationResourceApiService) CreateApplication(ctx context.Context, b return nil, resp, err } - return &result, resp, nil + return &result, resp, err } /* @@ -82,11 +79,7 @@ ApplicationResourceApiService Delete an access key func (a *ApplicationResourceApiService) DeleteAccessKey(ctx context.Context, applicationId string, keyId string) (*http.Response, error) { path := fmt.Sprintf("/applications/%s/accessKeys/%s", applicationId, keyId) resp, err := a.Delete(ctx, path, nil, nil) - if err != nil { - return resp, err - } - - return resp, nil + return resp, err } /* @@ -99,10 +92,7 @@ func (a *ApplicationResourceApiService) DeleteApplication(ctx context.Context, i var result interface{} path := fmt.Sprintf("/applications/%s", id) resp, err := a.Delete(ctx, path, nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } /* @@ -114,10 +104,7 @@ ApplicationResourceApiService Delete a tag for application func (a *ApplicationResourceApiService) DeleteTagForApplication(ctx context.Context, body []model.Tag, id string) (*http.Response, error) { path := fmt.Sprintf("/applications/%s/tags", id) resp, err := a.DeleteWithBody(ctx, path, body, nil) - if err != nil { - return resp, err - } - return resp, nil + return resp, err } // GetAccessKeys gets all access keys for an application @@ -125,10 +112,7 @@ func (a *ApplicationResourceApiService) GetAccessKeys(ctx context.Context, id st var result []rbac.AccessKeyResponse path := fmt.Sprintf("/applications/%s/accessKeys", id) resp, err := a.Get(ctx, path, nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } // GetAppByAccessKeyId gets an application by access key ID @@ -136,10 +120,7 @@ func (a *ApplicationResourceApiService) GetAppByAccessKeyId(ctx context.Context, var result interface{} path := fmt.Sprintf("/applications/key/%s", accessKeyId) resp, err := a.Get(ctx, path, nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } // GetApplication gets an application by ID @@ -159,30 +140,21 @@ func (a *ApplicationResourceApiService) GetTagsForApplication(ctx context.Contex var result []model.Tag path := fmt.Sprintf("/applications/%s/tags", id) resp, err := a.Get(ctx, path, nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } // ListApplications lists all applications func (a *ApplicationResourceApiService) ListApplications(ctx context.Context) ([]rbac.ConductorApplication, *http.Response, error) { var result []rbac.ConductorApplication resp, err := a.Get(ctx, "/applications", nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } // PutTagForApplication adds tags to an application func (a *ApplicationResourceApiService) PutTagForApplication(ctx context.Context, body []model.Tag, id string) (*http.Response, error) { path := fmt.Sprintf("/applications/%s/tags", id) resp, err := a.Put(ctx, path, body, nil) - if err != nil { - return resp, err - } - return resp, nil + return resp, err } // RemoveRoleFromApplicationUser removes a role from an application user @@ -190,10 +162,7 @@ func (a *ApplicationResourceApiService) RemoveRoleFromApplicationUser(ctx contex var result interface{} path := fmt.Sprintf("/applications/%s/roles/%s", applicationId, role) resp, err := a.Delete(ctx, path, nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } // ToggleAccessKeyStatus toggles the status of an access key @@ -201,10 +170,7 @@ func (a *ApplicationResourceApiService) ToggleAccessKeyStatus(ctx context.Contex var result interface{} path := fmt.Sprintf("/applications/%s/accessKeys/%s/status", applicationId, keyId) resp, err := a.Post(ctx, path, nil, &result) - if err != nil { - return nil, resp, err - } - return result, resp, nil + return result, resp, err } // UpdateApplication updates an application @@ -217,5 +183,5 @@ func (a *ApplicationResourceApiService) UpdateApplication(ctx context.Context, b return nil, resp, err } - return &result, resp, nil + return &result, resp, err } diff --git a/sdk/client/api_client.go b/sdk/client/api_client.go index adc28d33..ae6c3686 100644 --- a/sdk/client/api_client.go +++ b/sdk/client/api_client.go @@ -450,6 +450,11 @@ func (c *APIClient) DeleteWithBody(ctx context.Context, path string, body interf return c.executeCall(ctx, "DELETE", path, nil, body, "", result) } +// DeleteWithBody performs a DELETE request with a body +func (c *APIClient) DeleteWithBody(ctx context.Context, path string, body interface{}, result interface{}) (*http.Response, error) { + return c.executeCall(ctx, "DELETE", path, nil, body, result) +} + // Patch performs a PATCH request func (c *APIClient) Patch(ctx context.Context, path string, body interface{}, result interface{}) (*http.Response, error) { return c.executeCall(ctx, "PATCH", path, nil, body, "", result) diff --git a/test/testdata/util.go b/test/testdata/util.go index 2ffdcc43..0a9970e2 100644 --- a/test/testdata/util.go +++ b/test/testdata/util.go @@ -12,7 +12,6 @@ package testdata import ( "context" "fmt" - "os" "reflect" "time" From 9e91b6a5e3efc53c48154126ad7458af7750de70 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Fri, 23 May 2025 17:35:26 +0530 Subject: [PATCH 09/12] Added few code fixes --- sdk/client/api_client.go | 5 ----- sdk/client/api_task_resource.go | 14 +++++++------- sdk/client/task_client.go | 1 - sdk/worker/task_runner.go | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/sdk/client/api_client.go b/sdk/client/api_client.go index ae6c3686..adc28d33 100644 --- a/sdk/client/api_client.go +++ b/sdk/client/api_client.go @@ -450,11 +450,6 @@ func (c *APIClient) DeleteWithBody(ctx context.Context, path string, body interf return c.executeCall(ctx, "DELETE", path, nil, body, "", result) } -// DeleteWithBody performs a DELETE request with a body -func (c *APIClient) DeleteWithBody(ctx context.Context, path string, body interface{}, result interface{}) (*http.Response, error) { - return c.executeCall(ctx, "DELETE", path, nil, body, result) -} - // Patch performs a PATCH request func (c *APIClient) Patch(ctx context.Context, path string, body interface{}, result interface{}) (*http.Response, error) { return c.executeCall(ctx, "PATCH", path, nil, body, "", result) diff --git a/sdk/client/api_task_resource.go b/sdk/client/api_task_resource.go index 176435e3..0db93a4c 100644 --- a/sdk/client/api_task_resource.go +++ b/sdk/client/api_task_resource.go @@ -74,7 +74,7 @@ TaskResourceApiService Batch poll for a task of a certain type * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param tasktype * @param optional nil or *TaskResourceApiBatchPollOpts - Optional Parameters: - * @param "Workerid" (optional.String) - + * @param "WorkerId" (optional.String) - * @param "Domain" (optional.String) - * @param "Count" (optional.Int32) - * @param "Timeout" (optional.Int32) - @@ -82,20 +82,20 @@ TaskResourceApiService Batch poll for a task of a certain type */ type TaskResourceApiBatchPollOpts struct { - Workerid optional.String + WorkerId optional.String Domain optional.String Count optional.Int32 Timeout optional.Int32 } -func (a *TaskResourceApiService) BatchPoll(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiBatchPollOpts) ([]model.Task, *http.Response, error) { - var result []model.Task +func (a *TaskResourceApiService) BatchPollTask(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiBatchPollOpts) ([]model.PolledTask, *http.Response, error) { + var result []model.PolledTask path := fmt.Sprintf("/tasks/poll/batch/%s", tasktype) queryParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Workerid.IsSet() { - queryParams.Add("workerid", parameterToString(localVarOptionals.Workerid.Value(), "")) + if localVarOptionals != nil && localVarOptionals.WorkerId.IsSet() { + queryParams.Add("workerid", parameterToString(localVarOptionals.WorkerId.Value(), "")) } if localVarOptionals != nil && localVarOptionals.Domain.IsSet() { queryParams.Add("domain", parameterToString(localVarOptionals.Domain.Value(), "")) @@ -239,7 +239,7 @@ TaskResourceApiService Poll for a task of a certain type * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param tasktype * @param optional nil or *TaskResourceApiPollOpts - Optional Parameters: - * @param "Workerid" (optional.String) - + * @param "WorkerId" (optional.String) - * @param "Domain" (optional.String) - @return Task */ diff --git a/sdk/client/task_client.go b/sdk/client/task_client.go index 317c64ab..f2686e6e 100644 --- a/sdk/client/task_client.go +++ b/sdk/client/task_client.go @@ -10,7 +10,6 @@ import ( type TaskClient interface { All(ctx context.Context) (map[string]int64, *http.Response, error) AllVerbose(ctx context.Context) (map[string]map[string]map[string]int64, *http.Response, error) - BatchPoll(ctx context.Context, tasktype string, options *TaskResourceApiBatchPollOpts) ([]model.Task, *http.Response, error) BatchPollTask(ctx context.Context, tasktype string, options *TaskResourceApiBatchPollOpts) ([]model.PolledTask, *http.Response, error) GetAllPollData(ctx context.Context) ([]model.PollData, *http.Response, error) GetExternalStorageLocation1(ctx context.Context, path string, operation string, payloadType string) (model.ExternalStorageLocation, *http.Response, error) diff --git a/sdk/worker/task_runner.go b/sdk/worker/task_runner.go index f6f86291..9a3db5ec 100644 --- a/sdk/worker/task_runner.go +++ b/sdk/worker/task_runner.go @@ -496,7 +496,7 @@ func (c *TaskRunner) batchPoll(taskName string, count int, domain string) ([]mod } opts := &client.TaskResourceApiBatchPollOpts{ Domain: domainOptional, - Workerid: optional.NewString(hostname), + WorkerId: optional.NewString(hostname), Count: optional.NewInt32(int32(count)), } From 4a443ca17b115f01a1fdb97a0448ef8ea432b0c1 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Fri, 23 May 2025 18:39:22 +0530 Subject: [PATCH 10/12] Fix test --- test/testdata/kitchensink.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/testdata/kitchensink.go b/test/testdata/kitchensink.go index dc18bf12..7509d7b4 100644 --- a/test/testdata/kitchensink.go +++ b/test/testdata/kitchensink.go @@ -115,7 +115,7 @@ type WorkflowTask struct { } func DynamicForkWorker(t *model.Task) (output interface{}, err error) { - taskResult := model.NewTaskResultFromTask(t) + // Create the tasks to be forked tasks := []WorkflowTask{ { Name: "simple_task", @@ -133,6 +133,8 @@ func DynamicForkWorker(t *model.Task) (output interface{}, err error) { Type: "SIMPLE", }, } + + // Create inputs for each forked task inputs := map[string]interface{}{ "simple_task_6": map[string]interface{}{ "key1": "value1", @@ -148,13 +150,13 @@ func DynamicForkWorker(t *model.Task) (output interface{}, err error) { }, } - taskResult.OutputData = map[string]interface{}{ + // Return just the output data - the framework will create TaskResult + output = map[string]interface{}{ "forkedTasks": tasks, "forkedTasksInputs": inputs, } - taskResult.Status = model.CompletedTask - err = nil - return taskResult, err + + return output, nil } func GetWorkflowWithComplexSwitchTask() *workflow.ConductorWorkflow { From 69e7cd6c78abde6d261f65724951d162584070a9 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Fri, 23 May 2025 23:32:52 +0530 Subject: [PATCH 11/12] Updated code --- sdk/main/main.go | 154 -------------- test/integration_tests/worker_test.go | 283 ++++++++++++++++++++++++++ 2 files changed, 283 insertions(+), 154 deletions(-) delete mode 100644 sdk/main/main.go diff --git a/sdk/main/main.go b/sdk/main/main.go deleted file mode 100644 index 73f04960..00000000 --- a/sdk/main/main.go +++ /dev/null @@ -1,154 +0,0 @@ -package main - -import ( - "fmt" - "github.com/conductor-sdk/conductor-go/sdk/client" - "github.com/conductor-sdk/conductor-go/sdk/model" - "github.com/conductor-sdk/conductor-go/sdk/settings" - "github.com/conductor-sdk/conductor-go/sdk/worker" -) - -type Restaurant struct { - Restaurant RestaurantData `json:"restaurant"` -} - -type RestaurantData struct { - Name string `json:"name"` - Owner Owner `json:"owner"` -} - -type Owner struct { - Name string `json:"name"` -} - -func authSettings() *settings.AuthenticationSettings { - key := "api_key_user_03" - secret := "api_key_user_03" - if key != "" && secret != "" { - return settings.NewAuthenticationSettings( - key, - secret, - ) - } - - return nil -} - -func httpSettings() *settings.HttpSettings { - url := "http://localhost:8080/api" - return settings.NewHttpSettings(url) -} - -type Data struct { - InputKey InputKey `json:"inputKey"` -} - -type InputKey struct { - Headers Headers `json:"headers"` - ReasonPhrase string `json:"reasonPhrase"` - Body Body `json:"body"` - StatusCode int `json:"statusCode"` -} - -type Headers struct { - Date []string `json:"Date"` - ContentType []string `json:"Content-Type"` - ContentLength []string `json:"Content-Length"` - Connection []string `json:"Connection"` - StrictTransportSecurity []string `json:"Strict-Transport-Security"` -} - -type Body struct { - RandomString string `json:"randomString"` - RandomInt int `json:"randomInt"` - HostName string `json:"hostName"` - APIRandomDelay string `json:"apiRandomDelay"` - SleepFor string `json:"sleepFor"` - StatusCode string `json:"statusCode"` - QueryParams map[string]interface{} `json:"queryParams"` -} - -func ProcessBody(body *Data) (*Data, error) { - if body == nil { - return nil, fmt.Errorf("received nil body") - } - body.InputKey.Body.HostName = "locally hosting" - fmt.Println("returning", body) - return body, nil -} - -func ProcessBody2(task *model.Task) (interface{}, error) { - fmt.Println("executing", task.TaskId) - return Data{InputKey: InputKey{ - Headers: Headers{}, - ReasonPhrase: "", - Body: Body{}, - StatusCode: 0, - }}, nil -} - -func ProcessBody3(ctx worker.TaskContext, data *Data) (Data, error) { - - fmt.Println("taskId", ctx.GetTaskId()) - - return Data{InputKey: InputKey{ - Headers: Headers{}, - ReasonPhrase: "reason reason reason", - Body: Body{}, - StatusCode: data.InputKey.StatusCode + 2, - }}, nil -} - -func main() { - - apiClient := client.NewAPIClient( - authSettings(), - httpSettings(), - ) - taskRunner := worker.NewTaskRunnerWithApiClient(apiClient) - //taskRunner.StartWorker("hello", ProcessBody2, 1, 100) - //taskRunner.StartWorkerWithDomain("hello", ProcessBody2, 1, 100, "d1") - worker2 := worker.NewWorkerWithCtx("hello", ProcessBody3) - worker2.Options = &worker.TaskWorkerOptions{ - BatchSize: 10, - PollInterval: 100, - } - - //worker.Options.Domain = "d1" - err := worker2.Start(taskRunner) - if err != nil { - return - } - taskRunner.WaitWorkers() - ////worker := worker.NewWorker("hello", ProcessBody) - // - ////taskClient := client.NewTaskClient(apiClient) - ////workerFn, _ := worker.GetWorker(ProcessBody) - ////_ = taskRunner.StartWorker2("hello", workerFn, 1, 1) - // - //opts := &client.TaskResourceApiBatchPollOpts{} - //tasks, _, err := taskClient.BatchPollTask(context.Background(), "hello", opts) - ////task := model.PolledTask{ - //// TaskType: "abcd", - //// InputData: "{}", - //// OutputData: "{}", - ////} - //if err != nil { - // fmt.Println("Got error ", err.Error()) - //} - //fmt.Println("Got", len(tasks)) - - //for i := range tasks { - // fmt.Println("Task.Id", tasks[i].TaskId) - // res, err := te.Execute(&tasks[i]) - // if err != nil { - // fmt.Println("Error executing process body ", err.Error()) - // } else { - // fmt.Println("Response of process body", res) - // } - //} - - //data, _ := json.Marshal(task.InputData) - //jsons := string(data) - //fmt.Println(jsons) -} diff --git a/test/integration_tests/worker_test.go b/test/integration_tests/worker_test.go index 0ba27fc0..05833217 100644 --- a/test/integration_tests/worker_test.go +++ b/test/integration_tests/worker_test.go @@ -10,6 +10,7 @@ package integration_tests import ( + "github.com/conductor-sdk/conductor-go/sdk/worker" "testing" "time" @@ -18,6 +19,17 @@ import ( "github.com/conductor-sdk/conductor-go/test/testdata" ) +// Test data structures +type TestData struct { + InputKey TestInputKey `json:"inputKey"` +} + +type TestInputKey struct { + StatusCode int `json:"statusCode"` + ReasonPhrase string `json:"reasonPhrase"` + HostName string `json:"hostName"` +} + func TestWorkerBatchSize(t *testing.T) { simpleTaskWorkflow := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). Name("TEST_GO_WORKFLOW_SIMPLE"). @@ -119,3 +131,274 @@ func TestWorkerWithNonRetryableError(t *testing.T) { t.Fatal(err) } } + +func LegacyTestWorker(task *model.Task) (interface{}, error) { + return map[string]interface{}{ + "message": "processed by legacy worker", + "taskId": task.TaskId, + "timestamp": time.Now().Unix(), + }, nil +} + +func TypedTestWorker(ctx worker.TaskContext, data *TestData) (TestData, error) { + if data == nil { + data = &TestData{} + } + + return TestData{ + InputKey: TestInputKey{ + StatusCode: data.InputKey.StatusCode + 100, + ReasonPhrase: "processed by typed worker", + HostName: "test-host-processed", + }, + }, nil +} + +func SimpleTestWorker(ctx worker.TaskContext, input map[string]interface{}) (map[string]interface{}, error) { + name, exists := input["name"] + if !exists { + name = "DefaultName" + } + + return map[string]interface{}{ + "greeting": "Hello, " + name.(string) + "!", + "processedBy": "simple typed worker", + "taskId": ctx.GetTaskId(), + "retryCount": ctx.GetRetryCount(), + }, nil +} + +// Test: Legacy Worker Integration +func TestLegacyWorkerIntegration(t *testing.T) { + taskName := "TEST_GO_LEGACY_TASK" + wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). + Name("TEST_GO_LEGACY_WORKFLOW"). + Version(1). + Add(workflow.NewSimpleTask(taskName, taskName). + Input("testData", "legacy test input")) + + err := wf.Register(true) + if err != nil { + t.Fatal(err) + } + + err = testdata.TaskRunner.StartWorker( + taskName, + LegacyTestWorker, + 2, + testdata.WorkerPollInterval, + ) + if err != nil { + t.Fatal(err) + } + + err = testdata.ValidateWorkflow(wf, 10*time.Second, model.CompletedWorkflow) + if err != nil { + t.Fatal(err) + } +} + +// Test: New Typed Worker Integration +func TestTypedWorkerIntegration(t *testing.T) { + taskName := "TEST_GO_TYPED_TASK" + wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). + Name("TEST_GO_TYPED_WORKFLOW"). + Version(1). + Add(workflow.NewSimpleTask(taskName, taskName). + Input("inputKey", map[string]interface{}{ + "statusCode": 200, + "reasonPhrase": "initial", + "hostName": "original-host", + })) + + err := wf.Register(true) + if err != nil { + t.Fatal(err) + } + + // Start new typed worker + typedWorker := worker.NewWorkerWithCtx(taskName, TypedTestWorker) + typedWorker.Options = &worker.TaskWorkerOptions{ + BatchSize: 3, + PollInterval: testdata.WorkerPollInterval, + } + + err = typedWorker.Start(testdata.TaskRunner) + if err != nil { + t.Fatal(err) + } + + err = testdata.ValidateWorkflow(wf, 10*time.Second, model.CompletedWorkflow) + if err != nil { + t.Fatal(err) + } +} + +// Test: Simple Typed Worker Integration +func TestSimpleTypedWorkerIntegration(t *testing.T) { + taskName := "TEST_GO_SIMPLE_TYPED_TASK" + wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). + Name("TEST_GO_SIMPLE_TYPED_WORKFLOW"). + Version(1). + Add(workflow.NewSimpleTask(taskName, taskName). + Input("name", "TestUser")) + + err := wf.Register(true) + if err != nil { + t.Fatal(err) + } + + // Start simple typed worker + simpleWorker := worker.NewWorkerWithCtx(taskName, SimpleTestWorker) + simpleWorker.Options = &worker.TaskWorkerOptions{ + BatchSize: 2, + PollInterval: testdata.WorkerPollInterval, + } + + err = simpleWorker.Start(testdata.TaskRunner) + if err != nil { + t.Fatal(err) + } + + err = testdata.ValidateWorkflow(wf, 10*time.Second, model.CompletedWorkflow) + if err != nil { + t.Fatal(err) + } +} + +// Test: Multi-Task Workflow with Mixed Worker Types +func TestMultiTaskWorkflowIntegration(t *testing.T) { + legacyTaskName := "TEST_GO_MULTI_LEGACY_TASK" + typedTaskName := "TEST_GO_MULTI_TYPED_TASK" + simpleTaskName := "TEST_GO_MULTI_SIMPLE_TASK" + + wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). + Name("TEST_GO_MULTI_TASK_WORKFLOW"). + Version(1). + Add(workflow.NewSimpleTask(simpleTaskName, "simple_ref"). + Input("name", "MultiTaskTest")). + Add(workflow.NewSimpleTask(legacyTaskName, "legacy_ref"). + Input("data", "${simple_ref.output.greeting}")). + Add(workflow.NewSimpleTask(typedTaskName, "typed_ref"). + Input("inputKey", map[string]interface{}{ + "statusCode": 500, + "hostName": "multi-task-host", + })) + + err := wf.Register(true) + if err != nil { + t.Fatal(err) + } + + // Start legacy worker + err = testdata.TaskRunner.StartWorker( + legacyTaskName, + LegacyTestWorker, + 1, + testdata.WorkerPollInterval, + ) + if err != nil { + t.Fatal(err) + } + + // Start typed worker + typedWorker := worker.NewWorkerWithCtx(typedTaskName, TypedTestWorker) + typedWorker.Options = &worker.TaskWorkerOptions{ + BatchSize: 1, + PollInterval: testdata.WorkerPollInterval, + } + err = typedWorker.Start(testdata.TaskRunner) + if err != nil { + t.Fatal(err) + } + + // Start simple worker + simpleWorker := worker.NewWorkerWithCtx(simpleTaskName, SimpleTestWorker) + simpleWorker.Options = &worker.TaskWorkerOptions{ + BatchSize: 1, + PollInterval: testdata.WorkerPollInterval, + } + err = simpleWorker.Start(testdata.TaskRunner) + if err != nil { + t.Fatal(err) + } + + err = testdata.ValidateWorkflow(wf, 15*time.Second, model.CompletedWorkflow) + if err != nil { + t.Fatal(err) + } +} + +// Test: Parallel Execution with Fork-Join +func TestParallelExecutionIntegration(t *testing.T) { + taskName := "TEST_GO_PARALLEL_SIMPLE_TASK" + wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). + Name("TEST_GO_PARALLEL_EXECUTION_WORKFLOW"). + Version(1). + Add(workflow.NewForkTask("parallel_fork", + []workflow.TaskInterface{ + workflow.NewSimpleTask(taskName, "parallel_1").Input("name", "Task1"), + workflow.NewSimpleTask(taskName, "parallel_2").Input("name", "Task2"), + }, + []workflow.TaskInterface{ + workflow.NewSimpleTask(taskName, "parallel_3").Input("name", "Task3"), + }, + )). + Add(workflow.NewJoinTask("join_ref", "parallel_1", "parallel_2", "parallel_3")) + + err := wf.Register(true) + if err != nil { + t.Fatal(err) + } + + // Start simple worker for parallel tasks + simpleWorker := worker.NewWorkerWithCtx(taskName, SimpleTestWorker) + simpleWorker.Options = &worker.TaskWorkerOptions{ + BatchSize: 5, // Higher batch size for parallel execution + PollInterval: testdata.WorkerPollInterval, + } + + err = simpleWorker.Start(testdata.TaskRunner) + if err != nil { + t.Fatal(err) + } + + err = testdata.ValidateWorkflow(wf, 15*time.Second, model.CompletedWorkflow) + if err != nil { + t.Fatal(err) + } +} + +// Test: Batch Processing +func TestBatchProcessing(t *testing.T) { + taskName := "TEST_GO_BATCH_TASK" + wf := workflow.NewConductorWorkflow(testdata.WorkflowExecutor). + Name("TEST_GO_BATCH_WORKFLOW"). + Version(1). + Add(workflow.NewSimpleTask(taskName, "batch_1").Input("id", 1)). + Add(workflow.NewSimpleTask(taskName, "batch_2").Input("id", 2)). + Add(workflow.NewSimpleTask(taskName, "batch_3").Input("id", 3)). + Add(workflow.NewSimpleTask(taskName, "batch_4").Input("id", 4)). + Add(workflow.NewSimpleTask(taskName, "batch_5").Input("id", 5)) + + err := wf.Register(true) + if err != nil { + t.Fatal(err) + } + + // Start worker with higher batch size + err = testdata.TaskRunner.StartWorker( + taskName, + LegacyTestWorker, + 10, + testdata.WorkerPollInterval, + ) + if err != nil { + t.Fatal(err) + } + + err = testdata.ValidateWorkflow(wf, 15*time.Second, model.CompletedWorkflow) + if err != nil { + t.Fatal(err) + } +} From 13b6daea16e7f7a98196cea832c41a54ebccec67 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Sat, 24 May 2025 00:02:10 +0530 Subject: [PATCH 12/12] Removed mode_ from model file --- .../model_workflow_schedule_execution_model.go | 14 -------------- ...h_result_workflow_schedule_execution_model.go | 4 ++-- sdk/model/tag.go | 6 ++++++ sdk/model/tag_string.go | 16 ---------------- sdk/model/{model_run.go => workflow_run.go} | 0 sdk/model/workflow_schedule_execution_model.go | 12 +----------- 6 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 sdk/model/model_workflow_schedule_execution_model.go delete mode 100644 sdk/model/tag_string.go rename sdk/model/{model_run.go => workflow_run.go} (100%) diff --git a/sdk/model/model_workflow_schedule_execution_model.go b/sdk/model/model_workflow_schedule_execution_model.go deleted file mode 100644 index 5c884057..00000000 --- a/sdk/model/model_workflow_schedule_execution_model.go +++ /dev/null @@ -1,14 +0,0 @@ -package model - -type WorkflowScheduleExecution struct { - ExecutionId string `json:"executionId,omitempty"` - ExecutionTime int64 `json:"executionTime,omitempty"` - Reason string `json:"reason,omitempty"` - ScheduleName string `json:"scheduleName,omitempty"` - ScheduledTime int64 `json:"scheduledTime,omitempty"` - StackTrace string `json:"stackTrace,omitempty"` - StartWorkflowRequest *StartWorkflowRequest `json:"startWorkflowRequest,omitempty"` - State string `json:"state,omitempty"` - WorkflowId string `json:"workflowId,omitempty"` - WorkflowName string `json:"workflowName,omitempty"` -} diff --git a/sdk/model/search_result_workflow_schedule_execution_model.go b/sdk/model/search_result_workflow_schedule_execution_model.go index f8124fff..7b5757e1 100644 --- a/sdk/model/search_result_workflow_schedule_execution_model.go +++ b/sdk/model/search_result_workflow_schedule_execution_model.go @@ -10,6 +10,6 @@ package model type SearchResultWorkflowSchedule struct { - Results []WorkflowScheduleExecutionModel `json:"results,omitempty"` - TotalHits int64 `json:"totalHits,omitempty"` + Results []WorkflowScheduleExecution `json:"results,omitempty"` + TotalHits int64 `json:"totalHits,omitempty"` } diff --git a/sdk/model/tag.go b/sdk/model/tag.go index b1e1149d..020bc228 100644 --- a/sdk/model/tag.go +++ b/sdk/model/tag.go @@ -5,3 +5,9 @@ type Tag struct { Type_ string `json:"type,omitempty"` Value string `json:"value,omitempty"` } + +type TagString struct { + Key string `json:"key,omitempty"` + Type_ string `json:"type,omitempty"` + Value string `json:"value,omitempty"` +} diff --git a/sdk/model/tag_string.go b/sdk/model/tag_string.go deleted file mode 100644 index 2ebb4a4c..00000000 --- a/sdk/model/tag_string.go +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Orkes Conductor API Server - * - * Orkes Conductor API Server - * - * API version: v2 - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ - -package model - -type TagString struct { - Key string `json:"key,omitempty"` - Type_ string `json:"type,omitempty"` - Value string `json:"value,omitempty"` -} diff --git a/sdk/model/model_run.go b/sdk/model/workflow_run.go similarity index 100% rename from sdk/model/model_run.go rename to sdk/model/workflow_run.go diff --git a/sdk/model/workflow_schedule_execution_model.go b/sdk/model/workflow_schedule_execution_model.go index c167dcdb..5c884057 100644 --- a/sdk/model/workflow_schedule_execution_model.go +++ b/sdk/model/workflow_schedule_execution_model.go @@ -1,15 +1,6 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -// an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - package model -type WorkflowScheduleExecutionModel struct { +type WorkflowScheduleExecution struct { ExecutionId string `json:"executionId,omitempty"` ExecutionTime int64 `json:"executionTime,omitempty"` Reason string `json:"reason,omitempty"` @@ -20,5 +11,4 @@ type WorkflowScheduleExecutionModel struct { State string `json:"state,omitempty"` WorkflowId string `json:"workflowId,omitempty"` WorkflowName string `json:"workflowName,omitempty"` - ZoneId string `json:"zoneId,omitempty"` }