resourceIdentity: remove productName character check

google-beta/services/alloydb/resource_alloydb_backup_generated_test.go

@@ -52,6 +52,12 @@ func TestAccAlloydbBackup_alloydbBackupBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"annotations", "backup_id", "labels", "location", "reconciling", "terraform_labels", "update_time"},
 			},
+			{
+				ResourceName:       "google_alloydb_backup.default",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go

@@ -51,6 +51,12 @@ func TestAccAlloydbCluster_alloydbClusterBasicExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"annotations", "cluster_id", "initial_user", "labels", "location", "restore_backup_source", "restore_continuous_backup_source", "terraform_labels"},
 			},
+			{
+				ResourceName:       "google_alloydb_cluster.default",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/alloydb/resource_alloydb_instance_generated_test.go

@@ -52,6 +52,12 @@ func TestAccAlloydbInstance_alloydbInstanceBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"annotations", "cluster", "display_name", "instance_id", "labels", "reconciling", "terraform_labels", "update_time"},
 			},
+			{
+				ResourceName:       "google_alloydb_instance.default",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/alloydb/resource_alloydb_user_generated_test.go

@@ -52,6 +52,12 @@ func TestAccAlloydbUser_alloydbUserBuiltinTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"cluster", "password", "password", "user_id"},
 			},
+			{
+				ResourceName:       "google_alloydb_user.user1",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go

@@ -51,6 +51,12 @@ func TestAccApiGatewayApiConfig_apigatewayApiConfigBasicExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"api", "api_config_id", "gateway_config", "grpc_services", "labels", "terraform_labels"},
 			},
+			{
+				ResourceName:       "google_api_gateway_api_config.api_cfg",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigateway/resource_api_gateway_api_generated_test.go

@@ -51,6 +51,12 @@ func TestAccApiGatewayApi_apigatewayApiBasicExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"api_id", "labels", "terraform_labels"},
 			},
+			{
+				ResourceName:       "google_api_gateway_api.api",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go

@@ -51,6 +51,12 @@ func TestAccApiGatewayGateway_apigatewayGatewayBasicExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"gateway_id", "labels", "region", "terraform_labels"},
 			},
+			{
+				ResourceName:       "google_api_gateway_gateway.api_gw",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_addons_config_generated_test.go

@@ -54,6 +54,12 @@ func TestAccApigeeAddonsConfig_apigeeAddonsTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org"},
 			},
+			{
+				ResourceName:       "google_apigee_addons_config.apigee_org_addons",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_api_product_generated_test.go

@@ -57,6 +57,12 @@ func TestAccApigeeApiProduct_apigeeApiProductBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_api_product.apigee_api_product",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_app_group_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeAppGroup_apigeeAppGroupBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_app_group.apigee_app_group",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_control_plane_access_generated_test.go

@@ -48,6 +48,12 @@ func TestAccApigeeControlPlaneAccess_apigeeControlPlaneAccessBasicTestExample(t
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"name"},
 			},
+			{
+				ResourceName:       "google_apigee_control_plane_access.apigee_control_plane_access",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_developer_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeDeveloper_apigeeDeveloperBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_developer.apigee_developer",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_dns_zone_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeDnsZone_apigeeDnsZoneBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"dns_zone_id", "org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_dns_zone.apigee_dns_zone",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go

@@ -57,6 +57,12 @@ func TestAccApigeeEnvKeystore_apigeeEnvironmentKeystoreTestExample(t *testing.T)
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"env_id"},
 			},
+			{
+				ResourceName:       "google_apigee_env_keystore.apigee_environment_keystore",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_env_references_generated_test.go

@@ -57,6 +57,12 @@ func TestAccApigeeEnvReferences_apigeeEnvironmentReferenceTestExample(t *testing
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"env_id"},
 			},
+			{
+				ResourceName:       "google_apigee_env_references.apigee_environment_reference",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeEnvgroupAttachment_apigeeEnvironmentGroupAttachmentBasicTestEx
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"envgroup_id"},
 			},
+			{
+				ResourceName:       "google_apigee_envgroup_attachment.apigee_environment_group_attachment",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_envgroup_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeEnvgroup_apigeeEnvironmentGroupBasicTestExample(t *testing.T)
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_envgroup.apigee_environment_group",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_environment_addons_config_generated_test.go

@@ -51,6 +51,12 @@ func TestAccApigeeEnvironmentAddonsConfig_apigeeEnvAddonsAnalyticsTestExample(t
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"env_id"},
 			},
+			{
+				ResourceName:       "google_apigee_environment_addons_config.apigee_org_addons",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_environment_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeEnvironment_apigeeEnvironmentBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_environment.apigee_environment",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go

@@ -57,6 +57,12 @@ func TestAccApigeeEnvironmentKeyvaluemapsEntries_apigeeEnvironmentKeyvaluemapsEn
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"env_keyvaluemap_id"},
 			},
+			{
+				ResourceName:       "google_apigee_environment_keyvaluemaps_entries.apigee_environment_keyvaluemaps_entries",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go

@@ -57,6 +57,12 @@ func TestAccApigeeEnvironmentKeyvaluemaps_apigeeEnvironmentKeyvaluemapsTestExamp
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"env_id"},
 			},
+			{
+				ResourceName:       "google_apigee_environment_keyvaluemaps.apigee_environment_keyvaluemaps",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeInstanceAttachment_apigeeInstanceAttachmentBasicTestExample(t
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"instance_id"},
 			},
+			{
+				ResourceName:       "google_apigee_instance_attachment.apigee_instance_attachment",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_instance_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeInstance_apigeeInstanceBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"ip_range", "org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_instance.apigee_instance",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeKeystoresAliasesSelfSignedCert_apigeeEnvKeystoreAliasSelfSigne
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"cert_validity_in_days", "environment", "key_size", "keystore", "org_id", "sig_alg", "subject"},
 			},
+			{
+				ResourceName:       "google_apigee_keystores_aliases_self_signed_cert.apigee_environment_keystore_ss_alias",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_nat_address_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeNatAddress_apigeeNatAddressBasicTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"instance_id"},
 			},
+			{
+				ResourceName:       "google_apigee_nat_address.apigee_nat_address",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_organization_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample(t *testin
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"project_id", "properties", "retention"},
 			},
+			{
+				ResourceName:       "google_apigee_organization.org",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeSecurityMonitoringCondition_apigeeSecurityMonitoringConditionB
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"condition_id", "org_id"},
 			},
+			{
+				ResourceName:       "google_apigee_security_monitoring_condition.security_monitoring_condition",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_security_profile_v2_generated_test.go

@@ -58,6 +58,12 @@ func TestAccApigeeSecurityProfileV2_apigeeSecurityProfileV2BasicTestExample(t *t
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id", "profile_id"},
 			},
+			{
+				ResourceName:       "google_apigee_security_profile_v2.security_profile_v2",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go

@@ -48,6 +48,12 @@ func TestAccApigeeSyncAuthorization_apigeeSyncAuthorizationBasicTestExample(t *t
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"name"},
 			},
+			{
+				ResourceName:       "google_apigee_sync_authorization.apigee_sync_authorization",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }

google-beta/services/apigee/resource_apigee_target_server_generated_test.go

@@ -57,6 +57,12 @@ func TestAccApigeeTargetServer_apigeeTargetServerTestExample(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"env_id"},
 			},
+			{
+				ResourceName:       "google_apigee_target_server.apigee_target_server",
+				RefreshState:       true,
+				ExpectNonEmptyPlan: true,
+				ImportStateKind:    resource.ImportBlockWithResourceIdentity,
+			},
 		},
 	})
 }