public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-09-28 22:16:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix container wait operations (#2941)

Browse Source 
<!-- This change is generated by MagicModules. -->
/cc @chrisst
This commit is contained in:
The Magician 2019-01-25 16:28:54 -08:00 committed by Chris Stephens
parent cf489d4909
commit f32cfb5cb3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
google/container_operation.go
View File

@ -21,9 +21,23 @@ func (w *ContainerOperationWaiter) State() string {
}
func (w *ContainerOperationWaiter) Error() error {
if w != nil && w.Op != nil {
if w == nil || w.Op == nil {
return nil
}
// Error gets called during operation polling to see if there is an error.
// Since container's operation doesn't have an "error" field, we must wait
// until it's done and check the status message
for _, pending := range w.PendingStates() {
if w.Op.Status == pending {
return nil
}
}
if w.Op.StatusMessage != "" {
return fmt.Errorf(w.Op.StatusMessage)
}
return nil
}
@ -71,5 +85,6 @@ func containerOperationWait(config *Config, op *container.Operation, project, lo
if err := w.SetOp(op); err != nil {
return err
}
return OperationWait(w, activity, timeoutMinutes)
}