diff --git a/mmv1/third_party/terraform/services/bigtable/iam_bigtable_table.go b/mmv1/third_party/terraform/services/bigtable/iam_bigtable_table.go index 774efb4f761c..03c647546453 100644 --- a/mmv1/third_party/terraform/services/bigtable/iam_bigtable_table.go +++ b/mmv1/third_party/terraform/services/bigtable/iam_bigtable_table.go @@ -14,7 +14,7 @@ import ( ) var IamBigtableTableSchema = map[string]*schema.Schema{ - "instance": { + "instance_name": { Type: schema.TypeString, Required: true, ForceNew: true, diff --git a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go index e729f0a49a81..dd31e17eb757 100644 --- a/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go +++ b/mmv1/third_party/terraform/services/bigtable/resource_bigtable_table_iam_test.go @@ -140,10 +140,10 @@ resource "google_service_account" "test-account2" { } resource "google_bigtable_table_iam_binding" "binding" { - instance = google_bigtable_instance.instance.name - table = google_bigtable_table.table.name - role = "%s" - members = [ + instance_name = google_bigtable_instance.instance.name + table = google_bigtable_table.table.name + role = "%s" + members = [ "serviceAccount:${google_service_account.test-account1.email}", ] } @@ -163,10 +163,10 @@ resource "google_service_account" "test-account2" { } resource "google_bigtable_table_iam_binding" "binding" { - instance = google_bigtable_instance.instance.name - table = google_bigtable_table.table.name - role = "%s" - members = [ + instance_name = google_bigtable_instance.instance.name + table = google_bigtable_table.table.name + role = "%s" + members = [ "serviceAccount:${google_service_account.test-account1.email}", "serviceAccount:${google_service_account.test-account2.email}", ] @@ -182,10 +182,10 @@ resource "google_service_account" "test-account" { } resource "google_bigtable_table_iam_member" "member" { - instance = google_bigtable_instance.instance.name - table = google_bigtable_table.table.name - role = "%s" - member = "serviceAccount:${google_service_account.test-account.email}" + instance_name = google_bigtable_instance.instance.name + table = google_bigtable_table.table.name + role = "%s" + member = "serviceAccount:${google_service_account.test-account.email}" } `, instance, cluster, cluster, account, role) } @@ -205,14 +205,14 @@ data "google_iam_policy" "policy" { } resource "google_bigtable_table_iam_policy" "policy" { - instance = google_bigtable_instance.instance.name - table = google_bigtable_table.table.name - policy_data = data.google_iam_policy.policy.policy_data + instance_name = google_bigtable_instance.instance.name + table = google_bigtable_table.table.name + policy_data = data.google_iam_policy.policy.policy_data } data "google_bigtable_table_iam_policy" "policy" { - instance = google_bigtable_instance.instance.name - table = google_bigtable_table.table.name + instance_name = google_bigtable_instance.instance.name + table = google_bigtable_table.table.name } `, instance, cluster, cluster, account, role) diff --git a/mmv1/third_party/terraform/website/docs/d/bigtable_table_iam_policy.html.markdown b/mmv1/third_party/terraform/website/docs/d/bigtable_table_iam_policy.html.markdown index e44bd2b3e6f4..bfec2bb723b4 100644 --- a/mmv1/third_party/terraform/website/docs/d/bigtable_table_iam_policy.html.markdown +++ b/mmv1/third_party/terraform/website/docs/d/bigtable_table_iam_policy.html.markdown @@ -12,8 +12,8 @@ Retrieves the current IAM policy data for a Bigtable Table. ```hcl data "google_bigtable_table_iam_policy" "policy" { - instance = google_bigtable_instance.instance.name - table = google_bigtable_table.table.name + instance_name = google_bigtable_instance.instance.name + table = google_bigtable_table.table.name } ``` diff --git a/mmv1/third_party/terraform/website/docs/guides/version_7_upgrade.html.markdown b/mmv1/third_party/terraform/website/docs/guides/version_7_upgrade.html.markdown index 2b7ba1125ecb..e469a53221da 100644 --- a/mmv1/third_party/terraform/website/docs/guides/version_7_upgrade.html.markdown +++ b/mmv1/third_party/terraform/website/docs/guides/version_7_upgrade.html.markdown @@ -107,3 +107,21 @@ Description of the change and how users should adjust their configuration (if ne ### Resource-level change example header Description of the change and how users should adjust their configuration (if needed). + +## Resource: `google_bigtable_table_iam_policy` + +### `instance` is now removed + +`instance` has been removed in favor of `instance_name`. + +## Resource: `google_bigtable_table_iam_binding` + +### `instance` is now removed + +`instance` has been removed in favor of `instance_name`. + +## Resource: `google_bigtable_table_iam_member` + +### `instance` is now removed + +`instance` has been removed in favor of `instance_name`. diff --git a/mmv1/third_party/terraform/website/docs/r/bigtable_table_iam.html.markdown b/mmv1/third_party/terraform/website/docs/r/bigtable_table_iam.html.markdown index 7007e82bb986..b8dd500407fb 100644 --- a/mmv1/third_party/terraform/website/docs/r/bigtable_table_iam.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/bigtable_table_iam.html.markdown @@ -29,10 +29,10 @@ data "google_iam_policy" "admin" { } resource "google_bigtable_table_iam_policy" "editor" { - project = "your-project" - instance = "your-bigtable-instance" - table = "your-bigtable-table" - policy_data = data.google_iam_policy.admin.policy_data + project = "your-project" + instance_name = "your-bigtable-instance" + table = "your-bigtable-table" + policy_data = data.google_iam_policy.admin.policy_data } ``` @@ -40,10 +40,10 @@ resource "google_bigtable_table_iam_policy" "editor" { ```hcl resource "google_bigtable_table_iam_binding" "editor" { - table = "your-bigtable-table" - instance = "your-bigtable-instance" - role = "roles/bigtable.user" - members = [ + table = "your-bigtable-table" + instance_name = "your-bigtable-instance" + role = "roles/bigtable.user" + members = [ "user:jane@example.com", ] } @@ -53,10 +53,10 @@ resource "google_bigtable_table_iam_binding" "editor" { ```hcl resource "google_bigtable_table_iam_member" "editor" { - table = "your-bigtable-table" - instance = "your-bigtable-instance" - role = "roles/bigtable.user" - member = "user:jane@example.com" + table = "your-bigtable-table" + instance_name = "your-bigtable-instance" + role = "roles/bigtable.user" + member = "user:jane@example.com" } ``` @@ -64,7 +64,7 @@ resource "google_bigtable_table_iam_member" "editor" { The following arguments are supported: -* `instance` - (Required) The name or relative resource id of the instance that owns the table. +* `instance_name` - (Required) The name or relative resource id of the instance that owns the table. * `table` - (Required) The name or relative resource id of the table to manage IAM policies for.