From 2b3facda69754da1204a87394780315fe6bc74aa Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Wed, 6 Sep 2023 12:27:48 -0700 Subject: [PATCH 01/24] upgrade dcl --- mmv1/third_party/terraform/go.mod.erb | 2 +- mmv1/third_party/terraform/go.sum | 2 ++ tpgtools/go.mod | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/go.mod.erb b/mmv1/third_party/terraform/go.mod.erb index 13b659db12a6..60d9a7121a82 100644 --- a/mmv1/third_party/terraform/go.mod.erb +++ b/mmv1/third_party/terraform/go.mod.erb @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigtable v1.19.0 - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 + github.com/GoogleCloudPlatform/declarative-resource-client-library latest github.com/apparentlymart/go-cidr v1.1.0 github.com/davecgh/go-spew v1.1.1 github.com/dnaeon/go-vcr v1.0.1 diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum index 205203241069..38d0e2fd80ee 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -466,3 +466,5 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 h1:tsuB2FrGmDXIPUdhRD6YdUuvIzAly6+RYpyRkKWwk9E= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= diff --git a/tpgtools/go.mod b/tpgtools/go.mod index 01564e2fc660..4ee4fe5a69a3 100644 --- a/tpgtools/go.mod +++ b/tpgtools/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( bitbucket.org/creachadair/stringset v0.0.9 - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 + github.com/GoogleCloudPlatform/declarative-resource-client-library latest github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/hcl v1.0.0 From d1ada16ffad3e925f390e87f0c33eb0d8df8aa50 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Wed, 6 Sep 2023 13:22:11 -0700 Subject: [PATCH 02/24] updating go mod/sum properly --- mmv1/third_party/terraform/go.mod.erb | 2 +- mmv1/third_party/terraform/go.sum | 4 +- tpgtools/go.mod | 42 ++++++++------ tpgtools/go.sum | 83 ++++++++++++++++++++++++++- 4 files changed, 108 insertions(+), 23 deletions(-) diff --git a/mmv1/third_party/terraform/go.mod.erb b/mmv1/third_party/terraform/go.mod.erb index 60d9a7121a82..13b659db12a6 100644 --- a/mmv1/third_party/terraform/go.mod.erb +++ b/mmv1/third_party/terraform/go.mod.erb @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigtable v1.19.0 - github.com/GoogleCloudPlatform/declarative-resource-client-library latest + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 github.com/apparentlymart/go-cidr v1.1.0 github.com/davecgh/go-spew v1.1.1 github.com/dnaeon/go-vcr v1.0.1 diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum index 38d0e2fd80ee..22a4b9198ed7 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -15,8 +15,8 @@ cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+K cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 h1:tsuB2FrGmDXIPUdhRD6YdUuvIzAly6+RYpyRkKWwk9E= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 h1:YhWTPhOf6gVpA9mSfnLOuL8Y6j8W5pzmHE7flXjTke4= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= diff --git a/tpgtools/go.mod b/tpgtools/go.mod index 4ee4fe5a69a3..edb1c068553e 100644 --- a/tpgtools/go.mod +++ b/tpgtools/go.mod @@ -3,26 +3,30 @@ module github.com/GoogleCloudPlatform/magic-modules/tpgtools go 1.19 require ( - bitbucket.org/creachadair/stringset v0.0.9 - github.com/GoogleCloudPlatform/declarative-resource-client-library latest - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b + bitbucket.org/creachadair/stringset v0.0.11 + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 + github.com/golang/glog v1.1.2 github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0 github.com/kylelemons/godebug v1.1.0 - github.com/nasa9084/go-openapi v0.0.0-20200604141640-2875b7376353 + github.com/nasa9084/go-openapi v0.0.0-20210722142352-4a81d737faf6 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.61.0 // indirect + cloud.google.com/go v0.110.6 // indirect + cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-textseg v1.0.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect - github.com/golang/protobuf v1.4.2 // indirect - github.com/google/go-cmp v0.5.8 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect github.com/hashicorp/go-multierror v1.0.0 // indirect github.com/hashicorp/go-uuid v1.0.1 // indirect @@ -36,14 +40,16 @@ require ( github.com/mitchellh/reflectwalk v1.0.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/zclconf/go-cty v1.2.1 // indirect - go.opencensus.io v0.22.4 // indirect - golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect - golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect - golang.org/x/text v0.3.3 // indirect - google.golang.org/api v0.29.0 // indirect - google.golang.org/appengine v1.6.6 // indirect - google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect - google.golang.org/grpc v1.32.0 // indirect - google.golang.org/protobuf v1.25.0 // indirect + go.opencensus.io v0.24.0 // indirect + golang.org/x/crypto v0.13.0 // indirect + golang.org/x/net v0.15.0 // indirect + golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect + google.golang.org/api v0.138.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/grpc v1.57.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/tpgtools/go.sum b/tpgtools/go.sum index 7018bea809e0..e0e118ffa9fc 100644 --- a/tpgtools/go.sum +++ b/tpgtools/go.sum @@ -1,5 +1,7 @@ bitbucket.org/creachadair/stringset v0.0.9 h1:L4vld9nzPt90UZNrXjNelTshD74ps4P5NGs3Iq6yN3o= bitbucket.org/creachadair/stringset v0.0.9/go.mod h1:t+4WcQ4+PXTa8aQdNKe40ZP6iwesoMFWAxPGd3UGjyY= +bitbucket.org/creachadair/stringset v0.0.11 h1:6Sv4CCv14Wm+OipW4f3tWOb0SQVpBDLW0knnJqUnmZ8= +bitbucket.org/creachadair/stringset v0.0.11/go.mod h1:wh0BHewFe+j0HrzWz7KcGbSNpFzWwnpmgPRlB57U5jU= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -15,12 +17,18 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.61.0 h1:NLQf5e1OMspfNT1RAHOB3ublr1TW3YTXO8OiWwVjK2U= cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAqw= +cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= +cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -35,8 +43,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 h1:tsuB2FrGmDXIPUdhRD6YdUuvIzAly6+RYpyRkKWwk9E= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 h1:YhWTPhOf6gVpA9mSfnLOuL8Y6j8W5pzmHE7flXjTke4= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= @@ -90,10 +98,14 @@ 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/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -115,6 +127,11 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +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.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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= @@ -125,8 +142,12 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/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 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= 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-cpy v0.0.0-20211218193943-a9c933c06932 h1:5/4TSDzpDnHQ8rKEEQBjRlYx77mHOvXu08oGchxej7o= github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932/go.mod h1:cC6EdPbj/17GFCPDK39NRarlMI+kt+O60S12cNB5J9Y= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -139,6 +160,12 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= +github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= @@ -226,6 +253,8 @@ github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY7 github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/nasa9084/go-openapi v0.0.0-20200604141640-2875b7376353 h1:B12KiVODig0ltyL7AOeO68ZKLrIWAus/SdlWvO7KcfA= github.com/nasa9084/go-openapi v0.0.0-20200604141640-2875b7376353/go.mod h1:Y+QYE2No9P7gTzq/clACcx4vZ34gemXUmfspIcRD6LY= +github.com/nasa9084/go-openapi v0.0.0-20210722142352-4a81d737faf6 h1:EgeFHuf1nYbw8nN/04bzCHjUL+ZGOMi+b5DXH+TVNJE= +github.com/nasa9084/go-openapi v0.0.0-20210722142352-4a81d737faf6/go.mod h1:oY7A58oP7/O7+8Ob5s6uGrdVlLQj/BGgUUIsj6IMrQw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= @@ -241,10 +270,15 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= @@ -254,6 +288,7 @@ github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0B github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.2.1 h1:vGMsygfmeCl4Xb6OA5U5XVAaQZ69FvoG7X2jUtQujb8= github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= @@ -264,6 +299,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -272,6 +309,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= 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= @@ -302,6 +342,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -330,12 +371,19 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -344,6 +392,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -374,12 +423,25 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/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= @@ -421,6 +483,7 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= 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= @@ -440,6 +503,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0 h1:BaiDisFir8O4IJxvAabCGGkQ6yCJegNQqSVoYUNAnbk= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -447,6 +512,8 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -476,6 +543,10 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200711021454-869866162049 h1:YFTFpQhgvrLrmxtiIncJxFXeCyq84ixuKWVCaCAi9Oc= google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -490,6 +561,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -501,6 +575,10 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -515,6 +593,7 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 596fb1ba16c51c8cdb7e4e96f142114c4c18c945 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Wed, 6 Sep 2023 13:53:05 -0700 Subject: [PATCH 03/24] updating go mod/sum properly 2 --- mmv1/third_party/terraform/go.mod.erb | 2 +- mmv1/third_party/terraform/go.sum | 4 ++-- tools/diff-processor/go.mod | 2 +- tools/diff-processor/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mmv1/third_party/terraform/go.mod.erb b/mmv1/third_party/terraform/go.mod.erb index 13b659db12a6..db246d4dfd1a 100644 --- a/mmv1/third_party/terraform/go.mod.erb +++ b/mmv1/third_party/terraform/go.mod.erb @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigtable v1.19.0 - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 github.com/apparentlymart/go-cidr v1.1.0 github.com/davecgh/go-spew v1.1.1 github.com/dnaeon/go-vcr v1.0.1 diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum index 22a4b9198ed7..f1131ffa5f89 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -466,5 +466,5 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 h1:tsuB2FrGmDXIPUdhRD6YdUuvIzAly6+RYpyRkKWwk9E= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 h1:YhWTPhOf6gVpA9mSfnLOuL8Y6j8W5pzmHE7flXjTke4= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= diff --git a/tools/diff-processor/go.mod b/tools/diff-processor/go.mod index 37ae5ef32752..92d513b193cd 100644 --- a/tools/diff-processor/go.mod +++ b/tools/diff-processor/go.mod @@ -24,7 +24,7 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.0 // indirect cloud.google.com/go/longrunning v0.5.1 // indirect - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 // indirect + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-cidr v1.1.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect diff --git a/tools/diff-processor/go.sum b/tools/diff-processor/go.sum index d7166b77e319..8e301bf72f63 100644 --- a/tools/diff-processor/go.sum +++ b/tools/diff-processor/go.sum @@ -15,8 +15,8 @@ cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5 cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 h1:tsuB2FrGmDXIPUdhRD6YdUuvIzAly6+RYpyRkKWwk9E= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 h1:YhWTPhOf6gVpA9mSfnLOuL8Y6j8W5pzmHE7flXjTke4= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= From c808b8ded9dfdd7e022a01ec8932b638a8516c79 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Fri, 8 Sep 2023 15:11:26 -0700 Subject: [PATCH 04/24] updating go mod/sum properly 3 --- tools/missing-test-detector/go.mod | 2 +- tools/missing-test-detector/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/missing-test-detector/go.mod b/tools/missing-test-detector/go.mod index 5572d08961d0..291b412ade2c 100644 --- a/tools/missing-test-detector/go.mod +++ b/tools/missing-test-detector/go.mod @@ -23,7 +23,7 @@ require ( cloud.google.com/go/compute/metadata v0.2.2 // indirect cloud.google.com/go/iam v0.8.0 // indirect cloud.google.com/go/longrunning v0.3.0 // indirect - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0 // indirect + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-cidr v1.1.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect diff --git a/tools/missing-test-detector/go.sum b/tools/missing-test-detector/go.sum index 3a78829e6b16..9200a80bcd61 100644 --- a/tools/missing-test-detector/go.sum +++ b/tools/missing-test-detector/go.sum @@ -15,8 +15,8 @@ cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGE cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0 h1:o7t+hPFv+Ax5O2vxzIH7dEtvlWA7JJOlOd7mWFvMa6s= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0 h1:YhWTPhOf6gVpA9mSfnLOuL8Y6j8W5pzmHE7flXjTke4= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.51.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= From e8b1a9952b7db5072c8f2064f4f2c73c94d4ee60 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Fri, 8 Sep 2023 16:30:22 -0700 Subject: [PATCH 05/24] node pool sample updates --- .../overrides/containeraws/samples/nodepool/basic.tf.tmpl | 4 ++++ .../containeraws/samples/nodepool/basic_update.tf.tmpl | 4 ++++ .../overrides/containerazure/samples/nodepool/basic.tf.tmpl | 4 ++++ .../containerazure/samples/nodepool/basic_update.tf.tmpl | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl index abb995117a02..ce8bcc8229ab 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl @@ -146,6 +146,10 @@ resource "google_container_aws_node_pool" "primary" { label-one = "value-one" } + management { + auto_repair = false + } + project = "{{project}}" } diff --git a/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl index 85c7870fbf1c..5b765bf45d1c 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl @@ -145,6 +145,10 @@ resource "google_container_aws_node_pool" "primary" { label-two = "value-two" } + management { + auto_repair = true + } + project = "{{project}}" } diff --git a/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl b/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl index 9130e0b68e42..a792ef45e57d 100644 --- a/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl +++ b/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl @@ -90,6 +90,10 @@ resource "google_container_azure_node_pool" "primary" { annotation-one = "value-one" } + management { + auto_repair = false + } + project = "{{project}}" } diff --git a/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl b/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl index 31b230b5c09f..56b1f9c812de 100644 --- a/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl +++ b/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl @@ -91,6 +91,10 @@ resource "google_container_azure_node_pool" "primary" { annotation-two = "value-two" } + management { + auto_repair = true + } + project = "{{project}}" } From 1e267c5f902e8d62ee4d1dc63d196285c08dfea4 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Mon, 11 Sep 2023 09:35:01 -0700 Subject: [PATCH 06/24] updated tests --- .../overrides/containeraws/samples/nodepool/basic.tf.tmpl | 2 +- .../containeraws/samples/nodepool/basic_update.tf.tmpl | 2 +- .../containeraws/samples/nodepool/beta_basic.tf.tmpl | 4 ++++ .../containeraws/samples/nodepool/beta_basic_update.tf.tmpl | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl index ce8bcc8229ab..fd11ead5739d 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl @@ -147,7 +147,7 @@ resource "google_container_aws_node_pool" "primary" { } management { - auto_repair = false + auto_repair = true } project = "{{project}}" diff --git a/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl index 5b765bf45d1c..d7a2cb9aab28 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl @@ -146,7 +146,7 @@ resource "google_container_aws_node_pool" "primary" { } management { - auto_repair = true + auto_repair = false } project = "{{project}}" diff --git a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl index 58252330d551..cc4db2389621 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl @@ -150,6 +150,10 @@ resource "google_container_aws_node_pool" "primary" { name = "{{node-pool-name}}" subnet_id = "{{aws_subnet}}" version = "${data.google_container_aws_versions.versions.valid_versions[0]}" + + management { + auto_repair = true + } annotations = { label-one = "value-one" diff --git a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl index 13037629cb09..bedd2448a0a6 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl @@ -150,6 +150,10 @@ resource "google_container_aws_node_pool" "primary" { subnet_id = "{{aws_subnet}}" version = "${data.google_container_aws_versions.versions.valid_versions[0]}" + management { + auto_repair = true + } + annotations = { label-two = "value-two" } From 6259f5386c853541c864c279cc9b593d168edeea Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Mon, 11 Sep 2023 09:46:16 -0700 Subject: [PATCH 07/24] missing tests --- .../samples/spoke/linked_vpc_network.tf.tmpl | 30 +++++++++++++++++++ .../samples/spoke/linked_vpc_network.yaml | 13 ++++++++ 2 files changed, 43 insertions(+) create mode 100644 tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl create mode 100644 tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.yaml diff --git a/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl new file mode 100644 index 000000000000..0e3415df0024 --- /dev/null +++ b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl @@ -0,0 +1,30 @@ + +resource "google_compute_network" "network" { + name = "{{network}}" + auto_create_subnetworks = false +} + +resource "google_network_connectivity_hub" "basic_hub" { + name = "{{hub}}" + description = "A sample hub" + labels = { + label-two = "value-one" + } +} + +resource "google_network_connectivity_spoke" "primary" { + name = "{{name}}" + location = "{{region}}" + description = "A sample spoke with a linked routher appliance instance" + labels = { + label-one = "value-one" + } + hub = google_network_connectivity_hub.basic_hub.id + linked_vpc_network { + exclude_export_ranges = [ + "198.51.100.0/24", + "10.10.0.0/16" + ] + uri = google_compute_network.network.self_link + } +} \ No newline at end of file diff --git a/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.yaml b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.yaml new file mode 100644 index 000000000000..ec8fa78bb2fd --- /dev/null +++ b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.yaml @@ -0,0 +1,13 @@ +updates: + - resource: linked_vpc_network.tf.tmpl +variables: + - name: "project" + type: "project" + - name: "region" + type: "region" + - name: "name" + type: "resource_name" + - name: "hub" + type: "resource_name" + - name: "network" + type: "resource_name" From 2fcf423d7e63cb11ff08abb558c31b9f25e22b53 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Mon, 11 Sep 2023 14:08:36 -0700 Subject: [PATCH 08/24] adding diffsuppress --- tpgtools/overrides/containeraws/node_pool.yaml | 4 ++++ .../containeraws/samples/nodepool/beta_basic_update.tf.tmpl | 2 +- tpgtools/overrides/containerazure/node_pool.yaml | 4 ++++ .../overrides/containerazure/samples/nodepool/basic.tf.tmpl | 2 +- .../containerazure/samples/nodepool/basic_update.tf.tmpl | 2 +- .../containerazure/samples/nodepool/beta_basic.tf.tmpl | 4 ++++ .../containerazure/samples/nodepool/beta_basic_update.tf.tmpl | 4 ++++ 7 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tpgtools/overrides/containeraws/node_pool.yaml b/tpgtools/overrides/containeraws/node_pool.yaml index 4f76c9df9c1e..0669bebd8565 100644 --- a/tpgtools/overrides/containeraws/node_pool.yaml +++ b/tpgtools/overrides/containeraws/node_pool.yaml @@ -6,3 +6,7 @@ field: config.taints.effect details: diffsuppressfunc: tpgresource.CompareCaseInsensitive +- type: DIFF_SUPPRESS_FUNC + field: management.auto_repair + details: + diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") \ No newline at end of file diff --git a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl index bedd2448a0a6..42d8c055dbef 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl @@ -151,7 +151,7 @@ resource "google_container_aws_node_pool" "primary" { version = "${data.google_container_aws_versions.versions.valid_versions[0]}" management { - auto_repair = true + auto_repair = false } annotations = { diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index e69de29bb2d1..338b97037eb2 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -0,0 +1,4 @@ +- type: DIFF_SUPPRESS_FUNC + field: management.auto_repair + details: + diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") \ No newline at end of file diff --git a/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl b/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl index a792ef45e57d..8ea45ee3f996 100644 --- a/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl +++ b/tpgtools/overrides/containerazure/samples/nodepool/basic.tf.tmpl @@ -91,7 +91,7 @@ resource "google_container_azure_node_pool" "primary" { } management { - auto_repair = false + auto_repair = true } project = "{{project}}" diff --git a/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl b/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl index 56b1f9c812de..2786c74963b7 100644 --- a/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl +++ b/tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl @@ -92,7 +92,7 @@ resource "google_container_azure_node_pool" "primary" { } management { - auto_repair = true + auto_repair = false } project = "{{project}}" diff --git a/tpgtools/overrides/containerazure/samples/nodepool/beta_basic.tf.tmpl b/tpgtools/overrides/containerazure/samples/nodepool/beta_basic.tf.tmpl index ff9cb4c233db..4967311d5107 100644 --- a/tpgtools/overrides/containerazure/samples/nodepool/beta_basic.tf.tmpl +++ b/tpgtools/overrides/containerazure/samples/nodepool/beta_basic.tf.tmpl @@ -92,6 +92,10 @@ resource "google_container_azure_node_pool" "primary" { subnet_id = "/subscriptions/{{azure_subscription}}/resourceGroups/{{byo_multicloud_prefix}}-dev-byo/providers/Microsoft.Network/virtualNetworks/{{byo_multicloud_prefix}}-dev-vnet/subnets/default" version = "${data.google_container_azure_versions.versions.valid_versions[0]}" + management { + auto_repair = true + } + annotations = { annotation-one = "value-one" } diff --git a/tpgtools/overrides/containerazure/samples/nodepool/beta_basic_update.tf.tmpl b/tpgtools/overrides/containerazure/samples/nodepool/beta_basic_update.tf.tmpl index 2aef4c024ba4..2156af0dc662 100644 --- a/tpgtools/overrides/containerazure/samples/nodepool/beta_basic_update.tf.tmpl +++ b/tpgtools/overrides/containerazure/samples/nodepool/beta_basic_update.tf.tmpl @@ -93,6 +93,10 @@ resource "google_container_azure_node_pool" "primary" { subnet_id = "/subscriptions/{{azure_subscription}}/resourceGroups/{{byo_multicloud_prefix}}-dev-byo/providers/Microsoft.Network/virtualNetworks/{{byo_multicloud_prefix}}-dev-vnet/subnets/default" version = "${data.google_container_azure_versions.versions.valid_versions[0]}" + management { + auto_repair = false + } + annotations = { annotation-two = "value-two" } From 140a05a0bb119997cd1a6d66fe65080825e05f71 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Mon, 11 Sep 2023 14:11:53 -0700 Subject: [PATCH 09/24] network region --- .../networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl index 0e3415df0024..b8bc4ce57b0e 100644 --- a/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl +++ b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl @@ -1,6 +1,7 @@ resource "google_compute_network" "network" { name = "{{network}}" + region = "{{region}}" auto_create_subnetworks = false } From d55908d9e69c1cc9611da6b0bee974d6ec6d8b44 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Tue, 12 Sep 2023 12:28:01 -0700 Subject: [PATCH 10/24] adding enum bool flag --- tpgtools/overrides/containeraws/node_pool.yaml | 5 ++++- tpgtools/overrides/containerazure/node_pool.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tpgtools/overrides/containeraws/node_pool.yaml b/tpgtools/overrides/containeraws/node_pool.yaml index 0669bebd8565..d369ae5ae777 100644 --- a/tpgtools/overrides/containeraws/node_pool.yaml +++ b/tpgtools/overrides/containeraws/node_pool.yaml @@ -9,4 +9,7 @@ - type: DIFF_SUPPRESS_FUNC field: management.auto_repair details: - diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") \ No newline at end of file + diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") +- type: ENUM_BOOL + field: management.auto_repair + \ No newline at end of file diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index 338b97037eb2..d5d475085f68 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -1,4 +1,7 @@ - type: DIFF_SUPPRESS_FUNC field: management.auto_repair details: - diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") \ No newline at end of file + diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") +- type: ENUM_BOOL + field: management.auto_repair + \ No newline at end of file From f211e150b2adba2d99f2df82ddc1ac1494d9f7bb Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Tue, 12 Sep 2023 14:31:01 -0700 Subject: [PATCH 11/24] adding diffsuppress --- .../terraform/tpgresource/common_diff_suppress.go.erb | 5 +++++ tpgtools/overrides/containeraws/node_pool.yaml | 5 +---- tpgtools/overrides/containerazure/node_pool.yaml | 6 ++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb index b02b0204f400..555736419f76 100644 --- a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb +++ b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb @@ -55,6 +55,11 @@ func EmptyOrDefaultStringSuppress(defaultVal string) schema.SchemaDiffSuppressFu } } +func EmptyOrFalseSuppressBoolean(k, old, new string, d *schema.ResourceData) bool { + return (old == nil && new == "false" || old == "" && new == "false") + } +} + func IpCidrRangeDiffSuppress(k, old, new string, d *schema.ResourceData) bool { // The range may be a: // A) single IP address (e.g. 10.2.3.4) diff --git a/tpgtools/overrides/containeraws/node_pool.yaml b/tpgtools/overrides/containeraws/node_pool.yaml index d369ae5ae777..181211b4b5bd 100644 --- a/tpgtools/overrides/containeraws/node_pool.yaml +++ b/tpgtools/overrides/containeraws/node_pool.yaml @@ -9,7 +9,4 @@ - type: DIFF_SUPPRESS_FUNC field: management.auto_repair details: - diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") -- type: ENUM_BOOL - field: management.auto_repair - \ No newline at end of file + diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index d5d475085f68..eb5456dc2918 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -1,7 +1,5 @@ - type: DIFF_SUPPRESS_FUNC field: management.auto_repair details: - diffsuppressfunc: tpgresource.EmptyOrDefaultStringSuppress("false") -- type: ENUM_BOOL - field: management.auto_repair - \ No newline at end of file + diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean + \ No newline at end of file From ed27132c386f50dec3eb0992c27e539b4701c615 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Tue, 12 Sep 2023 14:34:57 -0700 Subject: [PATCH 12/24] connectivity test fix --- .../samples/spoke/linked_vpc_network.tf.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl index b8bc4ce57b0e..8a1bd423b3bb 100644 --- a/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl +++ b/tpgtools/overrides/networkconnectivity/samples/spoke/linked_vpc_network.tf.tmpl @@ -1,7 +1,6 @@ resource "google_compute_network" "network" { name = "{{network}}" - region = "{{region}}" auto_create_subnetworks = false } @@ -15,7 +14,7 @@ resource "google_network_connectivity_hub" "basic_hub" { resource "google_network_connectivity_spoke" "primary" { name = "{{name}}" - location = "{{region}}" + location = "global" description = "A sample spoke with a linked routher appliance instance" labels = { label-one = "value-one" From 770ac7d28f530b2e453e7ff4ae6974d23001a01e Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Tue, 12 Sep 2023 14:44:13 -0700 Subject: [PATCH 13/24] formatting --- .../terraform/tpgresource/common_diff_suppress.go.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb index 555736419f76..3fc42b7631da 100644 --- a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb +++ b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb @@ -57,7 +57,6 @@ func EmptyOrDefaultStringSuppress(defaultVal string) schema.SchemaDiffSuppressFu func EmptyOrFalseSuppressBoolean(k, old, new string, d *schema.ResourceData) bool { return (old == nil && new == "false" || old == "" && new == "false") - } } func IpCidrRangeDiffSuppress(k, old, new string, d *schema.ResourceData) bool { From ba99bd3c9f72b081a71c06c832dfd942e2ac182f Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Tue, 12 Sep 2023 15:43:44 -0700 Subject: [PATCH 14/24] cdiff updated for bool support --- .../terraform/tpgresource/common_diff_suppress.go.erb | 4 +++- tpgtools/overrides/containeraws/beta/node_pool.yaml | 4 ++++ tpgtools/overrides/containerazure/beta/node_pool.yaml | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb index 3fc42b7631da..580f0881cdb8 100644 --- a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb +++ b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb @@ -56,7 +56,9 @@ func EmptyOrDefaultStringSuppress(defaultVal string) schema.SchemaDiffSuppressFu } func EmptyOrFalseSuppressBoolean(k, old, new string, d *schema.ResourceData) bool { - return (old == nil && new == "false" || old == "" && new == "false") + o, n := d.GetChange(k) + return (o == nil && !n.(bool)) + } } func IpCidrRangeDiffSuppress(k, old, new string, d *schema.ResourceData) bool { diff --git a/tpgtools/overrides/containeraws/beta/node_pool.yaml b/tpgtools/overrides/containeraws/beta/node_pool.yaml index e16b502f32ef..86fbd573cf25 100644 --- a/tpgtools/overrides/containeraws/beta/node_pool.yaml +++ b/tpgtools/overrides/containeraws/beta/node_pool.yaml @@ -10,3 +10,7 @@ field: config.instance_placement.tenancy details: diffsuppressfunc: tpgresource.CompareCaseInsensitive +- type: DIFF_SUPPRESS_FUNC + field: management.auto_repair + details: + diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean diff --git a/tpgtools/overrides/containerazure/beta/node_pool.yaml b/tpgtools/overrides/containerazure/beta/node_pool.yaml index e69de29bb2d1..7e79b2ff100a 100644 --- a/tpgtools/overrides/containerazure/beta/node_pool.yaml +++ b/tpgtools/overrides/containerazure/beta/node_pool.yaml @@ -0,0 +1,4 @@ +- type: DIFF_SUPPRESS_FUNC + field: management.auto_repair + details: + diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean From 12803a17d3f58a223c7fb6dadb16d47ad9269909 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Wed, 13 Sep 2023 09:13:41 -0700 Subject: [PATCH 15/24] formatting --- .../terraform/tpgresource/common_diff_suppress.go.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb index 580f0881cdb8..86ced35209ab 100644 --- a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb +++ b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.erb @@ -56,9 +56,8 @@ func EmptyOrDefaultStringSuppress(defaultVal string) schema.SchemaDiffSuppressFu } func EmptyOrFalseSuppressBoolean(k, old, new string, d *schema.ResourceData) bool { - o, n := d.GetChange(k) - return (o == nil && !n.(bool)) - } + o, n := d.GetChange(k) + return (o == nil && !n.(bool)) } func IpCidrRangeDiffSuppress(k, old, new string, d *schema.ResourceData) bool { From 163f5da9bada55e2cefd54a14b5e0b9e9be61d86 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Wed, 13 Sep 2023 15:38:00 -0700 Subject: [PATCH 16/24] added custom state setter --- tpgtools/handwritten/flatteners.go | 18 ++++++++++++++++++ .../overrides/containeraws/beta/node_pool.yaml | 6 +++--- tpgtools/overrides/containeraws/node_pool.yaml | 6 +++--- .../containerazure/beta/node_pool.yaml | 6 +++--- .../overrides/containerazure/node_pool.yaml | 7 +++---- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/tpgtools/handwritten/flatteners.go b/tpgtools/handwritten/flatteners.go index b2bffefe9045..245f9e4a2a6a 100644 --- a/tpgtools/handwritten/flatteners.go +++ b/tpgtools/handwritten/flatteners.go @@ -11,3 +11,21 @@ func FlattenEnumBool(v interface{}) string { } return "FALSE" } + + +func flattenContainerAwsNodePoolManagement(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} { + if v == nil { + return nil + } + + original := v.(map[string]interface{}) + transformed := make(map[string]interface{}) + + if original["node_repair"] == nil { + transformed["node_repair"] = false + } else { + transformed["node_repair"] = original["node_repair"] + } + + return []interface{}{transformed} +} \ No newline at end of file diff --git a/tpgtools/overrides/containeraws/beta/node_pool.yaml b/tpgtools/overrides/containeraws/beta/node_pool.yaml index 86fbd573cf25..e47aa74b34a1 100644 --- a/tpgtools/overrides/containeraws/beta/node_pool.yaml +++ b/tpgtools/overrides/containeraws/beta/node_pool.yaml @@ -10,7 +10,7 @@ field: config.instance_placement.tenancy details: diffsuppressfunc: tpgresource.CompareCaseInsensitive -- type: DIFF_SUPPRESS_FUNC - field: management.auto_repair +- type: CUSTOM_STATE_SETTER + field: management details: - diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean + function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containeraws/node_pool.yaml b/tpgtools/overrides/containeraws/node_pool.yaml index 181211b4b5bd..365701118515 100644 --- a/tpgtools/overrides/containeraws/node_pool.yaml +++ b/tpgtools/overrides/containeraws/node_pool.yaml @@ -6,7 +6,7 @@ field: config.taints.effect details: diffsuppressfunc: tpgresource.CompareCaseInsensitive -- type: DIFF_SUPPRESS_FUNC - field: management.auto_repair +- type: CUSTOM_STATE_SETTER + field: management details: - diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean + function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containerazure/beta/node_pool.yaml b/tpgtools/overrides/containerazure/beta/node_pool.yaml index 7e79b2ff100a..d1ee91fd4a35 100644 --- a/tpgtools/overrides/containerazure/beta/node_pool.yaml +++ b/tpgtools/overrides/containerazure/beta/node_pool.yaml @@ -1,4 +1,4 @@ -- type: DIFF_SUPPRESS_FUNC - field: management.auto_repair +- type: CUSTOM_STATE_SETTER + field: management details: - diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean + function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index eb5456dc2918..d1ee91fd4a35 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -1,5 +1,4 @@ -- type: DIFF_SUPPRESS_FUNC - field: management.auto_repair +- type: CUSTOM_STATE_SETTER + field: management details: - diffsuppressfunc: tpgresource.EmptyOrFalseSuppressBoolean - \ No newline at end of file + function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) From 20a7ddcc38cb08ad11e85168cb001aa5492322fd Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Wed, 13 Sep 2023 15:50:07 -0700 Subject: [PATCH 17/24] import --- tpgtools/handwritten/flatteners.go | 7 ++++++- tpgtools/overrides/containeraws/beta/node_pool.yaml | 2 +- tpgtools/overrides/containeraws/node_pool.yaml | 2 +- tpgtools/overrides/containerazure/beta/node_pool.yaml | 2 +- tpgtools/overrides/containerazure/node_pool.yaml | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tpgtools/handwritten/flatteners.go b/tpgtools/handwritten/flatteners.go index 245f9e4a2a6a..31cbcdade5e5 100644 --- a/tpgtools/handwritten/flatteners.go +++ b/tpgtools/handwritten/flatteners.go @@ -1,5 +1,10 @@ package tpgdclresource +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" +) + // Returns the terraform representation of a three-state boolean value represented by a pointer to bool in DCL. func FlattenEnumBool(v interface{}) string { b, ok := v.(*bool) @@ -13,7 +18,7 @@ func FlattenEnumBool(v interface{}) string { } -func flattenContainerAwsNodePoolManagement(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} { +func FlattenContainerAwsNodePoolManagement(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} { if v == nil { return nil } diff --git a/tpgtools/overrides/containeraws/beta/node_pool.yaml b/tpgtools/overrides/containeraws/beta/node_pool.yaml index e47aa74b34a1..5cd1326ab4dc 100644 --- a/tpgtools/overrides/containeraws/beta/node_pool.yaml +++ b/tpgtools/overrides/containeraws/beta/node_pool.yaml @@ -13,4 +13,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containeraws/node_pool.yaml b/tpgtools/overrides/containeraws/node_pool.yaml index 365701118515..537ba1fa9bde 100644 --- a/tpgtools/overrides/containeraws/node_pool.yaml +++ b/tpgtools/overrides/containeraws/node_pool.yaml @@ -9,4 +9,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containerazure/beta/node_pool.yaml b/tpgtools/overrides/containerazure/beta/node_pool.yaml index d1ee91fd4a35..5ff7680434cc 100644 --- a/tpgtools/overrides/containerazure/beta/node_pool.yaml +++ b/tpgtools/overrides/containerazure/beta/node_pool.yaml @@ -1,4 +1,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index d1ee91fd4a35..5ff7680434cc 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -1,4 +1,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.flattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) From 2df9051529a572d921ed64526b7840da2925f9e8 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Wed, 13 Sep 2023 15:51:29 -0700 Subject: [PATCH 18/24] removing beta --- tpgtools/handwritten/flatteners.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpgtools/handwritten/flatteners.go b/tpgtools/handwritten/flatteners.go index 31cbcdade5e5..f3333a1ca449 100644 --- a/tpgtools/handwritten/flatteners.go +++ b/tpgtools/handwritten/flatteners.go @@ -2,7 +2,7 @@ package tpgdclresource import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) // Returns the terraform representation of a three-state boolean value represented by a pointer to bool in DCL. From dfcb52e7ee9d75110d48d396bc2147a055d6ce23 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 14 Sep 2023 09:36:01 -0700 Subject: [PATCH 19/24] renamed field, corrected object ref --- tpgtools/handwritten/flatteners.go | 23 +++++++++++++++---- .../containerazure/beta/node_pool.yaml | 2 +- .../overrides/containerazure/node_pool.yaml | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/tpgtools/handwritten/flatteners.go b/tpgtools/handwritten/flatteners.go index f3333a1ca449..6f119880f690 100644 --- a/tpgtools/handwritten/flatteners.go +++ b/tpgtools/handwritten/flatteners.go @@ -18,18 +18,31 @@ func FlattenEnumBool(v interface{}) string { } -func FlattenContainerAwsNodePoolManagement(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} { +func FlattenContainerAwsNodePoolManagement(obj *containeraws.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { if v == nil { return nil } + transformed := make(map[string]interface{}) + + if obj.auto_repair == nil { + transformed["auto_repair"] = false + } else { + transformed["auto_repair"] = obj.auto_repair + } + + return []interface{}{transformed} +} - original := v.(map[string]interface{}) +func FlattenContainerAzureNodePoolManagement(obj *containerazure.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { + if v == nil { + return nil + } transformed := make(map[string]interface{}) - if original["node_repair"] == nil { - transformed["node_repair"] = false + if obj.auto_repair == nil { + transformed["auto_repair"] = false } else { - transformed["node_repair"] = original["node_repair"] + transformed["auto_repair"] = obj.auto_repair } return []interface{}{transformed} diff --git a/tpgtools/overrides/containerazure/beta/node_pool.yaml b/tpgtools/overrides/containerazure/beta/node_pool.yaml index 5ff7680434cc..aa3df9eb617a 100644 --- a/tpgtools/overrides/containerazure/beta/node_pool.yaml +++ b/tpgtools/overrides/containerazure/beta/node_pool.yaml @@ -1,4 +1,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgdclresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index 5ff7680434cc..aa3df9eb617a 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -1,4 +1,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgdclresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) From b77243b60cfc284ccf399e3e8fdffdcfd1032c4f Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 14 Sep 2023 09:41:10 -0700 Subject: [PATCH 20/24] camelcase --- tpgtools/handwritten/flatteners.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tpgtools/handwritten/flatteners.go b/tpgtools/handwritten/flatteners.go index 6f119880f690..af1c933ee9f1 100644 --- a/tpgtools/handwritten/flatteners.go +++ b/tpgtools/handwritten/flatteners.go @@ -24,10 +24,10 @@ func FlattenContainerAwsNodePoolManagement(obj *containeraws.NodePoolManagement, } transformed := make(map[string]interface{}) - if obj.auto_repair == nil { + if obj.AutoRepair == nil { transformed["auto_repair"] = false } else { - transformed["auto_repair"] = obj.auto_repair + transformed["auto_repair"] = obj.AutoRepair } return []interface{}{transformed} @@ -39,10 +39,10 @@ func FlattenContainerAzureNodePoolManagement(obj *containerazure.NodePoolManagem } transformed := make(map[string]interface{}) - if obj.auto_repair == nil { + if obj.AutoRepair == nil { transformed["auto_repair"] = false } else { - transformed["auto_repair"] = obj.auto_repair + transformed["auto_repair"] = obj.AutoRepair } return []interface{}{transformed} From e618290424fd7e8a9887233ea3430931bd3cb90d Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 14 Sep 2023 14:53:31 -0700 Subject: [PATCH 21/24] resolved permadiff --- tpgtools/handwritten/flatteners.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tpgtools/handwritten/flatteners.go b/tpgtools/handwritten/flatteners.go index af1c933ee9f1..07ecc3c401c0 100644 --- a/tpgtools/handwritten/flatteners.go +++ b/tpgtools/handwritten/flatteners.go @@ -1,6 +1,9 @@ package tpgdclresource import ( + containeraws "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containeraws" + containerazure "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containerazure" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -17,14 +20,13 @@ func FlattenEnumBool(v interface{}) string { return "FALSE" } - func FlattenContainerAwsNodePoolManagement(obj *containeraws.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { - if v == nil { + if obj == nil { return nil } transformed := make(map[string]interface{}) - if obj.AutoRepair == nil { + if obj.AutoRepair == nil || obj.Empty() { transformed["auto_repair"] = false } else { transformed["auto_repair"] = obj.AutoRepair @@ -34,16 +36,16 @@ func FlattenContainerAwsNodePoolManagement(obj *containeraws.NodePoolManagement, } func FlattenContainerAzureNodePoolManagement(obj *containerazure.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { - if v == nil { + if obj == nil { return nil } transformed := make(map[string]interface{}) - if obj.AutoRepair == nil { + if obj.AutoRepair == nil || obj.Empty() { transformed["auto_repair"] = false } else { transformed["auto_repair"] = obj.AutoRepair } return []interface{}{transformed} -} \ No newline at end of file +} From 721c1817bc468a9e19d22931659bfe1937f64004 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 14 Sep 2023 15:09:12 -0700 Subject: [PATCH 22/24] moved to tpgresource for version generation --- .../tpgtools_custom_flattens.go.erb | 40 +++++++++++++++++++ tpgtools/handwritten/flatteners.go | 38 ------------------ .../containeraws/beta/node_pool.yaml | 2 +- .../overrides/containeraws/node_pool.yaml | 2 +- .../containerazure/beta/node_pool.yaml | 2 +- .../overrides/containerazure/node_pool.yaml | 2 +- 6 files changed, 44 insertions(+), 42 deletions(-) create mode 100644 mmv1/third_party/terraform/tpgresource/tpgtools_custom_flattens.go.erb diff --git a/mmv1/third_party/terraform/tpgresource/tpgtools_custom_flattens.go.erb b/mmv1/third_party/terraform/tpgresource/tpgtools_custom_flattens.go.erb new file mode 100644 index 000000000000..744d61c084ed --- /dev/null +++ b/mmv1/third_party/terraform/tpgresource/tpgtools_custom_flattens.go.erb @@ -0,0 +1,40 @@ +<% autogen_exception -%> +package tpgresource + +import ( + containeraws "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containeraws<%= dcl_version(version) -%>" + containerazure "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containerazure<%= dcl_version(version) -%>" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" +) + +func FlattenContainerAwsNodePoolManagement(obj *containeraws.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { + if obj == nil { + return nil + } + transformed := make(map[string]interface{}) + + if obj.AutoRepair == nil || obj.Empty() { + transformed["auto_repair"] = false + } else { + transformed["auto_repair"] = obj.AutoRepair + } + + return []interface{}{transformed} +} + +func FlattenContainerAzureNodePoolManagement(obj *containerazure.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { + if obj == nil { + return nil + } + transformed := make(map[string]interface{}) + + if obj.AutoRepair == nil || obj.Empty() { + transformed["auto_repair"] = false + } else { + transformed["auto_repair"] = obj.AutoRepair + } + + return []interface{}{transformed} +} diff --git a/tpgtools/handwritten/flatteners.go b/tpgtools/handwritten/flatteners.go index 07ecc3c401c0..b2bffefe9045 100644 --- a/tpgtools/handwritten/flatteners.go +++ b/tpgtools/handwritten/flatteners.go @@ -1,13 +1,5 @@ package tpgdclresource -import ( - containeraws "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containeraws" - containerazure "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containerazure" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" -) - // Returns the terraform representation of a three-state boolean value represented by a pointer to bool in DCL. func FlattenEnumBool(v interface{}) string { b, ok := v.(*bool) @@ -19,33 +11,3 @@ func FlattenEnumBool(v interface{}) string { } return "FALSE" } - -func FlattenContainerAwsNodePoolManagement(obj *containeraws.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { - if obj == nil { - return nil - } - transformed := make(map[string]interface{}) - - if obj.AutoRepair == nil || obj.Empty() { - transformed["auto_repair"] = false - } else { - transformed["auto_repair"] = obj.AutoRepair - } - - return []interface{}{transformed} -} - -func FlattenContainerAzureNodePoolManagement(obj *containerazure.NodePoolManagement, d *schema.ResourceData, config *transport_tpg.Config) interface{} { - if obj == nil { - return nil - } - transformed := make(map[string]interface{}) - - if obj.AutoRepair == nil || obj.Empty() { - transformed["auto_repair"] = false - } else { - transformed["auto_repair"] = obj.AutoRepair - } - - return []interface{}{transformed} -} diff --git a/tpgtools/overrides/containeraws/beta/node_pool.yaml b/tpgtools/overrides/containeraws/beta/node_pool.yaml index 5cd1326ab4dc..27c9141cf39f 100644 --- a/tpgtools/overrides/containeraws/beta/node_pool.yaml +++ b/tpgtools/overrides/containeraws/beta/node_pool.yaml @@ -13,4 +13,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containeraws/node_pool.yaml b/tpgtools/overrides/containeraws/node_pool.yaml index 537ba1fa9bde..b027f0c84c3e 100644 --- a/tpgtools/overrides/containeraws/node_pool.yaml +++ b/tpgtools/overrides/containeraws/node_pool.yaml @@ -9,4 +9,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containerazure/beta/node_pool.yaml b/tpgtools/overrides/containerazure/beta/node_pool.yaml index aa3df9eb617a..3d2db7e3c7da 100644 --- a/tpgtools/overrides/containerazure/beta/node_pool.yaml +++ b/tpgtools/overrides/containerazure/beta/node_pool.yaml @@ -1,4 +1,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index aa3df9eb617a..3d2db7e3c7da 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -1,4 +1,4 @@ - type: CUSTOM_STATE_SETTER field: management details: - function: d.Set("management", tpgdclresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) + function: d.Set("management", tpgresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) From b02f2ae604bc6545288285c115eeba4b6af108db Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 14 Sep 2023 17:47:28 -0700 Subject: [PATCH 23/24] adding management fields to ignore read and flagging management as computed to avoid complications with the flattener --- tpgtools/overrides/containeraws/beta/node_pool.yaml | 10 ++++++++++ tpgtools/overrides/containeraws/node_pool.yaml | 10 ++++++++++ .../overrides/containeraws/samples/nodepool/meta.yaml | 3 +++ tpgtools/overrides/containerazure/beta/node_pool.yaml | 10 ++++++++++ tpgtools/overrides/containerazure/node_pool.yaml | 10 ++++++++++ 5 files changed, 43 insertions(+) diff --git a/tpgtools/overrides/containeraws/beta/node_pool.yaml b/tpgtools/overrides/containeraws/beta/node_pool.yaml index 27c9141cf39f..e3742c97ecf1 100644 --- a/tpgtools/overrides/containeraws/beta/node_pool.yaml +++ b/tpgtools/overrides/containeraws/beta/node_pool.yaml @@ -14,3 +14,13 @@ field: management details: function: d.Set("management", tpgresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) +- type: CUSTOM_SCHEMA_VALUES + field: management + details: + optional: true + computed: true +- type: CUSTOM_SCHEMA_VALUES + field: management.auto_repair + details: + optional: true + computed: true diff --git a/tpgtools/overrides/containeraws/node_pool.yaml b/tpgtools/overrides/containeraws/node_pool.yaml index b027f0c84c3e..bb9479ee716e 100644 --- a/tpgtools/overrides/containeraws/node_pool.yaml +++ b/tpgtools/overrides/containeraws/node_pool.yaml @@ -10,3 +10,13 @@ field: management details: function: d.Set("management", tpgresource.FlattenContainerAwsNodePoolManagement(res.Management, d, config)) +- type: CUSTOM_SCHEMA_VALUES + field: management + details: + optional: true + computed: true +- type: CUSTOM_SCHEMA_VALUES + field: management.auto_repair + details: + optional: true + computed: true diff --git a/tpgtools/overrides/containeraws/samples/nodepool/meta.yaml b/tpgtools/overrides/containeraws/samples/nodepool/meta.yaml index 1f3464c256a4..b14ec31e9af2 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/meta.yaml +++ b/tpgtools/overrides/containeraws/samples/nodepool/meta.yaml @@ -1,4 +1,7 @@ ignore_read: - fleet.0.project + - management.# + - management.0.% + - management.0.auto_repair doc_hide: - beta_basic.tf.tmpl diff --git a/tpgtools/overrides/containerazure/beta/node_pool.yaml b/tpgtools/overrides/containerazure/beta/node_pool.yaml index 3d2db7e3c7da..62a7815cb0d4 100644 --- a/tpgtools/overrides/containerazure/beta/node_pool.yaml +++ b/tpgtools/overrides/containerazure/beta/node_pool.yaml @@ -2,3 +2,13 @@ field: management details: function: d.Set("management", tpgresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) +- type: CUSTOM_SCHEMA_VALUES + field: management + details: + optional: true + computed: true +- type: CUSTOM_SCHEMA_VALUES + field: management.auto_repair + details: + optional: true + computed: true diff --git a/tpgtools/overrides/containerazure/node_pool.yaml b/tpgtools/overrides/containerazure/node_pool.yaml index 3d2db7e3c7da..62a7815cb0d4 100644 --- a/tpgtools/overrides/containerazure/node_pool.yaml +++ b/tpgtools/overrides/containerazure/node_pool.yaml @@ -2,3 +2,13 @@ field: management details: function: d.Set("management", tpgresource.FlattenContainerAzureNodePoolManagement(res.Management, d, config)) +- type: CUSTOM_SCHEMA_VALUES + field: management + details: + optional: true + computed: true +- type: CUSTOM_SCHEMA_VALUES + field: management.auto_repair + details: + optional: true + computed: true From 64ede0d844bb424abc4631e8172ae7fb29ac4127 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 14 Sep 2023 21:48:07 -0700 Subject: [PATCH 24/24] flagging azure auto repair as ignore read --- tpgtools/overrides/containerazure/samples/nodepool/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tpgtools/overrides/containerazure/samples/nodepool/meta.yaml b/tpgtools/overrides/containerazure/samples/nodepool/meta.yaml index 0e7b5556a993..09bdf3c9ce82 100644 --- a/tpgtools/overrides/containerazure/samples/nodepool/meta.yaml +++ b/tpgtools/overrides/containerazure/samples/nodepool/meta.yaml @@ -1,2 +1,6 @@ +ignore_read: + - management.# + - management.0.% + - management.0.auto_repair doc_hide: - beta_basic.tf.tmpl \ No newline at end of file