Repository: GoogleCloudPlatform/terraform-validator
Pull request #307 (2021-09-17 19:09:25)

upgrade tgc
fixes https://github.com/GoogleCloudPlatform/terraform-validator/issues/268

upgrading tgc to consume the product url generation change created in https://github.com/GoogleCloudPlatform/magic-modules/pull/5203


Patch:
diff --git a/go.mod b/go.mod
index 74e86962..7c626b91 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,7 @@
 module github.com/GoogleCloudPlatform/terraform-validator
 
 require (
-	github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210902210028-f286d71b9418
+	github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210917180804-7d769d84f6a1
 	github.com/forseti-security/config-validator v0.0.0-20210621194145-08e4202b50d8
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/protobuf v1.5.2
diff --git a/go.sum b/go.sum
index 700d6dc5..33096fc8 100644
--- a/go.sum
+++ b/go.sum
@@ -73,6 +73,8 @@ github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210902183351
 github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210902183351-4366981879d6/go.mod h1:G9nbobJVSUiZx3TTUnwk8d519lUtNR5UIoQweRUY3Rs=
 github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210902210028-f286d71b9418 h1:awIENM0MgxIdbVUKBAQrb3JQ6PCj7tpP4HyMwhEZRQE=
 github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210902210028-f286d71b9418/go.mod h1:G9nbobJVSUiZx3TTUnwk8d519lUtNR5UIoQweRUY3Rs=
+github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210917180804-7d769d84f6a1 h1:qDglBAfw1FdkuFHl9z0uAJ6/dWHn3LssjBK+UyOsZ94=
+github.com/GoogleCloudPlatform/terraform-google-conversion v0.0.0-20210917180804-7d769d84f6a1/go.mod h1:G9nbobJVSUiZx3TTUnwk8d519lUtNR5UIoQweRUY3Rs=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=


Test patch:
diff --git a/testdata/templates/example_filestore_instance.json b/testdata/templates/example_filestore_instance.json
index 7f472aec..2dfe453b 100644
--- a/testdata/templates/example_filestore_instance.json
+++ b/testdata/templates/example_filestore_instance.json
@@ -1,11 +1,11 @@
 [
   {
-    "name": "//filestore.googleapis.com/projects/{{.Provider.project}}/locations/us-central1-b/instances/test-instance",
-    "asset_type": "filestore.googleapis.com/Instance",
+    "name": "//file.googleapis.com/projects/{{.Provider.project}}/locations/us-central1-b/instances/test-instance",
+    "asset_type": "file.googleapis.com/Instance",
     "ancestry_path": "{{.Ancestry}}/project/{{.Provider.project}}",
     "resource": {
       "version": "v1",
-      "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/filestore/v1/rest",
+      "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/file/v1/rest",
       "discovery_name": "Instance",
       "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
       "data": {
diff --git a/testdata/templates/example_kms_crypto_key.json b/testdata/templates/example_kms_crypto_key.json
index 2677e183..89120584 100644
--- a/testdata/templates/example_kms_crypto_key.json
+++ b/testdata/templates/example_kms_crypto_key.json
@@ -1,11 +1,11 @@
 [
   {
-    "name": "//kms.googleapis.com/key-ring-test/cryptoKeys/crypto-key-example",
-    "asset_type": "kms.googleapis.com/CryptoKey",
+    "name": "//cloudkms.googleapis.com/key-ring-test/cryptoKeys/crypto-key-example",
+    "asset_type": "cloudkms.googleapis.com/CryptoKey",
     "ancestry_path": "{{.Ancestry}}/project/{{.Provider.project}}",
     "resource": {
       "version": "v1",
-      "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/kms/v1/rest",
+      "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/cloudkms/v1/rest",
       "discovery_name": "CryptoKey",
       "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
       "data": {
diff --git a/testdata/templates/example_kms_key_ring.json b/testdata/templates/example_kms_key_ring.json
index 39aa6cbb..c23a388e 100644
--- a/testdata/templates/example_kms_key_ring.json
+++ b/testdata/templates/example_kms_key_ring.json
@@ -1,11 +1,11 @@
 [
   {
-    "name": "//kms.googleapis.com/projects/{{.Provider.project}}/locations/global/keyRings/keyring-example",
-    "asset_type": "kms.googleapis.com/KeyRing",
+    "name": "//cloudkms.googleapis.com/projects/{{.Provider.project}}/locations/global/keyRings/keyring-example",
+    "asset_type": "cloudkms.googleapis.com/KeyRing",
     "ancestry_path": "{{.Ancestry}}/project/{{.Provider.project}}",
     "resource": {
       "version": "v1",
-      "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/kms/v1/rest",
+      "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/cloudkms/v1/rest",
       "discovery_name": "KeyRing",
       "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
       "data": null