bigtable: IAM resources were not able to upgrade to v7.X.X without state upgrader (#15027) (#10667)

[upstream:b175083dcccfb400adfa5a9a397bcf4414b26034]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/15027.txt

@@ -1751,9 +1751,9 @@ var handwrittenIAMResources = map[string]*schema.Resource{
 	"google_bigtable_instance_iam_binding":       tpgiamresource.ResourceIamBinding(bigtable.IamBigtableInstanceSchema, bigtable.NewBigtableInstanceUpdater, bigtable.BigtableInstanceIdParseFunc),
 	"google_bigtable_instance_iam_member":        tpgiamresource.ResourceIamMember(bigtable.IamBigtableInstanceSchema, bigtable.NewBigtableInstanceUpdater, bigtable.BigtableInstanceIdParseFunc),
 	"google_bigtable_instance_iam_policy":        tpgiamresource.ResourceIamPolicy(bigtable.IamBigtableInstanceSchema, bigtable.NewBigtableInstanceUpdater, bigtable.BigtableInstanceIdParseFunc),
-	"google_bigtable_table_iam_binding":          tpgiamresource.ResourceIamBinding(bigtable.IamBigtableTableSchema, bigtable.NewBigtableTableUpdater, bigtable.BigtableTableIdParseFunc),
-	"google_bigtable_table_iam_member":           tpgiamresource.ResourceIamMember(bigtable.IamBigtableTableSchema, bigtable.NewBigtableTableUpdater, bigtable.BigtableTableIdParseFunc),
-	"google_bigtable_table_iam_policy":           tpgiamresource.ResourceIamPolicy(bigtable.IamBigtableTableSchema, bigtable.NewBigtableTableUpdater, bigtable.BigtableTableIdParseFunc),
+	"google_bigtable_table_iam_binding":          tpgiamresource.ResourceIamBinding(bigtable.IamBigtableTableSchema, bigtable.NewBigtableTableUpdater, bigtable.BigtableTableIdParseFunc, tpgiamresource.IamWithStateUpgraders(bigtable.BigtableTableIamStateUpgraders), tpgiamresource.IamWithSchemaVersion(1)),
+	"google_bigtable_table_iam_member":           tpgiamresource.ResourceIamMember(bigtable.IamBigtableTableSchema, bigtable.NewBigtableTableUpdater, bigtable.BigtableTableIdParseFunc, tpgiamresource.IamWithStateUpgraders(bigtable.BigtableTableIamStateUpgraders), tpgiamresource.IamWithSchemaVersion(1)),
+	"google_bigtable_table_iam_policy":           tpgiamresource.ResourceIamPolicy(bigtable.IamBigtableTableSchema, bigtable.NewBigtableTableUpdater, bigtable.BigtableTableIdParseFunc, tpgiamresource.IamWithStateUpgraders(bigtable.BigtableTableIamStateUpgraders), tpgiamresource.IamWithSchemaVersion(1)),
 	"google_bigquery_dataset_iam_binding":        tpgiamresource.ResourceIamBinding(bigquery.IamBigqueryDatasetSchema, bigquery.NewBigqueryDatasetIamUpdater, bigquery.BigqueryDatasetIdParseFunc),
 	"google_bigquery_dataset_iam_member":         tpgiamresource.ResourceIamMember(bigquery.IamMemberBigqueryDatasetSchema, bigquery.NewBigqueryDatasetIamMemberUpdater, bigquery.BigqueryDatasetIdParseFunc),
 	"google_bigquery_dataset_iam_policy":         tpgiamresource.ResourceIamPolicy(bigquery.IamBigqueryDatasetSchema, bigquery.NewBigqueryDatasetIamUpdater, bigquery.BigqueryDatasetIdParseFunc),

google-beta/provider/provider_mmv1_resources.go

@@ -0,0 +1,67 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+// ----------------------------------------------------------------------------
+//
+//	***     AUTO GENERATED CODE    ***    Type: Handwritten     ***
+//
+// ----------------------------------------------------------------------------
+//
+//	This code is generated by Magic Modules using the following:
+//
+//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/bigtable/iam_bigtable_table_migrate.go
+//
+//	DO NOT EDIT this file directly. Any changes made to this file will be
+//	overwritten during the next generation cycle.
+//
+// ----------------------------------------------------------------------------
+package bigtable
+
+import (
+	"context"
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+var BigtableTableIamStateUpgraders = []schema.StateUpgrader{
+	{
+		Type:    resourceBigtableTableIAMV0().CoreConfigSchema().ImpliedType(),
+		Upgrade: ResourceBigtableTableIAMUpgradeV0,
+		Version: 0,
+	},
+}
+
+func resourceBigtableTableIAMV0() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"instance": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"project": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+			"table": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+		},
+		UseJSONNumber: true,
+	}
+}
+
+func ResourceBigtableTableIAMUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+	log.Printf("[DEBUG] Attributes before migration: %#v", rawState)
+
+	if _, ok := rawState["instance"]; ok {
+		rawState["instance_name"] = rawState["instance"]
+	}
+
+	log.Printf("[DEBUG] Attributes after migration: %#v", rawState)
+	return rawState, nil
+}

google-beta/services/bigtable/iam_bigtable_table_migrate.go

@@ -483,6 +483,8 @@ func CompareAuditConfigs(a, b []*cloudresourcemanager.AuditConfig) bool {
 type IamSettings struct {
 	DeprecationMessage string
 	EnableBatching     bool
+	StateUpgraders     []schema.StateUpgrader
+	SchemaVersion      int
 }
 
 func NewIamSettings(options ...func(*IamSettings)) *IamSettings {
@@ -507,6 +509,18 @@ func IamWithBatching(s *IamSettings) {
 	s.EnableBatching = true
 }
 
+func IamWithStateUpgraders(upgraders []schema.StateUpgrader) func(*IamSettings) {
+	return func(s *IamSettings) {
+		s.StateUpgraders = upgraders
+	}
+}
+
+func IamWithSchemaVersion(version int) func(*IamSettings) {
+	return func(s *IamSettings) {
+		s.SchemaVersion = version
+	}
+}
+
 // Util to deref and print auditConfigs
 func DebugPrintAuditConfigs(bs []*cloudresourcemanager.AuditConfig) string {
 	v, _ := json.MarshalIndent(bs, "", "\t")

google-beta/tpgiamresource/iam.go

@@ -91,8 +91,9 @@ func ResourceIamBinding(parentSpecificSchema map[string]*schema.Schema, newUpdat
 		// if non-empty, this will be used to send a deprecation message when the
 		// resource is used.
 		DeprecationMessage: settings.DeprecationMessage,
-
-		Schema: tpgresource.MergeSchemas(iamBindingSchema, parentSpecificSchema),
+		Schema:             tpgresource.MergeSchemas(iamBindingSchema, parentSpecificSchema),
+		SchemaVersion:      settings.SchemaVersion,
+		StateUpgraders:     settings.StateUpgraders,
 		Importer: &schema.ResourceImporter{
 			State: iamBindingImport(newUpdaterFunc, resourceIdParser),
 		},

google-beta/tpgiamresource/resource_iam_binding.go

@@ -197,7 +197,9 @@ func ResourceIamMember(parentSpecificSchema map[string]*schema.Schema, newUpdate
 		// resource is used.
 		DeprecationMessage: settings.DeprecationMessage,
 
-		Schema: tpgresource.MergeSchemas(IamMemberBaseSchema, parentSpecificSchema),
+		Schema:         tpgresource.MergeSchemas(IamMemberBaseSchema, parentSpecificSchema),
+		SchemaVersion:  settings.SchemaVersion,
+		StateUpgraders: settings.StateUpgraders,
 		Importer: &schema.ResourceImporter{
 			State: iamMemberImport(newUpdaterFunc, resourceIdParser),
 		},

google-beta/tpgiamresource/resource_iam_member.go

@@ -69,7 +69,9 @@ func ResourceIamPolicy(parentSpecificSchema map[string]*schema.Schema, newUpdate
 		// resource is used.
 		DeprecationMessage: settings.DeprecationMessage,
 
-		Schema: tpgresource.MergeSchemas(IamPolicyBaseSchema, parentSpecificSchema),
+		Schema:         tpgresource.MergeSchemas(IamPolicyBaseSchema, parentSpecificSchema),
+		SchemaVersion:  settings.SchemaVersion,
+		StateUpgraders: settings.StateUpgraders,
 		Importer: &schema.ResourceImporter{
 			State: iamPolicyImport(resourceIdParser),
 		},