move setid calls back

Author: danawillow

Diff for: google/resource_container_cluster.go

@@ -567,8 +567,6 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
 		}
 	}
 
-	d.SetId(clusterName)
-
 	// Wait until it's created
 	waitErr := containerSharedOperationWait(config, op, project, zoneName, "creating GKE cluster", timeoutInMinutes, 3)
 	if waitErr != nil {
@@ -579,6 +577,8 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
 
 	log.Printf("[INFO] GKE cluster %s has been created", clusterName)
 
+	d.SetId(clusterName)
+
 	return resourceContainerClusterRead(d, meta)
 }
 

Diff for: google/resource_container_node_pool.go

@@ -189,8 +189,6 @@ func resourceContainerNodePoolCreate(d *schema.ResourceData, meta interface{}) e
 		}
 	}
 
-	d.SetId(fmt.Sprintf("%s/%s/%s", zone, cluster, nodePool.Name))
-
 	timeoutInMinutes := int(d.Timeout(schema.TimeoutCreate).Minutes())
 	waitErr := containerSharedOperationWait(config, op, project, zone, "creating GKE NodePool", timeoutInMinutes, 3)
 	if waitErr != nil {
@@ -201,6 +199,8 @@ func resourceContainerNodePoolCreate(d *schema.ResourceData, meta interface{}) e
 
 	log.Printf("[INFO] GKE NodePool %s has been created", nodePool.Name)
 
+	d.SetId(fmt.Sprintf("%s/%s/%s", zone, cluster, nodePool.Name))
+
 	return resourceContainerNodePoolRead(d, meta)
 }