Rename custom_import_state_id_funcs (#15935)

Author: trodge

mmv1/api/resource/iam_policy.go

@@ -84,8 +84,8 @@ type IamPolicy struct {
 	// CompareSelfLinkOrResourceName
 	CustomDiffSuppress *string `yaml:"custom_diff_suppress,omitempty"`
 
-	// StateIDFuncs may use a custom template if default funcs don't work.
-	CustomImportStateIDFuncs string `yaml:"custom_state_id_funcs"`
+	// ImportStateIDFuncs may use a custom template if default funcs don't work.
+	CustomImportStateIDFuncs string `yaml:"custom_import_state_id_funcs"`
 
 	// Some resources (IAP) use fields named differently from the parent resource.
 	// We need to use the parent's attributes to create an IAM policy, but they may not be

mmv1/templates/terraform/iam/iap_web_appengine_state_id_funcs.go.tmpl

@@ -11,7 +11,7 @@ func generateIapWebTypeAppEngineIAMPolicyStateID(iamResourceAddr string) func(*t
 		fmt.Printf("raw state %s\n", rawState)
 		project := tpgresource.GetResourceNameFromSelfLink(rawState["project"])
 		appId := appIdShortName(rawState["app_id"])
-		return fmt.Sprintf("projects/%s/iap_web/appengine-%s", project, appId) + acctest.ConditionTitleIfPresent(rawState), nil
+		return acctest.BuildIAMImportId(fmt.Sprintf("projects/%s/iap_web/appengine-%s", project, appId), "", "", rawState["condition.0.title"]), nil
 	}
 }
 
@@ -28,7 +28,7 @@ func generateIapWebTypeAppEngineIAMBindingStateID(iamResourceAddr string) func(*
 		fmt.Printf("raw state %s\n", rawState)
 		project := tpgresource.GetResourceNameFromSelfLink(rawState["project"])
 		appId := appIdShortName(rawState["app_id"])
-		return fmt.Sprintf("projects/%s/iap_web/appengine-%s %s", project, appId, rawState["role"]) + acctest.ConditionTitleIfPresent(rawState), nil
+		return acctest.BuildIAMImportId(fmt.Sprintf("projects/%s/iap_web/appengine-%s", project, appId), rawState["role"], "", rawState["condition.0.title"]), nil
 	}
 }
 
@@ -45,7 +45,7 @@ func generateIapWebTypeAppEngineIAMMemberStateID(iamResourceAddr string) func(*t
 		fmt.Printf("raw state %s\n", rawState)
 		project := tpgresource.GetResourceNameFromSelfLink(rawState["project"])
 		appId := appIdShortName(rawState["app_id"])
-		return fmt.Sprintf("projects/%s/iap_web/appengine-%s %s %s", project, appId, rawState["role"], rawState["member"]) + acctest.ConditionTitleIfPresent(rawState), nil
+		return acctest.BuildIAMImportId(fmt.Sprintf("projects/%s/iap_web/appengine-%s", project, appId), rawState["role"], rawState["member"], rawState["condition.0.title"]), nil
 	}
 }
 

mmv1/templates/terraform/iam/sourcerepo_state_id_funcs.go.tmpl

@@ -11,7 +11,7 @@ func generateSourceRepoRepositoryIAMPolicyStateID(iamResourceAddr string) func(*
 		fmt.Printf("raw state %s\n", rawState)
 		project := tpgresource.GetResourceNameFromSelfLink(rawState["project"])
 		repository := repositoryShortName(rawState["repository"])
-		return fmt.Sprintf("projects/%s/repos/%s", project, repository) + acctest.ConditionTitleIfPresent(rawState), nil
+		return acctest.BuildIAMImportId(fmt.Sprintf("projects/%s/repos/%s", project, repository), "", "", rawState["condition.0.title"]), nil
 	}
 }
 
@@ -28,7 +28,7 @@ func generateSourceRepoRepositoryIAMBindingStateID(iamResourceAddr string) func(
 		fmt.Printf("raw state %s\n", rawState)
 		project := tpgresource.GetResourceNameFromSelfLink(rawState["project"])
 		repository := repositoryShortName(rawState["repository"])
-		return fmt.Sprintf("projects/%s/repos/%s %s", project, repository, rawState["role"]) + acctest.ConditionTitleIfPresent(rawState), nil
+		return acctest.BuildIAMImportId(fmt.Sprintf("projects/%s/repos/%s", project, repository), rawState["role"], "", rawState["condition.0.title"]), nil
 	}
 }
 
@@ -45,7 +45,7 @@ func generateSourceRepoRepositoryIAMMemberStateID(iamResourceAddr string) func(*
 		fmt.Printf("raw state %s\n", rawState)
 		project := tpgresource.GetResourceNameFromSelfLink(rawState["project"])
 		repository := repositoryShortName(rawState["repository"])
-		return fmt.Sprintf("projects/%s/repos/%s %s %s", project, repository, rawState["role"], rawState["member"]) + acctest.ConditionTitleIfPresent(rawState), nil
+		return acctest.BuildIAMImportId(fmt.Sprintf("projects/%s/repos/%s", project, repository), rawState["role"], rawState["member"], rawState["condition.0.title"]), nil
 	}
 }