Skip to content

Commit

Permalink
Don't clear cluster from state if cleanup fails (hashicorp#929)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored and chrisst committed Jul 11, 2019
1 parent 27b6ba0 commit 78ad898
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions google-beta/resource_container_cluster.go
Expand Up @@ -1060,17 +1060,18 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
// Try a GET on the cluster so we can see the state in debug logs. This will help classify error states.
_, getErr := config.clientContainerBeta.Projects.Locations.Clusters.Get(containerClusterFullName(project, location, clusterName)).Do()
if getErr != nil {
// Make errcheck happy
log.Printf("[WARN] Cluster %s was created in an error state and not found", clusterName)
d.SetId("")
}

if deleteErr := cleanFailedContainerCluster(d, meta); deleteErr != nil {
log.Printf("[WARN] Unable to clean up cluster from failed creation: %s", deleteErr)
// Leave ID set as the cluster likely still exists and should not be removed from state yet.
} else {
log.Printf("[WARN] Verified failed creation of cluster %s was cleaned up", d.Id())
d.SetId("")
}
// The resource didn't actually create
d.SetId("")
return waitErr
}

Expand Down

0 comments on commit 78ad898

Please sign in to comment.