Add resource override to tainted on create failures (#6632) (#4751)

modular-magician · web-flow · commit 3d9d650f3223 · 2022-10-04T15:00:35.000-07:00
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/6632.txt b/.changelog/6632.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google-beta/resource_access_context_manager_access_level.go b/google-beta/resource_access_context_manager_access_level.go
@@ -369,6 +369,7 @@ func resourceAccessContextManagerAccessLevelCreate(d *schema.ResourceData, meta
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create AccessLevel: %s", err)
 	}
 
diff --git a/google-beta/resource_access_context_manager_access_policy.go b/google-beta/resource_access_context_manager_access_policy.go
@@ -145,6 +145,7 @@ func resourceAccessContextManagerAccessPolicyCreate(d *schema.ResourceData, meta
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create AccessPolicy: %s", err)
 	}
 
diff --git a/google-beta/resource_access_context_manager_gcp_user_access_binding.go b/google-beta/resource_access_context_manager_gcp_user_access_binding.go
@@ -129,6 +129,7 @@ func resourceAccessContextManagerGcpUserAccessBindingCreate(d *schema.ResourceDa
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create GcpUserAccessBinding: %s", err)
 	}
 
diff --git a/google-beta/resource_access_context_manager_service_perimeter.go b/google-beta/resource_access_context_manager_service_perimeter.go
@@ -895,6 +895,7 @@ func resourceAccessContextManagerServicePerimeterCreate(d *schema.ResourceData,
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create ServicePerimeter: %s", err)
 	}
 
diff --git a/google-beta/resource_access_context_manager_service_perimeter_resource.go b/google-beta/resource_access_context_manager_service_perimeter_resource.go
@@ -124,6 +124,7 @@ func resourceAccessContextManagerServicePerimeterResourceCreate(d *schema.Resour
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create ServicePerimeterResource: %s", err)
 	}
 
diff --git a/google-beta/resource_active_directory_domain.go b/google-beta/resource_active_directory_domain.go
@@ -191,6 +191,7 @@ func resourceActiveDirectoryDomainCreate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Domain: %s", err)
 	}
 
diff --git a/google-beta/resource_active_directory_domain_trust.go b/google-beta/resource_active_directory_domain_trust.go
@@ -190,6 +190,7 @@ func resourceActiveDirectoryDomainTrustCreate(d *schema.ResourceData, meta inter
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create DomainTrust: %s", err)
 	}
 
diff --git a/google-beta/resource_active_directory_peering.go b/google-beta/resource_active_directory_peering.go
@@ -160,6 +160,7 @@ func resourceActiveDirectoryPeeringCreate(d *schema.ResourceData, meta interface
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Peering: %s", err)
 	}
 
diff --git a/google-beta/resource_api_gateway_api.go b/google-beta/resource_api_gateway_api.go
@@ -156,6 +156,7 @@ func resourceApiGatewayApiCreate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Api: %s", err)
 	}
 
diff --git a/google-beta/resource_api_gateway_api_config.go b/google-beta/resource_api_gateway_api_config.go
@@ -332,6 +332,7 @@ func resourceApiGatewayApiConfigCreate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create ApiConfig: %s", err)
 	}
 
diff --git a/google-beta/resource_api_gateway_gateway.go b/google-beta/resource_api_gateway_gateway.go
@@ -162,6 +162,7 @@ func resourceApiGatewayGatewayCreate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Gateway: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_endpoint_attachment.go b/google-beta/resource_apigee_endpoint_attachment.go
@@ -141,6 +141,7 @@ func resourceApigeeEndpointAttachmentCreate(d *schema.ResourceData, meta interfa
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create EndpointAttachment: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_envgroup.go b/google-beta/resource_apigee_envgroup.go
@@ -123,6 +123,7 @@ func resourceApigeeEnvgroupCreate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Envgroup: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_envgroup_attachment.go b/google-beta/resource_apigee_envgroup_attachment.go
@@ -111,6 +111,7 @@ func resourceApigeeEnvgroupAttachmentCreate(d *schema.ResourceData, meta interfa
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create EnvgroupAttachment: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_environment.go b/google-beta/resource_apigee_environment.go
@@ -205,6 +205,7 @@ func resourceApigeeEnvironmentCreate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Environment: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_instance.go b/google-beta/resource_apigee_instance.go
@@ -231,6 +231,7 @@ func resourceApigeeInstanceCreate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Instance: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_instance_attachment.go b/google-beta/resource_apigee_instance_attachment.go
@@ -118,6 +118,7 @@ func resourceApigeeInstanceAttachmentCreate(d *schema.ResourceData, meta interfa
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create InstanceAttachment: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_nat_address.go b/google-beta/resource_apigee_nat_address.go
@@ -116,6 +116,7 @@ func resourceApigeeNatAddressCreate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create NatAddress: %s", err)
 	}
 
diff --git a/google-beta/resource_apigee_organization.go b/google-beta/resource_apigee_organization.go
@@ -253,6 +253,7 @@ func resourceApigeeOrganizationCreate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Organization: %s", err)
 	}
 
diff --git a/google-beta/resource_app_engine_domain_mapping.go b/google-beta/resource_app_engine_domain_mapping.go
@@ -218,6 +218,7 @@ func resourceAppEngineDomainMappingCreate(d *schema.ResourceData, meta interface
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create DomainMapping: %s", err)
 	}
 
diff --git a/google-beta/resource_artifact_registry_repository.go b/google-beta/resource_artifact_registry_repository.go
@@ -223,6 +223,7 @@ func resourceArtifactRegistryRepositoryCreate(d *schema.ResourceData, meta inter
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Repository: %s", err)
 	}
 
diff --git a/google-beta/resource_cloudfunctions2_function.go b/google-beta/resource_cloudfunctions2_function.go
@@ -561,6 +561,7 @@ func resourceCloudfunctions2functionCreate(d *schema.ResourceData, meta interfac
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create function: %s", err)
 	}
 
diff --git a/google-beta/resource_data_fusion_instance.go b/google-beta/resource_data_fusion_instance.go
@@ -320,6 +320,7 @@ func resourceDataFusionInstanceCreate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Instance: %s", err)
 	}
 
diff --git a/google-beta/resource_datastore_index.go b/google-beta/resource_datastore_index.go
@@ -160,6 +160,7 @@ func resourceDatastoreIndexCreate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Index: %s", err)
 	}
 
diff --git a/google-beta/resource_datastream_connection_profile.go b/google-beta/resource_datastream_connection_profile.go
@@ -419,6 +419,7 @@ func resourceDatastreamConnectionProfileCreate(d *schema.ResourceData, meta inte
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create ConnectionProfile: %s", err)
 	}
 
diff --git a/google-beta/resource_datastream_private_connection.go b/google-beta/resource_datastream_private_connection.go
@@ -172,6 +172,7 @@ func resourceDatastreamPrivateConnectionCreate(d *schema.ResourceData, meta inte
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create PrivateConnection: %s", err)
 	}
 
diff --git a/google-beta/resource_dialogflow_cx_environment.go b/google-beta/resource_dialogflow_cx_environment.go
@@ -167,6 +167,7 @@ func resourceDialogflowCXEnvironmentCreate(d *schema.ResourceData, meta interfac
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Environment: %s", err)
 	}
 
diff --git a/google-beta/resource_dialogflow_cx_version.go b/google-beta/resource_dialogflow_cx_version.go
@@ -186,6 +186,7 @@ func resourceDialogflowCXVersionCreate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Version: %s", err)
 	}
 
diff --git a/google-beta/resource_filestore_instance.go b/google-beta/resource_filestore_instance.go
@@ -360,6 +360,7 @@ func resourceFilestoreInstanceCreate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Instance: %s", err)
 	}
 
diff --git a/google-beta/resource_filestore_snapshot.go b/google-beta/resource_filestore_snapshot.go
@@ -172,6 +172,7 @@ func resourceFilestoreSnapshotCreate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Snapshot: %s", err)
 	}
 
diff --git a/google-beta/resource_firebase_web_app.go b/google-beta/resource_firebase_web_app.go
@@ -127,6 +127,7 @@ func resourceFirebaseWebAppCreate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create WebApp: %s", err)
 	}
 
diff --git a/google-beta/resource_firestore_index.go b/google-beta/resource_firestore_index.go
@@ -232,6 +232,7 @@ func resourceFirestoreIndexCreate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Index: %s", err)
 	}
 
diff --git a/google-beta/resource_game_services_game_server_cluster.go b/google-beta/resource_game_services_game_server_cluster.go
@@ -215,6 +215,7 @@ func resourceGameServicesGameServerClusterCreate(d *schema.ResourceData, meta in
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create GameServerCluster: %s", err)
 	}
 
diff --git a/google-beta/resource_game_services_game_server_config.go b/google-beta/resource_game_services_game_server_config.go
@@ -282,6 +282,7 @@ func resourceGameServicesGameServerConfigCreate(d *schema.ResourceData, meta int
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create GameServerConfig: %s", err)
 	}
 
diff --git a/google-beta/resource_game_services_game_server_deployment.go b/google-beta/resource_game_services_game_server_deployment.go
@@ -148,6 +148,7 @@ func resourceGameServicesGameServerDeploymentCreate(d *schema.ResourceData, meta
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create GameServerDeployment: %s", err)
 	}
 
diff --git a/google-beta/resource_game_services_realm.go b/google-beta/resource_game_services_realm.go
@@ -162,6 +162,7 @@ func resourceGameServicesRealmCreate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Realm: %s", err)
 	}
 
diff --git a/google-beta/resource_gke_hub_membership.go b/google-beta/resource_gke_hub_membership.go
@@ -211,6 +211,7 @@ func resourceGKEHubMembershipCreate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Membership: %s", err)
 	}
 
diff --git a/google-beta/resource_memcache_instance.go b/google-beta/resource_memcache_instance.go
@@ -439,6 +439,7 @@ func resourceMemcacheInstanceCreate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Instance: %s", err)
 	}
 
diff --git a/google-beta/resource_network_management_connectivity_test_resource.go b/google-beta/resource_network_management_connectivity_test_resource.go
@@ -315,6 +315,7 @@ func resourceNetworkManagementConnectivityTestCreate(d *schema.ResourceData, met
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create ConnectivityTest: %s", err)
 	}
 
diff --git a/google-beta/resource_notebooks_environment.go b/google-beta/resource_notebooks_environment.go
@@ -214,6 +214,7 @@ func resourceNotebooksEnvironmentCreate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Environment: %s", err)
 	}
 
diff --git a/google-beta/resource_notebooks_instance.go b/google-beta/resource_notebooks_instance.go
@@ -652,6 +652,7 @@ func resourceNotebooksInstanceCreate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Instance: %s", err)
 	}
 
diff --git a/google-beta/resource_notebooks_location.go b/google-beta/resource_notebooks_location.go
@@ -116,6 +116,7 @@ func resourceNotebooksLocationCreate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Location: %s", err)
 	}
 
diff --git a/google-beta/resource_notebooks_runtime.go b/google-beta/resource_notebooks_runtime.go
@@ -689,6 +689,7 @@ func resourceNotebooksRuntimeCreate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Runtime: %s", err)
 	}
 
diff --git a/google-beta/resource_privateca_ca_pool.go b/google-beta/resource_privateca_ca_pool.go
@@ -553,6 +553,7 @@ func resourcePrivatecaCaPoolCreate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create CaPool: %s", err)
 	}
 
diff --git a/google-beta/resource_privateca_certificate_authority.go b/google-beta/resource_privateca_certificate_authority.go
@@ -783,6 +783,7 @@ func resourcePrivatecaCertificateAuthorityCreate(d *schema.ResourceData, meta in
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create CertificateAuthority: %s", err)
 	}
 
diff --git a/google-beta/resource_redis_instance.go b/google-beta/resource_redis_instance.go
@@ -732,6 +732,7 @@ func resourceRedisInstanceCreate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Instance: %s", err)
 	}
 
diff --git a/google-beta/resource_service_usage_consumer_quota_override.go b/google-beta/resource_service_usage_consumer_quota_override.go
@@ -158,6 +158,7 @@ func resourceServiceUsageConsumerQuotaOverrideCreate(d *schema.ResourceData, met
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create ConsumerQuotaOverride: %s", err)
 	}
 
diff --git a/google-beta/resource_spanner_database.go b/google-beta/resource_spanner_database.go
@@ -291,6 +291,7 @@ func resourceSpannerDatabaseCreate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Database: %s", err)
 	}
 
diff --git a/google-beta/resource_spanner_instance.go b/google-beta/resource_spanner_instance.go
@@ -244,6 +244,7 @@ func resourceSpannerInstanceCreate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
+
 		return fmt.Errorf("Error waiting to create Instance: %s", err)
 	}
 
diff --git a/google-beta/resource_tags_tag_binding.go b/google-beta/resource_tags_tag_binding.go
diff --git a/google-beta/resource_tags_tag_key.go b/google-beta/resource_tags_tag_key.go
diff --git a/google-beta/resource_tags_tag_value.go b/google-beta/resource_tags_tag_value.go
diff --git a/google-beta/resource_tpu_node.go b/google-beta/resource_tpu_node.go
diff --git a/google-beta/resource_vertex_ai_dataset.go b/google-beta/resource_vertex_ai_dataset.go
diff --git a/google-beta/resource_vertex_ai_endpoint.go b/google-beta/resource_vertex_ai_endpoint.go
diff --git a/google-beta/resource_vertex_ai_featurestore.go b/google-beta/resource_vertex_ai_featurestore.go
diff --git a/google-beta/resource_vertex_ai_featurestore_entitytype.go b/google-beta/resource_vertex_ai_featurestore_entitytype.go
diff --git a/google-beta/resource_vertex_ai_featurestore_entitytype_feature.go b/google-beta/resource_vertex_ai_featurestore_entitytype_feature.go
diff --git a/google-beta/resource_vertex_ai_metadata_store.go b/google-beta/resource_vertex_ai_metadata_store.go
diff --git a/google-beta/resource_vpc_access_connector.go b/google-beta/resource_vpc_access_connector.go
diff --git a/google-beta/resource_workflows_workflow.go b/google-beta/resource_workflows_workflow.go

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ func resourceAccessContextManagerAccessLevelCreate(d *schema.ResourceData, meta`
`369`	`369`	`if err != nil {`
`370`	`370`	`// The resource didn't actually create`
`371`	`371`	`d.SetId("")`
	`372`	`+`
`372`	`373`	`return fmt.Errorf("Error waiting to create AccessLevel: %s", err)`
`373`	`374`	`}`
`374`	`375`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ func resourceAccessContextManagerAccessPolicyCreate(d *schema.ResourceData, meta`
`145`	`145`	`if err != nil {`
`146`	`146`	`// The resource didn't actually create`
`147`	`147`	`d.SetId("")`
	`148`	`+`
`148`	`149`	`return fmt.Errorf("Error waiting to create AccessPolicy: %s", err)`
`149`	`150`	`}`
`150`	`151`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ func resourceAccessContextManagerGcpUserAccessBindingCreate(d *schema.ResourceDa`
`129`	`129`	`if err != nil {`
`130`	`130`	`// The resource didn't actually create`
`131`	`131`	`d.SetId("")`
	`132`	`+`
`132`	`133`	`return fmt.Errorf("Error waiting to create GcpUserAccessBinding: %s", err)`
`133`	`134`	`}`
`134`	`135`
Original file line number	Diff line number	Diff line change
`@@ -895,6 +895,7 @@ func resourceAccessContextManagerServicePerimeterCreate(d *schema.ResourceData,`
`895`	`895`	`if err != nil {`
`896`	`896`	`// The resource didn't actually create`
`897`	`897`	`d.SetId("")`
	`898`	`+`
`898`	`899`	`return fmt.Errorf("Error waiting to create ServicePerimeter: %s", err)`
`899`	`900`	`}`
`900`	`901`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ func resourceAccessContextManagerServicePerimeterResourceCreate(d *schema.Resour`
`124`	`124`	`if err != nil {`
`125`	`125`	`// The resource didn't actually create`
`126`	`126`	`d.SetId("")`
	`127`	`+`
`127`	`128`	`return fmt.Errorf("Error waiting to create ServicePerimeterResource: %s", err)`
`128`	`129`	`}`
`129`	`130`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,7 @@ func resourceActiveDirectoryDomainCreate(d *schema.ResourceData, meta interface{`
`191`	`191`	`if err != nil {`
`192`	`192`	`// The resource didn't actually create`
`193`	`193`	`d.SetId("")`
	`194`	`+`
`194`	`195`	`return fmt.Errorf("Error waiting to create Domain: %s", err)`
`195`	`196`	`}`
`196`	`197`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@ func resourceActiveDirectoryDomainTrustCreate(d *schema.ResourceData, meta inter`
`190`	`190`	`if err != nil {`
`191`	`191`	`// The resource didn't actually create`
`192`	`192`	`d.SetId("")`
	`193`	`+`
`193`	`194`	`return fmt.Errorf("Error waiting to create DomainTrust: %s", err)`
`194`	`195`	`}`
`195`	`196`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ func resourceActiveDirectoryPeeringCreate(d *schema.ResourceData, meta interface`
`160`	`160`	`if err != nil {`
`161`	`161`	`// The resource didn't actually create`
`162`	`162`	`d.SetId("")`
	`163`	`+`
`163`	`164`	`return fmt.Errorf("Error waiting to create Peering: %s", err)`
`164`	`165`	`}`
`165`	`166`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ func resourceApiGatewayApiCreate(d *schema.ResourceData, meta interface{}) error`
`156`	`156`	`if err != nil {`
`157`	`157`	`// The resource didn't actually create`
`158`	`158`	`d.SetId("")`
	`159`	`+`
`159`	`160`	`return fmt.Errorf("Error waiting to create Api: %s", err)`
`160`	`161`	`}`
`161`	`162`