Ensure that no matter what the ID is, we can still wait for state. (#…

…3241) (#1846) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Mar 10, 2020 · 2266970 · 2266970
1 parent 0b1f744
commit 2266970
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.changelog/3241.txt b/.changelog/3241.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+container: `google_container_node_pool` resources created in the 2.X series were failing to update after 3.11.
+```
diff --git a/google-beta/resource_container_node_pool.go b/google-beta/resource_container_node_pool.go
@@ -367,8 +367,9 @@ func resourceContainerNodePoolUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
+	name := getNodePoolName(d.Id())
 
-	_, err = containerNodePoolAwaitRestingState(config, d.Id(), d.Timeout(schema.TimeoutUpdate))
+	_, err = containerNodePoolAwaitRestingState(config, nodePoolInfo.fullyQualifiedName(name), d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		return err
 	}
@@ -379,7 +380,7 @@ func resourceContainerNodePoolUpdate(d *schema.ResourceData, meta interface{}) e
 	}
 	d.Partial(false)
 
-	_, err = containerNodePoolAwaitRestingState(config, d.Id(), d.Timeout(schema.TimeoutUpdate))
+	_, err = containerNodePoolAwaitRestingState(config, nodePoolInfo.fullyQualifiedName(name), d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		return err
 	}
@@ -397,7 +398,7 @@ func resourceContainerNodePoolDelete(d *schema.ResourceData, meta interface{}) e
 
 	name := getNodePoolName(d.Id())
 
-	_, err = containerNodePoolAwaitRestingState(config, d.Id(), d.Timeout(schema.TimeoutDelete))
+	_, err = containerNodePoolAwaitRestingState(config, nodePoolInfo.fullyQualifiedName(name), d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return err
 	}