Skip to content

Commit 1b39086

Browse files
jen20jen20
committed
Merge pull request hashicorp#4767 from monkeylittleinc/v0.6.9-branch
Add support for multiple final states on the WaitForState resource
2 parents 78825e7 + 47ac10d commit 1b39086

75 files changed

Lines changed: 130 additions & 128 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎builtin/providers/aws/resource_aws_cloudformation_stack.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func resourceAwsCloudFormationStackCreate(d *schema.ResourceData, meta interface
142142

143143
wait := resource.StateChangeConf{
144144
Pending: []string{"CREATE_IN_PROGRESS", "ROLLBACK_IN_PROGRESS", "ROLLBACK_COMPLETE"},
145-
Target: "CREATE_COMPLETE",
145+
Target: []string{"CREATE_COMPLETE"},
146146
Timeout: 30 * time.Minute,
147147
MinTimeout: 5 * time.Second,
148148
Refresh: func() (interface{}, string, error) {
@@ -311,7 +311,7 @@ func resourceAwsCloudFormationStackUpdate(d *schema.ResourceData, meta interface
311311
"UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS",
312312
"UPDATE_ROLLBACK_COMPLETE",
313313
},
314-
Target: "UPDATE_COMPLETE",
314+
Target: []string{"UPDATE_COMPLETE"},
315315
Timeout: 15 * time.Minute,
316316
MinTimeout: 5 * time.Second,
317317
Refresh: func() (interface{}, string, error) {
@@ -370,7 +370,7 @@ func resourceAwsCloudFormationStackDelete(d *schema.ResourceData, meta interface
370370

371371
wait := resource.StateChangeConf{
372372
Pending: []string{"DELETE_IN_PROGRESS", "ROLLBACK_IN_PROGRESS"},
373-
Target: "DELETE_COMPLETE",
373+
Target: []string{"DELETE_COMPLETE"},
374374
Timeout: 30 * time.Minute,
375375
MinTimeout: 5 * time.Second,
376376
Refresh: func() (interface{}, string, error) {

‎builtin/providers/aws/resource_aws_customer_gateway.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func resourceAwsCustomerGatewayCreate(d *schema.ResourceData, meta interface{})
6868
// Wait for the CustomerGateway to be available.
6969
stateConf := &resource.StateChangeConf{
7070
Pending: []string{"pending"},
71-
Target: "available",
71+
Target: []string{"available"},
7272
Refresh: customerGatewayRefreshFunc(conn, *customerGateway.CustomerGatewayId),
7373
Timeout: 10 * time.Minute,
7474
Delay: 10 * time.Second,

‎builtin/providers/aws/resource_aws_db_instance.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
388388
stateConf := &resource.StateChangeConf{
389389
Pending: []string{"creating", "backing-up", "modifying", "resetting-master-credentials",
390390
"maintenance", "renaming", "rebooting", "upgrading"},
391-
Target: "available",
391+
Target: []string{"available"},
392392
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
393393
Timeout: 40 * time.Minute,
394394
MinTimeout: 10 * time.Second,
@@ -512,7 +512,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
512512
stateConf := &resource.StateChangeConf{
513513
Pending: []string{"creating", "backing-up", "modifying", "resetting-master-credentials",
514514
"maintenance", "renaming", "rebooting", "upgrading"},
515-
Target: "available",
515+
Target: []string{"available"},
516516
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
517517
Timeout: 40 * time.Minute,
518518
MinTimeout: 10 * time.Second,
@@ -663,7 +663,7 @@ func resourceAwsDbInstanceDelete(d *schema.ResourceData, meta interface{}) error
663663
stateConf := &resource.StateChangeConf{
664664
Pending: []string{"creating", "backing-up",
665665
"modifying", "deleting", "available"},
666-
Target: "",
666+
Target: []string{},
667667
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
668668
Timeout: 40 * time.Minute,
669669
MinTimeout: 10 * time.Second,

‎builtin/providers/aws/resource_aws_db_parameter_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func resourceAwsDbParameterGroupUpdate(d *schema.ResourceData, meta interface{})
226226
func resourceAwsDbParameterGroupDelete(d *schema.ResourceData, meta interface{}) error {
227227
stateConf := &resource.StateChangeConf{
228228
Pending: []string{"pending"},
229-
Target: "destroyed",
229+
Target: []string{"destroyed"},
230230
Refresh: resourceAwsDbParameterGroupDeleteRefreshFunc(d, meta),
231231
Timeout: 3 * time.Minute,
232232
MinTimeout: 1 * time.Second,

‎builtin/providers/aws/resource_aws_db_security_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func resourceAwsDbSecurityGroupCreate(d *schema.ResourceData, meta interface{})
125125

126126
stateConf := &resource.StateChangeConf{
127127
Pending: []string{"authorizing"},
128-
Target: "authorized",
128+
Target: []string{"authorized"},
129129
Refresh: resourceAwsDbSecurityGroupStateRefreshFunc(d, meta),
130130
Timeout: 10 * time.Minute,
131131
}

‎builtin/providers/aws/resource_aws_db_subnet_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func resourceAwsDbSubnetGroupUpdate(d *schema.ResourceData, meta interface{}) er
189189
func resourceAwsDbSubnetGroupDelete(d *schema.ResourceData, meta interface{}) error {
190190
stateConf := &resource.StateChangeConf{
191191
Pending: []string{"pending"},
192-
Target: "destroyed",
192+
Target: []string{"destroyed"},
193193
Refresh: resourceAwsDbSubnetGroupDeleteRefreshFunc(d, meta),
194194
Timeout: 3 * time.Minute,
195195
MinTimeout: 1 * time.Second,

‎builtin/providers/aws/resource_aws_directory_service_directory.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func resourceAwsDirectoryServiceDirectoryCreate(d *schema.ResourceData, meta int
321321
log.Printf("[DEBUG] Waiting for DS (%q) to become available", d.Id())
322322
stateConf := &resource.StateChangeConf{
323323
Pending: []string{"Requested", "Creating", "Created"},
324-
Target: "Active",
324+
Target: []string{"Active"},
325325
Refresh: func() (interface{}, string, error) {
326326
resp, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{
327327
DirectoryIds: []*string{aws.String(d.Id())},
@@ -449,7 +449,7 @@ func resourceAwsDirectoryServiceDirectoryDelete(d *schema.ResourceData, meta int
449449
log.Printf("[DEBUG] Waiting for DS (%q) to be deleted", d.Id())
450450
stateConf := &resource.StateChangeConf{
451451
Pending: []string{"Deleting"},
452-
Target: "Deleted",
452+
Target: []string{"Deleted"},
453453
Refresh: func() (interface{}, string, error) {
454454
resp, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{
455455
DirectoryIds: []*string{aws.String(d.Id())},

‎builtin/providers/aws/resource_aws_ebs_volume.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
117117

118118
stateConf := &resource.StateChangeConf{
119119
Pending: []string{"creating"},
120-
Target: "available",
120+
Target: []string{"available"},
121121
Refresh: volumeStateRefreshFunc(conn, *result.VolumeId),
122122
Timeout: 5 * time.Minute,
123123
Delay: 10 * time.Second,

‎builtin/providers/aws/resource_aws_ecs_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error
313313
// Wait until it's deleted
314314
wait := resource.StateChangeConf{
315315
Pending: []string{"DRAINING"},
316-
Target: "INACTIVE",
316+
Target: []string{"INACTIVE"},
317317
Timeout: 5 * time.Minute,
318318
MinTimeout: 1 * time.Second,
319319
Refresh: func() (interface{}, string, error) {

‎builtin/providers/aws/resource_aws_efs_file_system.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func resourceAwsEfsFileSystemCreate(d *schema.ResourceData, meta interface{}) er
5151

5252
stateConf := &resource.StateChangeConf{
5353
Pending: []string{"creating"},
54-
Target: "available",
54+
Target: []string{"available"},
5555
Refresh: func() (interface{}, string, error) {
5656
resp, err := conn.DescribeFileSystems(&efs.DescribeFileSystemsInput{
5757
FileSystemId: aws.String(d.Id()),
@@ -127,7 +127,7 @@ func resourceAwsEfsFileSystemDelete(d *schema.ResourceData, meta interface{}) er
127127
})
128128
stateConf := &resource.StateChangeConf{
129129
Pending: []string{"available", "deleting"},
130-
Target: "",
130+
Target: []string{},
131131
Refresh: func() (interface{}, string, error) {
132132
resp, err := conn.DescribeFileSystems(&efs.DescribeFileSystemsInput{
133133
FileSystemId: aws.String(d.Id()),

0 commit comments

Comments
 (0)