Amend commit author to align with Hashicorp license
This commit is contained in:
parent
d6831a4de3
commit
937e39d9f4
|
@ -757,13 +757,16 @@ func (d *driverGCE) AddToInstanceMetadata(zone string, name string, metadata map
|
|||
}
|
||||
|
||||
newErrCh := make(chan error, 1)
|
||||
go waitForState(newErrCh, "DONE", d.refreshZoneOp(zone, op))
|
||||
|
||||
select {
|
||||
case err = <-newErrCh:
|
||||
case <-time.After(time.Second * 30):
|
||||
err = errors.New("time out while waiting for instance to create")
|
||||
}
|
||||
go func() {
|
||||
err = waitForState(newErrCh, "DONE", d.refreshZoneOp(zone, op))
|
||||
|
||||
select {
|
||||
case err = <-newErrCh:
|
||||
case <-time.After(time.Second * 30):
|
||||
err = errors.New("time out while waiting for instance to create")
|
||||
}
|
||||
}()
|
||||
|
||||
if err != nil {
|
||||
newErrCh <- err
|
||||
|
|
|
@ -304,7 +304,6 @@ func (d *DriverMock) AddToInstanceMetadata(zone string, name string, metadata ma
|
|||
if resultCh == nil {
|
||||
ch := make(chan error)
|
||||
close(ch)
|
||||
resultCh = ch
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
Loading…
Reference in New Issue