diff --git a/.changelog/3241.txt b/.changelog/3241.txt new file mode 100644 index 0000000000..3a77fd1212 --- /dev/null +++ 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 index 173f769fdf..24d338d725 100644 --- 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 }