mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-06 10:41:07 +00:00
Change resource.StateChangeConf to use an array for target states
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
This commit is contained in:
parent
d99a368c03
commit
5d940efddf
@ -63,7 +63,7 @@ func (w *ComputeOperationWaiter) RefreshFunc() resource.StateRefreshFunc {
|
|||||||
func (w *ComputeOperationWaiter) Conf() *resource.StateChangeConf {
|
func (w *ComputeOperationWaiter) Conf() *resource.StateChangeConf {
|
||||||
return &resource.StateChangeConf{
|
return &resource.StateChangeConf{
|
||||||
Pending: []string{"PENDING", "RUNNING"},
|
Pending: []string{"PENDING", "RUNNING"},
|
||||||
Target: "DONE",
|
Target: []string{"DONE"},
|
||||||
Refresh: w.RefreshFunc(),
|
Refresh: w.RefreshFunc(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ func (w *DnsChangeWaiter) RefreshFunc() resource.StateRefreshFunc {
|
|||||||
func (w *DnsChangeWaiter) Conf() *resource.StateChangeConf {
|
func (w *DnsChangeWaiter) Conf() *resource.StateChangeConf {
|
||||||
return &resource.StateChangeConf{
|
return &resource.StateChangeConf{
|
||||||
Pending: []string{"pending"},
|
Pending: []string{"pending"},
|
||||||
Target: "done",
|
Target: []string{"done"},
|
||||||
Refresh: w.RefreshFunc(),
|
Refresh: w.RefreshFunc(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -281,7 +281,7 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
|
|||||||
// Wait until it's created
|
// Wait until it's created
|
||||||
wait := resource.StateChangeConf{
|
wait := resource.StateChangeConf{
|
||||||
Pending: []string{"PENDING", "RUNNING"},
|
Pending: []string{"PENDING", "RUNNING"},
|
||||||
Target: "DONE",
|
Target: []string{"DONE"},
|
||||||
Timeout: 30 * time.Minute,
|
Timeout: 30 * time.Minute,
|
||||||
MinTimeout: 3 * time.Second,
|
MinTimeout: 3 * time.Second,
|
||||||
Refresh: func() (interface{}, string, error) {
|
Refresh: func() (interface{}, string, error) {
|
||||||
@ -373,7 +373,7 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
|
|||||||
// Wait until it's updated
|
// Wait until it's updated
|
||||||
wait := resource.StateChangeConf{
|
wait := resource.StateChangeConf{
|
||||||
Pending: []string{"PENDING", "RUNNING"},
|
Pending: []string{"PENDING", "RUNNING"},
|
||||||
Target: "DONE",
|
Target: []string{"DONE"},
|
||||||
Timeout: 10 * time.Minute,
|
Timeout: 10 * time.Minute,
|
||||||
MinTimeout: 2 * time.Second,
|
MinTimeout: 2 * time.Second,
|
||||||
Refresh: func() (interface{}, string, error) {
|
Refresh: func() (interface{}, string, error) {
|
||||||
@ -413,7 +413,7 @@ func resourceContainerClusterDelete(d *schema.ResourceData, meta interface{}) er
|
|||||||
// Wait until it's deleted
|
// Wait until it's deleted
|
||||||
wait := resource.StateChangeConf{
|
wait := resource.StateChangeConf{
|
||||||
Pending: []string{"PENDING", "RUNNING"},
|
Pending: []string{"PENDING", "RUNNING"},
|
||||||
Target: "DONE",
|
Target: []string{"DONE"},
|
||||||
Timeout: 10 * time.Minute,
|
Timeout: 10 * time.Minute,
|
||||||
MinTimeout: 3 * time.Second,
|
MinTimeout: 3 * time.Second,
|
||||||
Refresh: func() (interface{}, string, error) {
|
Refresh: func() (interface{}, string, error) {
|
||||||
|
@ -37,7 +37,7 @@ func (w *SqlAdminOperationWaiter) RefreshFunc() resource.StateRefreshFunc {
|
|||||||
func (w *SqlAdminOperationWaiter) Conf() *resource.StateChangeConf {
|
func (w *SqlAdminOperationWaiter) Conf() *resource.StateChangeConf {
|
||||||
return &resource.StateChangeConf{
|
return &resource.StateChangeConf{
|
||||||
Pending: []string{"PENDING", "RUNNING"},
|
Pending: []string{"PENDING", "RUNNING"},
|
||||||
Target: "DONE",
|
Target: []string{"DONE"},
|
||||||
Refresh: w.RefreshFunc(),
|
Refresh: w.RefreshFunc(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user