send friendly_name (GoogleCloudPlatform#7433)

* send friendly_name * fixed validator failures * update * fix validator errors --------- Co-authored-by: Edward Sun <sunedward@google.com>
ericayyliu · Jul 26, 2023 · ea0e35d · ea0e35d
1 parent 0fbbc85
commit ea0e35d
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 4 deletions.
diff --git a/mmv1/products/bigquery/terraform.yaml b/mmv1/products/bigquery/terraform.yaml
@@ -93,6 +93,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         default_from_api: true
       maxTimeTravelHours: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
+      friendlyName: !ruby/object:Overrides::Terraform::PropertyOverride
+        send_empty_value: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       constants: templates/terraform/constants/bigquery_dataset.go.erb
     docs: !ruby/object:Provider::Terraform::Docs

diff --git a/mmv1/third_party/terraform/tests/resource_big_query_dataset_test.go b/mmv1/third_party/terraform/tests/resource_big_query_dataset_test.go
@@ -35,6 +35,14 @@ func TestAccBigQueryDataset_basic(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccBigQueryDatasetUpdated2(datasetID),
+			},
+			{
+				ResourceName:      "google_bigquery_dataset.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -212,6 +220,24 @@ resource "google_bigquery_dataset" "test" {
 `, datasetID)
 }
 
+func testAccBigQueryDatasetUpdated2(datasetID string) string {
+	return fmt.Sprintf(`
+resource "google_bigquery_dataset" "test" {
+  dataset_id                      = "%s"
+  # friendly_name                   = "bar"
+  description                     = "This is a bar description"
+  location                        = "EU"
+  default_partition_expiration_ms = 7200000
+  default_table_expiration_ms     = 7200000
+
+  labels = {
+    env                         = "bar"
+    default_table_expiration_ms = 7200000
+  }
+}
+`, datasetID)
+}
+
 func testAccBigQueryDatasetDeleteContents(datasetID string) string {
 	return fmt.Sprintf(`
 resource "google_bigquery_dataset" "contents_test" {

diff --git a/mmv1/third_party/validator/tests/data/example_bigquery_dataset.json b/mmv1/third_party/validator/tests/data/example_bigquery_dataset.json
@@ -9,6 +9,7 @@
       "discovery_name": "Dataset",
       "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
       "data": {
+        "friendlyName": "",
         "datasetReference": {
           "datasetId": "test-dataset"
         },

diff --git a/mmv1/third_party/validator/tests/data/example_bigquery_dataset_iam_binding.json b/mmv1/third_party/validator/tests/data/example_bigquery_dataset_iam_binding.json
@@ -16,7 +16,8 @@
         "labels": {
           "env": "dev"
         },
-        "location": "EU"
+        "location": "EU",
+        "friendlyName": ""
       }
     },
     "iam_policy": {

diff --git a/mmv1/third_party/validator/tests/data/example_bigquery_dataset_iam_member.json b/mmv1/third_party/validator/tests/data/example_bigquery_dataset_iam_member.json
@@ -16,7 +16,8 @@
         "labels": {
           "env": "dev"
         },
-        "location": "EU"
+        "location": "EU",
+        "friendlyName": ""
       }
     },
     "iam_policy": {

diff --git a/mmv1/third_party/validator/tests/data/example_bigquery_dataset_iam_policy.json b/mmv1/third_party/validator/tests/data/example_bigquery_dataset_iam_policy.json
@@ -16,7 +16,8 @@
         "labels": {
           "env": "dev"
         },
-        "location": "EU"
+        "location": "EU",
+        "friendlyName": ""
       }
     },
     "iam_policy": {

diff --git a/...ird_party/validator/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.json b/...ird_party/validator/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.json
@@ -12,7 +12,8 @@
         "datasetReference": {
           "datasetId": "example_dataset"
         },
-        "location": "US"
+        "location": "US",
+        "friendlyName": ""
       }
     },
     "iam_policy": {