handle not found errors correctly in read.

GoogleCloudPlatform · Jul 9, 2019 · 4c341e7 · 4c341e7
1 parent 8ce0fb6
commit 4c341e7
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/third_party/terraform/resources/resource_container_cluster.go.erb b/third_party/terraform/resources/resource_container_cluster.go.erb
@@ -1156,14 +1156,11 @@ func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) erro
 	name := containerClusterFullName(project, location, clusterName)
 	cluster, err := config.clientContainerBeta.Projects.Locations.Clusters.Get(name).Do()
 	if err != nil {
-		return err
+		return handleNotFoundError(err, d, fmt.Sprintf("Container Cluster %q", d.Get("name").(string)))
 	}
 	if cluster.Status == "ERROR" || cluster.Status == "DEGRADED" {
 		return fmt.Errorf("Cluster %q has status %q with message %q", d.Get("name"), cluster.Status, cluster.StatusMessage)
 	}
-	if err != nil {
-		return handleNotFoundError(err, d, fmt.Sprintf("Container Cluster %q", d.Get("name").(string)))
-	}
 
 	d.Set("name", cluster.Name)
 	if err := d.Set("network_policy", flattenNetworkPolicy(cluster.NetworkPolicy)); err != nil {