From 2275b1e4caad4b4e1d54b04e339a7be14895a3c6 Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 23 Feb 2023 15:57:43 -0800 Subject: [PATCH] Fix caps in spanner resource schema accesses (#7346) (#1390) Signed-off-by: Modular Magician --- go.mod | 2 +- go.sum | 4 +- ...dRunDomainMappingBasicExample_offline.json | 63 ++++++++++++++++++ ...e_cloudRunServiceBasicExample_offline.json | 41 ++++++++++++ ...leEnvironmentVariablesExample_offline.json | 54 ++++++++++++++++ ...ice_cloudRunServiceSqlExample_offline.json | 64 +++++++++++++++++++ 6 files changed, 225 insertions(+), 3 deletions(-) create mode 100644 testdata/generatedconvert/CloudRunDomainMapping_cloudRunDomainMappingBasicExample_offline.json create mode 100644 testdata/generatedconvert/CloudRunService_cloudRunServiceBasicExample_offline.json create mode 100644 testdata/generatedconvert/CloudRunService_cloudRunServiceMultipleEnvironmentVariablesExample_offline.json create mode 100644 testdata/generatedconvert/CloudRunService_cloudRunServiceSqlExample_offline.json diff --git a/go.mod b/go.mod index 95bd3ba4b..1ce95012a 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/terraform-json v0.14.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 - github.com/hashicorp/terraform-provider-google v1.20.1-0.20230223184619-984817bc88a4 + github.com/hashicorp/terraform-provider-google v1.20.1-0.20230223235211-a28617e79822 github.com/mitchellh/go-homedir v1.1.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 644db918a..5e389744c 100644 --- a/go.sum +++ b/go.sum @@ -514,8 +514,8 @@ github.com/hashicorp/terraform-plugin-log v0.7.0 h1:SDxJUyT8TwN4l5b5/VkiTIaQgY6R github.com/hashicorp/terraform-plugin-log v0.7.0/go.mod h1:p4R1jWBXRTvL4odmEkFfDdhUjHf9zcs/BCoNHAc7IK4= github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 h1:FtCLTiTcykdsURXPt/ku7fYXm3y19nbzbZcUxHx9RbI= github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0/go.mod h1:80wf5oad1tW+oLnbXS4UTYmDCrl7BuN1Q+IA91X1a4Y= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20230223184619-984817bc88a4 h1:2HmPdDqlNj4gi9QuXSSkLRzUmQ6GzWY+sAYFQhSX0wI= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20230223184619-984817bc88a4/go.mod h1:pyZhyCZDq3hw8CosCtfG1e0gpLacdJyvqLbooxxTbns= +github.com/hashicorp/terraform-provider-google v1.20.1-0.20230223235211-a28617e79822 h1:nIVbS1qkIE8nUbQ6HLlVj+20hqQAppIwQOHHr6H6M7A= +github.com/hashicorp/terraform-provider-google v1.20.1-0.20230223235211-a28617e79822/go.mod h1:pyZhyCZDq3hw8CosCtfG1e0gpLacdJyvqLbooxxTbns= github.com/hashicorp/terraform-registry-address v0.1.0 h1:W6JkV9wbum+m516rCl5/NjKxCyTVaaUBbzYcMzBDO3U= github.com/hashicorp/terraform-registry-address v0.1.0/go.mod h1:EnyO2jYO6j29DTHbJcm00E5nQTFeTtyZH3H5ycydQ5A= github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0= diff --git a/testdata/generatedconvert/CloudRunDomainMapping_cloudRunDomainMappingBasicExample_offline.json b/testdata/generatedconvert/CloudRunDomainMapping_cloudRunDomainMappingBasicExample_offline.json new file mode 100644 index 000000000..3f1157444 --- /dev/null +++ b/testdata/generatedconvert/CloudRunDomainMapping_cloudRunDomainMappingBasicExample_offline.json @@ -0,0 +1,63 @@ +[ + { + "name": "//run.googleapis.com/projects/foobar/locations/us-central1/DomainMappings/tf-test-domainmeepmerp.gcp.tfacc.hashicorptest.com", + "asset_type": "run.googleapis.com/DomainMapping", + "resource": { + "version": "v1", + "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/run/v1/rest", + "discovery_name": "DomainMapping", + "parent": "//cloudresourcemanager.googleapis.com/projects/foobar", + "data": { + "apiVersion": "domains.cloudrun.com/v1", + "kind": "DomainMapping", + "metadata": { + "name": "tf-test-domainmeepmerp.gcp.tfacc.hashicorptest.com", + "namespace": "foobar" + }, + "spec": { + "certificateMode": "AUTOMATIC", + "routeName": "tf-test-cloudrun-srvmeepmerp" + } + } + }, + "ancestors": [ + "projects/foobar", + "folders/67890", + "organizations/12345" + ] + }, + { + "name": "//run.googleapis.com/projects/foobar/locations/us-central1/services/tf-test-cloudrun-srvmeepmerp", + "asset_type": "run.googleapis.com/Service", + "resource": { + "version": "v1", + "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/run/v1/rest", + "discovery_name": "Service", + "parent": "//cloudresourcemanager.googleapis.com/projects/foobar", + "data": { + "apiVersion": "serving.knative.dev/v1", + "kind": "Service", + "metadata": { + "name": "tf-test-cloudrun-srvmeepmerp", + "namespace": "foobar" + }, + "spec": { + "template": { + "spec": { + "containers": [ + { + "image": "us-docker.pkg.dev/cloudrun/container/hello" + } + ] + } + } + } + } + }, + "ancestors": [ + "projects/foobar", + "folders/67890", + "organizations/12345" + ] + } +] diff --git a/testdata/generatedconvert/CloudRunService_cloudRunServiceBasicExample_offline.json b/testdata/generatedconvert/CloudRunService_cloudRunServiceBasicExample_offline.json new file mode 100644 index 000000000..2e6aaeb9f --- /dev/null +++ b/testdata/generatedconvert/CloudRunService_cloudRunServiceBasicExample_offline.json @@ -0,0 +1,41 @@ +[ + { + "name": "//run.googleapis.com/projects/foobar/locations/us-central1/services/tf-test-cloudrun-srvmeepmerp", + "asset_type": "run.googleapis.com/Service", + "resource": { + "version": "v1", + "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/run/v1/rest", + "discovery_name": "Service", + "parent": "//cloudresourcemanager.googleapis.com/projects/foobar", + "data": { + "apiVersion": "serving.knative.dev/v1", + "kind": "Service", + "metadata": { + "name": "tf-test-cloudrun-srvmeepmerp" + }, + "spec": { + "template": { + "spec": { + "containers": [ + { + "image": "us-docker.pkg.dev/cloudrun/container/hello" + } + ] + } + }, + "traffic": [ + { + "latestRevision": true, + "percent": 100 + } + ] + } + } + }, + "ancestors": [ + "projects/foobar", + "folders/67890", + "organizations/12345" + ] + } +] diff --git a/testdata/generatedconvert/CloudRunService_cloudRunServiceMultipleEnvironmentVariablesExample_offline.json b/testdata/generatedconvert/CloudRunService_cloudRunServiceMultipleEnvironmentVariablesExample_offline.json new file mode 100644 index 000000000..bd469bc7d --- /dev/null +++ b/testdata/generatedconvert/CloudRunService_cloudRunServiceMultipleEnvironmentVariablesExample_offline.json @@ -0,0 +1,54 @@ +[ + { + "name": "//run.googleapis.com/projects/foobar/locations/us-central1/services/tf-test-cloudrun-srvmeepmerp", + "asset_type": "run.googleapis.com/Service", + "resource": { + "version": "v1", + "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/run/v1/rest", + "discovery_name": "Service", + "parent": "//cloudresourcemanager.googleapis.com/projects/foobar", + "data": { + "apiVersion": "serving.knative.dev/v1", + "kind": "Service", + "metadata": { + "annotations": { + "generated-by": "magic-modules" + }, + "name": "tf-test-cloudrun-srvmeepmerp" + }, + "spec": { + "template": { + "spec": { + "containers": [ + { + "env": [ + { + "name": "SOURCE", + "value": "remote" + }, + { + "name": "TARGET", + "value": "home" + } + ], + "image": "us-docker.pkg.dev/cloudrun/container/hello" + } + ] + } + }, + "traffic": [ + { + "latestRevision": true, + "percent": 100 + } + ] + } + } + }, + "ancestors": [ + "projects/foobar", + "folders/67890", + "organizations/12345" + ] + } +] diff --git a/testdata/generatedconvert/CloudRunService_cloudRunServiceSqlExample_offline.json b/testdata/generatedconvert/CloudRunService_cloudRunServiceSqlExample_offline.json new file mode 100644 index 000000000..046d9b61e --- /dev/null +++ b/testdata/generatedconvert/CloudRunService_cloudRunServiceSqlExample_offline.json @@ -0,0 +1,64 @@ +[ + { + "name": "//cloudsql.googleapis.com/projects/foobar/instances/tf-test-cloudrun-sqlmeepmerp", + "asset_type": "sqladmin.googleapis.com/Instance", + "resource": { + "version": "v1beta4", + "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/sqladmin/v1beta4/rest", + "discovery_name": "DatabaseInstance", + "parent": "//cloudresourcemanager.googleapis.com/projects/foobar", + "data": { + "databaseVersion": "MYSQL_5_7", + "name": "tf-test-cloudrun-sqlmeepmerp", + "project": "foobar", + "region": "us-east1", + "settings": { + "activationPolicy": "ALWAYS", + "availabilityType": "ZONAL", + "dataDiskType": "PD_SSD", + "pricingPlan": "PER_USE", + "storageAutoResize": true, + "tier": "db-f1-micro" + } + } + }, + "ancestors": [ + "projects/foobar", + "folders/67890", + "organizations/12345" + ] + }, + { + "name": "//run.googleapis.com/projects/foobar/locations/us-central1/services/tf-test-cloudrun-srvmeepmerp", + "asset_type": "run.googleapis.com/Service", + "resource": { + "version": "v1", + "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/run/v1/rest", + "discovery_name": "Service", + "parent": "//cloudresourcemanager.googleapis.com/projects/foobar", + "data": { + "apiVersion": "serving.knative.dev/v1", + "kind": "Service", + "metadata": { + "name": "tf-test-cloudrun-srvmeepmerp" + }, + "spec": { + "template": { + "spec": { + "containers": [ + { + "image": "us-docker.pkg.dev/cloudrun/container/hello" + } + ] + } + } + } + } + }, + "ancestors": [ + "projects/foobar", + "folders/67890", + "organizations/12345" + ] + } +]