From 47002a318f4538e738381cedae214821a0217baf Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Wed, 20 Sep 2023 13:18:08 +0200 Subject: [PATCH 01/15] Update Go examples to awsx and aws-apigateway v2-alpha.3 --- aws-apigateway-go-routes/go.mod | 87 +++++- aws-apigateway-go-routes/go.sum | 477 ++++++++++++-------------------- aws-go-fargate/go.mod | 65 +++-- aws-go-fargate/go.sum | 369 +++++++----------------- aws-go-fargate/main.go | 12 +- 5 files changed, 396 insertions(+), 614 deletions(-) diff --git a/aws-apigateway-go-routes/go.mod b/aws-apigateway-go-routes/go.mod index bb3aa80c8..6e5a9ddc3 100644 --- a/aws-apigateway-go-routes/go.mod +++ b/aws-apigateway-go-routes/go.mod @@ -1,10 +1,89 @@ module github.com/pulumi/examples/aws-apigateway-go-routes -go 1.16 +go 1.19 require ( github.com/aws/aws-lambda-go v1.27.0 - github.com/pulumi/pulumi-aws-apigateway/sdk v0.0.5 - github.com/pulumi/pulumi-aws/sdk/v6 v6.0.2 - github.com/pulumi/pulumi/sdk/v3 v3.50.1 + github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3 + github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4 + github.com/pulumi/pulumi/sdk/v3 v3.81.0 +) + +require ( + github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect + github.com/acomagu/bufpipe v1.0.3 // indirect + github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect + github.com/agext/levenshtein v1.2.3 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/atotto/clipboard v0.1.4 // indirect + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/charmbracelet/bubbles v0.16.1 // indirect + github.com/charmbracelet/bubbletea v0.24.2 // indirect + github.com/charmbracelet/lipgloss v0.7.1 // indirect + github.com/cheggaaa/pb v1.0.29 // indirect + github.com/cloudflare/circl v1.3.3 // indirect + github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect + github.com/djherbis/times v1.5.0 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.4.0 // indirect + github.com/go-git/go-git/v5 v5.6.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/glog v1.1.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/hcl/v2 v2.16.2 // indirect + github.com/imdario/mergo v0.3.13 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-localereader v0.0.1 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect + github.com/mitchellh/go-ps v1.0.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect + github.com/muesli/cancelreader v0.2.2 // indirect + github.com/muesli/reflow v0.3.0 // indirect + github.com/muesli/termenv v0.15.1 // indirect + github.com/opentracing/basictracer-go v1.1.0 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pkg/term v1.1.0 // indirect + github.com/rivo/uniseg v0.4.4 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect + github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect + github.com/sergi/go-diff v1.3.1 // indirect + github.com/skeema/knownhosts v1.1.0 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/cobra v1.7.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.2.0 // indirect + github.com/texttheater/golang-levenshtein v1.0.1 // indirect + github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect + github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect + github.com/uber/jaeger-lib v2.4.1+incompatible // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect + github.com/zclconf/go-cty v1.13.2 // indirect + go.uber.org/atomic v1.9.0 // indirect + golang.org/x/crypto v0.9.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sync v0.2.0 // indirect + golang.org/x/sys v0.9.0 // indirect + golang.org/x/term v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/grpc v1.57.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + lukechampine.com/frand v1.4.2 // indirect + sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect ) diff --git a/aws-apigateway-go-routes/go.sum b/aws-apigateway-go-routes/go.sum index da2818613..55cf702ca 100644 --- a/aws-apigateway-go-routes/go.sum +++ b/aws-apigateway-go-routes/go.sum @@ -1,455 +1,324 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ= -github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= +github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= +github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= +github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= +github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= +github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aws/aws-lambda-go v1.27.0 h1:aLzrJwdyHoF1A18YeVdJjX8Ixkd+bpogdxVInvHcWjM= github.com/aws/aws-lambda-go v1.27.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= -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/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cheggaaa/pb v1.0.18 h1:G/DgkKaBP0V5lnBg/vx61nVxxAU+VqU5yMzSc0f2PPE= -github.com/cheggaaa/pb v1.0.18/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= -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/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5WdeuYSY= +github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc= +github.com/charmbracelet/bubbletea v0.24.2 h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY= +github.com/charmbracelet/bubbletea v0.24.2/go.mod h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg= +github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E= +github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c= +github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo= +github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30= +github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= +github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/djherbis/times v1.2.0 h1:xANXjsC/iBqbO00vkWlYwPWgBgEVU6m6AFYg0Pic+Mc= -github.com/djherbis/times v1.2.0/go.mod h1:CGMZlo255K5r4Yw0b9RRfFQpM2y7uOmxg4jm9HsaVf8= -github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -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/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= +github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU= +github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= -github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= +github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= -github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8= -github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0= -github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4= -github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84= -github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/go-git/go-billy/v5 v5.4.0 h1:Vaw7LaSTRJOUric7pe4vnzBSgyuf2KrLsu2Y4ZpQBDE= +github.com/go-git/go-billy/v5 v5.4.0/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= +github.com/go-git/go-git-fixtures/v4 v4.3.1 h1:y5z6dd3qi8Hl+stezc8p3JxDkoTRqMAlKnXHuzrfjTQ= +github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= +github.com/go-git/go-git/v5 v5.6.0 h1:JvBdYfcttd+0kdpuWO7KTu0FYgCf5W0t5VwkWGobaa4= +github.com/go-git/go-git/v5 v5.6.0/go.mod h1:6nmJ0tJ3N4noMV1Omv7rC5FG3/o8Cm51TB4CJp7mRmE= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -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.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 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -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 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/hcl/v2 v2.16.2 h1:mpkHZh/Tv+xet3sy3F9Ld4FyI2tUpWe9x3XtPx9f1a0= +github.com/hashicorp/hcl/v2 v2.16.2/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= 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/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= 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/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0= -github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= +github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= +github.com/mmcloughlin/avo v0.5.0/go.mod h1:ChHFdoV7ql95Wi7vuq2YT1bwCJqiWdZrQ1im3VujLYM= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= +github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= +github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= +github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= +github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs= +github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= +github.com/opentracing/basictracer-go v1.1.0 h1:Oa1fTSBvAl8pa3U+IJYqrKm0NALwH9OsgwOqDv4xJW0= +github.com/opentracing/basictracer-go v1.1.0/go.mod h1:V2HZueSJEp879yv285Aap1BS69fQMD+MNP1mRs6mBQc= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -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/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= 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 v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -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/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pulumi/pulumi-aws-apigateway/sdk v0.0.5 h1:UsC+IBeiklHIQGYJ4qkXUOeiTrJe9r4GVQjAJRn7KNo= -github.com/pulumi/pulumi-aws-apigateway/sdk v0.0.5/go.mod h1:BWvfHnmCDBFIcHf4eVuL1mvs9sWSinCfWswSA8rAJE0= -github.com/pulumi/pulumi-aws/sdk/v4 v4.6.0 h1:ZLPVTJNTrAuCmbmkZyZte9AvO6l/nNv1L5bQQtqbJwU= -github.com/pulumi/pulumi-aws/sdk/v4 v4.6.0/go.mod h1:31LC9pNuxOtzZ7E1/MaSHmeKkU/J9yAWsHjBqZ3GWjI= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.2 h1:Zk5q3HOXVa2ofozcjDUnpb/YaYW/eWrCoNkddzslupc= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.2/go.mod h1:hPo4YXFjU4ikODkvF8UxIXkzHg2G1qj68t3xs2xjA08= -github.com/pulumi/pulumi/sdk/v3 v3.3.1/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds= -github.com/pulumi/pulumi/sdk/v3 v3.50.1 h1:te0QzDEaovgya2Vtunhw4W3bABxvu2/a6dgzM5I32oI= -github.com/pulumi/pulumi/sdk/v3 v3.50.1/go.mod h1:tqQ4z9ocyM/UI2VQ7ZReWR3w6dF5ffEozoHipOMcDh4= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3 h1:AbeIa9FUvpr5hoN/Jk+5ZTspuHmIgvmx1YRnSTFFVk8= +github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3/go.mod h1:/GMyOlowMMpGo1fm3M0wgee4lxtrFbfBlkrUCUq2rvE= +github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4 h1:VSLvAi+/kZt0k+KjMZ9zd8/NJ5w3vsS0RUKX3vwFa1A= +github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4/go.mod h1:amR/FWXmTqZI5ZtR/5JASorWmOqAIif+FVBSBEZ0uOw= +github.com/pulumi/pulumi/sdk/v3 v3.81.0 h1:d711GUpjZK1beNpIKFReC1LBmHXYE684sYWntJWQ4Q0= +github.com/pulumi/pulumi/sdk/v3 v3.81.0/go.mod h1:RMilNNVMlmK1h4Nl/qylb9vzbgh4F3mufZoUOnPy98o= +github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= -github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 h1:G04eS0JkAIVZfaJLjla9dNxkJCPiKIGZlw9AfOhzOD0= -github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ= +github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= +github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= +github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= +github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= 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.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= 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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6 h1:9VTskZOIRf2vKF3UL8TuWElry5pgUpV1tFSe/e/0m/E= -github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= +github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68= github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7/go.mod h1:UxoP3EypF8JfGEjAII8jx1q8rQyDnX8qdTCs/UQBVIE= -github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM= -github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= +github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= +github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= -github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= -github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= -github.com/xanzy/ssh-agent v0.3.2 h1:eKj4SX2Fe7mui28ZgnFW5fmTz1EIr7ugo5s6wDxdHBM= -github.com/xanzy/ssh-agent v0.3.2/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +github.com/zclconf/go-cty v1.13.2 h1:4GvrUxe/QUDYuJKAav4EYqdM47/kZa672LwmXFmEKT0= +github.com/zclconf/go-cty v1.13.2/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +golang.org/x/arch v0.1.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200317142112-1b76d66859c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 h1:vJ2V3lFLg+bBhgroYuRfyN583UzVveQmIXjc8T/y3to= -golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -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-20190313153728-d0100b6bd8b3/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-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= +golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -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-20181220203305-927f97764cc3/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/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= 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-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/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-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/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-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/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-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/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-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/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-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/text v0.3.0/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/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/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-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200608174601-1b747fd94509/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= 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/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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482 h1:i+Aiej6cta/Frzp13/swvwz5O00kYcSe0A/C5Wd7zX8= -google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.21.0/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.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -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 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 h1:2FZP5XuJY9zQyGM5N0rtovnoXjiMUEIUMvw0m9wlpLc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:8mL13HKkDa+IuJ8yruA3ci0q+0vsUz4m//+ottjwS5o= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= -gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -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.8/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 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= 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.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/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-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw= lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= -pgregory.net/rapid v0.4.7 h1:MTNRktPuv5FNqOO151TM9mDTa+XHcX6ypYeISDVD14g= -pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +pgregory.net/rapid v0.6.1 h1:4eyrDxyht86tT4Ztm+kvlyNBLIk071gR+ZQdhphc9dQ= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= +sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 h1:hfyJ5ku9yFtLVOiSxa3IN+dx5eBQT9mPmKFypAmg8XM= +sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/aws-go-fargate/go.mod b/aws-go-fargate/go.mod index 1a022e28c..798f9e912 100644 --- a/aws-go-fargate/go.mod +++ b/aws-go-fargate/go.mod @@ -1,73 +1,86 @@ module github.com/pulumi/examples/aws-go-fargate -go 1.19 +go 1.21 require ( - github.com/pulumi/pulumi-aws/sdk/v5 v5.41.0 - github.com/pulumi/pulumi-awsx/sdk v1.0.2 - github.com/pulumi/pulumi-docker/sdk/v4 v4.2.4 - github.com/pulumi/pulumi/sdk/v3 v3.71.0 + github.com/pulumi/pulumi-aws/sdk/v6 v6.7.0 + github.com/pulumi/pulumi-awsx/sdk/v2 v2.1.1 + github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3 + github.com/pulumi/pulumi/sdk/v3 v3.91.1 ) require ( - github.com/Masterminds/semver v1.5.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect github.com/acomagu/bufpipe v1.0.3 // indirect github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect - github.com/agext/levenshtein v1.2.1 // indirect + github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/atotto/clipboard v0.1.4 // indirect + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect + github.com/charmbracelet/bubbles v0.16.1 // indirect + github.com/charmbracelet/bubbletea v0.24.2 // indirect + github.com/charmbracelet/lipgloss v0.7.1 // indirect github.com/cheggaaa/pb v1.0.29 // indirect github.com/cloudflare/circl v1.3.3 // indirect + github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/djherbis/times v1.5.0 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/go-git/gcfg v1.5.0 // indirect github.com/go-git/go-billy/v5 v5.4.0 // indirect github.com/go-git/go-git/v5 v5.6.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/glog v1.0.0 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/glog v1.1.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/hcl/v2 v2.16.1 // indirect + github.com/hashicorp/hcl/v2 v2.17.0 // indirect github.com/imdario/mergo v0.3.13 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-localereader v0.0.1 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect - github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect + github.com/muesli/cancelreader v0.2.2 // indirect + github.com/muesli/reflow v0.3.0 // indirect + github.com/muesli/termenv v0.15.1 // indirect github.com/opentracing/basictracer-go v1.1.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.1.0 // indirect - github.com/pulumi/pulumi-docker/sdk/v3 v3.2.0 // indirect github.com/rivo/uniseg v0.4.4 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect - github.com/sergi/go-diff v1.2.0 // indirect + github.com/sergi/go-diff v1.3.1 // indirect github.com/skeema/knownhosts v1.1.0 // indirect - github.com/spf13/cobra v1.6.1 // indirect + github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.5.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/zclconf/go-cty v1.12.1 // indirect + github.com/zclconf/go-cty v1.13.2 // indirect go.uber.org/atomic v1.9.0 // indirect - golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - google.golang.org/genproto v0.0.0-20220802133213-ce4fa296bf78 // indirect - google.golang.org/grpc v1.51.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sync v0.2.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect + google.golang.org/grpc v1.57.1 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/frand v1.4.2 // indirect diff --git a/aws-go-fargate/go.sum b/aws-go-fargate/go.sum index f0ad0535f..9f6aee626 100644 --- a/aws-go-fargate/go.sum +++ b/aws-go-fargate/go.sum @@ -1,78 +1,51 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= -github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= -github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= +github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -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/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= +github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cheggaaa/pb v1.0.18/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5WdeuYSY= +github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc= +github.com/charmbracelet/bubbletea v0.24.2 h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY= +github.com/charmbracelet/bubbletea v0.24.2/go.mod h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg= +github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E= +github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c= github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo= github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/djherbis/times v1.2.0/go.mod h1:CGMZlo255K5r4Yw0b9RRfFQpM2y7uOmxg4jm9HsaVf8= github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU= github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -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/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= @@ -84,244 +57,158 @@ github.com/go-git/go-git-fixtures/v4 v4.3.1 h1:y5z6dd3qi8Hl+stezc8p3JxDkoTRqMAlK github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= github.com/go-git/go-git/v5 v5.6.0 h1:JvBdYfcttd+0kdpuWO7KTu0FYgCf5W0t5VwkWGobaa4= github.com/go-git/go-git/v5 v5.6.0/go.mod h1:6nmJ0tJ3N4noMV1Omv7rC5FG3/o8Cm51TB4CJp7mRmE= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -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.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/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= 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 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/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/hcl/v2 v2.16.1 h1:BwuxEMD/tsYgbhIW7UuI3crjovf3MzuFWiVgiv57iHg= -github.com/hashicorp/hcl/v2 v2.16.1/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= +github.com/hashicorp/hcl/v2 v2.16.2 h1:mpkHZh/Tv+xet3sy3F9Ld4FyI2tUpWe9x3XtPx9f1a0= +github.com/hashicorp/hcl/v2 v2.16.2/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= +github.com/hashicorp/hcl/v2 v2.17.0/go.mod h1:gJyW2PTShkJqQBKpAmPO3yxMxIuoXkOF2TpqXzrQyx4= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= 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/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= 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/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= +github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/mmcloughlin/avo v0.5.0/go.mod h1:ChHFdoV7ql95Wi7vuq2YT1bwCJqiWdZrQ1im3VujLYM= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= +github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= +github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= +github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= +github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs= +github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/basictracer-go v1.1.0 h1:Oa1fTSBvAl8pa3U+IJYqrKm0NALwH9OsgwOqDv4xJW0= github.com/opentracing/basictracer-go v1.1.0/go.mod h1:V2HZueSJEp879yv285Aap1BS69fQMD+MNP1mRs6mBQc= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= -github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -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/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= 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 v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -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/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pulumi/pulumi-aws/sdk/v5 v5.16.2 h1:lPiMvKBZmZqhZ5OcM8iEb97oeX8chhtbRUskiyDeVYg= -github.com/pulumi/pulumi-aws/sdk/v5 v5.16.2/go.mod h1:Ro2eNbpP/uGWMMvtBDrVph+jdL/G6+IiGB6kj+kDRYM= -github.com/pulumi/pulumi-aws/sdk/v5 v5.41.0/go.mod h1:qFeKTFSNIlMHotu9ntOWFjJBHtCiUhJeaiUB/0nVwXk= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.2 h1:Zk5q3HOXVa2ofozcjDUnpb/YaYW/eWrCoNkddzslupc= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.2/go.mod h1:hPo4YXFjU4ikODkvF8UxIXkzHg2G1qj68t3xs2xjA08= -github.com/pulumi/pulumi-awsx/sdk v1.0.2 h1:SLm2MUICM91b/02r7KTI2/4R1XRJedIeMQdeYxATe9k= -github.com/pulumi/pulumi-awsx/sdk v1.0.2/go.mod h1:jwPmIPvPTVYkq+n6Nz/QfMhNZ1cHvBSORdRYvljV9Xo= -github.com/pulumi/pulumi-docker/sdk/v3 v3.2.0 h1:7liqzpMLCmk7BIO7w6f6JCh9IdtwCp0a//jA12i6eyo= -github.com/pulumi/pulumi-docker/sdk/v3 v3.2.0/go.mod h1:TACDfD6SWGyaHmWLrtHAuGiZ+pTBD4OYYFb5kTyxdtQ= -github.com/pulumi/pulumi-docker/sdk/v4 v4.2.4 h1:INbCFvd4vtpGdzPWpcjBfMFnItFVLn7Pp/i+fsrI3eg= -github.com/pulumi/pulumi-docker/sdk/v4 v4.2.4/go.mod h1:zZCDXSO99WbbrmsijAZkLQIdwkQYG8YaxDbq+wzzhn0= -github.com/pulumi/pulumi/sdk/v3 v3.27.0/go.mod h1:VsxW+TGv2VBLe/MeqsAr9r0zKzK/gbAhFT9QxYr24cY= -github.com/pulumi/pulumi/sdk/v3 v3.71.0 h1:D/02vc3Xn/eKxwCDWuYmkxAO1Jm7waOeiuxercQQWLY= -github.com/pulumi/pulumi/sdk/v3 v3.71.0/go.mod h1:BUUBfQZsH0FPuznRfFHkR+b96VlXELnn+DgidFj4XSQ= +github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4 h1:VSLvAi+/kZt0k+KjMZ9zd8/NJ5w3vsS0RUKX3vwFa1A= +github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4/go.mod h1:amR/FWXmTqZI5ZtR/5JASorWmOqAIif+FVBSBEZ0uOw= +github.com/pulumi/pulumi-aws/sdk/v6 v6.7.0/go.mod h1:rcJQBU34BEyeDaN+ImpT1e45x+JLKSzSSR+ahvJm2H8= +github.com/pulumi/pulumi-awsx/sdk/v2 v2.0.0-beta.3 h1:S71k9x0sd4aDLSuMs0wXzVqXYwO+Y6KRA4UkffHLFAs= +github.com/pulumi/pulumi-awsx/sdk/v2 v2.0.0-beta.3/go.mod h1:DLPNRca+s+25plsc5ZKhAXL5rD7oj8WxeydsfVXZKDY= +github.com/pulumi/pulumi-awsx/sdk/v2 v2.1.1 h1:qDqZgQCqYPk4xEivrj28H3DrFTLSGdH9fdwMJsK4nEY= +github.com/pulumi/pulumi-awsx/sdk/v2 v2.1.1/go.mod h1:86knzt6UPIYl1ibCnEBDQB3JsuHBc50ngYsvjtJqjb0= +github.com/pulumi/pulumi-docker/sdk/v4 v4.4.1 h1:HwiS5C0LlCvCOoiksqShbqNRg4HyzY1tPKQLPPmQKEY= +github.com/pulumi/pulumi-docker/sdk/v4 v4.4.1/go.mod h1:cVHWxouf/zu+/gLHR5G9moRqnZWQStren7J1ngzLX8I= +github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3/go.mod h1:i19ZhFjFQrngtXYLHp3kjZNRmnEnq/DUdXK6/CBk77o= +github.com/pulumi/pulumi/sdk/v3 v3.84.0 h1:/vCRj6ATGVZw4pFmG7pZgjlKUcnbbnb9vmlqd+OpdXo= +github.com/pulumi/pulumi/sdk/v3 v3.84.0/go.mod h1:RMilNNVMlmK1h4Nl/qylb9vzbgh4F3mufZoUOnPy98o= +github.com/pulumi/pulumi/sdk/v3 v3.91.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ= +github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= 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.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g= +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.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68= github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7/go.mod h1:UxoP3EypF8JfGEjAII8jx1q8rQyDnX8qdTCs/UQBVIE= -github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY= -github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +github.com/zclconf/go-cty v1.13.2 h1:4GvrUxe/QUDYuJKAav4EYqdM47/kZa672LwmXFmEKT0= +github.com/zclconf/go-cty v1.13.2/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/arch v0.1.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/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-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200317142112-1b76d66859c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -329,32 +216,19 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a h1:diz9pEYuTIuLMJLs3rGDkeaTsNyRs6duYdFyPAxzE/U= -golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -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-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= -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-20181220203305-927f97764cc3/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-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -362,31 +236,20 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= 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-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/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-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/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-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/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-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/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-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -396,7 +259,6 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -406,36 +268,30 @@ golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/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/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/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-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200608174601-1b747fd94509/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= @@ -444,68 +300,33 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20220802133213-ce4fa296bf78 h1:QntLWYqZeuBtJkth3m/6DLznnI0AHJr+AgJXvVh/izw= -google.golang.org/genproto v0.0.0-20220802133213-ce4fa296bf78/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.21.0/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.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= -google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= -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/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d h1:pgIUhmqwKOUlnKna4r6amKdUngdL8DrkpFeV8+VBElY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= 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.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -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.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +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.0/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-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw= lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= -pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= -pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= +pgregory.net/rapid v0.6.1 h1:4eyrDxyht86tT4Ztm+kvlyNBLIk071gR+ZQdhphc9dQ= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 h1:hfyJ5ku9yFtLVOiSxa3IN+dx5eBQT9mPmKFypAmg8XM= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/aws-go-fargate/main.go b/aws-go-fargate/main.go index 556c33109..8955bb416 100644 --- a/aws-go-fargate/main.go +++ b/aws-go-fargate/main.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/ec2" - "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/ecr" - "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/ecs" - elb "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/elasticloadbalancingv2" - "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/iam" - awsx "github.com/pulumi/pulumi-awsx/sdk/go/awsx/ec2" + "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2" + "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ecr" + "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ecs" + "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam" + elb "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/lb" + awsx "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/ec2" "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) From 388075278015af9802ee0983f984de30e2a293f0 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Wed, 20 Sep 2023 13:37:48 +0200 Subject: [PATCH 02/15] Update Py examples to awsx and aws-apigateway v2-alpha.3 --- aws-apigateway-py-routes/requirements.txt | 2 +- aws-py-hub-and-spoke-network/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-apigateway-py-routes/requirements.txt b/aws-apigateway-py-routes/requirements.txt index 35496c54b..bdf417048 100644 --- a/aws-apigateway-py-routes/requirements.txt +++ b/aws-apigateway-py-routes/requirements.txt @@ -1,3 +1,3 @@ pulumi>=3.0.0,<4.0.0 pulumi-aws>=6.0.2,<7.0.0 -pulumi-aws-apigateway>=0.0.5 +pulumi-aws-apigateway==1.1.0a3 diff --git a/aws-py-hub-and-spoke-network/requirements.txt b/aws-py-hub-and-spoke-network/requirements.txt index 377f386e2..a78275854 100644 --- a/aws-py-hub-and-spoke-network/requirements.txt +++ b/aws-py-hub-and-spoke-network/requirements.txt @@ -1,3 +1,3 @@ pulumi>=3.0.0,<4.0.0 -pulumi_aws>=5.0.0,<6.0.0 -pulumi_awsx>=1.0.0,<2.0.0 +pulumi_aws>=6.0.0,<7.0.0 +pulumi_awsx==2.0.0b3 From e32d6cef9bb14888b6410e2aae1e01e5686d750f Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Fri, 22 Sep 2023 08:18:51 +0200 Subject: [PATCH 03/15] Update all examples but five to latest aws, awsx, eks, and aws-apigateway. Also updated a few other dependencies along the way when I came across them. I haven't fully figured out how to handle the breaking changes in these upgrades: - aws-ts-apigateway-auth0 - aws-ts-lambda-efs - aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure - aws-ts-pulumi-webhooks - aws-ts-slackbot --- aws-apigateway-ts-routes/package.json | 2 +- aws-js-containers/package.json | 2 +- aws-ts-airflow/index.ts | 8 ++-- aws-ts-airflow/package.json | 7 +-- aws-ts-apigateway-eventbridge/package.json | 4 +- .../package.json | 4 +- aws-ts-apigateway/package.json | 4 +- aws-ts-apigatewayv2-eventbridge/package.json | 4 +- aws-ts-containers/index.ts | 2 +- aws-ts-containers/package.json | 7 ++- aws-ts-ecs-anywhere/index.ts | 15 +++--- aws-ts-ecs-anywhere/package.json | 6 +-- aws-ts-eks-distro/package.json | 8 ++-- aws-ts-eks-hello-world/package.json | 10 ++-- aws-ts-eks-migrate-nodegroups/index.ts | 7 ++- aws-ts-eks-migrate-nodegroups/package.json | 11 +++-- aws-ts-eks/index.ts | 2 +- aws-ts-eks/package.json | 9 ++-- aws-ts-hello-fargate/index.ts | 2 +- aws-ts-hello-fargate/package.json | 9 ++-- aws-ts-k8s-mern-voting-app/index.ts | 10 ++-- aws-ts-k8s-mern-voting-app/package.json | 9 ++-- aws-ts-k8s-voting-app/index.ts | 10 ++-- aws-ts-k8s-voting-app/package.json | 9 ++-- aws-ts-lambda-thumbnailer/index.ts | 2 +- aws-ts-lambda-thumbnailer/package.json | 4 +- .../cms/infrastructure/package.json | 8 ++-- aws-ts-organizations/package.json | 7 +-- aws-ts-pern-voting-app/index.ts | 31 ++++++------ aws-ts-pern-voting-app/package.json | 7 +-- aws-ts-pulumi-miniflux/index.ts | 46 +++++++++--------- aws-ts-pulumi-miniflux/package.json | 7 +-- aws-ts-redshift-glue-etl/package.json | 7 +-- aws-ts-thumbnailer/index.ts | 4 +- aws-ts-thumbnailer/package.json | 4 +- aws-ts-url-shortener-cache-http/cache.ts | 33 ++++++------- aws-ts-url-shortener-cache-http/package.json | 4 +- aws-ts-voting-app/index.ts | 48 ++++++++++--------- aws-ts-voting-app/package.json | 6 +-- .../vpc-crosswalk-ts/index.ts | 7 +-- .../vpc-crosswalk-ts/package.json | 6 +-- aws-ts-webserver/package.json | 8 ++-- kubernetes-ts-multicloud/aks.ts | 10 +--- kubernetes-ts-multicloud/eks.ts | 2 +- kubernetes-ts-multicloud/package.json | 13 ++--- secrets-provider/aws/package.json | 4 +- secrets-provider/vault/package.json | 4 +- testing-pac-ts/package.json | 6 +-- testing-pac-ts/tests/package.json | 2 +- testing-unit-ts-mocks-jest/package.json | 9 ++-- 50 files changed, 238 insertions(+), 212 deletions(-) diff --git a/aws-apigateway-ts-routes/package.json b/aws-apigateway-ts-routes/package.json index 291f805cd..1497a60e7 100644 --- a/aws-apigateway-ts-routes/package.json +++ b/aws-apigateway-ts-routes/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.2", - "@pulumi/aws-apigateway": "^0.0.5", + "@pulumi/aws-apigateway": "1.1.0-alpha.3", "@pulumi/pulumi": "^3.3.1", "aws-lambda": "^1.0.7" } diff --git a/aws-js-containers/package.json b/aws-js-containers/package.json index bea36069a..951f4dfc0 100644 --- a/aws-js-containers/package.json +++ b/aws-js-containers/package.json @@ -3,7 +3,7 @@ "main": "index.js", "dependencies": { "@pulumi/aws": "^5.29.1", - "@pulumi/awsx": "^1.0.2", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.55.0" } } diff --git a/aws-ts-airflow/index.ts b/aws-ts-airflow/index.ts index 6d63747fb..51347f144 100644 --- a/aws-ts-airflow/index.ts +++ b/aws-ts-airflow/index.ts @@ -81,7 +81,7 @@ const airflowController = new awsx.classic.ecs.EC2Service("airflowcontroller", { taskDefinitionArgs: { containers: { "webserver": { - image: new awsx.ecr.Image("webserver", { repositoryUrl: repo.url, path: "./airflow-container" }).imageUri, + image: new awsx.ecr.Image("webserver", { repositoryUrl: repo.url, context: "./airflow-container" }).imageUri, portMappings: [airflowControllerListener], environment: environment, command: [ "webserver" ], @@ -89,7 +89,7 @@ const airflowController = new awsx.classic.ecs.EC2Service("airflowcontroller", { }, "scheduler": { - image: new awsx.ecr.Image("scheduler", { repositoryUrl: repo.url, path: "./airflow-container" }).imageUri, + image: new awsx.ecr.Image("scheduler", { repositoryUrl: repo.url, context: "./airflow-container" }).imageUri, environment: environment, command: [ "scheduler" ], memory: 128, @@ -111,7 +111,7 @@ const airflower = new awsx.classic.ecs.EC2Service("airflower", { // If the container is named "flower", we create environment variables that start // with `FLOWER_` and Flower tries and fails to parse them as configuration. "notflower": { - image: new awsx.ecr.Image("notflower", { repositoryUrl: repo.url, path: "./airflow-container" }).imageUri, + image: new awsx.ecr.Image("notflower", { repositoryUrl: repo.url, context: "./airflow-container" }).imageUri, portMappings: [airflowerListener], environment: environment, command: [ "flower" ], @@ -127,7 +127,7 @@ const airflowWorkers = new awsx.classic.ecs.EC2Service("airflowworkers", { taskDefinitionArgs: { containers: { "worker": { - image: new awsx.ecr.Image("worker", { repositoryUrl: repo.url, path: "./airflow-container" }).imageUri, + image: new awsx.ecr.Image("worker", { repositoryUrl: repo.url, context: "./airflow-container" }).imageUri, environment: environment, command: [ "worker" ], memory: 1024, diff --git a/aws-ts-airflow/package.json b/aws-ts-airflow/package.json index 1dc6323cf..0b04940d7 100644 --- a/aws-ts-airflow/package.json +++ b/aws-ts-airflow/package.json @@ -4,8 +4,9 @@ "@types/node": "^18.13.0" }, "dependencies": { - "@pulumi/aws": "^5.29.1", - "@pulumi/awsx": "^1.0.2", - "@pulumi/pulumi": "^3.55.0" + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/pulumi": "^3.55.0", + "typescript": "^4.6.0" } } diff --git a/aws-ts-apigateway-eventbridge/package.json b/aws-ts-apigateway-eventbridge/package.json index b955fbae2..86b2a7b4b 100644 --- a/aws-ts-apigateway-eventbridge/package.json +++ b/aws-ts-apigateway-eventbridge/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/pulumi": "^3.0.0", - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0" + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3" } } diff --git a/aws-ts-apigateway-lambda-serverless/package.json b/aws-ts-apigateway-lambda-serverless/package.json index c49fc203f..f7620e795 100644 --- a/aws-ts-apigateway-lambda-serverless/package.json +++ b/aws-ts-apigateway-lambda-serverless/package.json @@ -5,8 +5,8 @@ "@types/node": "^10.0.0" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-apigateway/package.json b/aws-ts-apigateway/package.json index b01c3b520..fc10abfdd 100644 --- a/aws-ts-apigateway/package.json +++ b/aws-ts-apigateway/package.json @@ -2,8 +2,8 @@ "name": "aws-ts-apigateway", "version": "0.1.0", "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-apigatewayv2-eventbridge/package.json b/aws-ts-apigatewayv2-eventbridge/package.json index 93ad7a652..c9aaf4c53 100644 --- a/aws-ts-apigatewayv2-eventbridge/package.json +++ b/aws-ts-apigatewayv2-eventbridge/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/pulumi": "^3.0.0", - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0" + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3" } } diff --git a/aws-ts-containers/index.ts b/aws-ts-containers/index.ts index 648d1083e..020147df7 100644 --- a/aws-ts-containers/index.ts +++ b/aws-ts-containers/index.ts @@ -18,7 +18,7 @@ const repo = new awsx.ecr.Repository("repo", { // Build and publish our application's container image from ./app to the ECR repository. const image = new awsx.ecr.Image("image", { repositoryUrl: repo.url, - path: "./app", + context: "./app", }); // Deploy an ECS Service on Fargate to host the application container. diff --git a/aws-ts-containers/package.json b/aws-ts-containers/package.json index 85cc2eff5..dc2f8ccca 100644 --- a/aws-ts-containers/package.json +++ b/aws-ts-containers/package.json @@ -2,8 +2,11 @@ "name": "aws-ts-containers", "main": "index.js", "dependencies": { - "@pulumi/aws": "^5.29.1", - "@pulumi/awsx": "^1.0.2", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.55.0" + }, + "devDependencies": { + "typescript": "^4.6.2" } } diff --git a/aws-ts-ecs-anywhere/index.ts b/aws-ts-ecs-anywhere/index.ts index 2e62bcfb4..53218d577 100644 --- a/aws-ts-ecs-anywhere/index.ts +++ b/aws-ts-ecs-anywhere/index.ts @@ -117,7 +117,7 @@ const loadBalancerTag = new digitalocean.Tag("lb"); for (let i = 1; i <= numberNodes; i++) { const droplet = new digitalocean.Droplet(`droplet-${i}`, { - region: digitalocean.Regions.NYC1, + region: digitalocean.Region.NYC1, size: "s-1vcpu-2gb", image: "ubuntu-20-04-x64", userData: userData, @@ -127,18 +127,18 @@ for (let i = 1; i <= numberNodes; i++) { // Set up load balancer const lb = new digitalocean.LoadBalancer("lb", { - region: digitalocean.Regions.NYC1, + region: digitalocean.Region.NYC1, forwardingRules: [ { entryPort: 80, - entryProtocol: digitalocean.Protocols.HTTP, + entryProtocol: digitalocean.Protocol.HTTP, targetPort: 80, - targetProtocol: digitalocean.Protocols.HTTP, + targetProtocol: digitalocean.Protocol.HTTP, }, ], healthcheck: { port: 80, - protocol: digitalocean.Protocols.HTTP, + protocol: digitalocean.Protocol.HTTP, path: "/", }, dropletTag: loadBalancerTag.name, @@ -147,7 +147,10 @@ const lb = new digitalocean.LoadBalancer("lb", { // Create ECR repository and build and push docker image const repo = new awsx.ecr.Repository("app"); -const image = repo.buildAndPushImage("./app"); +const image = new awsx.ecr.Image("app", { + repositoryUrl: repo.repository.repositoryUrl, + context: "./app", +}); // Set up task definition const taskDefinition = new aws.ecs.TaskDefinition("taskdefinition", { diff --git a/aws-ts-ecs-anywhere/package.json b/aws-ts-ecs-anywhere/package.json index 96b92d220..d0598aed2 100644 --- a/aws-ts-ecs-anywhere/package.json +++ b/aws-ts-ecs-anywhere/package.json @@ -1,11 +1,11 @@ { "name": "ecs-anywhere", "devDependencies": { - "@types/node": "^10.0.0" + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "4.3.0", - "@pulumi/awsx": "^0.30.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/digitalocean": "^4.1.0", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-eks-distro/package.json b/aws-ts-eks-distro/package.json index 4fe84581c..5aa96d8af 100644 --- a/aws-ts-eks-distro/package.json +++ b/aws-ts-eks-distro/package.json @@ -1,12 +1,12 @@ { "name": "aws-ts-eks-distro", "devDependencies": { - "@types/node": "^10.0.0" + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", - "@pulumi/kubernetes": "^3.0.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", "@types/mustache": "^4.0.1", "@types/tmp": "^0.2.0", diff --git a/aws-ts-eks-hello-world/package.json b/aws-ts-eks-hello-world/package.json index 92c16aa4f..42070c81b 100644 --- a/aws-ts-eks-hello-world/package.json +++ b/aws-ts-eks-hello-world/package.json @@ -1,11 +1,11 @@ { "name": "aws-ts-eks-hello-world", "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^1.0.2", - "@pulumi/eks": "^1.0.2", - "@pulumi/kubernetes": "^3.0.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", - "@types/node": "^8.0.0" + "@types/node": "^18.0.0" } } diff --git a/aws-ts-eks-migrate-nodegroups/index.ts b/aws-ts-eks-migrate-nodegroups/index.ts index 6a95a70db..393b40af1 100644 --- a/aws-ts-eks-migrate-nodegroups/index.ts +++ b/aws-ts-eks-migrate-nodegroups/index.ts @@ -13,11 +13,14 @@ const projectName = pulumi.getProject(); // Allocate a new VPC with custom settings, and a public & private subnet per AZ. const vpc = new awsx.ec2.Vpc(`${projectName}`, { cidrBlock: "172.16.0.0/16", - subnets: [{ type: "public" }, { type: "private" }], + subnetSpecs: [ + { type: awsx.ec2.SubnetType.Public }, + { type: awsx.ec2.SubnetType.Private } + ], }); // Export VPC ID and Subnets. -export const vpcId = vpc.id; +export const vpcId = vpc.vpcId; export const allVpcSubnets = pulumi.all([vpc.privateSubnetIds, vpc.publicSubnetIds]) .apply(([privateSubnetIds, publicSubnetIds]) => privateSubnetIds.concat(publicSubnetIds)); diff --git a/aws-ts-eks-migrate-nodegroups/package.json b/aws-ts-eks-migrate-nodegroups/package.json index d132cca48..decfdf71e 100644 --- a/aws-ts-eks-migrate-nodegroups/package.json +++ b/aws-ts-eks-migrate-nodegroups/package.json @@ -1,13 +1,14 @@ { "name": "aws-ts-eks-migrate-nodegroups", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", - "@pulumi/eks": "^0.30.0", - "@pulumi/kubernetes": "^3.0.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-eks/index.ts b/aws-ts-eks/index.ts index 213d04328..cc3ba0a75 100644 --- a/aws-ts-eks/index.ts +++ b/aws-ts-eks/index.ts @@ -8,7 +8,7 @@ const vpc = new awsx.ec2.Vpc("vpc", { numberOfAvailabilityZones: 2 }); // Create the EKS cluster itself and a deployment of the Kubernetes dashboard. const cluster = new eks.Cluster("cluster", { - vpcId: vpc.id, + vpcId: vpc.vpcId, subnetIds: vpc.publicSubnetIds, instanceType: "t2.medium", desiredCapacity: 2, diff --git a/aws-ts-eks/package.json b/aws-ts-eks/package.json index 095782780..7e34ac2e1 100644 --- a/aws-ts-eks/package.json +++ b/aws-ts-eks/package.json @@ -1,12 +1,13 @@ { "name": "aws-ts-eks", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", - "@pulumi/eks": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/pulumi": "^3.32.1" } } diff --git a/aws-ts-hello-fargate/index.ts b/aws-ts-hello-fargate/index.ts index f96cd3343..4e0b52c25 100644 --- a/aws-ts-hello-fargate/index.ts +++ b/aws-ts-hello-fargate/index.ts @@ -16,7 +16,7 @@ const repo = new awsx.ecr.Repository("repo", { }); // Build and publish a Docker image to a private ECR registry. -const img = new awsx.ecr.Image("app-img", { repositoryUrl: repo.url, path: "./app" }); +const img = new awsx.ecr.Image("app-img", { repositoryUrl: repo.url, context: "./app" }); // Create a Fargate service task that can scale out. const appService = new awsx.classic.ecs.FargateService("app-svc", { diff --git a/aws-ts-hello-fargate/package.json b/aws-ts-hello-fargate/package.json index 7c11c8b6d..8a0d17480 100644 --- a/aws-ts-hello-fargate/package.json +++ b/aws-ts-hello-fargate/package.json @@ -1,12 +1,13 @@ { "name": "aws-typescript", "devDependencies": { - "@types/node": "^18.13.0" + "@types/node": "^18.13.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.29.1", - "@pulumi/awsx": "^1.0.2", - "@pulumi/docker": "^3.6.1", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/docker": "^4.0.0", "@pulumi/pulumi": "^3.55.0" } } diff --git a/aws-ts-k8s-mern-voting-app/index.ts b/aws-ts-k8s-mern-voting-app/index.ts index e3674f70e..c35a250d6 100644 --- a/aws-ts-k8s-mern-voting-app/index.ts +++ b/aws-ts-k8s-mern-voting-app/index.ts @@ -40,9 +40,11 @@ const ebsVolume = new aws.ebs.Volume("storage-volume", { const databaseName = "votes"; +const repo = new awsx.ecr.Repository("repository"); // Creating a Kubernetes deployment for the MongoDB database. A single pod will receive queries, and will // modify the data accordingly +const dbImage = new awsx.ecr.Image("database-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./databaseside" }); const databaseAppName = "database-side-service"; const databaseAppLabels = { appClass: databaseAppName }; const databaseDeployment = new k8s.apps.v1.Deployment(databaseAppName, { @@ -55,7 +57,7 @@ const databaseDeployment = new k8s.apps.v1.Deployment(databaseAppName, { spec: { containers: [{ name: databaseAppName, - image: awsx.ecr.buildAndPushImage("database-side-service", "./databaseside").image(), + image: dbImage.imageUri, //awsx.ecr.buildAndPushImage("database-side-service", "./databaseside").image(), ports: [{ name: "http", containerPort: 27017 }], env: [ { name: "DATABASE_NAME", value: databaseName }, @@ -121,6 +123,7 @@ const mongodbAddress = databasesideListener.spec.clusterIP; // Creating a deployment for the server which receives requests from the users, and translates them into // queries for the database. Any number of pods can be created for this deployment +const serverImage = new awsx.ecr.Image("server-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./serverside" }); const serverAppName = "server"; const serverAppLabels = { appClass: serverAppName }; const serverDeployment = new k8s.apps.v1.Deployment("server-side-service", { @@ -133,7 +136,7 @@ const serverDeployment = new k8s.apps.v1.Deployment("server-side-service", { spec: { containers: [{ name: serverAppName, - image: awsx.ecr.buildAndPushImage("server-side-service", "./serverside").image(), + image: serverImage.imageUri, ports: [{ name: "http", containerPort: 5000 }], env: [ { name: "USER_NAME", value: sqlUserName }, @@ -171,6 +174,7 @@ const serversideListener = new k8s.core.v1.Service("server-side-listener", { // The final deployment is created for the client compoment. It acts as the main web page of the // voting application +const clientImage = new awsx.ecr.Image("client-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./clientside" }); const clientAppName = "client"; const clientAppLabels = { appClass: clientAppName }; const clientDeployment = new k8s.apps.v1.Deployment("client-side-service", { @@ -183,7 +187,7 @@ const clientDeployment = new k8s.apps.v1.Deployment("client-side-service", { spec: { containers: [{ name: clientAppName, - image: awsx.ecr.buildAndPushImage("client-side-service", "./clientside").image(), + image: clientImage.imageUri, ports: [{ name: "http", containerPort: 3000 }], env: [ { name: "SERVER_HOSTNAME", value: serversideListener.status.loadBalancer.ingress[0].hostname }, diff --git a/aws-ts-k8s-mern-voting-app/package.json b/aws-ts-k8s-mern-voting-app/package.json index 882ae69bd..7dc57270c 100644 --- a/aws-ts-k8s-mern-voting-app/package.json +++ b/aws-ts-k8s-mern-voting-app/package.json @@ -2,12 +2,13 @@ "name": "voting-app", "version": "0.1.0", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", - "@pulumi/eks": "^0.30.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-k8s-voting-app/index.ts b/aws-ts-k8s-voting-app/index.ts index 85995a172..9a1657689 100644 --- a/aws-ts-k8s-voting-app/index.ts +++ b/aws-ts-k8s-voting-app/index.ts @@ -43,9 +43,11 @@ const ebsVolume = new aws.ebs.Volume("storage-volume", { const databaseName = "votes"; +const repo = new awsx.ecr.Repository("repository"); // Creating a Kubernetes deployment for the PostgreSQL database. A single pod will receive queries, and will // modify the data accordingly +const dbImage = new awsx.ecr.Image("database-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./databaseside" }); const databaseAppName = "database-side-service"; const databaseAppLabels = { appClass: databaseAppName }; const databaseDeployment = new k8s.apps.v1.Deployment(databaseAppName, { @@ -58,7 +60,7 @@ const databaseDeployment = new k8s.apps.v1.Deployment(databaseAppName, { spec: { containers: [{ name: databaseAppName, - image: awsx.ecr.buildAndPushImage("database-side-service", "./databaseside").image(), + image: dbImage.imageUri, ports: [{ name: "http", containerPort: 5432 }], env: [ { name: "DATABASE_NAME", value: databaseName }, @@ -126,6 +128,7 @@ const postgresqlAddress = databasesideListener.spec.clusterIP; // Creating a deployment for the server which receives requests from the users, and translates them into // queries for the database. Any number of pods can be created for this deployment +const serverImage = new awsx.ecr.Image("server-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./serverside" }); const serverAppName = "server"; const serverAppLabels = { appClass: serverAppName }; const serverDeployment = new k8s.apps.v1.Deployment("server-side-service", { @@ -138,7 +141,7 @@ const serverDeployment = new k8s.apps.v1.Deployment("server-side-service", { spec: { containers: [{ name: serverAppName, - image: awsx.ecr.buildAndPushImage("server-side-service", "./serverside").image(), + image: serverImage.imageUri, ports: [{ name: "http", containerPort: 5000 }], env: [ { name: "USER_NAME", value: sqlUserName }, @@ -176,6 +179,7 @@ const serversideListener = new k8s.core.v1.Service("server-side-listener", { // The final deployment is created for the client compoment. It acts as the main web page of the // voting application +const clientImage = new awsx.ecr.Image("client-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./clientside" }); const clientAppName = "client"; const clientAppLabels = { appClass: clientAppName }; const clientDeployment = new k8s.apps.v1.Deployment("client-side-service", { @@ -188,7 +192,7 @@ const clientDeployment = new k8s.apps.v1.Deployment("client-side-service", { spec: { containers: [{ name: clientAppName, - image: awsx.ecr.buildAndPushImage("client-side-service", "./clientside").image(), + image: clientImage.imageUri, ports: [{ name: "http", containerPort: 3000 }], env: [ { name: "SERVER_HOSTNAME", value: serversideListener.status.loadBalancer.ingress[0].hostname }, diff --git a/aws-ts-k8s-voting-app/package.json b/aws-ts-k8s-voting-app/package.json index 28cddeedf..1eea2c3a1 100644 --- a/aws-ts-k8s-voting-app/package.json +++ b/aws-ts-k8s-voting-app/package.json @@ -2,12 +2,13 @@ "name": "voting-app", "version": "0.1.0", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", - "@pulumi/eks": "^0.30.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/postgresql": "^3.0.0", "@pulumi/pulumi": "^3.0.0", "pg": "^8.3.3" diff --git a/aws-ts-lambda-thumbnailer/index.ts b/aws-ts-lambda-thumbnailer/index.ts index 99f7d328c..917e4a4a7 100644 --- a/aws-ts-lambda-thumbnailer/index.ts +++ b/aws-ts-lambda-thumbnailer/index.ts @@ -12,7 +12,7 @@ const repo = new awsx.ecr.Repository("repo", { const image = new awsx.ecr.Image("image", { repositoryUrl: repo.url, - path: "./app", + context: "./app", }); const role = new aws.iam.Role("thumbnailerRole", { diff --git a/aws-ts-lambda-thumbnailer/package.json b/aws-ts-lambda-thumbnailer/package.json index f6679d6cf..43f97afd6 100755 --- a/aws-ts-lambda-thumbnailer/package.json +++ b/aws-ts-lambda-thumbnailer/package.json @@ -3,8 +3,8 @@ "version": "0.1.0", "main": "index.js", "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^1.0.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json b/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json index 742855f4f..c97534f43 100644 --- a/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json +++ b/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json @@ -1,12 +1,12 @@ { "name": "pulumi-website-cms", "devDependencies": { - "@types/mime": "^2.0.3", - "@types/node": "^10.0.0" + "@types/mime": "^3.0.0", + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0", "mime": "^2.4.6" } diff --git a/aws-ts-organizations/package.json b/aws-ts-organizations/package.json index 13349249b..cff7bf50e 100644 --- a/aws-ts-organizations/package.json +++ b/aws-ts-organizations/package.json @@ -1,11 +1,12 @@ { "name": "aws-organizations", "devDependencies": { - "@types/node": "^14" + "@types/node": "^18", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.23.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.48.0" } } diff --git a/aws-ts-pern-voting-app/index.ts b/aws-ts-pern-voting-app/index.ts index c3366b577..7c25a4cf9 100644 --- a/aws-ts-pern-voting-app/index.ts +++ b/aws-ts-pern-voting-app/index.ts @@ -135,14 +135,18 @@ const postgresqlVotesTable = new Schema("postgresql-votes-schema", { postgresUserName: postgresUser.name, }); -const serversideListener = new awsx.elasticloadbalancingv2.NetworkListener("server-side-listener", { port: 5000 }); +const repo = new awsx.ecr.Repository("repo", {}); + +const loadbalancer = new awsx.lb.ApplicationLoadBalancer("loadbalancer", {}); + +const serverImage = new awsx.ecr.Image("server-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./serverside" }); const serversideService = new awsx.ecs.FargateService("server-side-service", { taskDefinitionArgs: { - containers: { - serversideService: { - image: awsx.ecs.Image.fromPath("server-side-service", "./serverside"), + container: { + name: "serversideService", + image: serverImage.imageUri, memory: 512, - portMappings: [serversideListener], + portMappings: [{containerPort: 5000, targetGroup: loadbalancer.defaultTargetGroup}], environment: [ { name: "USER_NAME", value: sqlUserName }, { name: "USER_PASSWORD", value: sqlUserPassword }, @@ -150,25 +154,24 @@ const serversideService = new awsx.ecs.FargateService("server-side-service", { { name: "RDS_PORT", value: String(2000) }, { name: "DATABASE_NAME", value: postgresDatabase.name }, ], - }, }, }, }); -const clientsideListener = new awsx.elasticloadbalancingv2.NetworkListener("client-side-listener", { port: 3000 }); +const clientImage = new awsx.ecr.Image("client-side-service", { repositoryUrl: repo.repository.repositoryUrl, context: "./clientside" }); +const clientLB = new awsx.lb.ApplicationLoadBalancer("client-loadbalancer", {}); const clientsideService = new awsx.ecs.FargateService("client-side-service", { taskDefinitionArgs: { - containers: { - clientsideService: { - image: awsx.ecs.Image.fromPath("client-side-service", "./clientside"), + container: { + name: "clientsideService", + image: clientImage.imageUri, memory: 512, - portMappings: [clientsideListener], + portMappings: [{containerPort: 3000, targetGroup: clientLB.defaultTargetGroup}], environment: [ - { name: "SERVER_HOSTNAME", value: serversideListener.endpoint.hostname }, + { name: "SERVER_HOSTNAME", value: loadbalancer.loadBalancer.dnsName }, ], - }, }, }, }); -export let URL = clientsideListener.endpoint.hostname; +export let URL = clientLB.loadBalancer.dnsName; diff --git a/aws-ts-pern-voting-app/package.json b/aws-ts-pern-voting-app/package.json index 2033aeb0f..06b87bcb1 100644 --- a/aws-ts-pern-voting-app/package.json +++ b/aws-ts-pern-voting-app/package.json @@ -2,11 +2,12 @@ "name": "voting-app", "version": "1.0.0", "devDependencies": { - "@types/node": "^14.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/postgresql": "^3.0.0", "@pulumi/pulumi": "^3.0.0", "pg": "^8.6.0" diff --git a/aws-ts-pulumi-miniflux/index.ts b/aws-ts-pulumi-miniflux/index.ts index 8a6ea39b2..a6654d951 100644 --- a/aws-ts-pulumi-miniflux/index.ts +++ b/aws-ts-pulumi-miniflux/index.ts @@ -13,21 +13,25 @@ const adminUsername = config.require("admin_username"); const adminPassword = config.require("admin_password"); // Get the default VPC and ECS Cluster for your account. -const vpc = awsx.ec2.Vpc.getDefault(); -const cluster = awsx.ecs.Cluster.getDefault(); +// const vpcId = aws.ec2.getVpc({ default: true }, { async: true }).then(r => r.id); +// const vpc = aws.ec2.getVpcOutput({ default: true }, { async: true }); +const vpc = new aws.ec2.DefaultVpc("defaultVpc", {}); +const subnet = new aws.ec2.Subnet("defaultSubnet", { vpcId: vpc.id }) // Create a new subnet group for the database. const subnetGroup = new aws.rds.SubnetGroup("dbsubnets", { - subnetIds: vpc.publicSubnetIds, + subnetIds: [subnet.id], }); +const cluster = new aws.ecs.Cluster("cluster", {}); + // Create a new database, using the subnet and cluster groups. const db = new aws.rds.Instance("db", { engine: "postgres", instanceClass: aws.rds.InstanceTypes.T3_Micro, allocatedStorage: 5, dbSubnetGroupName: subnetGroup.id, - vpcSecurityGroupIds: cluster.securityGroups.map(g => g.id), + // vpcSecurityGroupIds: cluster.securityGroups.map(g => g.id), name: dbName, username: dbUsername, password: dbPassword, @@ -37,29 +41,27 @@ const db = new aws.rds.Instance("db", { // Assemble a connection string for the Miniflux service. const connectionString = pulumi.interpolate `postgres://${dbUsername}:${dbPassword}@${db.endpoint}/${dbName}?sslmode=disable`; -// Create an NetworkListener to forward HTTP traffic on port 8080. -const listener = new awsx.lb.NetworkListener("lb", { port: 8080 }); +const loadBalancer = new awsx.lb.ApplicationLoadBalancer("loadbalancer", {}); // Create a Fargate service consisting of just one container instance (since that's all we // really need), passing it the cluster, DB connection and Pulumi config settings. const service = new awsx.ecs.FargateService("service", { - cluster, + cluster: cluster.arn, desiredCount: 1, taskDefinitionArgs: { - containers: { - service: { - image: "miniflux/miniflux:latest", - portMappings: [ - listener, - ], - environment: [ - { name: "DATABASE_URL", value: connectionString }, - { name: "RUN_MIGRATIONS", value: "1" }, - { name: "CREATE_ADMIN", value: "1" }, - { name: "ADMIN_USERNAME", value: adminUsername }, - { name: "ADMIN_PASSWORD", value: adminPassword }, - ], - }, + container: { + name: "service", + image: "miniflux/miniflux:latest", + portMappings: [ + {containerPort: 8080, targetGroup: loadBalancer.defaultTargetGroup}, + ], + environment: [ + { name: "DATABASE_URL", value: connectionString }, + { name: "RUN_MIGRATIONS", value: "1" }, + { name: "CREATE_ADMIN", value: "1" }, + { name: "ADMIN_USERNAME", value: adminUsername }, + { name: "ADMIN_PASSWORD", value: adminPassword }, + ], }, }, }, { @@ -71,4 +73,4 @@ const service = new awsx.ecs.FargateService("service", { }); // Export the publicly accessible URL. -export const url = pulumi.interpolate `http://${listener.endpoint.hostname}:${listener.endpoint.port}`; +export const url = pulumi.interpolate `http://${loadBalancer.loadBalancer.dnsName}:8080}`; diff --git a/aws-ts-pulumi-miniflux/package.json b/aws-ts-pulumi-miniflux/package.json index ca6751898..0fda83da3 100644 --- a/aws-ts-pulumi-miniflux/package.json +++ b/aws-ts-pulumi-miniflux/package.json @@ -1,11 +1,12 @@ { "name": "aws-typescript", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-redshift-glue-etl/package.json b/aws-ts-redshift-glue-etl/package.json index ae1b82a08..1b0dffff5 100644 --- a/aws-ts-redshift-glue-etl/package.json +++ b/aws-ts-redshift-glue-etl/package.json @@ -2,11 +2,12 @@ "name": "aws-ts-redshift-glue-etl", "main": "index.ts", "devDependencies": { - "@types/node": "^14" + "@types/node": "^18", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^1.0.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-thumbnailer/index.ts b/aws-ts-thumbnailer/index.ts index d8ca347dc..a0b057838 100644 --- a/aws-ts-thumbnailer/index.ts +++ b/aws-ts-thumbnailer/index.ts @@ -12,7 +12,7 @@ const bucket = new aws.s3.Bucket("bucket"); // Export the bucket name. export const bucketName = bucket.id; -// Create a repository for hte FFMPEG image. +// Create a repository for the FFMPEG image. const repo = new awsx.ecr.Repository("repo", { forceDelete: true, }); @@ -20,7 +20,7 @@ const repo = new awsx.ecr.Repository("repo", { // A task which runs a containerized FFMPEG job to extract a thumbnail image. const ffmpegThumbnailTask = new awsx.classic.ecs.FargateTaskDefinition("ffmpegThumbTask", { container: { - image: new awsx.ecr.Image("ffmpegThumbTask", { repositoryUrl: repo.url, path: "./docker-ffmpeg-thumb" }).imageUri, + image: new awsx.ecr.Image("ffmpegThumbTask", { repositoryUrl: repo.url, context: "./docker-ffmpeg-thumb" }).imageUri, memoryReservation: 512, }, }); diff --git a/aws-ts-thumbnailer/package.json b/aws-ts-thumbnailer/package.json index 8750f696a..02c5c5e1e 100755 --- a/aws-ts-thumbnailer/package.json +++ b/aws-ts-thumbnailer/package.json @@ -3,8 +3,8 @@ "version": "0.1.0", "main": "index.ts", "dependencies": { - "@pulumi/aws": "^5.30.0", - "@pulumi/awsx": "^1.0.2", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.55.0" } } diff --git a/aws-ts-url-shortener-cache-http/cache.ts b/aws-ts-url-shortener-cache-http/cache.ts index 7302af383..297504286 100644 --- a/aws-ts-url-shortener-cache-http/cache.ts +++ b/aws-ts-url-shortener-cache-http/cache.ts @@ -7,36 +7,36 @@ import * as config from "./config"; // A simple cache abstraction that wraps Redis. export class Cache { private readonly redis: awsx.ecs.FargateService; - private readonly endpoint: pulumi.Output; + private readonly endpoint: pulumi.Output; public get: (key: string) => Promise; public set: (key: string, value: string) => Promise; constructor(name: string, memory: number = 128) { const pw = config.redisPassword; - const listener = new awsx.elasticloadbalancingv2.NetworkListener(name, { port: 6379 }); + const loadBalancer = new awsx.lb.ApplicationLoadBalancer("loadbalancer", {}); this.redis = new awsx.ecs.FargateService(name, { taskDefinitionArgs: { - containers: { - redis: { - image: "redis:alpine", - memory: memory, - portMappings: [listener], - command: ["redis-server", "--requirepass", pw], - }, + container: { + name: "redis", + image: "redis:alpine", + memory: memory, + portMappings: [{containerPort: 6379, targetGroup: loadBalancer.defaultTargetGroup}], + command: ["redis-server", "--requirepass", pw], }, }, }); - this.endpoint = listener.endpoint; + this.endpoint = loadBalancer.loadBalancer.dnsName; // Expose get/set as member fields that don't capture 'this'. That way we don't try to // serialize pulumi resources unnecessarily into our lambdas. this.get = key => { - const ep = listener.endpoint.get(); - console.log(`Getting key '${key}' on Redis@${ep.hostname}:${ep.port}`); + const endpoint = loadBalancer.loadBalancer.dnsName.get(); + const endpointPort = loadBalancer.defaultTargetGroup.port; + console.log(`Getting key '${key}' on Redis@${endpoint}:${endpointPort}`); - const client = require("redis").createClient(ep.port, ep.hostname, { password: config.redisPassword }); + const client = require("redis").createClient(endpoint, endpointPort, { password: config.redisPassword }); return new Promise((resolve, reject) => { client.get(key, (err: any, v: any) => { if (err) { @@ -49,10 +49,11 @@ export class Cache { }; this.set = (key, value) => { - const ep = listener.endpoint.get(); - console.log(`Setting key '${key}' to '${value}' on Redis@${ep.hostname}:${ep.port}`); + const endpoint = loadBalancer.loadBalancer.dnsName.get(); + const endpointPort = loadBalancer.defaultTargetGroup.port; + console.log(`Setting key '${key}' to '${value}' on Redis@${endpoint}:${endpointPort}`); - const client = require("redis").createClient(ep.port, ep.hostname, { password: config.redisPassword }); + const client = require("redis").createClient(endpoint, endpointPort, { password: config.redisPassword }); return new Promise((resolve, reject) => { client.set(key, value, (err: any, v: any) => { if (err) { diff --git a/aws-ts-url-shortener-cache-http/package.json b/aws-ts-url-shortener-cache-http/package.json index bd19b28ba..0a9206628 100644 --- a/aws-ts-url-shortener-cache-http/package.json +++ b/aws-ts-url-shortener-cache-http/package.json @@ -14,8 +14,8 @@ "@types/send": "^0.14.4" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/cloud-aws": "^0.30.0", "@pulumi/pulumi": "^3.0.0", "express": "^4.16.3", diff --git a/aws-ts-voting-app/index.ts b/aws-ts-voting-app/index.ts index d2cb0885c..4f2ee868e 100644 --- a/aws-ts-voting-app/index.ts +++ b/aws-ts-voting-app/index.ts @@ -10,42 +10,46 @@ const redisPort = 6379; // The data layer for the application // Use the 'image' property to point to a pre-built Docker image. -const redisListener = new awsx.elasticloadbalancingv2.NetworkListener("voting-app-cache", { port: redisPort }); +const redisLB = new awsx.lb.ApplicationLoadBalancer("voting-app-cache", {}); const redisCache = new awsx.ecs.FargateService("voting-app-cache", { taskDefinitionArgs: { - containers: { - redis: { - image: "redis:alpine", - memory: 512, - portMappings: [redisListener], - command: ["redis-server", "--requirepass", redisPassword], - }, + container: { + name: "redis", + image: "redis:alpine", + memory: 512, + portMappings: [{ containerPort: redisPort, targetGroup: redisLB.defaultTargetGroup }], + command: ["redis-server", "--requirepass", redisPassword], }, }, }); -const redisEndpoint = redisListener.endpoint; +const redisEndpoint = redisLB.loadBalancer.dnsName; +const redistHostPort = redisLB.defaultTargetGroup.port; // A custom container for the frontend, which is a Python Flask app // Use the 'build' property to specify a folder that contains a Dockerfile. // Pulumi builds the container for you and pushes to an ECR registry -const frontendListener = new awsx.elasticloadbalancingv2.NetworkListener("voting-app-frontend", { port: 80 }); +const frontendLB = new awsx.lb.ApplicationLoadBalancer("voting-app-frontend", {}); +const repo = new awsx.ecr.Repository("repo", {}); +const image = new awsx.ecr.Image("voting-app-frontend", { + repositoryUrl: repo.url, + context: "./frontend", +}); const frontend = new awsx.ecs.FargateService("voting-app-frontend", { taskDefinitionArgs: { - containers: { - votingAppFrontend: { - image: awsx.ecs.Image.fromPath("voting-app-frontend", "./frontend"), // path to the folder containing the Dockerfile - memory: 512, - portMappings: [frontendListener], - environment: redisEndpoint.apply(e => [ - { name: "REDIS", value: e.hostname }, - { name: "REDIS_PORT", value: e.port.toString() }, - { name: "REDIS_PWD", value: redisPassword }, - ]), - }, + container: { + name: "votingAppFrontend", + image: image.imageUri, + memory: 512, + portMappings: [{ containerPort: 80, targetGroup: frontendLB.defaultTargetGroup }], + environment: pulumi.all([redisEndpoint, redistHostPort]).apply(([e, p]) => [ + { name: "REDIS", value: e }, + { name: "REDIS_PORT", value: p?.toString() }, + { name: "REDIS_PWD", value: redisPassword }, + ]) }, }, }); // Export a variable that will be displayed during 'pulumi up' -export let frontendURL = frontendListener.endpoint; +export let frontendURL = pulumi.interpolate`http://${frontendLB.loadBalancer.dnsName}:${frontendLB.defaultTargetGroup.port}`; diff --git a/aws-ts-voting-app/package.json b/aws-ts-voting-app/package.json index 906bf5ed7..8d482ef90 100644 --- a/aws-ts-voting-app/package.json +++ b/aws-ts-voting-app/package.json @@ -2,11 +2,11 @@ "name": "voting-app", "version": "0.1.0", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/cloud-aws": "^0.40.1", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/index.ts b/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/index.ts index f9333681b..9af96d335 100644 --- a/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/index.ts +++ b/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/index.ts @@ -7,14 +7,12 @@ const env = pulumi.getStack() const vpc_name = config.require("vpc_name"); const zone_number = config.requireNumber("zone_number"); const vpc_cidr = config.require("vpc_cidr"); -const number_of_nat_gateways = config.requireNumber("number_of_nat_gateways"); const baseTags = { "Name": `${vpc_name}`, "availability_zones_used": `${zone_number}`, "cidr_block": `${vpc_cidr}`, "crosswalk": "yes", - "number_of_nat_gateways": `${number_of_nat_gateways}`, "demo": "true", "pulumi:Project": pulumi.getProject(), "pulumi:Stack": pulumi.getStack(), @@ -25,17 +23,14 @@ const baseTags = { const vpc = new awsx.ec2.Vpc(vpc_name, { cidrBlock: vpc_cidr, numberOfAvailabilityZones: zone_number, - numberOfNatGateways: number_of_nat_gateways, tags: baseTags, - }); // Export a few resulting fields to make them easy to use: export const pulumi_vpc_name = vpc_name; -export const pulumi_vpc_id = vpc.id; +export const pulumi_vpc_id = vpc.vpcId; export const pulumi_vpc_az_zones = zone_number; export const pulumi_vpc_cidr = vpc_cidr; -export const pulumic_vpc_number_of_nat_gateways = number_of_nat_gateways; export const pulumi_vpc_private_subnet_ids = vpc.privateSubnetIds; export const pulumi_vpc_public_subnet_ids = vpc.publicSubnetIds; export const pulumi_vpc_aws_tags = baseTags; \ No newline at end of file diff --git a/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json b/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json index 9b0167094..9a547ea8d 100644 --- a/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json +++ b/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json @@ -1,11 +1,11 @@ { "name": "crosswalk-vpc", "devDependencies": { - "@types/node": "^14.0.0" + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-webserver/package.json b/aws-ts-webserver/package.json index dc2478b44..2088a5b24 100644 --- a/aws-ts-webserver/package.json +++ b/aws-ts-webserver/package.json @@ -1,11 +1,11 @@ { "name": "aws-ts-webserver", "devDependencies": { - "@types/node": "^10.0.0" + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "^3.25.1", - "@pulumi/awsx": "^0.24.0", - "@pulumi/pulumi": "^2.0.0" + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/pulumi": "^3.0.0" } } diff --git a/kubernetes-ts-multicloud/aks.ts b/kubernetes-ts-multicloud/aks.ts index b80b04968..84c31eeec 100644 --- a/kubernetes-ts-multicloud/aks.ts +++ b/kubernetes-ts-multicloud/aks.ts @@ -16,7 +16,6 @@ import * as azure from "@pulumi/azure"; import * as azuread from "@pulumi/azuread"; import * as k8s from "@pulumi/kubernetes"; import * as pulumi from "@pulumi/pulumi"; -import * as random from "@pulumi/random"; import * as tls from "@pulumi/tls"; export class AksCluster extends pulumi.ComponentResource { @@ -28,12 +27,6 @@ export class AksCluster extends pulumi.ComponentResource { opts: pulumi.ComponentResourceOptions = {}) { super("examples:kubernetes-ts-multicloud:AksCluster", name, {}, opts); - // Generate a strong password for the Service Principal. - const password = new random.RandomPassword("password", { - length: 20, - special: true, - }, {parent: this}).result; - // Create an SSH public key that will be used by the Kubernetes cluster. // Note: We create one here to simplify the demo, but a production deployment would probably pass // an existing key in as a variable. @@ -49,7 +42,6 @@ export class AksCluster extends pulumi.ComponentResource { }, {parent: this}); const adSpPassword = new azuread.ServicePrincipalPassword("aksSpPassword", { servicePrincipalId: adSp.id, - value: password, endDate: "2099-01-01T00:00:00Z", }, {parent: this}); @@ -98,7 +90,7 @@ export class AksCluster extends pulumi.ComponentResource { clientSecret: adSpPassword.value, }, kubernetesVersion: "1.16.9", - roleBasedAccessControl: {enabled: true}, + roleBasedAccessControlEnabled: true, networkProfile: { networkPlugin: "azure", dnsServiceIp: "10.2.2.254", diff --git a/kubernetes-ts-multicloud/eks.ts b/kubernetes-ts-multicloud/eks.ts index b8eef155b..b217869b8 100644 --- a/kubernetes-ts-multicloud/eks.ts +++ b/kubernetes-ts-multicloud/eks.ts @@ -30,7 +30,7 @@ export class EksCluster extends pulumi.ComponentResource { // Create the EKS cluster itself, including a "gp2"-backed StorageClass and a deployment of the Kubernetes dashboard. this.cluster = new eks.Cluster("cluster", { - vpcId: vpc.id, + vpcId: vpc.vpcId, subnetIds: vpc.publicSubnetIds, instanceType: "t2.medium", desiredCapacity: 2, diff --git a/kubernetes-ts-multicloud/package.json b/kubernetes-ts-multicloud/package.json index 2b5f7f126..97512d7fa 100644 --- a/kubernetes-ts-multicloud/package.json +++ b/kubernetes-ts-multicloud/package.json @@ -1,15 +1,16 @@ { "name": "kubernetes-ts-multicloud", "devDependencies": { - "@types/node": "^12.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/awsx": "^0.40.0", - "@pulumi/azure": "^4.0.0", - "@pulumi/azuread": "^4.0.0", - "@pulumi/eks": "^0.30.0", + "@pulumi/awsx": "^2.0.2", + "@pulumi/azure": "^5.0.0", + "@pulumi/azuread": "^5.0.0", + "@pulumi/eks": "^2.0.0", "@pulumi/gcp": "^7.0.0", - "@pulumi/kubernetes": "^3.0.0", + "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", "@pulumi/random": "^4.0.0", "@pulumi/tls": "^4.0.0" diff --git a/secrets-provider/aws/package.json b/secrets-provider/aws/package.json index fe1f7ad19..404146f9f 100644 --- a/secrets-provider/aws/package.json +++ b/secrets-provider/aws/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/pulumi": "^3.0.0", - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0" + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3" } } diff --git a/secrets-provider/vault/package.json b/secrets-provider/vault/package.json index fe1f7ad19..404146f9f 100644 --- a/secrets-provider/vault/package.json +++ b/secrets-provider/vault/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/pulumi": "^3.0.0", - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0" + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3" } } diff --git a/testing-pac-ts/package.json b/testing-pac-ts/package.json index c4569b138..ba65c4d06 100644 --- a/testing-pac-ts/package.json +++ b/testing-pac-ts/package.json @@ -2,9 +2,9 @@ "name": "pac-ts-eks", "devDependencies": {}, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", - "@pulumi/eks": "^0.30.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/pulumi": "^3.0.0", "@types/node": "^13.1.8", "ts-node": "^8.6.2" diff --git a/testing-pac-ts/tests/package.json b/testing-pac-ts/tests/package.json index 830810f8c..9bca3de94 100644 --- a/testing-pac-ts/tests/package.json +++ b/testing-pac-ts/tests/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "dependencies": { "@pulumi/aws": "^6.0.2", - "@pulumi/eks": "^0.22.0", + "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/policy": "latest", "@pulumi/pulumi": "^2.0.0" }, diff --git a/testing-unit-ts-mocks-jest/package.json b/testing-unit-ts-mocks-jest/package.json index 802531701..c09b4a0aa 100644 --- a/testing-unit-ts-mocks-jest/package.json +++ b/testing-unit-ts-mocks-jest/package.json @@ -2,12 +2,13 @@ "name": "testing-unit-ts-mocks-jest", "devDependencies": { "@types/jest": "^28.1.1", - "@types/node": "^14", - "ts-jest": "^28.0.5" + "@types/node": "^18", + "ts-jest": "^28.0.5", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0", "node-fetch": "^2.6.7" }, From cd549262dc69b5e52eea95d234c484c7a45dfa76 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Fri, 22 Sep 2023 14:55:39 +0200 Subject: [PATCH 04/15] linting --- aws-ts-apigateway-auth0/index.ts | 6 +- aws-ts-apigateway-auth0/package.json | 12 +- aws-ts-eks-migrate-nodegroups/index.ts | 2 +- aws-ts-k8s-mern-voting-app/index.ts | 2 +- aws-ts-lambda-efs/package.json | 7 +- .../cms-oauth/infrastructure/index.ts | 4 +- .../cms-oauth/infrastructure/package.json | 6 +- aws-ts-pulumi-miniflux/index.ts | 2 +- aws-ts-pulumi-webhooks/package.json | 7 +- aws-ts-slackbot/index.ts | 140 +++++++++--------- aws-ts-slackbot/package.json | 13 +- .../application/package.json | 5 +- .../application/src/application.ts | 89 ++++++----- .../database/package.json | 4 +- .../networking/package.json | 5 +- .../networking/src/vpc.ts | 2 +- aws-ts-voting-app/index.ts | 2 +- 17 files changed, 163 insertions(+), 145 deletions(-) diff --git a/aws-ts-apigateway-auth0/index.ts b/aws-ts-apigateway-auth0/index.ts index 15e2764d4..cd39428ce 100644 --- a/aws-ts-apigateway-auth0/index.ts +++ b/aws-ts-apigateway-auth0/index.ts @@ -11,9 +11,9 @@ // 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. +import * as apigateway from "@pulumi/aws-apigateway"; import * as awsx from "@pulumi/awsx"; import * as pulumi from "@pulumi/pulumi"; - import * as jwt from "jsonwebtoken"; import * as jwksClient from "jwks-rsa"; import * as util from "util"; @@ -23,7 +23,7 @@ const jwksUri = config.require("jwksUri"); const audience = config.require("audience"); const issuer = config.require("issuer"); -const authorizerLambda = async (event: awsx.apigateway.AuthorizerEvent) => { +const authorizerLambda = async (event: apigateway.AuthorizerEvent) => { try { return await authenticate(event); } @@ -45,7 +45,7 @@ const api = new awsx.apigateway.API("myapi", { body: "

Hello world!

", }; }, - authorizers: awsx.apigateway.getTokenLambdaAuthorizer({ + authorizers: apigateway.getTokenLambdaAuthorizer({ authorizerName: "jwt-rsa-custom-authorizer", header: "Authorization", handler: authorizerLambda, diff --git a/aws-ts-apigateway-auth0/package.json b/aws-ts-apigateway-auth0/package.json index dba6ab352..5067e4718 100644 --- a/aws-ts-apigateway-auth0/package.json +++ b/aws-ts-apigateway-auth0/package.json @@ -1,15 +1,17 @@ { "name": "aws-typescript", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "^3.0.0", - "@pulumi/awsx": "^0.24.0", - "@pulumi/pulumi": "^2.0.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/pulumi": "^3.0.0", "@types/auth0-js": "^9.10.1", "@types/jsonwebtoken": "^8.3.2", "jsonwebtoken": "^8.5.1", - "jwks-rsa": "^1.4.0" + "jwks-rsa": "^1.4.0", + "typescript": "^4.6.0" } } diff --git a/aws-ts-eks-migrate-nodegroups/index.ts b/aws-ts-eks-migrate-nodegroups/index.ts index 393b40af1..8fffd06a0 100644 --- a/aws-ts-eks-migrate-nodegroups/index.ts +++ b/aws-ts-eks-migrate-nodegroups/index.ts @@ -15,7 +15,7 @@ const vpc = new awsx.ec2.Vpc(`${projectName}`, { cidrBlock: "172.16.0.0/16", subnetSpecs: [ { type: awsx.ec2.SubnetType.Public }, - { type: awsx.ec2.SubnetType.Private } + { type: awsx.ec2.SubnetType.Private }, ], }); diff --git a/aws-ts-k8s-mern-voting-app/index.ts b/aws-ts-k8s-mern-voting-app/index.ts index c35a250d6..bffa44253 100644 --- a/aws-ts-k8s-mern-voting-app/index.ts +++ b/aws-ts-k8s-mern-voting-app/index.ts @@ -57,7 +57,7 @@ const databaseDeployment = new k8s.apps.v1.Deployment(databaseAppName, { spec: { containers: [{ name: databaseAppName, - image: dbImage.imageUri, //awsx.ecr.buildAndPushImage("database-side-service", "./databaseside").image(), + image: dbImage.imageUri, ports: [{ name: "http", containerPort: 27017 }], env: [ { name: "DATABASE_NAME", value: databaseName }, diff --git a/aws-ts-lambda-efs/package.json b/aws-ts-lambda-efs/package.json index 04574108e..16c1b7470 100644 --- a/aws-ts-lambda-efs/package.json +++ b/aws-ts-lambda-efs/package.json @@ -2,8 +2,11 @@ "name": "aws-ts-lambda-efs", "version": "0.1.0", "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" + }, + "devDependencies": { + "typescript": "^4.6.2" } } diff --git a/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/index.ts b/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/index.ts index f4db5e4ea..6831b83fc 100644 --- a/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/index.ts +++ b/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/index.ts @@ -100,7 +100,7 @@ const certificateValidation = new aws.acm.CertificateValidation("certificateVali const cluster = new awsx.ecs.Cluster("cluster"); // Define an ec2 application load balancer alb to distribute incomming application traffic across multiple targets, such as EC2 instances, in multiple Availability Zones. -const alb = new awsx.elasticloadbalancingv2.ApplicationLoadBalancer( +const alb = new awsx.lb.ApplicationLoadBalancer( "net-lb", { external: true, securityGroups: cluster.securityGroups }); // alb need a listener to listen to 443 the standard port for the HTTPS traffic, certificate is using the certificate we created above @@ -191,7 +191,7 @@ const appService = new awsx.ecs.FargateService("app-svc", { // Creates a new Route53 DNS record pointing the domain to the CloudFront distribution. function createAliasRecord( - targetDomain: string, lb: awsx.elasticloadbalancingv2.ApplicationLoadBalancer): aws.route53.Record { + targetDomain: string, lb: awsx.lb.ApplicationLoadBalancer): aws.route53.Record { const domainParts = getDomainAndSubdomain(targetDomain); const hostedZoneId = aws.route53.getZone({ name: domainParts.parentDomain }, { async: true }).then(zone => zone.zoneId); return new aws.route53.Record( diff --git a/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json b/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json index 9bfc5432a..988deb54d 100644 --- a/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json +++ b/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json @@ -1,11 +1,11 @@ { "name": "netlify-cms-oauth-provider-infrastructure", "devDependencies": { - "@types/node": "^10.0.0" + "@types/node": "^18.0.0" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0", "@pulumi/random": "^4.0.0" } diff --git a/aws-ts-pulumi-miniflux/index.ts b/aws-ts-pulumi-miniflux/index.ts index a6654d951..aed13000e 100644 --- a/aws-ts-pulumi-miniflux/index.ts +++ b/aws-ts-pulumi-miniflux/index.ts @@ -16,7 +16,7 @@ const adminPassword = config.require("admin_password"); // const vpcId = aws.ec2.getVpc({ default: true }, { async: true }).then(r => r.id); // const vpc = aws.ec2.getVpcOutput({ default: true }, { async: true }); const vpc = new aws.ec2.DefaultVpc("defaultVpc", {}); -const subnet = new aws.ec2.Subnet("defaultSubnet", { vpcId: vpc.id }) +const subnet = new aws.ec2.Subnet("defaultSubnet", { vpcId: vpc.id }); // Create a new subnet group for the database. const subnetGroup = new aws.rds.SubnetGroup("dbsubnets", { diff --git a/aws-ts-pulumi-webhooks/package.json b/aws-ts-pulumi-webhooks/package.json index 82e9dbe52..d34ac041d 100644 --- a/aws-ts-pulumi-webhooks/package.json +++ b/aws-ts-pulumi-webhooks/package.json @@ -1,11 +1,12 @@ { "name": "typescript", "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0", + "typescript": "^4.6.2" }, "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0", "@slack/webhook": "^5.0.3" } diff --git a/aws-ts-slackbot/index.ts b/aws-ts-slackbot/index.ts index 4e701b4ef..8d0e75828 100644 --- a/aws-ts-slackbot/index.ts +++ b/aws-ts-slackbot/index.ts @@ -1,12 +1,16 @@ // Copyright 2016-2019, Pulumi Corporation. All rights reserved. import * as aws from "@pulumi/aws"; -import * as awsx from "@pulumi/awsx"; +import * as apig from "@pulumi/aws-apigateway"; import * as pulumi from "@pulumi/pulumi"; import * as qs from "qs"; import * as superagent from "superagent"; +import * as dynamoClient from "@aws-sdk/client-dynamodb"; +import * as sns from "@aws-sdk/client-sns"; +import * as dynamoLib from "@aws-sdk/lib-dynamodb"; + // A simple slack bot that, when requested, will monitor for @mentions of your name and post them to // the channel you contacted the bot from. @@ -63,63 +67,67 @@ interface Event { channel_type: string; } -// Create an API endpoint that slack will use to push events to us with. -const endpoint = new awsx.apigateway.API("mentionbot", { - routes: [{ - path: "/events", - method: "POST", - eventHandler: async (event) => { - try { - if (!slackToken) { - throw new Error("mentionbot:slackToken was not provided"); - } +const handler = new aws.lambda.CallbackFunction("handler", { + callback: async (event) => { + try { + if (!slackToken) { + throw new Error("mentionbot:slackToken was not provided"); + } - if (!verificationToken) { - throw new Error("mentionbot:verificationToken was not provided"); - } + if (!verificationToken) { + throw new Error("mentionbot:verificationToken was not provided"); + } - if (!event.isBase64Encoded || event.body == null) { - console.log("Unexpected content received"); - console.log(JSON.stringify(event)); - } - else { - const parsed = JSON.parse(Buffer.from(event.body, "base64").toString()); - - switch (parsed.type) { - case "url_verification": - // url_verification is the simple message slack sends to our endpoint to - // just make sure we're setup properly. All we have to do is get the - // challenge data they send us and return it untouched. - const verificationRequest = parsed; - const challenge = verificationRequest.challenge; - return { statusCode: 200, body: JSON.stringify({ challenge }) }; - - case "event_callback": - const eventRequest = parsed; - - if (eventRequest.token !== verificationToken) { - console.log("Error: Invalid verification token"); - return { statusCode: 401, body: "Invalid verification token" }; - } - - await onEventCallback(eventRequest); - break; - - default: - console.log("Unknown event type: " + parsed.type); - break; - } - } + if (!event.isBase64Encoded || event.body == null) { + console.log("Unexpected content received"); + console.log(JSON.stringify(event)); } - catch (err) { - console.log("Error: " + err.message); - // Fall through. Even in the event of an error, we want to return '200' so that slack - // doesn't just repeat the message, causing the same error. + else { + const parsed = JSON.parse(Buffer.from(event.body, "base64").toString()); + + switch (parsed.type) { + case "url_verification": + // url_verification is the simple message slack sends to our endpoint to + // just make sure we're setup properly. All we have to do is get the + // challenge data they send us and return it untouched. + const verificationRequest = parsed; + const challenge = verificationRequest.challenge; + return { statusCode: 200, body: JSON.stringify({ challenge }) }; + + case "event_callback": + const eventRequest = parsed; + + if (eventRequest.token !== verificationToken) { + console.log("Error: Invalid verification token"); + return { statusCode: 401, body: "Invalid verification token" }; + } + + await onEventCallback(eventRequest); + break; + + default: + console.log("Unknown event type: " + parsed.type); + break; + } } + } + catch (err) { + console.log("Error: " + err.message); + // Fall through. Even in the event of an error, we want to return '200' so that slack + // doesn't just repeat the message, causing the same error. + } + + // Always return success so that Slack doesn't just immediately resend this message to us. + return { statusCode: 200, body: "" }; + }, +}); - // Always return success so that Slack doesn't just immediately resend this message to us. - return { statusCode: 200, body: "" }; - }, +// Create an API endpoint that slack will use to push events to us with. +const endpoint = new apig.RestAPI("mentionbot", { + routes: [{ + path: "/events", + method: "POST", + eventHandler: handler, }], }); @@ -132,11 +140,11 @@ async function onEventCallback(request: EventCallbackRequest) { // Just enqueue the request to our topic and return immediately. We have a strict time limit from // slack and they will resend messages if we don't get back to them ASAP. - const client = new aws.sdk.SNS(); + const client = new sns.SNS(); await client.publish({ Message: JSON.stringify(request), TopicArn: messageTopic.arn.get(), - }).promise(); + }); } // Hook up a lambda that will then process the topic when possible. @@ -175,7 +183,8 @@ async function onMessageEventCallback(request: EventCallbackRequest) { return; } - const client = new aws.sdk.DynamoDB.DocumentClient(); + const dynoClient = new dynamoClient.DynamoDBClient({}); + const client = dynamoLib.DynamoDBDocumentClient.from(dynoClient); // There might be multiple @mentions to the same person in the same message. // So make into a set to make things unique. @@ -189,10 +198,11 @@ async function onMessageEventCallback(request: EventCallbackRequest) { async function processMatch(match: string) { const id = match.substring("@<".length, match.length - ">".length); - const getResult = await client.get({ + const dynoClient = new dynamoClient.DynamoDBClient({}); + const getResult = await dynamoLib.DynamoDBDocument.from(dynoClient).get({ TableName: subscriptionsTable.name.get(), Key: { id: id }, - }).promise(); + }); if (!getResult.Item) { // No subscription found for this user. @@ -228,26 +238,24 @@ async function onAppMentionEventCallback(request: EventCallbackRequest) { } async function unsubscribeFromMentions(event: Event) { - const client = new aws.sdk.DynamoDB.DocumentClient(); - // User is unsubscribing. Remove them from subscription table. - await client.delete({ + const dynoClient = new dynamoClient.DynamoDBClient({}); + await dynamoLib.DynamoDBDocument.from(dynoClient).delete({ TableName: subscriptionsTable.name.get(), Key: { id: event.user }, - }).promise(); + }); const text = `Hi <@${event.user}>. You've been unsubscribed from @ mentions. Mention me again to resubscribe.`; await sendChannelMessage(event.channel, text); } async function subscribeToMentions(event: Event) { - const client = new aws.sdk.DynamoDB.DocumentClient(); - // User is subscribing. Add them from subscription table. - await client.put({ + const dynoClient = new dynamoClient.DynamoDBClient({}); + await dynamoLib.DynamoDBDocument.from(dynoClient).put({ TableName: subscriptionsTable.name.get(), Item: { id: event.user, channel: event.channel }, - }).promise(); + }); const text = `Hi <@${event.user}>. You've been subscribed to @ mentions. Send me an message containing 'unsubscribe' to stop receiving these notifications.`; await sendChannelMessage(event.channel, text); diff --git a/aws-ts-slackbot/package.json b/aws-ts-slackbot/package.json index a54fb69ba..7ed2a1163 100644 --- a/aws-ts-slackbot/package.json +++ b/aws-ts-slackbot/package.json @@ -2,14 +2,19 @@ "name": "aws-ts-slackbot", "version": "0.1.0", "dependencies": { - "@pulumi/aws": "^5.0.0", - "@pulumi/awsx": "^0.40.0", + "@aws-sdk/client-dynamodb": "^3.417.0", + "@aws-sdk/client-sns": "^3.414.0", + "@aws-sdk/lib-dynamodb": "^3.417.0", + "@pulumi/aws": "^6.0.0", + "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0", "qs": "^6.7.0", - "superagent": "^5.0.2" + "superagent": "^8.1.0" }, "devDependencies": { "@types/qs": "^6.5.2", - "@types/superagent": "^4.1.1" + "@types/superagent": "^4.1.0", + "typescript": "^4.6.2" } } diff --git a/aws-ts-stackreference-architecture/application/package.json b/aws-ts-stackreference-architecture/application/package.json index 263ab2470..cc0936d46 100644 --- a/aws-ts-stackreference-architecture/application/package.json +++ b/aws-ts-stackreference-architecture/application/package.json @@ -3,11 +3,12 @@ "main": "src/index.ts", "devDependencies": { "@types/mime": "^2.0.1", - "@types/node": "latest" + "@types/node": "latest", + "typescript": "^4" }, "dependencies": { "@pulumi/aws": "latest", - "@pulumi/awsx": "latest", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/newrelic": "latest", "@pulumi/pulumi": "latest", "ip-address": "^5.9.2", diff --git a/aws-ts-stackreference-architecture/application/src/application.ts b/aws-ts-stackreference-architecture/application/src/application.ts index 49fe897a6..fd3a27ae3 100644 --- a/aws-ts-stackreference-architecture/application/src/application.ts +++ b/aws-ts-stackreference-architecture/application/src/application.ts @@ -34,7 +34,7 @@ export interface ApplicationArgs { */ appSecurityGroupIds?: Input[]; - appImage: Input | awsx.ecs.ContainerImageProvider; + appImage: Input | aws.ecs.ContainerImageProvider; appResources?: ApplicationResources; } @@ -45,9 +45,9 @@ export interface ApplicationResources { } export class Application extends ComponentResource { - applicationLoadBalancer: awsx.elasticloadbalancingv2.ApplicationLoadBalancer; - applicationListener: awsx.elasticloadbalancingv2.ApplicationListener; - cluster: awsx.ecs.Cluster; + applicationLoadBalancer: awsx.lb.ApplicationLoadBalancer; + applicationListener: aws.lb.Listener; + cluster: aws.ecs.Cluster; fargateService: awsx.ecs.FargateService; /** @@ -60,21 +60,19 @@ export class Application extends ComponentResource { constructor(name: string, args: ApplicationArgs, opts?: ComponentResourceOptions) { super("application", name, {}, opts); - const vpc = awsx.ec2.Vpc.fromExistingIds(`${name}-service-vpc`, { - vpcId: args.vpcId, - }, { parent: this }); + const vpc = aws.ec2.Vpc.get(`${name}-service-vpc`, args.vpcId, {}, { parent: this }); // Use the provided pre-existing security group or create a new one. const albSecGroup = args.albSecurityGroupIds || [ - new awsx.ec2.SecurityGroup(`${name}-service-alb-sg`, { - vpc: vpc, - }, { parent: vpc }), + new aws.ec2.SecurityGroup(`${name}-service-alb-sg`, { + vpcId: vpc.id, + }, { parent: vpc }).id, ]; - this.applicationLoadBalancer = new awsx.elasticloadbalancingv2.ApplicationLoadBalancer(`${name}-service-alb`, { - vpc: vpc, + this.applicationLoadBalancer = new awsx.lb.ApplicationLoadBalancer(`${name}-service-alb`, { + vpc: vpc.id, external: true, - subnets: args.albSubnetIds, + subnetIds: args.albSubnetIds, securityGroups: albSecGroup, tags: { ...args.baseTags, @@ -82,13 +80,13 @@ export class Application extends ComponentResource { }, }, { parent: this }); - this.applicationListener = new awsx.elasticloadbalancingv2.ApplicationListener(`${name}-service-alb-listener`, { + this.applicationListener = new aws.lb.Listener(`${name}-service-alb-listener`, { vpc: vpc, loadBalancer: this.applicationLoadBalancer, port: args.appPort, }, { parent: this.applicationLoadBalancer }); - this.cluster = new awsx.ecs.Cluster(`${name}-cluster`, { + this.cluster = new aws.ecs.Cluster(`${name}-cluster`, { vpc: vpc, /** * Prevent default security groups with `[]`. Instead @@ -103,8 +101,8 @@ export class Application extends ComponentResource { // Use the provided pre-existing security group or create a new one. const appSecGroup = args.appSecurityGroupIds || [ - new awsx.ec2.SecurityGroup(`${name}-service-sg`, { - vpc: vpc, + new aws.ec2.SecurityGroup(`${name}-service-sg`, { + vpcId: vpc.id, ingress: [ { fromPort: args.appPort, @@ -118,40 +116,39 @@ export class Application extends ComponentResource { ]; this.fargateService = new awsx.ecs.FargateService(`${name}-service`, { - cluster: this.cluster, + cluster: this.cluster.arn, assignPublicIp: false, subnets: args.appSubnetIds, securityGroups: appSecGroup, desiredCount: (args.appResources || {}).desiredCount, taskDefinitionArgs: { - containers: { - [name]: { - ...args.appResources, // cpu, memory, etc. - image: args.appImage, - portMappings: [this.applicationListener], - environment: [ - { - name: "DB_HOST", - value: args.dbHost, - }, - { - name: "DB_USERNAME", - value: args.dbUsername, - }, - { - name: "DB_PASSWORD", - value: args.dbPassword, - }, - { - name: "DB_PORT", - value: args.dbPort, - }, - { - name: "DB_NAME", - value: args.dbName, - }, - ], - }, + container: { + name: name, + ...args.appResources, // cpu, memory, etc. + image: args.appImage, + portMappings: [this.applicationListener], + environment: [ + { + name: "DB_HOST", + value: args.dbHost, + }, + { + name: "DB_USERNAME", + value: args.dbUsername, + }, + { + name: "DB_PASSWORD", + value: args.dbPassword, + }, + { + name: "DB_PORT", + value: args.dbPort, + }, + { + name: "DB_NAME", + value: args.dbName, + }, + ], }, }, }, { parent: this.cluster }); diff --git a/aws-ts-stackreference-architecture/database/package.json b/aws-ts-stackreference-architecture/database/package.json index 48fbe47c5..70394622b 100644 --- a/aws-ts-stackreference-architecture/database/package.json +++ b/aws-ts-stackreference-architecture/database/package.json @@ -3,11 +3,11 @@ "main": "src/index.ts", "devDependencies": { "@types/mime": "^2.0.1", - "@types/node": "latest" + "@types/node": "latest", + "typescript": "^4" }, "dependencies": { "@pulumi/aws": "latest", - "@pulumi/awsx": "latest", "@pulumi/pulumi": "latest", "@pulumi/random": "latest", "ip-address": "^5.9.2", diff --git a/aws-ts-stackreference-architecture/networking/package.json b/aws-ts-stackreference-architecture/networking/package.json index 263ab2470..cc0936d46 100644 --- a/aws-ts-stackreference-architecture/networking/package.json +++ b/aws-ts-stackreference-architecture/networking/package.json @@ -3,11 +3,12 @@ "main": "src/index.ts", "devDependencies": { "@types/mime": "^2.0.1", - "@types/node": "latest" + "@types/node": "latest", + "typescript": "^4" }, "dependencies": { "@pulumi/aws": "latest", - "@pulumi/awsx": "latest", + "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/newrelic": "latest", "@pulumi/pulumi": "latest", "ip-address": "^5.9.2", diff --git a/aws-ts-stackreference-architecture/networking/src/vpc.ts b/aws-ts-stackreference-architecture/networking/src/vpc.ts index 992833744..49159c76d 100644 --- a/aws-ts-stackreference-architecture/networking/src/vpc.ts +++ b/aws-ts-stackreference-architecture/networking/src/vpc.ts @@ -261,7 +261,7 @@ export class Vpc extends ComponentResource { let autoAccept = false; let peerOwner = args.peerOwnerId; if (!args.peerOwnerId) { - peerOwner = aws.getCallerIdentity({ async: true }).then(i => i.accountId); + peerOwner = aws.getCallerIdentity({}, { async: true }).then(i => i.accountId); autoAccept = true; } const peerName = args.peerVpc.name; diff --git a/aws-ts-voting-app/index.ts b/aws-ts-voting-app/index.ts index 4f2ee868e..5a8cd59c4 100644 --- a/aws-ts-voting-app/index.ts +++ b/aws-ts-voting-app/index.ts @@ -46,7 +46,7 @@ const frontend = new awsx.ecs.FargateService("voting-app-frontend", { { name: "REDIS", value: e }, { name: "REDIS_PORT", value: p?.toString() }, { name: "REDIS_PWD", value: redisPassword }, - ]) + ]), }, }, }); From 37cb7a30aef12c037101452c2f124569272eb31c Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Mon, 2 Oct 2023 15:41:52 +0200 Subject: [PATCH 05/15] One more overlooked aws v5->6 bump --- aws-js-containers/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-js-containers/package.json b/aws-js-containers/package.json index 951f4dfc0..b48343c58 100644 --- a/aws-js-containers/package.json +++ b/aws-js-containers/package.json @@ -2,7 +2,7 @@ "name": "aws-js-containers", "main": "index.js", "dependencies": { - "@pulumi/aws": "^5.29.1", + "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.55.0" } From 49ee3a0a9fa9e46d6550e0f17499b5673f559135 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Tue, 3 Oct 2023 12:41:33 +0200 Subject: [PATCH 06/15] Upgrade aws-ts-lambda-efs to aws v6 --- aws-ts-lambda-efs/index.ts | 48 ++++++++++++++++++++-------------- aws-ts-lambda-efs/package.json | 1 + 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/aws-ts-lambda-efs/index.ts b/aws-ts-lambda-efs/index.ts index a4b61a865..9927ba4a5 100644 --- a/aws-ts-lambda-efs/index.ts +++ b/aws-ts-lambda-efs/index.ts @@ -1,6 +1,7 @@ // Copyright 2016-2019, Pulumi Corporation. All rights reserved. import * as aws from "@pulumi/aws"; +import * as apigateway from "@pulumi/aws-apigateway"; import * as awsx from "@pulumi/awsx"; import * as cp from "child_process"; import * as fs from "fs"; @@ -8,19 +9,20 @@ import * as fs from "fs"; export = async () => { // VPC - const vpc = new awsx.ec2.Vpc("vpc", { subnets: [{ type: "private" }, { type: "public" }] }); - const subnetIds = await vpc.publicSubnetIds; + const vpc = new awsx.ec2.Vpc("vpc", {}); // subnets default to one private, one public // EFS const filesystem = new aws.efs.FileSystem("filesystem"); - const targets = []; - for (let i = 0; i < subnetIds.length; i++) { - targets.push(new aws.efs.MountTarget(`fs-mount-${i}`, { - fileSystemId: filesystem.id, - subnetId: subnetIds[i], - securityGroups: [vpc.vpc.defaultSecurityGroupId], - })); - } + const targets: aws.efs.MountTarget[] = []; + vpc.publicSubnetIds.apply(ids => { + for (let i = 0; i < ids.length; i++) { + targets.push(new aws.efs.MountTarget(`fs-mount-${i}`, { + fileSystemId: filesystem.id, + subnetId: ids[i], + securityGroups: [vpc.vpc.defaultSecurityGroupId], + })); + } + }); const ap = new aws.efs.AccessPoint("ap", { fileSystemId: filesystem.id, posixUser: { uid: 1000, gid: 1000 }, @@ -28,7 +30,7 @@ export = async () => { }, { dependsOn: targets }); // Lambda - function efsvpcCallback(name: string, f: aws.lambda.Callback) { + function efsvpcCallback(name: string, f: aws.lambda.Callback) { return new aws.lambda.CallbackFunction(name, { policies: [aws.iam.ManagedPolicy.AWSLambdaVPCAccessExecutionRole, aws.iam.ManagedPolicy.LambdaFullAccess], vpcConfig: { @@ -41,12 +43,13 @@ export = async () => { } // API Gateway - const api = new awsx.apigateway.API("api", { + const api = new apigateway.RestAPI("api", { routes: [ { method: "GET", path: "/files/{filename+}", eventHandler: efsvpcCallback("getHandler", async (ev, ctx) => { try { - const f = "/mnt/storage/" + ev.pathParameters!.filename; + const event = ev; + const f = "/mnt/storage/" + event.pathParameters!.filename; const data = fs.readFileSync(f); return { statusCode: 200, @@ -60,8 +63,9 @@ export = async () => { { method: "POST", path: "/files/{filename+}", eventHandler: efsvpcCallback("uploadHandler", async (ev, ctx) => { try { - const f = "/mnt/storage/" + ev.pathParameters!.filename; - const data = new Buffer(ev.body!, "base64"); + const event = ev; + const f = "/mnt/storage/" + event.pathParameters!.filename; + const data = Buffer.from(event.body!, "base64"); fs.writeFileSync(f, data); return { statusCode: 200, @@ -74,7 +78,8 @@ export = async () => { }, { method: "POST", path: "/", eventHandler: efsvpcCallback("execHandler", async (ev, ctx) => { - const cmd = new Buffer(ev.body!, "base64").toString(); + const event = ev; + const cmd = Buffer.from(event.body!, "base64").toString(); const buf = cp.execSync(cmd); return { statusCode: 200, @@ -86,7 +91,7 @@ export = async () => { }); // ECS Cluster - const cluster = new awsx.ecs.Cluster("cluster", { vpc: vpc }); + const cluster = new aws.ecs.Cluster("cluster"); const efsVolumeConfiguration: aws.types.input.ecs.TaskDefinitionVolumeEfsVolumeConfiguration = { fileSystemId: filesystem.id, authorizationConfig: { accessPointId: ap.id }, @@ -96,9 +101,10 @@ export = async () => { // Fargate Service const nginx = new awsx.ecs.FargateService("nginx", { - cluster: cluster, + cluster: cluster.arn, taskDefinitionArgs: { container: { + name: "nginx", image: "nginx", memory: 128, portMappings: [{ containerPort: 80, hostPort: 80, protocol: "tcp" }], @@ -106,8 +112,10 @@ export = async () => { }, volumes: [{ name: "efs", efsVolumeConfiguration }], }, - securityGroups: [vpc.vpc.defaultSecurityGroupId, ...cluster.securityGroups], - subnets: vpc.publicSubnetIds, + networkConfiguration: { + subnets: vpc.publicSubnetIds, + securityGroups: [vpc.vpc.defaultSecurityGroupId], + }, platformVersion: "1.4.0", }); diff --git a/aws-ts-lambda-efs/package.json b/aws-ts-lambda-efs/package.json index 16c1b7470..267185d9c 100644 --- a/aws-ts-lambda-efs/package.json +++ b/aws-ts-lambda-efs/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "dependencies": { "@pulumi/aws": "^6.0.0", + "@pulumi/aws-apigateway": "1.1.0-alpha.3", "@pulumi/awsx": "2.0.0-beta.3", "@pulumi/pulumi": "^3.0.0" }, From 85db7530399da058d8873bca7bf0fa293418a08c Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Tue, 3 Oct 2023 16:00:23 +0200 Subject: [PATCH 07/15] Fix upgrade of aws-js-containers --- aws-js-containers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-js-containers/index.js b/aws-js-containers/index.js index 51be919c6..5fdba5825 100644 --- a/aws-js-containers/index.js +++ b/aws-js-containers/index.js @@ -18,7 +18,7 @@ const repo = new awsx.ecr.Repository("repo", { // Build and publish our application's container image from ./app to the ECR repository. const image = new awsx.ecr.Image("image", { repositoryUrl: repo.url, - path: "./app", + context: "./app", }); // Deploy an ECS Service on Fargate to host the application container. From bdf171a1c399ee013ffeab20b9766c1940f39a2e Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Wed, 4 Oct 2023 10:39:30 +0200 Subject: [PATCH 08/15] Use gotestfmt for readable test output on GH --- .github/workflows/run-tests-command.yml | 16 ++++++++++++---- Makefile | 6 +++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests-command.yml b/.github/workflows/run-tests-command.yml index 53778025c..8a89a2008 100644 --- a/.github/workflows/run-tests-command.yml +++ b/.github/workflows/run-tests-command.yml @@ -169,8 +169,7 @@ jobs: uses: google-github-actions/auth@v0 with: service_account: ${{ env.GOOGLE_CI_SERVICE_ACCOUNT_EMAIL }} - workload_identity_provider: projects/${{ env.GOOGLE_PROJECT_NUMBER - }}/locations/global/workloadIdentityPools/${{ + workload_identity_provider: projects/${{ env.GOOGLE_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/${{ env.GOOGLE_CI_WORKLOAD_IDENTITY_POOL }}/providers/${{ env.GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER }} - name: Setup gcloud auth @@ -199,6 +198,11 @@ jobs: run: echo "Currently Pulumi $(pulumi version) is installed" - name: Install Go Dependencies run: make ensure + - name: Install gotestfmt + uses: GoTestTools/gotestfmt-action@v2 + with: + version: v2.5.0 + token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Config run: >- mkdir -p "$HOME/.kube/" @@ -317,8 +321,7 @@ jobs: uses: google-github-actions/auth@v0 with: service_account: ${{ env.GOOGLE_CI_SERVICE_ACCOUNT_EMAIL }} - workload_identity_provider: projects/${{ env.GOOGLE_PROJECT_NUMBER - }}/locations/global/workloadIdentityPools/${{ + workload_identity_provider: projects/${{ env.GOOGLE_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/${{ env.GOOGLE_CI_WORKLOAD_IDENTITY_POOL }}/providers/${{ env.GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER }} - name: Setup gcloud auth @@ -347,6 +350,11 @@ jobs: run: echo "Currently Pulumi $(pulumi version) is installed" - name: Install Testing Dependencies run: make ensure + - name: Install gotestfmt + uses: GoTestTools/gotestfmt-action@v2 + with: + version: v2.5.0 + token: ${{ secrets.GITHUB_TOKEN }} - name: Running ${{ matrix.clouds }}${{ matrix.languages }} Tests run: make specific_test_set TestSet=${{ matrix.clouds }}${{ matrix.languages }} strategy: diff --git a/Makefile b/Makefile index f648398c3..cf4d08094 100644 --- a/Makefile +++ b/Makefile @@ -13,15 +13,15 @@ lint: tslint -c tslint.json **/*.ts only_test: - cd misc/test && go test ./... --timeout 4h -v -count=1 -short -parallel 40 --tags=all + cd misc/test && go test -json ./... --timeout 4h -v -count=1 -short -parallel 40 --tags=all | gotestfmt specific_test_set: echo "running $(TestSet) Acceptance Tests" - cd misc/test && go test . --timeout 4h -v -count=1 -short -parallel 40 --tags=all --run=TestAcc$(TestSet) + cd misc/test && go test -json . --timeout 4h -v -count=1 -short -parallel 40 --tags=all --run=TestAcc$(TestSet) | gotestfmt specific_tag_set: echo "running $(TagSet)$(TestSet) Acceptance Tests" - cd misc/test && go test . --timeout 4h -v -count=1 -short -parallel 40 --tags=$(TagSet) --run=TestAcc$(TagSet)$(TestSet) + cd misc/test && go test -json . --timeout 4h -v -count=1 -short -parallel 40 --tags=$(TagSet) --run=TestAcc$(TagSet)$(TestSet) | gotestfmt performance_test_set: cd misc/test && go test . --timeout 4h -count=1 -short -parallel 40 --tags=Performance From 235c0138f9790cb2a0916265ad00c8a05011489e Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Wed, 4 Oct 2023 17:17:11 +0200 Subject: [PATCH 09/15] Fix aws-ts-slackbot compilation and cleanup unused code --- aws-ts-slackbot/index.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aws-ts-slackbot/index.ts b/aws-ts-slackbot/index.ts index 8d0e75828..dad7222c8 100644 --- a/aws-ts-slackbot/index.ts +++ b/aws-ts-slackbot/index.ts @@ -68,7 +68,7 @@ interface Event { } const handler = new aws.lambda.CallbackFunction("handler", { - callback: async (event) => { + callback: async (ev) => { try { if (!slackToken) { throw new Error("mentionbot:slackToken was not provided"); @@ -78,6 +78,7 @@ const handler = new aws.lambda.CallbackFunction("handler", { throw new Error("mentionbot:verificationToken was not provided"); } + const event = ev; if (!event.isBase64Encoded || event.body == null) { console.log("Unexpected content received"); console.log(JSON.stringify(event)); @@ -183,9 +184,6 @@ async function onMessageEventCallback(request: EventCallbackRequest) { return; } - const dynoClient = new dynamoClient.DynamoDBClient({}); - const client = dynamoLib.DynamoDBDocumentClient.from(dynoClient); - // There might be multiple @mentions to the same person in the same message. // So make into a set to make things unique. for (const match of new Set(matches)) { From ba51d50131e2b59c29166929d797d22efdc56306 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Thu, 5 Oct 2023 08:44:57 +0200 Subject: [PATCH 10/15] Fix aws-ts-apigateway compilation --- aws-ts-apigateway/index.ts | 70 +++++++++++++++++++--------------- aws-ts-apigateway/package.json | 4 +- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/aws-ts-apigateway/index.ts b/aws-ts-apigateway/index.ts index 20429bd98..0997ac93c 100644 --- a/aws-ts-apigateway/index.ts +++ b/aws-ts-apigateway/index.ts @@ -1,7 +1,10 @@ // Copyright 2016-2019, Pulumi Corporation. All rights reserved. +import * as dynamoClient from "@aws-sdk/client-dynamodb"; +import * as dynamoLib from "@aws-sdk/lib-dynamodb"; + import * as aws from "@pulumi/aws"; -import * as awsx from "@pulumi/awsx"; +import * as apigateway from "@pulumi/aws-apigateway"; // Create a mapping from 'route' to a count const counterTable = new aws.dynamodb.Table("counterTable", { @@ -14,39 +17,46 @@ const counterTable = new aws.dynamodb.Table("counterTable", { writeCapacity: 5, }); +const getHandler = new aws.lambda.CallbackFunction("GET", { + policies: [aws.iam.ManagedPolicy.AWSLambdaVPCAccessExecutionRole, aws.iam.ManagedPolicy.LambdaFullAccess], + callback: async (ev, ctx) => { + const event = ev; + const route = event.pathParameters!["route"]; + console.log(`Getting count for '${route}'`); + + const dynoClient = new dynamoClient.DynamoDBClient({}); + const doc = dynamoLib.DynamoDBDocument.from(dynoClient); + + // get previous value and increment + // reference outer `counterTable` object + const tableData = await doc.get({ + TableName: counterTable.name.get(), + Key: { id: route }, + ConsistentRead: true, + }); + + const value = tableData.Item; + let count = (value && value.count) || 0; + + await doc.put({ + TableName: counterTable.name.get(), + Item: { id: route, count: ++count }, + }); + + console.log(`Got count ${count} for '${route}'`); + return { + statusCode: 200, + body: JSON.stringify({ route, count }), + }; + }, +}); + // Create an API endpoint -const endpoint = new awsx.apigateway.API("hello-world", { +const endpoint = new apigateway.RestAPI("hello-world", { routes: [{ path: "/{route+}", method: "GET", - eventHandler: async (event) => { - const route = event.pathParameters!["route"]; - console.log(`Getting count for '${route}'`); - - const client = new aws.sdk.DynamoDB.DocumentClient(); - - // get previous value and increment - // reference outer `counterTable` object - const tableData = await client.get({ - TableName: counterTable.name.get(), - Key: { id: route }, - ConsistentRead: true, - }).promise(); - - const value = tableData.Item; - let count = (value && value.count) || 0; - - await client.put({ - TableName: counterTable.name.get(), - Item: { id: route, count: ++count }, - }).promise(); - - console.log(`Got count ${count} for '${route}'`); - return { - statusCode: 200, - body: JSON.stringify({ route, count }), - }; - }, + eventHandler: getHandler, }], }); diff --git a/aws-ts-apigateway/package.json b/aws-ts-apigateway/package.json index fc10abfdd..6e72188f0 100644 --- a/aws-ts-apigateway/package.json +++ b/aws-ts-apigateway/package.json @@ -2,8 +2,10 @@ "name": "aws-ts-apigateway", "version": "0.1.0", "dependencies": { + "@aws-sdk/client-dynamodb": "^3.423.0", + "@aws-sdk/lib-dynamodb": "^3.423.0", "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/aws-apigateway": "^2.0.0-alpha.1", "@pulumi/pulumi": "^3.0.0" } } From bdb73edfaca8547b24264d51be5929457c9eea6b Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Mon, 16 Oct 2023 17:50:48 +0200 Subject: [PATCH 11/15] Revert aws-ts-thumbnailer, aws-ts-pulumi-webhooks, aws-ts-thumbnailer to aws v5 Not 100% clear yet how to port them correctly. Also, fix container creation in aws-ts-thumbnailer. --- aws-ts-lambda-efs/index.ts | 48 ++++++++++++----------------- aws-ts-lambda-efs/package.json | 8 ++--- aws-ts-pulumi-webhooks/package.json | 7 ++--- aws-ts-thumbnailer/index.ts | 4 +-- aws-ts-thumbnailer/package.json | 4 +-- 5 files changed, 29 insertions(+), 42 deletions(-) diff --git a/aws-ts-lambda-efs/index.ts b/aws-ts-lambda-efs/index.ts index 9927ba4a5..a4b61a865 100644 --- a/aws-ts-lambda-efs/index.ts +++ b/aws-ts-lambda-efs/index.ts @@ -1,7 +1,6 @@ // Copyright 2016-2019, Pulumi Corporation. All rights reserved. import * as aws from "@pulumi/aws"; -import * as apigateway from "@pulumi/aws-apigateway"; import * as awsx from "@pulumi/awsx"; import * as cp from "child_process"; import * as fs from "fs"; @@ -9,20 +8,19 @@ import * as fs from "fs"; export = async () => { // VPC - const vpc = new awsx.ec2.Vpc("vpc", {}); // subnets default to one private, one public + const vpc = new awsx.ec2.Vpc("vpc", { subnets: [{ type: "private" }, { type: "public" }] }); + const subnetIds = await vpc.publicSubnetIds; // EFS const filesystem = new aws.efs.FileSystem("filesystem"); - const targets: aws.efs.MountTarget[] = []; - vpc.publicSubnetIds.apply(ids => { - for (let i = 0; i < ids.length; i++) { - targets.push(new aws.efs.MountTarget(`fs-mount-${i}`, { - fileSystemId: filesystem.id, - subnetId: ids[i], - securityGroups: [vpc.vpc.defaultSecurityGroupId], - })); - } - }); + const targets = []; + for (let i = 0; i < subnetIds.length; i++) { + targets.push(new aws.efs.MountTarget(`fs-mount-${i}`, { + fileSystemId: filesystem.id, + subnetId: subnetIds[i], + securityGroups: [vpc.vpc.defaultSecurityGroupId], + })); + } const ap = new aws.efs.AccessPoint("ap", { fileSystemId: filesystem.id, posixUser: { uid: 1000, gid: 1000 }, @@ -30,7 +28,7 @@ export = async () => { }, { dependsOn: targets }); // Lambda - function efsvpcCallback(name: string, f: aws.lambda.Callback) { + function efsvpcCallback(name: string, f: aws.lambda.Callback) { return new aws.lambda.CallbackFunction(name, { policies: [aws.iam.ManagedPolicy.AWSLambdaVPCAccessExecutionRole, aws.iam.ManagedPolicy.LambdaFullAccess], vpcConfig: { @@ -43,13 +41,12 @@ export = async () => { } // API Gateway - const api = new apigateway.RestAPI("api", { + const api = new awsx.apigateway.API("api", { routes: [ { method: "GET", path: "/files/{filename+}", eventHandler: efsvpcCallback("getHandler", async (ev, ctx) => { try { - const event = ev; - const f = "/mnt/storage/" + event.pathParameters!.filename; + const f = "/mnt/storage/" + ev.pathParameters!.filename; const data = fs.readFileSync(f); return { statusCode: 200, @@ -63,9 +60,8 @@ export = async () => { { method: "POST", path: "/files/{filename+}", eventHandler: efsvpcCallback("uploadHandler", async (ev, ctx) => { try { - const event = ev; - const f = "/mnt/storage/" + event.pathParameters!.filename; - const data = Buffer.from(event.body!, "base64"); + const f = "/mnt/storage/" + ev.pathParameters!.filename; + const data = new Buffer(ev.body!, "base64"); fs.writeFileSync(f, data); return { statusCode: 200, @@ -78,8 +74,7 @@ export = async () => { }, { method: "POST", path: "/", eventHandler: efsvpcCallback("execHandler", async (ev, ctx) => { - const event = ev; - const cmd = Buffer.from(event.body!, "base64").toString(); + const cmd = new Buffer(ev.body!, "base64").toString(); const buf = cp.execSync(cmd); return { statusCode: 200, @@ -91,7 +86,7 @@ export = async () => { }); // ECS Cluster - const cluster = new aws.ecs.Cluster("cluster"); + const cluster = new awsx.ecs.Cluster("cluster", { vpc: vpc }); const efsVolumeConfiguration: aws.types.input.ecs.TaskDefinitionVolumeEfsVolumeConfiguration = { fileSystemId: filesystem.id, authorizationConfig: { accessPointId: ap.id }, @@ -101,10 +96,9 @@ export = async () => { // Fargate Service const nginx = new awsx.ecs.FargateService("nginx", { - cluster: cluster.arn, + cluster: cluster, taskDefinitionArgs: { container: { - name: "nginx", image: "nginx", memory: 128, portMappings: [{ containerPort: 80, hostPort: 80, protocol: "tcp" }], @@ -112,10 +106,8 @@ export = async () => { }, volumes: [{ name: "efs", efsVolumeConfiguration }], }, - networkConfiguration: { - subnets: vpc.publicSubnetIds, - securityGroups: [vpc.vpc.defaultSecurityGroupId], - }, + securityGroups: [vpc.vpc.defaultSecurityGroupId, ...cluster.securityGroups], + subnets: vpc.publicSubnetIds, platformVersion: "1.4.0", }); diff --git a/aws-ts-lambda-efs/package.json b/aws-ts-lambda-efs/package.json index 267185d9c..04574108e 100644 --- a/aws-ts-lambda-efs/package.json +++ b/aws-ts-lambda-efs/package.json @@ -2,12 +2,8 @@ "name": "aws-ts-lambda-efs", "version": "0.1.0", "dependencies": { - "@pulumi/aws": "^6.0.0", - "@pulumi/aws-apigateway": "1.1.0-alpha.3", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/aws": "^5.0.0", + "@pulumi/awsx": "^0.40.0", "@pulumi/pulumi": "^3.0.0" - }, - "devDependencies": { - "typescript": "^4.6.2" } } diff --git a/aws-ts-pulumi-webhooks/package.json b/aws-ts-pulumi-webhooks/package.json index d34ac041d..82e9dbe52 100644 --- a/aws-ts-pulumi-webhooks/package.json +++ b/aws-ts-pulumi-webhooks/package.json @@ -1,12 +1,11 @@ { "name": "typescript", "devDependencies": { - "@types/node": "^18.0.0", - "typescript": "^4.6.2" + "@types/node": "^8.0.0" }, "dependencies": { - "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/aws": "^5.0.0", + "@pulumi/awsx": "^0.40.0", "@pulumi/pulumi": "^3.0.0", "@slack/webhook": "^5.0.3" } diff --git a/aws-ts-thumbnailer/index.ts b/aws-ts-thumbnailer/index.ts index a0b057838..d8ca347dc 100644 --- a/aws-ts-thumbnailer/index.ts +++ b/aws-ts-thumbnailer/index.ts @@ -12,7 +12,7 @@ const bucket = new aws.s3.Bucket("bucket"); // Export the bucket name. export const bucketName = bucket.id; -// Create a repository for the FFMPEG image. +// Create a repository for hte FFMPEG image. const repo = new awsx.ecr.Repository("repo", { forceDelete: true, }); @@ -20,7 +20,7 @@ const repo = new awsx.ecr.Repository("repo", { // A task which runs a containerized FFMPEG job to extract a thumbnail image. const ffmpegThumbnailTask = new awsx.classic.ecs.FargateTaskDefinition("ffmpegThumbTask", { container: { - image: new awsx.ecr.Image("ffmpegThumbTask", { repositoryUrl: repo.url, context: "./docker-ffmpeg-thumb" }).imageUri, + image: new awsx.ecr.Image("ffmpegThumbTask", { repositoryUrl: repo.url, path: "./docker-ffmpeg-thumb" }).imageUri, memoryReservation: 512, }, }); diff --git a/aws-ts-thumbnailer/package.json b/aws-ts-thumbnailer/package.json index 02c5c5e1e..8750f696a 100755 --- a/aws-ts-thumbnailer/package.json +++ b/aws-ts-thumbnailer/package.json @@ -3,8 +3,8 @@ "version": "0.1.0", "main": "index.ts", "dependencies": { - "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/aws": "^5.30.0", + "@pulumi/awsx": "^1.0.2", "@pulumi/pulumi": "^3.55.0" } } From 4f8e5c0cfdda22a2bed15841cd194523a56bc4d4 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Mon, 6 Nov 2023 16:06:23 +0100 Subject: [PATCH 12/15] Bump awsx to latest stable --- aws-go-fargate/go.mod | 3 +- aws-go-fargate/go.sum | 54 ++++++++----------- aws-js-containers/package.json | 2 +- aws-ts-airflow/package.json | 2 +- aws-ts-apigateway-auth0/package.json | 2 +- aws-ts-apigateway-eventbridge/package.json | 2 +- .../package.json | 2 +- aws-ts-apigatewayv2-eventbridge/package.json | 2 +- aws-ts-containers/package.json | 2 +- aws-ts-ecs-anywhere/package.json | 2 +- aws-ts-eks-distro/package.json | 2 +- aws-ts-eks-hello-world/package.json | 2 +- aws-ts-eks-migrate-nodegroups/package.json | 2 +- aws-ts-eks/package.json | 2 +- aws-ts-hello-fargate/package.json | 2 +- aws-ts-k8s-mern-voting-app/package.json | 2 +- aws-ts-k8s-voting-app/package.json | 2 +- aws-ts-lambda-thumbnailer/package.json | 2 +- .../cms-oauth/infrastructure/package.json | 2 +- .../cms/infrastructure/package.json | 2 +- aws-ts-organizations/package.json | 2 +- aws-ts-pern-voting-app/package.json | 2 +- aws-ts-pulumi-miniflux/package.json | 2 +- aws-ts-redshift-glue-etl/package.json | 2 +- aws-ts-slackbot/package.json | 2 +- .../application/package.json | 2 +- .../networking/package.json | 2 +- aws-ts-url-shortener-cache-http/package.json | 2 +- aws-ts-voting-app/package.json | 2 +- .../vpc-crosswalk-ts/package.json | 2 +- aws-ts-webserver/package.json | 2 +- secrets-provider/aws/package.json | 2 +- secrets-provider/vault/package.json | 2 +- testing-pac-ts/package.json | 2 +- testing-unit-ts-mocks-jest/package.json | 2 +- 35 files changed, 58 insertions(+), 65 deletions(-) diff --git a/aws-go-fargate/go.mod b/aws-go-fargate/go.mod index 798f9e912..5b66b2ef0 100644 --- a/aws-go-fargate/go.mod +++ b/aws-go-fargate/go.mod @@ -56,6 +56,7 @@ require ( github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.1.0 // indirect + github.com/pulumi/esc v0.5.6 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect @@ -64,7 +65,6 @@ require ( github.com/skeema/knownhosts v1.1.0 // indirect github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.5.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect @@ -73,6 +73,7 @@ require ( github.com/zclconf/go-cty v1.13.2 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/crypto v0.14.0 // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/sync v0.2.0 // indirect golang.org/x/sys v0.13.0 // indirect diff --git a/aws-go-fargate/go.sum b/aws-go-fargate/go.sum index 9f6aee626..38c3d3363 100644 --- a/aws-go-fargate/go.sum +++ b/aws-go-fargate/go.sum @@ -1,4 +1,5 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= @@ -46,6 +47,7 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= @@ -75,8 +77,7 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/hcl/v2 v2.16.2 h1:mpkHZh/Tv+xet3sy3F9Ld4FyI2tUpWe9x3XtPx9f1a0= -github.com/hashicorp/hcl/v2 v2.16.2/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= +github.com/hashicorp/hcl/v2 v2.17.0 h1:z1XvSUyXd1HP10U4lrLg5e0JMVz6CPaJvAgxM0KNZVY= github.com/hashicorp/hcl/v2 v2.17.0/go.mod h1:gJyW2PTShkJqQBKpAmPO3yxMxIuoXkOF2TpqXzrQyx4= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= @@ -91,8 +92,8 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= 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= @@ -103,6 +104,7 @@ github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= @@ -140,25 +142,21 @@ github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= 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/pulumi/pulumi-aws/sdk/v6 v6.0.4 h1:VSLvAi+/kZt0k+KjMZ9zd8/NJ5w3vsS0RUKX3vwFa1A= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4/go.mod h1:amR/FWXmTqZI5ZtR/5JASorWmOqAIif+FVBSBEZ0uOw= +github.com/pulumi/esc v0.5.6 h1:4WV3X7OEVcChIwbSG+JxhZDdmq/q7lFPaSjHRYlPwmI= +github.com/pulumi/esc v0.5.6/go.mod h1:wpwNfVS5fV7Kd51j4dJ6FWYlKfxdqyppgp0gtkzqH04= +github.com/pulumi/pulumi-aws/sdk/v6 v6.7.0 h1:dV/Z1+zo4VidKkykPOJS5uAb6rlumwHHaSgzQhIg3+w= github.com/pulumi/pulumi-aws/sdk/v6 v6.7.0/go.mod h1:rcJQBU34BEyeDaN+ImpT1e45x+JLKSzSSR+ahvJm2H8= -github.com/pulumi/pulumi-awsx/sdk/v2 v2.0.0-beta.3 h1:S71k9x0sd4aDLSuMs0wXzVqXYwO+Y6KRA4UkffHLFAs= -github.com/pulumi/pulumi-awsx/sdk/v2 v2.0.0-beta.3/go.mod h1:DLPNRca+s+25plsc5ZKhAXL5rD7oj8WxeydsfVXZKDY= github.com/pulumi/pulumi-awsx/sdk/v2 v2.1.1 h1:qDqZgQCqYPk4xEivrj28H3DrFTLSGdH9fdwMJsK4nEY= github.com/pulumi/pulumi-awsx/sdk/v2 v2.1.1/go.mod h1:86knzt6UPIYl1ibCnEBDQB3JsuHBc50ngYsvjtJqjb0= -github.com/pulumi/pulumi-docker/sdk/v4 v4.4.1 h1:HwiS5C0LlCvCOoiksqShbqNRg4HyzY1tPKQLPPmQKEY= -github.com/pulumi/pulumi-docker/sdk/v4 v4.4.1/go.mod h1:cVHWxouf/zu+/gLHR5G9moRqnZWQStren7J1ngzLX8I= +github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3 h1:gQC2As+wE8QflbLCG90jLaKwIpqW3yl1y327Jj6ovbI= github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3/go.mod h1:i19ZhFjFQrngtXYLHp3kjZNRmnEnq/DUdXK6/CBk77o= -github.com/pulumi/pulumi/sdk/v3 v3.84.0 h1:/vCRj6ATGVZw4pFmG7pZgjlKUcnbbnb9vmlqd+OpdXo= -github.com/pulumi/pulumi/sdk/v3 v3.84.0/go.mod h1:RMilNNVMlmK1h4Nl/qylb9vzbgh4F3mufZoUOnPy98o= +github.com/pulumi/pulumi/sdk/v3 v3.91.1 h1:6I9GMmHv23X+G6hoduU1XE6hBWSNtB+zcb1MX17YvlA= github.com/pulumi/pulumi/sdk/v3 v3.91.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= @@ -176,9 +174,7 @@ github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRM github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= 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= @@ -186,9 +182,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68= @@ -216,9 +211,10 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -236,8 +232,7 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= 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= @@ -269,24 +264,21 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= 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/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -302,8 +294,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d h1:pgIUhmqwKOUlnKna4r6amKdUngdL8DrkpFeV8+VBElY= google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg= google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= 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= @@ -327,6 +318,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw= lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= pgregory.net/rapid v0.6.1 h1:4eyrDxyht86tT4Ztm+kvlyNBLIk071gR+ZQdhphc9dQ= +pgregory.net/rapid v0.6.1/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 h1:hfyJ5ku9yFtLVOiSxa3IN+dx5eBQT9mPmKFypAmg8XM= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/aws-js-containers/package.json b/aws-js-containers/package.json index b48343c58..cc80cc1f4 100644 --- a/aws-js-containers/package.json +++ b/aws-js-containers/package.json @@ -3,7 +3,7 @@ "main": "index.js", "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.55.0" } } diff --git a/aws-ts-airflow/package.json b/aws-ts-airflow/package.json index 0b04940d7..4fc0b3c32 100644 --- a/aws-ts-airflow/package.json +++ b/aws-ts-airflow/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.55.0", "typescript": "^4.6.0" } diff --git a/aws-ts-apigateway-auth0/package.json b/aws-ts-apigateway-auth0/package.json index 5067e4718..b5b65e389 100644 --- a/aws-ts-apigateway-auth0/package.json +++ b/aws-ts-apigateway-auth0/package.json @@ -6,7 +6,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/aws-apigateway": "1.1.0-alpha.3", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "@types/auth0-js": "^9.10.1", "@types/jsonwebtoken": "^8.3.2", diff --git a/aws-ts-apigateway-eventbridge/package.json b/aws-ts-apigateway-eventbridge/package.json index 86b2a7b4b..fd6045624 100644 --- a/aws-ts-apigateway-eventbridge/package.json +++ b/aws-ts-apigateway-eventbridge/package.json @@ -6,6 +6,6 @@ "dependencies": { "@pulumi/pulumi": "^3.0.0", "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3" + "@pulumi/awsx": "^2.0.2" } } diff --git a/aws-ts-apigateway-lambda-serverless/package.json b/aws-ts-apigateway-lambda-serverless/package.json index f7620e795..64cd50ca4 100644 --- a/aws-ts-apigateway-lambda-serverless/package.json +++ b/aws-ts-apigateway-lambda-serverless/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-apigatewayv2-eventbridge/package.json b/aws-ts-apigatewayv2-eventbridge/package.json index c9aaf4c53..59dea03d6 100644 --- a/aws-ts-apigatewayv2-eventbridge/package.json +++ b/aws-ts-apigatewayv2-eventbridge/package.json @@ -6,6 +6,6 @@ "dependencies": { "@pulumi/pulumi": "^3.0.0", "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3" + "@pulumi/awsx": "^2.0.2" } } diff --git a/aws-ts-containers/package.json b/aws-ts-containers/package.json index dc2f8ccca..ee9dabd2a 100644 --- a/aws-ts-containers/package.json +++ b/aws-ts-containers/package.json @@ -3,7 +3,7 @@ "main": "index.js", "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.55.0" }, "devDependencies": { diff --git a/aws-ts-ecs-anywhere/package.json b/aws-ts-ecs-anywhere/package.json index d0598aed2..f69dafe9a 100644 --- a/aws-ts-ecs-anywhere/package.json +++ b/aws-ts-ecs-anywhere/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/digitalocean": "^4.1.0", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-eks-distro/package.json b/aws-ts-eks-distro/package.json index 5aa96d8af..94027d004 100644 --- a/aws-ts-eks-distro/package.json +++ b/aws-ts-eks-distro/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", "@types/mustache": "^4.0.1", diff --git a/aws-ts-eks-hello-world/package.json b/aws-ts-eks-hello-world/package.json index 42070c81b..d13c5674b 100644 --- a/aws-ts-eks-hello-world/package.json +++ b/aws-ts-eks-hello-world/package.json @@ -2,7 +2,7 @@ "name": "aws-ts-eks-hello-world", "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", diff --git a/aws-ts-eks-migrate-nodegroups/package.json b/aws-ts-eks-migrate-nodegroups/package.json index decfdf71e..b3eb9c47c 100644 --- a/aws-ts-eks-migrate-nodegroups/package.json +++ b/aws-ts-eks-migrate-nodegroups/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0" diff --git a/aws-ts-eks/package.json b/aws-ts-eks/package.json index 7e34ac2e1..3c9a2e2eb 100644 --- a/aws-ts-eks/package.json +++ b/aws-ts-eks/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/pulumi": "^3.32.1" } diff --git a/aws-ts-hello-fargate/package.json b/aws-ts-hello-fargate/package.json index 8a0d17480..32407ecc7 100644 --- a/aws-ts-hello-fargate/package.json +++ b/aws-ts-hello-fargate/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/docker": "^4.0.0", "@pulumi/pulumi": "^3.55.0" } diff --git a/aws-ts-k8s-mern-voting-app/package.json b/aws-ts-k8s-mern-voting-app/package.json index 7dc57270c..9fe69fa9e 100644 --- a/aws-ts-k8s-mern-voting-app/package.json +++ b/aws-ts-k8s-mern-voting-app/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-k8s-voting-app/package.json b/aws-ts-k8s-voting-app/package.json index 1eea2c3a1..e627619fe 100644 --- a/aws-ts-k8s-voting-app/package.json +++ b/aws-ts-k8s-voting-app/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/postgresql": "^3.0.0", "@pulumi/pulumi": "^3.0.0", diff --git a/aws-ts-lambda-thumbnailer/package.json b/aws-ts-lambda-thumbnailer/package.json index 43f97afd6..0292a4618 100755 --- a/aws-ts-lambda-thumbnailer/package.json +++ b/aws-ts-lambda-thumbnailer/package.json @@ -4,7 +4,7 @@ "main": "index.js", "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json b/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json index 988deb54d..0c7f7fcf5 100644 --- a/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json +++ b/aws-ts-netlify-cms-and-oauth/cms-oauth/infrastructure/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "@pulumi/random": "^4.0.0" } diff --git a/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json b/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json index c97534f43..4a8b6d312 100644 --- a/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json +++ b/aws-ts-netlify-cms-and-oauth/cms/infrastructure/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "mime": "^2.4.6" } diff --git a/aws-ts-organizations/package.json b/aws-ts-organizations/package.json index cff7bf50e..70c168437 100644 --- a/aws-ts-organizations/package.json +++ b/aws-ts-organizations/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.48.0" } } diff --git a/aws-ts-pern-voting-app/package.json b/aws-ts-pern-voting-app/package.json index 06b87bcb1..2251ae0e4 100644 --- a/aws-ts-pern-voting-app/package.json +++ b/aws-ts-pern-voting-app/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/postgresql": "^3.0.0", "@pulumi/pulumi": "^3.0.0", "pg": "^8.6.0" diff --git a/aws-ts-pulumi-miniflux/package.json b/aws-ts-pulumi-miniflux/package.json index 0fda83da3..ebdf427f0 100644 --- a/aws-ts-pulumi-miniflux/package.json +++ b/aws-ts-pulumi-miniflux/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-redshift-glue-etl/package.json b/aws-ts-redshift-glue-etl/package.json index 1b0dffff5..c24055df7 100644 --- a/aws-ts-redshift-glue-etl/package.json +++ b/aws-ts-redshift-glue-etl/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-slackbot/package.json b/aws-ts-slackbot/package.json index 7ed2a1163..d6eebb970 100644 --- a/aws-ts-slackbot/package.json +++ b/aws-ts-slackbot/package.json @@ -7,7 +7,7 @@ "@aws-sdk/lib-dynamodb": "^3.417.0", "@pulumi/aws": "^6.0.0", "@pulumi/aws-apigateway": "1.1.0-alpha.3", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "qs": "^6.7.0", "superagent": "^8.1.0" diff --git a/aws-ts-stackreference-architecture/application/package.json b/aws-ts-stackreference-architecture/application/package.json index cc0936d46..3bc4a90ac 100644 --- a/aws-ts-stackreference-architecture/application/package.json +++ b/aws-ts-stackreference-architecture/application/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@pulumi/aws": "latest", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/newrelic": "latest", "@pulumi/pulumi": "latest", "ip-address": "^5.9.2", diff --git a/aws-ts-stackreference-architecture/networking/package.json b/aws-ts-stackreference-architecture/networking/package.json index cc0936d46..3bc4a90ac 100644 --- a/aws-ts-stackreference-architecture/networking/package.json +++ b/aws-ts-stackreference-architecture/networking/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@pulumi/aws": "latest", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/newrelic": "latest", "@pulumi/pulumi": "latest", "ip-address": "^5.9.2", diff --git a/aws-ts-url-shortener-cache-http/package.json b/aws-ts-url-shortener-cache-http/package.json index 0a9206628..9349980c1 100644 --- a/aws-ts-url-shortener-cache-http/package.json +++ b/aws-ts-url-shortener-cache-http/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/cloud-aws": "^0.30.0", "@pulumi/pulumi": "^3.0.0", "express": "^4.16.3", diff --git a/aws-ts-voting-app/package.json b/aws-ts-voting-app/package.json index 8d482ef90..552c0efd2 100644 --- a/aws-ts-voting-app/package.json +++ b/aws-ts-voting-app/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/cloud-aws": "^0.40.1", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json b/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json index 9a547ea8d..df9012145 100644 --- a/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json +++ b/aws-ts-vpc-with-ecs-fargate-py/vpc-crosswalk-ts/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-webserver/package.json b/aws-ts-webserver/package.json index 2088a5b24..40f18b765 100644 --- a/aws-ts-webserver/package.json +++ b/aws-ts-webserver/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0" } } diff --git a/secrets-provider/aws/package.json b/secrets-provider/aws/package.json index 404146f9f..6a128489f 100644 --- a/secrets-provider/aws/package.json +++ b/secrets-provider/aws/package.json @@ -6,6 +6,6 @@ "dependencies": { "@pulumi/pulumi": "^3.0.0", "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3" + "@pulumi/awsx": "^2.0.2" } } diff --git a/secrets-provider/vault/package.json b/secrets-provider/vault/package.json index 404146f9f..6a128489f 100644 --- a/secrets-provider/vault/package.json +++ b/secrets-provider/vault/package.json @@ -6,6 +6,6 @@ "dependencies": { "@pulumi/pulumi": "^3.0.0", "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3" + "@pulumi/awsx": "^2.0.2" } } diff --git a/testing-pac-ts/package.json b/testing-pac-ts/package.json index ba65c4d06..a6d1e02f7 100644 --- a/testing-pac-ts/package.json +++ b/testing-pac-ts/package.json @@ -3,7 +3,7 @@ "devDependencies": {}, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/eks": "2.0.0-alpha.3", "@pulumi/pulumi": "^3.0.0", "@types/node": "^13.1.8", diff --git a/testing-unit-ts-mocks-jest/package.json b/testing-unit-ts-mocks-jest/package.json index c09b4a0aa..e1c727c5c 100644 --- a/testing-unit-ts-mocks-jest/package.json +++ b/testing-unit-ts-mocks-jest/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/awsx": "2.0.0-beta.3", + "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "node-fetch": "^2.6.7" }, From 4084a6911a3bda8783307933d6f58949ddd45185 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Fri, 10 Nov 2023 07:50:24 +0100 Subject: [PATCH 13/15] Bump EKS to v2 release --- aws-ts-eks-hello-world/package.json | 2 +- aws-ts-eks-migrate-nodegroups/package.json | 2 +- aws-ts-eks/package.json | 2 +- aws-ts-k8s-mern-voting-app/package.json | 2 +- aws-ts-k8s-voting-app/package.json | 2 +- testing-pac-ts/package.json | 2 +- testing-pac-ts/tests/package.json | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aws-ts-eks-hello-world/package.json b/aws-ts-eks-hello-world/package.json index d13c5674b..0bbd34bf8 100644 --- a/aws-ts-eks-hello-world/package.json +++ b/aws-ts-eks-hello-world/package.json @@ -3,7 +3,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/eks": "^2.0.0", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", "@types/node": "^18.0.0" diff --git a/aws-ts-eks-migrate-nodegroups/package.json b/aws-ts-eks-migrate-nodegroups/package.json index b3eb9c47c..d7abf1eee 100644 --- a/aws-ts-eks-migrate-nodegroups/package.json +++ b/aws-ts-eks-migrate-nodegroups/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/eks": "^2.0.0", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-eks/package.json b/aws-ts-eks/package.json index 3c9a2e2eb..dfb179402 100644 --- a/aws-ts-eks/package.json +++ b/aws-ts-eks/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/eks": "^2.0.0", "@pulumi/pulumi": "^3.32.1" } } diff --git a/aws-ts-k8s-mern-voting-app/package.json b/aws-ts-k8s-mern-voting-app/package.json index 9fe69fa9e..94748bb59 100644 --- a/aws-ts-k8s-mern-voting-app/package.json +++ b/aws-ts-k8s-mern-voting-app/package.json @@ -8,7 +8,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/eks": "^2.0.0", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-k8s-voting-app/package.json b/aws-ts-k8s-voting-app/package.json index e627619fe..72127ac37 100644 --- a/aws-ts-k8s-voting-app/package.json +++ b/aws-ts-k8s-voting-app/package.json @@ -8,7 +8,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/eks": "^2.0.0", "@pulumi/postgresql": "^3.0.0", "@pulumi/pulumi": "^3.0.0", "pg": "^8.3.3" diff --git a/testing-pac-ts/package.json b/testing-pac-ts/package.json index a6d1e02f7..85c108c81 100644 --- a/testing-pac-ts/package.json +++ b/testing-pac-ts/package.json @@ -4,7 +4,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/eks": "^2.0.0", "@pulumi/pulumi": "^3.0.0", "@types/node": "^13.1.8", "ts-node": "^8.6.2" diff --git a/testing-pac-ts/tests/package.json b/testing-pac-ts/tests/package.json index 9bca3de94..ac65d5a8c 100644 --- a/testing-pac-ts/tests/package.json +++ b/testing-pac-ts/tests/package.json @@ -3,11 +3,11 @@ "version": "0.0.1", "dependencies": { "@pulumi/aws": "^6.0.2", - "@pulumi/eks": "2.0.0-alpha.3", + "@pulumi/eks": "^2.0.0", "@pulumi/policy": "latest", - "@pulumi/pulumi": "^2.0.0" + "@pulumi/pulumi": "^3.0.0" }, "devDependencies": { - "@types/node": "^8.0.0" + "@types/node": "^18.0.0" } } From e3273a827baaa736ffcee573a5c5a56a49eb763a Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Tue, 14 Nov 2023 12:12:43 +0100 Subject: [PATCH 14/15] Update aws-apigateway to official v2 --- aws-apigateway-go-routes/go.mod | 8 ++++---- aws-apigateway-go-routes/go.sum | 21 +++++++++++++++------ aws-apigateway-go-routes/main.go | 2 +- aws-apigateway-py-routes/requirements.txt | 2 +- aws-apigateway-ts-routes/package.json | 2 +- aws-java-eks-minimal/pom.xml | 2 +- aws-ts-apigateway-auth0/package.json | 2 +- aws-ts-apigateway/package.json | 2 +- aws-ts-slackbot/package.json | 2 +- 9 files changed, 26 insertions(+), 17 deletions(-) diff --git a/aws-apigateway-go-routes/go.mod b/aws-apigateway-go-routes/go.mod index 6e5a9ddc3..957c6bdd8 100644 --- a/aws-apigateway-go-routes/go.mod +++ b/aws-apigateway-go-routes/go.mod @@ -1,11 +1,11 @@ module github.com/pulumi/examples/aws-apigateway-go-routes -go 1.19 +go 1.21 require ( github.com/aws/aws-lambda-go v1.27.0 - github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3 - github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4 + github.com/pulumi/pulumi-aws-apigateway/sdk/v2 v2.0.0 + github.com/pulumi/pulumi-aws/sdk/v6 v6.5.0 github.com/pulumi/pulumi/sdk/v3 v3.81.0 ) @@ -65,7 +65,7 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.2.0 // indirect + github.com/stretchr/objx v0.5.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect diff --git a/aws-apigateway-go-routes/go.sum b/aws-apigateway-go-routes/go.sum index 55cf702ca..cddb3425b 100644 --- a/aws-apigateway-go-routes/go.sum +++ b/aws-apigateway-go-routes/go.sum @@ -1,5 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= @@ -51,6 +52,7 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= @@ -97,6 +99,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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= @@ -107,6 +110,7 @@ github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= @@ -144,10 +148,10 @@ github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= 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/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3 h1:AbeIa9FUvpr5hoN/Jk+5ZTspuHmIgvmx1YRnSTFFVk8= -github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3/go.mod h1:/GMyOlowMMpGo1fm3M0wgee4lxtrFbfBlkrUCUq2rvE= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4 h1:VSLvAi+/kZt0k+KjMZ9zd8/NJ5w3vsS0RUKX3vwFa1A= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4/go.mod h1:amR/FWXmTqZI5ZtR/5JASorWmOqAIif+FVBSBEZ0uOw= +github.com/pulumi/pulumi-aws-apigateway/sdk/v2 v2.0.0 h1:oSmjanBxu522lvh5MeWbiXf3HPawcTT+6qA/MGGopms= +github.com/pulumi/pulumi-aws-apigateway/sdk/v2 v2.0.0/go.mod h1:bz463xt5GSwmzN2FpIH4pA2pF9dCEtVznp9AX20H8/U= +github.com/pulumi/pulumi-aws/sdk/v6 v6.5.0 h1:ouyCTAVyK7oeWPbAhWOd6mZQTIt3/56/Zc3OsLnvYLA= +github.com/pulumi/pulumi-aws/sdk/v6 v6.5.0/go.mod h1:UeOesX8l9ntIiiKXdQue8/rQDAvSf7Spd5qf15qngcY= github.com/pulumi/pulumi/sdk/v3 v3.81.0 h1:d711GUpjZK1beNpIKFReC1LBmHXYE684sYWntJWQ4Q0= github.com/pulumi/pulumi/sdk/v3 v3.81.0/go.mod h1:RMilNNVMlmK1h4Nl/qylb9vzbgh4F3mufZoUOnPy98o= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -176,15 +180,19 @@ github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRM github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68= @@ -319,6 +327,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw= lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= pgregory.net/rapid v0.6.1 h1:4eyrDxyht86tT4Ztm+kvlyNBLIk071gR+ZQdhphc9dQ= +pgregory.net/rapid v0.6.1/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 h1:hfyJ5ku9yFtLVOiSxa3IN+dx5eBQT9mPmKFypAmg8XM= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/aws-apigateway-go-routes/main.go b/aws-apigateway-go-routes/main.go index 1c28dd314..5ed24b188 100644 --- a/aws-apigateway-go-routes/main.go +++ b/aws-apigateway-go-routes/main.go @@ -2,7 +2,7 @@ package main import ( - apigateway "github.com/pulumi/pulumi-aws-apigateway/sdk/go/apigateway" + apigateway "github.com/pulumi/pulumi-aws-apigateway/sdk/v2/go/apigateway" awsapigateway "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/apigateway" "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/cognito" "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/route53" diff --git a/aws-apigateway-py-routes/requirements.txt b/aws-apigateway-py-routes/requirements.txt index bdf417048..3702e9eea 100644 --- a/aws-apigateway-py-routes/requirements.txt +++ b/aws-apigateway-py-routes/requirements.txt @@ -1,3 +1,3 @@ pulumi>=3.0.0,<4.0.0 pulumi-aws>=6.0.2,<7.0.0 -pulumi-aws-apigateway==1.1.0a3 +pulumi-aws-apigateway>=2.0.0,<3.0.0 diff --git a/aws-apigateway-ts-routes/package.json b/aws-apigateway-ts-routes/package.json index 1497a60e7..eaf1fc7b8 100644 --- a/aws-apigateway-ts-routes/package.json +++ b/aws-apigateway-ts-routes/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.2", - "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/pulumi": "^3.3.1", "aws-lambda": "^1.0.7" } diff --git a/aws-java-eks-minimal/pom.xml b/aws-java-eks-minimal/pom.xml index 8e37b61ae..f546d2cfd 100644 --- a/aws-java-eks-minimal/pom.xml +++ b/aws-java-eks-minimal/pom.xml @@ -36,7 +36,7 @@ com.pulumi eks - (,1.0] + [2.0,3.0) diff --git a/aws-ts-apigateway-auth0/package.json b/aws-ts-apigateway-auth0/package.json index b5b65e389..90d9dddb3 100644 --- a/aws-ts-apigateway-auth0/package.json +++ b/aws-ts-apigateway-auth0/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "@types/auth0-js": "^9.10.1", diff --git a/aws-ts-apigateway/package.json b/aws-ts-apigateway/package.json index 6e72188f0..9bfe22acf 100644 --- a/aws-ts-apigateway/package.json +++ b/aws-ts-apigateway/package.json @@ -5,7 +5,7 @@ "@aws-sdk/client-dynamodb": "^3.423.0", "@aws-sdk/lib-dynamodb": "^3.423.0", "@pulumi/aws": "^6.0.0", - "@pulumi/aws-apigateway": "^2.0.0-alpha.1", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-slackbot/package.json b/aws-ts-slackbot/package.json index d6eebb970..5929230b6 100644 --- a/aws-ts-slackbot/package.json +++ b/aws-ts-slackbot/package.json @@ -6,7 +6,7 @@ "@aws-sdk/client-sns": "^3.414.0", "@aws-sdk/lib-dynamodb": "^3.417.0", "@pulumi/aws": "^6.0.0", - "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "qs": "^6.7.0", From 9d19ffe78e5bda2567be8848436fc0091fc9e186 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Wed, 15 Nov 2023 08:43:29 +0100 Subject: [PATCH 15/15] Update overlooked awsx dependency --- aws-py-hub-and-spoke-network/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-py-hub-and-spoke-network/requirements.txt b/aws-py-hub-and-spoke-network/requirements.txt index a78275854..5603d2c9f 100644 --- a/aws-py-hub-and-spoke-network/requirements.txt +++ b/aws-py-hub-and-spoke-network/requirements.txt @@ -1,3 +1,3 @@ pulumi>=3.0.0,<4.0.0 pulumi_aws>=6.0.0,<7.0.0 -pulumi_awsx==2.0.0b3 +pulumi_awsx>=2.0.0,<3.0.0