Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Mar 10, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3241.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
```
7 changes: 4 additions & 3 deletions google-beta/resource_container_node_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand All @@ -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
}
Expand Down