Skip to content

Commit

Permalink
Add resource override to tainted on create failures (#6632) (#12718)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Oct 4, 2022
1 parent 67afa96 commit b4a37c5
Show file tree
Hide file tree
Showing 52 changed files with 54 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .changelog/6632.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
1 change: 1 addition & 0 deletions google/resource_access_context_manager_access_level.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_access_context_manager_access_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_active_directory_domain.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_active_directory_domain_trust.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_endpoint_attachment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_envgroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_envgroup_attachment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_instance_attachment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_nat_address.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_apigee_organization.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_app_engine_domain_mapping.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_artifact_registry_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_cloudfunctions2_function.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_data_fusion_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_datastore_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_datastream_connection_profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_datastream_private_connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_dialogflow_cx_environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_dialogflow_cx_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_filestore_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_filestore_snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_firestore_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_game_services_game_server_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_game_services_game_server_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_game_services_game_server_deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_game_services_realm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_gke_hub_membership.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_memcache_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_notebooks_environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_notebooks_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_notebooks_location.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_notebooks_runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_privateca_ca_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_privateca_certificate_authority.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_redis_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_spanner_database.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_spanner_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_tags_tag_binding.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ func resourceTagsTagBindingCreate(d *schema.ResourceData, meta interface{}) erro
if err != nil {
// The resource didn't actually create
d.SetId("")

return fmt.Errorf("Error waiting to create TagBinding: %s", err)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_tags_tag_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ func resourceTagsTagKeyCreate(d *schema.ResourceData, meta interface{}) error {
if err != nil {
// The resource didn't actually create
d.SetId("")

return fmt.Errorf("Error waiting to create TagKey: %s", err)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_tags_tag_value.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ func resourceTagsTagValueCreate(d *schema.ResourceData, meta interface{}) error
if err != nil {
// The resource didn't actually create
d.SetId("")

return fmt.Errorf("Error waiting to create TagValue: %s", err)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_tpu_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ func resourceTPUNodeCreate(d *schema.ResourceData, meta interface{}) error {
if err != nil {
// The resource didn't actually create
d.SetId("")

return fmt.Errorf("Error waiting to create Node: %s", err)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_vertex_ai_dataset.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ func resourceVertexAIDatasetCreate(d *schema.ResourceData, meta interface{}) err
if err != nil {
// The resource didn't actually create
d.SetId("")

return fmt.Errorf("Error waiting to create Dataset: %s", err)
}

Expand Down
1 change: 1 addition & 0 deletions google/resource_vertex_ai_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ func resourceVertexAIEndpointCreate(d *schema.ResourceData, meta interface{}) er
if err != nil {
// The resource didn't actually create
d.SetId("")

return fmt.Errorf("Error waiting to create Endpoint: %s", err)
}

Expand Down

0 comments on commit b4a37c5

Please sign in to comment.