diff --git a/docs/platypus2/cmd/bootstrap/bucket.go b/docs/platypus2/cmd/bootstrap/bucket.go index cde5f8b..a357d66 100644 --- a/docs/platypus2/cmd/bootstrap/bucket.go +++ b/docs/platypus2/cmd/bootstrap/bucket.go @@ -13,8 +13,7 @@ import ( "github.com/golingon/lingon/pkg/terra" "github.com/golingon/lingoneks/infra" "github.com/golingon/lingoneks/terraclient" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/provider" + aws "github.com/golingon/terra-aws" ) const ( @@ -125,17 +124,15 @@ func run(p runParams) error { s3 := s3Stack{ StackConfig: StackConfig{ Stack: terraclient.Stack{Name: bucketName}, - Provider: aws.NewProvider( - aws.ProviderArgs{ - Profile: S(p.AWSParams.Profile), - Region: S(p.AWSParams.Region), - DefaultTags: []provider.DefaultTags{ - { - Tags: infra.Ttags(p.TFLabels), - }, + Provider: &aws.Provider{ + Profile: S(p.AWSParams.Profile), + Region: S(p.AWSParams.Region), + DefaultTags: []aws.DefaultTags{ + { + Tags: infra.Ttags(p.TFLabels), }, }, - ), + }, }, Bucket: *infra.NewBucket(bucketName), } diff --git a/docs/platypus2/cmd/platypus/stacks.go b/docs/platypus2/cmd/platypus/stacks.go index 2e9ed17..84e9e55 100644 --- a/docs/platypus2/cmd/platypus/stacks.go +++ b/docs/platypus2/cmd/platypus/stacks.go @@ -11,8 +11,7 @@ import ( "github.com/golingon/lingoneks/infra" "github.com/golingon/lingoneks/karpenter" "github.com/golingon/lingoneks/terraclient" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/provider" + aws "github.com/golingon/terra-aws" "github.com/golingon/lingon/pkg/terra" ) @@ -80,17 +79,15 @@ func newProv(p AWSParams, labels map[string]string) *aws.Provider { l[k] = S(v) } - return aws.NewProvider( - aws.ProviderArgs{ - Profile: S(p.Profile), - Region: S(p.Region), - DefaultTags: []provider.DefaultTags{ - { - Tags: terra.Map(l), - }, + return &aws.Provider{ + Profile: S(p.Profile), + Region: S(p.Region), + DefaultTags: []aws.DefaultTags{ + { + Tags: terra.Map(l), }, }, - ) + } } func kubeconfigFromAWSCmd( diff --git a/docs/platypus2/go.mod b/docs/platypus2/go.mod index 8fc5d37..5bb0469 100644 --- a/docs/platypus2/go.mod +++ b/docs/platypus2/go.mod @@ -1,6 +1,6 @@ module github.com/golingon/lingoneks -go 1.21 +go 1.21.7 replace github.com/golingon/lingon => ../../ @@ -10,29 +10,28 @@ require ( github.com/ardanlabs/conf/v3 v3.1.6 github.com/aws/karpenter v0.29.2 github.com/aws/karpenter-core v0.29.2 - github.com/golingon/terraproviders/aws/5.13.1 v0.0.0-20230821062044-8717820dd713 - github.com/golingon/terraproviders/tls/4.0.4 v0.0.0-20230821062044-8717820dd713 + github.com/golingon/lingon v0.0.0-20240410151041-d6e1fef1f2a8 + github.com/golingon/terra-aws v0.0.0-20240411092819-1b44e89cb239 + github.com/golingon/terra_tls v0.0.0-20240411093921-49711ab41872 github.com/grafana/dashboard-linter v0.0.0-20230622143601-02e2cd156626 - github.com/hashicorp/terraform-exec v0.18.1 - github.com/hashicorp/terraform-json v0.17.1 + github.com/hashicorp/terraform-exec v0.20.0 + github.com/hashicorp/terraform-json v0.21.0 github.com/nats-io/nats.go v1.28.0 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1 github.com/prometheus/client_golang v1.16.0 - github.com/rogpeppe/go-internal v1.11.0 - github.com/tidwall/gjson v1.16.0 - github.com/golingon/lingon v0.0.0-20230821085204-81fbacc93e96 + github.com/rogpeppe/go-internal v1.12.0 + github.com/tidwall/gjson v1.17.1 github.com/zeitlinger/conflate v0.0.0-20230622100834-279724abda8c go.uber.org/automaxprocs v1.5.3 - golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 - k8s.io/api v0.28.0 - k8s.io/apiextensions-apiserver v0.28.0 - k8s.io/apimachinery v0.28.0 + k8s.io/api v0.29.3 + k8s.io/apiextensions-apiserver v0.29.3 + k8s.io/apimachinery v0.29.3 k8s.io/client-go v1.5.2 k8s.io/kube-aggregator v0.28.0 sigs.k8s.io/kind v0.20.0 - sigs.k8s.io/yaml v1.3.0 + sigs.k8s.io/yaml v1.4.0 ) replace ( @@ -57,7 +56,7 @@ require ( github.com/VictoriaMetrics/metrics v1.24.0 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/alessio/shellescape v1.4.1 // indirect - github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect @@ -68,22 +67,22 @@ require ( github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.20.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.15.1 // indirect + github.com/go-playground/validator/v10 v10.19.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/gnostic v0.6.9 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.5 // indirect github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect @@ -92,14 +91,14 @@ require ( github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/hashicorp/hcl/v2 v2.17.0 // indirect + github.com/hashicorp/hcl/v2 v2.20.1 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect - github.com/leodido/go-urn v1.2.4 // indirect + github.com/leodido/go-urn v1.4.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -134,21 +133,22 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - github.com/zclconf/go-cty v1.13.2 // indirect + github.com/zclconf/go-cty v1.14.4 // indirect go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.2.1 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.12.0 // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/oauth2 v0.11.0 // indirect - golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/term v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect + golang.org/x/tools v0.20.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.138.0 // indirect @@ -160,12 +160,12 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/component-base v0.28.0 // indirect - k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 // indirect - mvdan.cc/gofumpt v0.5.0 // indirect + mvdan.cc/gofumpt v0.6.0 // indirect sigs.k8s.io/controller-runtime v0.16.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/docs/platypus2/go.sum b/docs/platypus2/go.sum index 8079cde..762c0be 100644 --- a/docs/platypus2/go.sum +++ b/docs/platypus2/go.sum @@ -46,24 +46,33 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.32.0 h1:5w6DxEGOnktmJHarxAOUywxVW9lbNWIzlzzUltG/3+o= cloud.google.com/go/storage v1.32.0/go.mod h1:Hhh/dogNRGca7IWv1RC2YqEn0c0G77ctA/OxflYkiD8= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0 h1:HCc0+LpPfpCKs6LGGLAhwBARt9632unrVcI6i8s/8os= +github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg= -github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ= +github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y= +github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= +github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/VictoriaMetrics/VictoriaMetrics v1.93.0 h1:7Lsysu5Rzi7ZQPmBNa8ap7Yge1+7enmkHCtTSr0a9i8= @@ -76,7 +85,6 @@ github.com/VictoriaMetrics/metricsql v0.63.0 h1:RRu3lln7uhQwSRkzAknOUyB0uP9LwymF github.com/VictoriaMetrics/metricsql v0.63.0/go.mod h1:k4UaP/+CjuZslIjd+kCigNG9TQmUqh5v0TP/nMEy90I= github.com/VictoriaMetrics/operator/api v0.0.0-20230818073123-76d5956610b7 h1:UC2egryv5Rw143EovMqM73533K1o4D/yDQ45fJvJsxE= github.com/VictoriaMetrics/operator/api v0.0.0-20230818073123-76d5956610b7/go.mod h1:9xOZrc3kjanpgasau9iMeUM6vYIm37bdTpBRYB0nccY= -github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -85,14 +93,15 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0= github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -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/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= +github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/ardanlabs/conf/v3 v3.1.6 h1:t6AkG131ncy21ko18KQvBIc6+fWGZHTho12fd8JaUo8= github.com/ardanlabs/conf/v3 v3.1.6/go.mod h1:zclexWKe0NVj6LHQ8NgDDZ7bQ1spE0KeKPFficdtAjU= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -109,6 +118,7 @@ github.com/aws/karpenter-core v0.29.2/go.mod h1:GzFITbd2ijUiV4UJ0wox4RJQsFD2ncyJ github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -118,6 +128,7 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE= +github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc= github.com/bmatcuk/doublestar/v4 v4.6.0 h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc= github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= @@ -132,6 +143,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/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/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -155,6 +168,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t 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/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/dave/jennifer v1.7.0 h1:uRbSBH9UTS64yXbh4FrMHfgfY762RD+C7bUPKODpSJE= github.com/dave/jennifer v1.7.0/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -173,7 +188,8 @@ github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +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= @@ -191,19 +207,23 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= 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/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= -github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= -github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git/v5 v5.10.1 h1:tu8/D8i+TWxgKpzQ3Vc43e+kkhXqtsZCKI/egajKnxk= +github.com/go-git/go-git/v5 v5.10.1/go.mod h1:uEuHjxkHap8kAl//V5F/nNWwqIYtP/402ddd05mp0wg= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -221,10 +241,11 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= +github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= @@ -241,16 +262,19 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.15.1 h1:BSe8uhN+xQ4r5guV/ywQI4gO59C2raYcGffYWZEjZzM= -github.com/go-playground/validator/v10 v10.15.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= +github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= 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= @@ -258,6 +282,7 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= +github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= 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= @@ -295,10 +320,11 @@ 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/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golingon/terraproviders/aws/5.13.1 v0.0.0-20230821062044-8717820dd713 h1:7EekNI6bSKCOXAUWHS+jAhIG5O2EK0r3BCLu+cLD2KY= -github.com/golingon/terraproviders/aws/5.13.1 v0.0.0-20230821062044-8717820dd713/go.mod h1:jgGVqPd1MNY6kL2MR19FdB4G7BscuvNJ3NbU8x1btq4= -github.com/golingon/terraproviders/tls/4.0.4 v0.0.0-20230821062044-8717820dd713 h1:mo/ovOct14q3nI7b58TjqkSQB2yXUYVajoBr7KUPEz8= -github.com/golingon/terraproviders/tls/4.0.4 v0.0.0-20230821062044-8717820dd713/go.mod h1:9YiA/6+3k63yk5XMFLrTkD3nK2i1J04V8umfvyyBIxA= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golingon/terra-aws v0.0.0-20240411092819-1b44e89cb239 h1:vqnH3XOdT1FTebLSz2vDe+BB1q6c2CQOvly1WG5g1aM= +github.com/golingon/terra-aws v0.0.0-20240411092819-1b44e89cb239/go.mod h1:QoUmwquPXMpAMAp36k0TYAwMmyKKj1xr4FltzHD75kY= +github.com/golingon/terra_tls v0.0.0-20240411093921-49711ab41872 h1:9H3VZ/Eq51t2W3Aycfk7wvgLTM7fokuo4jqq0wmBcis= +github.com/golingon/terra_tls v0.0.0-20240411093921-49711ab41872/go.mod h1:IPr5Pavvt7gG2WDKK7E/v0nNe+0fu5k+b3q0i/Vr6AA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= @@ -319,8 +345,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -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/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -330,6 +357,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -343,6 +371,7 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 h1:n6vlPhxsA+BW/XsS5+uqi7GyzaLa5MH7qlSLBZtRdiA= +github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= @@ -375,6 +404,7 @@ github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyN github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= @@ -388,18 +418,19 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hc-install v0.5.0 h1:D9bl4KayIYKEeJ4vUDe9L5huqxZXczKaykSRcmQ0xY0= +github.com/hashicorp/hc-install v0.6.2 h1:V1k+Vraqz4olgZ9UzKiAcbman9i9scg9GgSt/U3mw/M= +github.com/hashicorp/hc-install v0.6.2/go.mod h1:2JBpd+NCFKiHiu/yYCGaPyPHhZLxXTpz8oreHa/a3Ps= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/hcl/v2 v2.17.0 h1:z1XvSUyXd1HP10U4lrLg5e0JMVz6CPaJvAgxM0KNZVY= -github.com/hashicorp/hcl/v2 v2.17.0/go.mod h1:gJyW2PTShkJqQBKpAmPO3yxMxIuoXkOF2TpqXzrQyx4= +github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc= +github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/terraform-exec v0.18.1 h1:LAbfDvNQU1l0NOQlTuudjczVhHj061fNX5H8XZxHlH4= -github.com/hashicorp/terraform-exec v0.18.1/go.mod h1:58wg4IeuAJ6LVsLUeD2DWZZoc/bYi6dzhLHzxM41980= -github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA= -github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o= +github.com/hashicorp/terraform-exec v0.20.0 h1:DIZnPsqzPGuUnq6cH8jWcPunBfY+C+M8JyYF3vpnuEo= +github.com/hashicorp/terraform-exec v0.20.0/go.mod h1:ckKGkJWbsNqFKV1itgMnE0hY9IYf1HoiekpuN0eWoDw= +github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U= +github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -410,6 +441,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt 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/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -431,7 +463,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= +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= @@ -448,13 +481,15 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= -github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= -github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -473,9 +508,9 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= +github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -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/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= @@ -502,6 +537,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4= +github.com/nats-io/jwt/v2 v2.4.1/go.mod h1:24BeQtRwxRV8ruvC4CojXlx/WQ/VjuwlYiH+vu/+ibI= github.com/nats-io/nats-server/v2 v2.9.17 h1:gFpUQ3hqIDJrnqog+Bl5vaXg+RhhYEZIElasEuRn2tw= github.com/nats-io/nats-server/v2 v2.9.17/go.mod h1:eQysm3xDZmIjfkjr7DuD9DjRFpnxQc2vKVxtEg0Dp6s= github.com/nats-io/nats.go v1.28.0 h1:Th4G6zdsz2d0OqXdfzKLClo6bOfoI/b1kInhRtFIy5c= @@ -526,6 +562,7 @@ github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7 github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0= github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= @@ -535,6 +572,7 @@ github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8lu github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= +github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -542,7 +580,10 @@ github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +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/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= 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= @@ -554,6 +595,7 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1 h1:u1Mw9irznvsBPxQxjUmCel1ufP3UgzA1CILj7/2tpNw= github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1/go.mod h1:KZHvrby65G+rA4V/vMTUXDV22TI+GgLIrCigYClpjzk= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -578,6 +620,7 @@ github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+ github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= +github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= 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/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -591,8 +634,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -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/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= 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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -600,12 +643,15 @@ github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= 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.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= +github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -642,13 +688,12 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= 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/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg= -github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= +github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= @@ -674,7 +719,8 @@ github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/V github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/veggiemonk/strcase v0.0.0-20230627213939-a882c834bcab h1:XFqIqepU0qLA2+oK9XEjZE4yuh33T4Mc/v4uurLBrSI= github.com/veggiemonk/strcase v0.0.0-20230627213939-a882c834bcab/go.mod h1:FhMPOXYKshhGzQYJHiD5+zsWaVMP2NGpi/HfPu14QPA= -github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= +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/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -691,8 +737,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -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= +github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= +github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= github.com/zeitlinger/conflate v0.0.0-20230622100834-279724abda8c h1:PtECnCzGLw8MuQ0tmPRaN5c95ZfNTFZOobvgC6A83zk= github.com/zeitlinger/conflate v0.0.0-20230622100834-279724abda8c/go.mod h1:KsJBt1tGR0Q7u+3T7CLN+zITAI06GiXVi/cgP9Xrpb8= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -742,6 +790,7 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -756,8 +805,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -799,8 +848,8 @@ golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2 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/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -860,8 +909,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -891,8 +940,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -971,15 +1020,15 @@ 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.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -993,8 +1042,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1065,8 +1114,8 @@ golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E 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/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= -golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E= -golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= 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= @@ -1220,6 +1269,7 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= 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= @@ -1262,8 +1312,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= -k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= +k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-aggregator v0.26.2 h1:WtcLGisa5aCKBbBI1/Xe7gdjPlVb5Xhvs4a8Rdk8EXs= k8s.io/kube-aggregator v0.26.2/go.mod h1:swDTw0k/XghVLR+PCWnP6Y36wR2+DsqL2HUVq8eu0RI= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= @@ -1275,8 +1325,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 h1:TI2hMwTM5Bl+yaWu1gN5bXAHSvc+FtH9cqm3NzmDBtY= knative.dev/pkg v0.0.0-20230821102121-81e4ee140363/go.mod h1:dA3TdhFTRm4KmmpvfknpGV43SbGNFkLHySjC8/+NczM= -mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E= -mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js= +mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo= +mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= @@ -1291,8 +1341,9 @@ sigs.k8s.io/kind v0.20.0 h1:f0sc3v9mQbGnjBUaqSFST1dwIuiikKVGgoTwpoP33a8= sigs.k8s.io/kind v0.20.0/go.mod h1:aBlbxg08cauDgZ612shr017/rZwqd7AS563FvpWKPVs= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= -sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/docs/platypus2/infra/csi_ebs.go b/docs/platypus2/infra/csi_ebs.go index fb00164..2e80739 100644 --- a/docs/platypus2/infra/csi_ebs.go +++ b/docs/platypus2/infra/csi_ebs.go @@ -5,13 +5,14 @@ package infra import ( "github.com/golingon/lingon/pkg/terra" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/dataiampolicydocument" - "github.com/golingon/terraproviders/aws/5.13.1/iamrole" + "github.com/golingon/terra-aws/aws_eks_addon" + "github.com/golingon/terra-aws/aws_iam_role" + "github.com/golingon/terra-aws/aws_iam_role_policy_attachment" + "github.com/golingon/terra-aws/data_aws_iam_policy_document" ) type CSI struct { - CSIDriver *aws.EksAddon `validate:"required"` + CSIDriver *aws_eks_addon.AwsEksAddon `validate:"required"` IAMRole `validate:"required"` } @@ -22,17 +23,17 @@ type CSIOpts struct { } type IAMRole struct { - AssumeRolePolicy *aws.DataIamPolicyDocument `validate:"required"` - Role *aws.IamRole `validate:"required"` - RolePolicy *aws.DataIamPolicyDocument `validate:"required"` - PolicyAttach *aws.IamRolePolicyAttachment `validate:"required"` + AssumeRolePolicy *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` + Role *aws_iam_role.AwsIamRole `validate:"required"` + RolePolicy *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` + PolicyAttach *aws_iam_role_policy_attachment.AwsIamRolePolicyAttachment `validate:"required"` } func NewCSIEBS(opts CSIOpts) *CSI { ir := newIAMRole(opts) return &CSI{ - CSIDriver: aws.NewEksAddon( - opts.ClusterName+"-csiebs", aws.EksAddonArgs{ + CSIDriver: aws_eks_addon.New( + opts.ClusterName+"-csiebs", aws_eks_addon.Args{ AddonName: S("aws-ebs-csi-driver"), // AddonVersion: S("v1.19.0-eksbuild.1"), AddonVersion: S("v1.21.0-eksbuild.1"), @@ -47,14 +48,14 @@ func NewCSIEBS(opts CSIOpts) *CSI { } func newIAMRole(opts CSIOpts) *IAMRole { - assumeRolePolicy := aws.NewDataIamPolicyDocument( - "csi_assume_role", aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + assumeRolePolicy := data_aws_iam_policy_document.New( + "csi_assume_role", data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Actions: terra.Set(S("sts:AssumeRoleWithWebIdentity")), Effect: S("Allow"), - Condition: []dataiampolicydocument.Condition{ + Condition: []data_aws_iam_policy_document.Condition{ { Test: S("StringEquals"), Variable: S(opts.OIDCProviderURL + ":sub"), @@ -70,7 +71,7 @@ func newIAMRole(opts CSIOpts) *IAMRole { Values: terra.ListString("sts.amazonaws.com"), }, }, - Principals: []dataiampolicydocument.Principals{ + Principals: []data_aws_iam_policy_document.Principals{ { Type: S("Federated"), Identifiers: terra.Set(S(opts.OIDCProviderArn)), @@ -82,12 +83,12 @@ func newIAMRole(opts CSIOpts) *IAMRole { ) // small utility function to avoid repeting fields in the policy - cond := func(action, v, val string) dataiampolicydocument.Statement { - return dataiampolicydocument.Statement{ + cond := func(action, v, val string) data_aws_iam_policy_document.Statement { + return data_aws_iam_policy_document.Statement{ Effect: S("Allow"), Actions: terra.SetString(action), Resources: terra.SetString("*"), - Condition: []dataiampolicydocument.Condition{ + Condition: []data_aws_iam_policy_document.Condition{ { Test: S("StringLike"), Variable: S(v), @@ -100,9 +101,9 @@ func newIAMRole(opts CSIOpts) *IAMRole { // converted from // https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/docs/example-iam-policy.json // - policy := aws.NewDataIamPolicyDocument( - "csiebs", aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + policy := data_aws_iam_policy_document.New( + "csiebs", data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Effect: S("Allow"), Actions: terra.SetString( @@ -126,7 +127,7 @@ func newIAMRole(opts CSIOpts) *IAMRole { "arn:aws:ec2:*:*:volume/*", "arn:aws:ec2:*:*:snapshot/*", ), - Condition: []dataiampolicydocument.Condition{ + Condition: []data_aws_iam_policy_document.Condition{ { Test: S("StringEquals"), Variable: S("ec2:CreateAction"), @@ -177,13 +178,13 @@ func newIAMRole(opts CSIOpts) *IAMRole { }, ) - csiRole := aws.NewIamRole( - "csiebs_role", aws.IamRoleArgs{ + csiRole := aws_iam_role.New( + "csiebs_role", aws_iam_role.Args{ Name: S(opts.ClusterName + "-csi"), Description: S("IAM Role for CSI EBS driver"), AssumeRolePolicy: assumeRolePolicy.Attributes().Json(), - InlinePolicy: []iamrole.InlinePolicy{ + InlinePolicy: []aws_iam_role.InlinePolicy{ { Name: S("csi-ebs-driver"), Policy: policy.Attributes().Json(), @@ -191,9 +192,9 @@ func newIAMRole(opts CSIOpts) *IAMRole { }, }, ) - pa := aws.NewIamRolePolicyAttachment( + pa := aws_iam_role_policy_attachment.New( "csiebs_attach_AmazonEBSCSIDriverPolicy", - aws.IamRolePolicyAttachmentArgs{ + aws_iam_role_policy_attachment.Args{ PolicyArn: S( "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy", ), diff --git a/docs/platypus2/infra/eks.go b/docs/platypus2/infra/eks.go index 997e2cb..8c54f21 100644 --- a/docs/platypus2/infra/eks.go +++ b/docs/platypus2/infra/eks.go @@ -7,10 +7,14 @@ import ( "fmt" "github.com/golingon/lingon/pkg/terra" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/dataiampolicydocument" - "github.com/golingon/terraproviders/aws/5.13.1/ekscluster" - tls "github.com/golingon/terraproviders/tls/4.0.4" + "github.com/golingon/terra-aws/aws_eks_cluster" + "github.com/golingon/terra-aws/aws_iam_openid_connect_provider" + "github.com/golingon/terra-aws/aws_iam_role" + "github.com/golingon/terra-aws/aws_iam_role_policy_attachment" + "github.com/golingon/terra-aws/aws_security_group" + "github.com/golingon/terra-aws/aws_security_group_rule" + "github.com/golingon/terra-aws/data_aws_iam_policy_document" + "github.com/golingon/terra_tls/data_tls_certificate" ) var ( @@ -32,25 +36,25 @@ type ClusterOpts struct { } type Cluster struct { - EKSCluster *aws.EksCluster `validate:"required"` - IAMPolicyDocument *aws.DataIamPolicyDocument `validate:"required"` - IAMRole *aws.IamRole `validate:"required"` - IAMRoleClusterPolicy *aws.IamRolePolicyAttachment `validate:"required"` - IAMRoleVPCController *aws.IamRolePolicyAttachment `validate:"required"` + EKSCluster *aws_eks_cluster.AwsEksCluster `validate:"required"` + IAMPolicyDocument *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` + IAMRole *aws_iam_role.AwsIamRole `validate:"required"` + IAMRoleClusterPolicy *aws_iam_role_policy_attachment.AwsIamRolePolicyAttachment `validate:"required"` + IAMRoleVPCController *aws_iam_role_policy_attachment.AwsIamRolePolicyAttachment `validate:"required"` // SecurityGroup is the AWS security group for both the EKS control plane // and worker nodes - SecurityGroup *aws.SecurityGroup `validate:"required"` - IngressAllowAll *aws.SecurityGroupRule `validate:"required"` - EgressAllowAll *aws.SecurityGroupRule `validate:"required"` + SecurityGroup *aws_security_group.AwsSecurityGroup `validate:"required"` + IngressAllowAll *aws_security_group_rule.AwsSecurityGroupRule `validate:"required"` + EgressAllowAll *aws_security_group_rule.AwsSecurityGroupRule `validate:"required"` - TLSCert *tls.DataCertificate `validate:"required"` - IAMOIDCProvider *aws.IamOpenidConnectProvider `validate:"required"` + TLSCert *data_tls_certificate.TlsCertificate `validate:"required"` + IAMOIDCProvider *aws_iam_openid_connect_provider.AwsIamOpenidConnectProvider `validate:"required"` } func NewCluster(opts ClusterOpts) *Cluster { - sg := aws.NewSecurityGroup( - "eks", aws.SecurityGroupArgs{ + sg := aws_security_group.New( + "eks", aws_security_group.Args{ Name: S("eks-" + opts.Name), Description: S( fmt.Sprintf( @@ -67,8 +71,8 @@ func NewCluster(opts ClusterOpts) *Cluster { sgAttrs := sg.Attributes() - ingressAllowAll := aws.NewSecurityGroupRule( - "eks", aws.SecurityGroupRuleArgs{ + ingressAllowAll := aws_security_group_rule.New( + "eks", aws_security_group_rule.Args{ SecurityGroupId: sgAttrs.Id(), SourceSecurityGroupId: sgAttrs.Id(), Description: S( @@ -80,8 +84,8 @@ func NewCluster(opts ClusterOpts) *Cluster { Type: INGRESS, }, ) - egressAllowAll := aws.NewSecurityGroupRule( - "node_egress_all", aws.SecurityGroupRuleArgs{ + egressAllowAll := aws_security_group_rule.New( + "node_egress_all", aws_security_group_rule.Args{ SecurityGroupId: sgAttrs.Id(), Description: S("Allow all egress"), Protocol: S("-1"), @@ -92,13 +96,13 @@ func NewCluster(opts ClusterOpts) *Cluster { }, ) - iamPolicyDocument := aws.NewDataIamPolicyDocument( - "eks", aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + iamPolicyDocument := data_aws_iam_policy_document.New( + "eks", data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Sid: S("EKSClusterAssumeRole"), Actions: terra.Set(S("sts:AssumeRole")), - Principals: []dataiampolicydocument.Principals{ + Principals: []data_aws_iam_policy_document.Principals{ { Type: S("Service"), Identifiers: terra.Set(S("eks.amazonaws.com")), @@ -109,31 +113,31 @@ func NewCluster(opts ClusterOpts) *Cluster { }, ) - iamRole := aws.NewIamRole( - "eks", aws.IamRoleArgs{ + iamRole := aws_iam_role.New( + "eks", aws_iam_role.Args{ Name: S("eks-" + opts.Name), AssumeRolePolicy: iamPolicyDocument.Attributes().Json(), }, ) - clusterPolicy := aws.NewIamRolePolicyAttachment( - "cluster_policy", aws.IamRolePolicyAttachmentArgs{ + clusterPolicy := aws_iam_role_policy_attachment.New( + "cluster_policy", aws_iam_role_policy_attachment.Args{ PolicyArn: arnClusterPolicy, Role: iamRole.Attributes().Name(), }, ) - vpcController := aws.NewIamRolePolicyAttachment( - "vpc_controller", aws.IamRolePolicyAttachmentArgs{ + vpcController := aws_iam_role_policy_attachment.New( + "vpc_controller", aws_iam_role_policy_attachment.Args{ PolicyArn: arnVPCResourceController, Role: iamRole.Attributes().Name(), }, ) - eksCluster := aws.NewEksCluster( - "eks", aws.EksClusterArgs{ + eksCluster := aws_eks_cluster.New( + "eks", aws_eks_cluster.Args{ Name: S(opts.Name), RoleArn: iamRole.Attributes().Arn(), - VpcConfig: &ekscluster.VpcConfig{ + VpcConfig: &aws_eks_cluster.VpcConfig{ SecurityGroupIds: terra.Set(sgAttrs.Id()), SubnetIds: terra.SetString(opts.PrivateSubnetIDs[:]...), }, @@ -153,8 +157,8 @@ func NewCluster(opts ClusterOpts) *Cluster { // ), // } - tlsCert := tls.NewDataCertificate( - "eks", tls.DataCertificateArgs{ + tlsCert := data_tls_certificate.New( + "eks", data_tls_certificate.Args{ Url: eksCluster.Attributes(). Identity(). Index(0). @@ -163,8 +167,8 @@ func NewCluster(opts ClusterOpts) *Cluster { Issuer(), }, ) - iamOIDCProvider := aws.NewIamOpenidConnectProvider( - "eks", aws.IamOpenidConnectProviderArgs{ + iamOIDCProvider := aws_iam_openid_connect_provider.New( + "eks", aws_iam_openid_connect_provider.Args{ ClientIdList: terra.Set(terra.String("sts.amazonaws.com")), ThumbprintList: terra.CastAsList( tlsCert.Attributes(). diff --git a/docs/platypus2/infra/eks_test.go b/docs/platypus2/infra/eks_test.go index 953cfa7..2385b19 100644 --- a/docs/platypus2/infra/eks_test.go +++ b/docs/platypus2/infra/eks_test.go @@ -11,7 +11,7 @@ import ( "github.com/golingon/lingon/pkg/terra" tu "github.com/golingon/lingon/pkg/testutil" - aws "github.com/golingon/terraproviders/aws/5.13.1" + aws "github.com/golingon/terra-aws" "github.com/hashicorp/terraform-exec/tfexec" ) @@ -84,7 +84,7 @@ func TestEKS(t *testing.T) { }, ) stack := awsStack{ - Provider: aws.NewProvider(aws.ProviderArgs{}), + Provider: &aws.Provider{}, Cluster: *eks, } ctx := context.Background() diff --git a/docs/platypus2/infra/s3.go b/docs/platypus2/infra/s3.go index 37717c0..7dc91a4 100644 --- a/docs/platypus2/infra/s3.go +++ b/docs/platypus2/infra/s3.go @@ -5,23 +5,24 @@ package infra import ( "github.com/golingon/lingon/pkg/terra" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/s3bucketserversideencryptionconfiguration" - "github.com/golingon/terraproviders/aws/5.13.1/s3bucketversioning" + "github.com/golingon/terra-aws/aws_s3_bucket" + "github.com/golingon/terra-aws/aws_s3_bucket_public_access_block" + "github.com/golingon/terra-aws/aws_s3_bucket_server_side_encryption_configuration" + "github.com/golingon/terra-aws/aws_s3_bucket_versioning" ) type Bucket struct { - S3 *aws.S3Bucket `validate:"required"` + S3 *aws_s3_bucket.AwsS3Bucket `validate:"required"` // ACL *aws.S3BucketAcl // `validate:"required"` - Versioning *aws.S3BucketVersioning `validate:"required"` - PublicAccess *aws.S3BucketPublicAccessBlock `validate:"required"` - SSE *aws.S3BucketServerSideEncryptionConfiguration `validate:"required"` + Versioning *aws_s3_bucket_versioning.AwsS3BucketVersioning `validate:"required"` + PublicAccess *aws_s3_bucket_public_access_block.AwsS3BucketPublicAccessBlock `validate:"required"` + SSE *aws_s3_bucket_server_side_encryption_configuration.AwsS3BucketServerSideEncryptionConfiguration `validate:"required"` } func NewBucket(bucketName string) *Bucket { - b := aws.NewS3Bucket( - "s3", aws.S3BucketArgs{ + b := aws_s3_bucket.New( + "s3", aws_s3_bucket.Args{ Bucket: S(bucketName), Tags: Stags("Name", "Lingon Experiment"), }, @@ -40,17 +41,17 @@ func NewBucket(bucketName string) *Bucket { // }, // ) - vv := aws.NewS3BucketVersioning( - "s3", aws.S3BucketVersioningArgs{ + vv := aws_s3_bucket_versioning.New( + "s3", aws_s3_bucket_versioning.Args{ Bucket: bucketID, - VersioningConfiguration: &s3bucketversioning.VersioningConfiguration{ + VersioningConfiguration: &aws_s3_bucket_versioning.VersioningConfiguration{ Status: S("Enabled"), }, }, ) - pab := aws.NewS3BucketPublicAccessBlock( - "s3", aws.S3BucketPublicAccessBlockArgs{ + pab := aws_s3_bucket_public_access_block.New( + "s3", aws_s3_bucket_public_access_block.Args{ Bucket: bucketID, BlockPublicAcls: terra.Bool(true), BlockPublicPolicy: terra.Bool(true), @@ -59,8 +60,8 @@ func NewBucket(bucketName string) *Bucket { }, ) - enc := aws.NewS3BucketServerSideEncryptionConfiguration( - "s3", aws.S3BucketServerSideEncryptionConfigurationArgs{ + enc := aws_s3_bucket_server_side_encryption_configuration.New( + "s3", aws_s3_bucket_server_side_encryption_configuration.Args{ Bucket: bucketID, Rule: RuleEncryptKMS(), }, @@ -75,10 +76,10 @@ func NewBucket(bucketName string) *Bucket { } } -func RuleEncryptKMS() []s3bucketserversideencryptionconfiguration.Rule { - return []s3bucketserversideencryptionconfiguration.Rule{ +func RuleEncryptKMS() []aws_s3_bucket_server_side_encryption_configuration.Rule { + return []aws_s3_bucket_server_side_encryption_configuration.Rule{ { - ApplyServerSideEncryptionByDefault: &s3bucketserversideencryptionconfiguration.ApplyServerSideEncryptionByDefault{ + ApplyServerSideEncryptionByDefault: &aws_s3_bucket_server_side_encryption_configuration.ApplyServerSideEncryptionByDefault{ SseAlgorithm: S("aws:kms"), }, }, diff --git a/docs/platypus2/infra/vpc.go b/docs/platypus2/infra/vpc.go index e9cbe0c..e4c0ed3 100644 --- a/docs/platypus2/infra/vpc.go +++ b/docs/platypus2/infra/vpc.go @@ -7,7 +7,14 @@ import ( "fmt" "github.com/golingon/lingon/pkg/terra" - aws "github.com/golingon/terraproviders/aws/5.13.1" + "github.com/golingon/terra-aws/aws_eip" + "github.com/golingon/terra-aws/aws_internet_gateway" + "github.com/golingon/terra-aws/aws_nat_gateway" + "github.com/golingon/terra-aws/aws_route" + "github.com/golingon/terra-aws/aws_route_table" + "github.com/golingon/terra-aws/aws_route_table_association" + "github.com/golingon/terra-aws/aws_subnet" + "github.com/golingon/terra-aws/aws_vpc" ) type Opts struct { @@ -21,21 +28,21 @@ type Opts struct { } type AWSVPC struct { - VPC *aws.Vpc `validate:"required"` + VPC *aws_vpc.AwsVpc `validate:"required"` - PublicSubnets [3]*aws.Subnet `validate:"required,dive,required"` - PublicRT *aws.RouteTable `validate:"required"` - PublicRoute *aws.Route `validate:"required"` - PublicRTAssocs [3]*aws.RouteTableAssociation `validate:"required,dive,required"` + PublicSubnets [3]*aws_subnet.AwsSubnet `validate:"required,dive,required"` + PublicRT *aws_route_table.AwsRouteTable `validate:"required"` + PublicRoute *aws_route.AwsRoute `validate:"required"` + PublicRTAssocs [3]*aws_route_table_association.AwsRouteTableAssociation `validate:"required,dive,required"` - PrivateSubnets [3]*aws.Subnet `validate:"required,dive,required"` - PrivateRTs [3]*aws.RouteTable `validate:"required,dive,required"` - PrivateRoutes [3]*aws.Route `validate:"required,dive,required"` - PrivateRTAssocs [3]*aws.RouteTableAssociation `validate:"required,dive,required"` + PrivateSubnets [3]*aws_subnet.AwsSubnet `validate:"required,dive,required"` + PrivateRTs [3]*aws_route_table.AwsRouteTable `validate:"required,dive,required"` + PrivateRoutes [3]*aws_route.AwsRoute `validate:"required,dive,required"` + PrivateRTAssocs [3]*aws_route_table_association.AwsRouteTableAssociation `validate:"required,dive,required"` - InternetGateway *aws.InternetGateway `validate:"required"` - EIPNat [3]*aws.Eip `validate:"required,dive,required"` - NatGateways [3]*aws.NatGateway `validate:"required,dive,required"` + InternetGateway *aws_internet_gateway.AwsInternetGateway `validate:"required"` + EIPNat [3]*aws_eip.AwsEip `validate:"required,dive,required"` + NatGateways [3]*aws_nat_gateway.AwsNatGateway `validate:"required,dive,required"` } func NewAWSVPC(opts Opts) *AWSVPC { @@ -50,8 +57,8 @@ func NewAWSVPC(opts Opts) *AWSVPC { return MergeSTags(opts.CommonTags, ss...) } - vpc := aws.NewVpc( - name, aws.VpcArgs{ + vpc := aws_vpc.New( + name, aws_vpc.Args{ CidrBlock: S(opts.CIDR), // Tags: ttags(map[string]string{TagName: opts.Name}), InstanceTenancy: S("default"), @@ -61,17 +68,17 @@ func NewAWSVPC(opts Opts) *AWSVPC { }, ) - igw := aws.NewInternetGateway( - name, aws.InternetGatewayArgs{ + igw := aws_internet_gateway.New( + name, aws_internet_gateway.Args{ VpcId: vpc.Attributes().Id(), Tags: tags(name + "-igw"), }, ) - eipNats := [3]*aws.Eip{} + eipNats := [3]*aws_eip.AwsEip{} for i := 0; i < 3; i++ { - eipNats[i] = aws.NewEip( - fmt.Sprintf("nats_%d", i), aws.EipArgs{ + eipNats[i] = aws_eip.New( + fmt.Sprintf("nats_%d", i), aws_eip.Args{ // Vpc: B(true), // deprecated Domain: S("vpc"), Tags: tags("nat-" + opts.AZs[i]), @@ -79,10 +86,10 @@ func NewAWSVPC(opts Opts) *AWSVPC { ) } - publicSubnets := [3]*aws.Subnet{} + publicSubnets := [3]*aws_subnet.AwsSubnet{} for i := 0; i < 3; i++ { - publicSubnets[i] = aws.NewSubnet( - fmt.Sprintf("public_%d", i), aws.SubnetArgs{ + publicSubnets[i] = aws_subnet.New( + fmt.Sprintf("public_%d", i), aws_subnet.Args{ VpcId: vpc.Attributes().Id(), AvailabilityZone: S(opts.AZs[i]), CidrBlock: S(opts.PublicSubnetCIDRs[i]), @@ -92,34 +99,34 @@ func NewAWSVPC(opts Opts) *AWSVPC { ) } - publicRT := aws.NewRouteTable( - "public", aws.RouteTableArgs{ + publicRT := aws_route_table.New( + "public", aws_route_table.Args{ VpcId: vpc.Attributes().Id(), Tags: tags(name + "-public"), }, ) - publicRoute := aws.NewRoute( - "public", aws.RouteArgs{ + publicRoute := aws_route.New( + "public", aws_route.Args{ DestinationCidrBlock: Anywhere, RouteTableId: publicRT.Attributes().Id(), GatewayId: igw.Attributes().Id(), }, ) - pubRTAssocs := [3]*aws.RouteTableAssociation{} + pubRTAssocs := [3]*aws_route_table_association.AwsRouteTableAssociation{} for i := 0; i < 3; i++ { - pubRTAssocs[i] = aws.NewRouteTableAssociation( - fmt.Sprintf("public_%d", i), aws.RouteTableAssociationArgs{ + pubRTAssocs[i] = aws_route_table_association.New( + fmt.Sprintf("public_%d", i), aws_route_table_association.Args{ SubnetId: publicSubnets[i].Attributes().Id(), RouteTableId: publicRT.Attributes().Id(), }, ) } - natGateways := [3]*aws.NatGateway{} + natGateways := [3]*aws_nat_gateway.AwsNatGateway{} for i := 0; i < 3; i++ { - ng := aws.NewNatGateway( - fmt.Sprintf("nat_gateway_%d", i), aws.NatGatewayArgs{ + ng := aws_nat_gateway.New( + fmt.Sprintf("nat_gateway_%d", i), aws_nat_gateway.Args{ SubnetId: publicSubnets[i].Attributes().Id(), AllocationId: eipNats[i].Attributes().Id(), Tags: tags(fmt.Sprintf("ng-%d", i)), @@ -129,10 +136,10 @@ func NewAWSVPC(opts Opts) *AWSVPC { natGateways[i] = ng } - privateSubnets := [3]*aws.Subnet{} + privateSubnets := [3]*aws_subnet.AwsSubnet{} for i := 0; i < 3; i++ { - privateSubnets[i] = aws.NewSubnet( - fmt.Sprintf("private_%d", i), aws.SubnetArgs{ + privateSubnets[i] = aws_subnet.New( + fmt.Sprintf("private_%d", i), aws_subnet.Args{ VpcId: vpc.Attributes().Id(), AvailabilityZone: S(opts.AZs[i]), CidrBlock: S(opts.PrivateSubnetCIDRs[i]), @@ -145,19 +152,19 @@ func NewAWSVPC(opts Opts) *AWSVPC { ) } - privateRTs := [3]*aws.RouteTable{} + privateRTs := [3]*aws_route_table.AwsRouteTable{} for i := 0; i < 3; i++ { - privateRTs[i] = aws.NewRouteTable( - fmt.Sprintf("private_%d", i), aws.RouteTableArgs{ + privateRTs[i] = aws_route_table.New( + fmt.Sprintf("private_%d", i), aws_route_table.Args{ VpcId: vpc.Attributes().Id(), Tags: tags(fmt.Sprintf("platypus-private-%d", i)), }, ) } - privateRoutes := [3]*aws.Route{} + privateRoutes := [3]*aws_route.AwsRoute{} for i := 0; i < 3; i++ { - privateRoutes[i] = aws.NewRoute( - fmt.Sprintf("private_%d", i), aws.RouteArgs{ + privateRoutes[i] = aws_route.New( + fmt.Sprintf("private_%d", i), aws_route.Args{ RouteTableId: privateRTs[i].Attributes().Id(), DestinationCidrBlock: Anywhere, NatGatewayId: natGateways[i].Attributes().Id(), @@ -165,10 +172,10 @@ func NewAWSVPC(opts Opts) *AWSVPC { ) } - privateRTAssocs := [3]*aws.RouteTableAssociation{} + privateRTAssocs := [3]*aws_route_table_association.AwsRouteTableAssociation{} for i := 0; i < 3; i++ { - privateRTAssocs[i] = aws.NewRouteTableAssociation( - fmt.Sprintf("private_%d", i), aws.RouteTableAssociationArgs{ + privateRTAssocs[i] = aws_route_table_association.New( + fmt.Sprintf("private_%d", i), aws_route_table_association.Args{ SubnetId: privateSubnets[i].Attributes().Id(), RouteTableId: privateRTs[i].Attributes().Id(), }, diff --git a/docs/platypus2/karpenter/infra.go b/docs/platypus2/karpenter/infra.go index 63af242..f012009 100644 --- a/docs/platypus2/karpenter/infra.go +++ b/docs/platypus2/karpenter/infra.go @@ -6,9 +6,10 @@ package karpenter import ( "fmt" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/dataiampolicydocument" - "github.com/golingon/terraproviders/aws/5.13.1/iamrole" + "github.com/golingon/terra-aws/aws_iam_role" + "github.com/golingon/terra-aws/aws_sqs_queue" + "github.com/golingon/terra-aws/aws_sqs_queue_policy" + "github.com/golingon/terra-aws/data_aws_iam_policy_document" "github.com/golingon/lingon/pkg/terra" ) @@ -42,9 +43,9 @@ type Controller struct { } type NodeTerminationQueue struct { - SimpleQueue *aws.SqsQueue `validate:"required"` - QueuePolicy *aws.SqsQueuePolicy `validate:"required"` - QueuePolicyDocument *aws.DataIamPolicyDocument `validate:"required"` + SimpleQueue *aws_sqs_queue.AwsSqsQueue `validate:"required"` + QueuePolicy *aws_sqs_queue_policy.AwsSqsQueuePolicy `validate:"required"` + QueuePolicyDocument *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` } func NewInfra(opts InfraOpts) Infra { @@ -56,7 +57,7 @@ func NewInfra(opts InfraOpts) Infra { } } -func newController(opts InfraOpts, ipRole *aws.IamRole) Controller { +func newController(opts InfraOpts, ipRole *aws_iam_role.AwsIamRole) Controller { queue := newNodeTerminationQueue(opts) return Controller{ IAMRole: newIAMRole(opts, ipRole, queue.SimpleQueue), @@ -65,28 +66,28 @@ func newController(opts InfraOpts, ipRole *aws.IamRole) Controller { } type IAMRole struct { - AssumeRolePolicy *aws.DataIamPolicyDocument `validate:"required"` - Role *aws.IamRole `validate:"required"` - RolePolicy *aws.DataIamPolicyDocument `validate:"required"` + AssumeRolePolicy *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` + Role *aws_iam_role.AwsIamRole `validate:"required"` + RolePolicy *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` } func newIAMRole( opts InfraOpts, - ipRole *aws.IamRole, - queue *aws.SqsQueue, + ipRole *aws_iam_role.AwsIamRole, + queue *aws_sqs_queue.AwsSqsQueue, ) IAMRole { - assumeRolePolicy := aws.NewDataIamPolicyDocument( - KA.Name+"_assume_role", aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + assumeRolePolicy := data_aws_iam_policy_document.New( + KA.Name+"_assume_role", data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Actions: terra.Set(S("sts:AssumeRoleWithWebIdentity")), - Principals: []dataiampolicydocument.Principals{ + Principals: []data_aws_iam_policy_document.Principals{ { Type: S("Federated"), Identifiers: terra.Set(S(opts.OIDCProviderArn)), }, }, - Condition: []dataiampolicydocument.Condition{ + Condition: []data_aws_iam_policy_document.Condition{ { Test: S("StringEquals"), Variable: S(opts.OIDCProviderURL + ":sub"), @@ -108,9 +109,9 @@ func newIAMRole( }, }, ) - policy := aws.NewDataIamPolicyDocument( - KA.Name, aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + policy := data_aws_iam_policy_document.New( + KA.Name, data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Actions: terra.SetString( "ec2:DescribeImages", @@ -140,7 +141,7 @@ func newIAMRole( ), Effect: S("Allow"), Resources: terra.SetString("*"), - Condition: []dataiampolicydocument.Condition{ + Condition: []data_aws_iam_policy_document.Condition{ { Test: S("StringEquals"), Variable: S( @@ -178,15 +179,15 @@ func newIAMRole( }, }, ) - role := aws.NewIamRole( - KA.Name, aws.IamRoleArgs{ + role := aws_iam_role.New( + KA.Name, aws_iam_role.Args{ Name: S(opts.Name + "-controller"), Description: S( "IAM Role for Karpenter Controller (pod) to assume", ), AssumeRolePolicy: assumeRolePolicy.Attributes().Json(), - InlinePolicy: []iamrole.InlinePolicy{ + InlinePolicy: []aws_iam_role.InlinePolicy{ { Name: S(KA.Name), Policy: policy.Attributes().Json(), @@ -202,20 +203,20 @@ func newIAMRole( } func newNodeTerminationQueue(opts InfraOpts) NodeTerminationQueue { - queue := aws.NewSqsQueue( - KA.Name, aws.SqsQueueArgs{ + queue := aws_sqs_queue.New( + KA.Name, aws_sqs_queue.Args{ Name: S(opts.Name), MessageRetentionSeconds: terra.Number(300), }, ) - policyDoc := aws.NewDataIamPolicyDocument( - "node_termination_queue", aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + policyDoc := data_aws_iam_policy_document.New( + "node_termination_queue", data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Sid: S("SQSWrite"), Resources: terra.Set(queue.Attributes().Arn()), Actions: terra.SetString("sqs:SendMessage"), - Principals: []dataiampolicydocument.Principals{ + Principals: []data_aws_iam_policy_document.Principals{ { Type: S("Service"), Identifiers: terra.SetString( @@ -228,8 +229,8 @@ func newNodeTerminationQueue(opts InfraOpts) NodeTerminationQueue { }, }, ) - queuePolicy := aws.NewSqsQueuePolicy( - KA.Name, aws.SqsQueuePolicyArgs{ + queuePolicy := aws_sqs_queue_policy.New( + KA.Name, aws_sqs_queue_policy.Args{ QueueUrl: queue.Attributes().Url(), Policy: policyDoc.Attributes().Json(), }, diff --git a/docs/platypus2/karpenter/infra_fargateprofile.go b/docs/platypus2/karpenter/infra_fargateprofile.go index 7f95303..11b469d 100644 --- a/docs/platypus2/karpenter/infra_fargateprofile.go +++ b/docs/platypus2/karpenter/infra_fargateprofile.go @@ -6,9 +6,10 @@ package karpenter import ( "fmt" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/dataiampolicydocument" - "github.com/golingon/terraproviders/aws/5.13.1/eksfargateprofile" + "github.com/golingon/terra-aws/aws_eks_fargate_profile" + "github.com/golingon/terra-aws/aws_iam_role" + "github.com/golingon/terra-aws/aws_iam_role_policy_attachment" + "github.com/golingon/terra-aws/data_aws_iam_policy_document" "github.com/golingon/lingon/pkg/terra" ) @@ -25,20 +26,20 @@ const ( // FargateProfile is the AWS EKS Fargate profile for the Karpenter pods to // run on type FargateProfile struct { - FargateProfile *aws.EksFargateProfile `validate:"required"` - IAMRole *aws.IamRole `validate:"required"` - AssumeRole *aws.DataIamPolicyDocument `validate:"required"` - PolicyAttachments []*aws.IamRolePolicyAttachment `validate:"required,dive,required"` + FargateProfile *aws_eks_fargate_profile.AwsEksFargateProfile `validate:"required"` + IAMRole *aws_iam_role.AwsIamRole `validate:"required"` + AssumeRole *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` + PolicyAttachments []*aws_iam_role_policy_attachment.AwsIamRolePolicyAttachment `validate:"required,dive,required"` } func newFargateProfile(opts InfraOpts) FargateProfile { - arPolicy := aws.NewDataIamPolicyDocument( - "fargate", aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + arPolicy := data_aws_iam_policy_document.New( + "fargate", data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Effect: S("Allow"), Actions: terra.SetString("sts:AssumeRole"), - Principals: []dataiampolicydocument.Principals{ + Principals: []data_aws_iam_policy_document.Principals{ { Type: S("Service"), Identifiers: terra.SetString( @@ -51,8 +52,8 @@ func newFargateProfile(opts InfraOpts) FargateProfile { }, ) - iamRole := aws.NewIamRole( - "fargate", aws.IamRoleArgs{ + iamRole := aws_iam_role.New( + "fargate", aws_iam_role.Args{ Name: S(opts.Name + "-fargate"), Description: S( "IAM Role for Fargate profile for Karpenter pods to run", @@ -66,24 +67,27 @@ func newFargateProfile(opts InfraOpts) FargateProfile { awsEKSCNIPolicy, } - policyAttachments := make([]*aws.IamRolePolicyAttachment, len(policies)) + policyAttachments := make( + []*aws_iam_role_policy_attachment.AwsIamRolePolicyAttachment, + len(policies), + ) for i, policy := range policies { - policyAttachments[i] = aws.NewIamRolePolicyAttachment( + policyAttachments[i] = aws_iam_role_policy_attachment.New( fmt.Sprintf("%s_attach_%s", "fargate", policy), - aws.IamRolePolicyAttachmentArgs{ + aws_iam_role_policy_attachment.Args{ PolicyArn: S(awsPolicyARNPrefix + policy), Role: iamRole.Attributes().Name(), }, ) } - fargateProfile := aws.NewEksFargateProfile( - KA.Name, aws.EksFargateProfileArgs{ + fargateProfile := aws_eks_fargate_profile.New( + KA.Name, aws_eks_fargate_profile.Args{ ClusterName: S(opts.ClusterName), FargateProfileName: S(KA.Name), PodExecutionRoleArn: iamRole.Attributes().Arn(), SubnetIds: terra.SetString(opts.PrivateSubnetIDs[:]...), - Selector: []eksfargateprofile.Selector{ + Selector: []aws_eks_fargate_profile.Selector{ { Namespace: S(KA.Namespace), }, diff --git a/docs/platypus2/karpenter/infra_instanceprofile.go b/docs/platypus2/karpenter/infra_instanceprofile.go index 98f6562..fda5433 100644 --- a/docs/platypus2/karpenter/infra_instanceprofile.go +++ b/docs/platypus2/karpenter/infra_instanceprofile.go @@ -6,8 +6,10 @@ package karpenter import ( "fmt" - aws "github.com/golingon/terraproviders/aws/5.13.1" - "github.com/golingon/terraproviders/aws/5.13.1/dataiampolicydocument" + "github.com/golingon/terra-aws/aws_iam_instance_profile" + "github.com/golingon/terra-aws/aws_iam_role" + "github.com/golingon/terra-aws/aws_iam_role_policy_attachment" + "github.com/golingon/terra-aws/data_aws_iam_policy_document" "github.com/golingon/lingon/pkg/terra" ) @@ -15,21 +17,21 @@ import ( // InstanceProfile is the AWS EC2 Instance Profile for the nodes provisioned by // Karpenter to use. type InstanceProfile struct { - InstanceProfile *aws.IamInstanceProfile `validate:"required"` - IAMRole *aws.IamRole `validate:"required"` - AssumeRole *aws.DataIamPolicyDocument `validate:"required"` - PolicyAttachments []*aws.IamRolePolicyAttachment `validate:"required,dive,required"` + InstanceProfile *aws_iam_instance_profile.AwsIamInstanceProfile `validate:"required"` + IAMRole *aws_iam_role.AwsIamRole `validate:"required"` + AssumeRole *data_aws_iam_policy_document.AwsIamPolicyDocument `validate:"required"` + PolicyAttachments []*aws_iam_role_policy_attachment.AwsIamRolePolicyAttachment `validate:"required,dive,required"` } func newInstanceProfile() InstanceProfile { - arPolicy := aws.NewDataIamPolicyDocument( - "eks_node", aws.DataIamPolicyDocumentArgs{ - Statement: []dataiampolicydocument.Statement{ + arPolicy := data_aws_iam_policy_document.New( + "eks_node", data_aws_iam_policy_document.Args{ + Statement: []data_aws_iam_policy_document.Statement{ { Sid: S("EKSNodeAssumeRole"), Effect: S("Allow"), Actions: terra.SetString("sts:AssumeRole"), - Principals: []dataiampolicydocument.Principals{ + Principals: []data_aws_iam_policy_document.Principals{ { Type: S("Service"), Identifiers: terra.SetString( @@ -42,8 +44,8 @@ func newInstanceProfile() InstanceProfile { }, ) - iamRole := aws.NewIamRole( - "eks_node", aws.IamRoleArgs{ + iamRole := aws_iam_role.New( + "eks_node", aws_iam_role.Args{ Name: S("platypus-karpenter-node"), Description: S( "IAM Role for Karpenter's InstanceProfile to use when launching nodes", @@ -59,19 +61,22 @@ func newInstanceProfile() InstanceProfile { awsSSMManagedInstanceCore, } - policyAttachments := make([]*aws.IamRolePolicyAttachment, len(policies)) + policyAttachments := make( + []*aws_iam_role_policy_attachment.AwsIamRolePolicyAttachment, + len(policies), + ) for i, policy := range policies { - policyAttachments[i] = aws.NewIamRolePolicyAttachment( + policyAttachments[i] = aws_iam_role_policy_attachment.New( fmt.Sprintf("eks_node_attach_%s", policy), - aws.IamRolePolicyAttachmentArgs{ + aws_iam_role_policy_attachment.Args{ PolicyArn: S(awsPolicyARNPrefix + policy), Role: iamRole.Attributes().Name(), }, ) } - instanceProfile := aws.NewIamInstanceProfile( - KA.Name, aws.IamInstanceProfileArgs{ + instanceProfile := aws_iam_instance_profile.New( + KA.Name, aws_iam_instance_profile.Args{ Name: S("platypus-karpenter-instance-profile"), Role: iamRole.Attributes().Name(), },