diff --git a/service/acm/api_op_DescribeCertificate.go b/service/acm/api_op_DescribeCertificate.go index 1501468d17d..027c9076dd4 100644 --- a/service/acm/api_op_DescribeCertificate.go +++ b/service/acm/api_op_DescribeCertificate.go @@ -266,16 +266,21 @@ func certificateValidatedStateRetryable(ctx context.Context, input *DescribeCert expectedValue := "SUCCESS" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.DomainStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.DomainStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -292,13 +297,18 @@ func certificateValidatedStateRetryable(ctx context.Context, input *DescribeCert } expectedValue := "PENDING_VALIDATION" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.DomainStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.DomainStatus value, got %T", pathValue) + } + + if string(value) == expectedValue { return true, nil } } @@ -311,12 +321,12 @@ func certificateValidatedStateRetryable(ctx context.Context, input *DescribeCert } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CertificateStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CertificateStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go index 694172394bf..dddb4eb57de 100644 --- a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go +++ b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go @@ -284,12 +284,12 @@ func auditReportCreatedStateRetryable(ctx context.Context, input *DescribeCertif } expectedValue := "SUCCESS" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AuditReportStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AuditReportStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -301,12 +301,12 @@ func auditReportCreatedStateRetryable(ctx context.Context, input *DescribeCertif } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AuditReportStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AuditReportStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/appstream/api_op_DescribeFleets.go b/service/appstream/api_op_DescribeFleets.go index 92e31ae0dd9..8f2130f63d6 100644 --- a/service/appstream/api_op_DescribeFleets.go +++ b/service/appstream/api_op_DescribeFleets.go @@ -263,16 +263,21 @@ func fleetStartedStateRetryable(ctx context.Context, input *DescribeFleetsInput, expectedValue := "ACTIVE" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.FleetState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -289,13 +294,18 @@ func fleetStartedStateRetryable(ctx context.Context, input *DescribeFleetsInput, } expectedValue := "PENDING_DEACTIVATE" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.FleetState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -308,13 +318,18 @@ func fleetStartedStateRetryable(ctx context.Context, input *DescribeFleetsInput, } expectedValue := "INACTIVE" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.FleetState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -462,16 +477,21 @@ func fleetStoppedStateRetryable(ctx context.Context, input *DescribeFleetsInput, expectedValue := "INACTIVE" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.FleetState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -488,13 +508,18 @@ func fleetStoppedStateRetryable(ctx context.Context, input *DescribeFleetsInput, } expectedValue := "PENDING_ACTIVATE" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.FleetState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -507,13 +532,18 @@ func fleetStoppedStateRetryable(ctx context.Context, input *DescribeFleetsInput, } expectedValue := "ACTIVE" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.FleetState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/cloudformation/api_op_DescribeTypeRegistration.go b/service/cloudformation/api_op_DescribeTypeRegistration.go index d2451c6fe62..4ad0da81e05 100644 --- a/service/cloudformation/api_op_DescribeTypeRegistration.go +++ b/service/cloudformation/api_op_DescribeTypeRegistration.go @@ -278,12 +278,12 @@ func typeRegistrationCompleteStateRetryable(ctx context.Context, input *Describe } expectedValue := "COMPLETE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.RegistrationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.RegistrationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -295,12 +295,12 @@ func typeRegistrationCompleteStateRetryable(ctx context.Context, input *Describe } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.RegistrationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.RegistrationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/cloudfront/api_op_GetDistribution.go b/service/cloudfront/api_op_GetDistribution.go index ac7996c2f85..5046a79a213 100644 --- a/service/cloudfront/api_op_GetDistribution.go +++ b/service/cloudfront/api_op_GetDistribution.go @@ -266,12 +266,12 @@ func distributionDeployedStateRetryable(ctx context.Context, input *GetDistribut } expectedValue := "Deployed" - value, ok := pathValue.(string) + value, ok := pathValue.(*string) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) } - if value == expectedValue { + if string(*value) == expectedValue { return false, nil } } diff --git a/service/cloudfront/api_op_GetInvalidation.go b/service/cloudfront/api_op_GetInvalidation.go index 43b80bc37b8..d16ce02b0c5 100644 --- a/service/cloudfront/api_op_GetInvalidation.go +++ b/service/cloudfront/api_op_GetInvalidation.go @@ -268,12 +268,12 @@ func invalidationCompletedStateRetryable(ctx context.Context, input *GetInvalida } expectedValue := "Completed" - value, ok := pathValue.(string) + value, ok := pathValue.(*string) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) } - if value == expectedValue { + if string(*value) == expectedValue { return false, nil } } diff --git a/service/cloudfront/api_op_GetStreamingDistribution.go b/service/cloudfront/api_op_GetStreamingDistribution.go index 719731ec041..3547eed782c 100644 --- a/service/cloudfront/api_op_GetStreamingDistribution.go +++ b/service/cloudfront/api_op_GetStreamingDistribution.go @@ -270,12 +270,12 @@ func streamingDistributionDeployedStateRetryable(ctx context.Context, input *Get } expectedValue := "Deployed" - value, ok := pathValue.(string) + value, ok := pathValue.(*string) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) } - if value == expectedValue { + if string(*value) == expectedValue { return false, nil } } diff --git a/service/databasemigrationservice/api_op_DescribeConnections.go b/service/databasemigrationservice/api_op_DescribeConnections.go index 6c1e0d633e9..92cc008cde2 100644 --- a/service/databasemigrationservice/api_op_DescribeConnections.go +++ b/service/databasemigrationservice/api_op_DescribeConnections.go @@ -361,16 +361,21 @@ func testConnectionSucceedsStateRetryable(ctx context.Context, input *DescribeCo expectedValue := "successful" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -387,13 +392,18 @@ func testConnectionSucceedsStateRetryable(ctx context.Context, input *DescribeCo } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/databasemigrationservice/api_op_DescribeEndpoints.go b/service/databasemigrationservice/api_op_DescribeEndpoints.go index 794d793d508..e13561ec592 100644 --- a/service/databasemigrationservice/api_op_DescribeEndpoints.go +++ b/service/databasemigrationservice/api_op_DescribeEndpoints.go @@ -364,13 +364,18 @@ func endpointDeletedStateRetryable(ctx context.Context, input *DescribeEndpoints } expectedValue := "active" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -383,13 +388,18 @@ func endpointDeletedStateRetryable(ctx context.Context, input *DescribeEndpoints } expectedValue := "creating" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go index 8fb891b2d51..7eb4c4219d6 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go @@ -367,16 +367,21 @@ func replicationInstanceAvailableStateRetryable(ctx context.Context, input *Desc expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -393,13 +398,18 @@ func replicationInstanceAvailableStateRetryable(ctx context.Context, input *Desc } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -412,13 +422,18 @@ func replicationInstanceAvailableStateRetryable(ctx context.Context, input *Desc } expectedValue := "incompatible-credentials" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -431,13 +446,18 @@ func replicationInstanceAvailableStateRetryable(ctx context.Context, input *Desc } expectedValue := "incompatible-network" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -450,13 +470,18 @@ func replicationInstanceAvailableStateRetryable(ctx context.Context, input *Desc } expectedValue := "inaccessible-encryption-credentials" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -607,13 +632,18 @@ func replicationInstanceDeletedStateRetryable(ctx context.Context, input *Descri } expectedValue := "available" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go index 81063135b86..e7623bbdf64 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go @@ -366,13 +366,18 @@ func replicationTaskDeletedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "ready" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -385,13 +390,18 @@ func replicationTaskDeletedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "creating" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -404,13 +414,18 @@ func replicationTaskDeletedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "stopped" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -423,13 +438,18 @@ func replicationTaskDeletedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "running" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -442,13 +462,18 @@ func replicationTaskDeletedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -604,16 +629,21 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl expectedValue := "ready" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -630,13 +660,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "starting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -649,13 +684,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "running" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -668,13 +708,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "stopping" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -687,13 +732,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "stopped" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -706,13 +756,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -725,13 +780,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "modifying" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -744,13 +804,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "testing" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -763,13 +828,18 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -918,16 +988,21 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe expectedValue := "running" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -944,13 +1019,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "ready" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -963,13 +1043,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "creating" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -982,13 +1067,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "stopping" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1001,13 +1091,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "stopped" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1020,13 +1115,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1039,13 +1139,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "modifying" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1058,13 +1163,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "testing" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1077,13 +1187,18 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1232,16 +1347,21 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe expectedValue := "stopped" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -1258,13 +1378,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "ready" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1277,13 +1402,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "creating" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1296,13 +1426,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "starting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1315,13 +1450,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "running" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1334,13 +1474,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1353,13 +1498,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "modifying" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1372,13 +1522,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "testing" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1391,13 +1546,18 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/docdb/api_op_DescribeDBInstances.go b/service/docdb/api_op_DescribeDBInstances.go index e52563dffa1..9c1ffdc0c66 100644 --- a/service/docdb/api_op_DescribeDBInstances.go +++ b/service/docdb/api_op_DescribeDBInstances.go @@ -377,16 +377,21 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -403,13 +408,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -422,13 +432,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -441,13 +456,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -460,13 +480,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "incompatible-restore" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -479,13 +504,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "incompatible-parameters" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/dynamodb/api_op_DescribeTable.go b/service/dynamodb/api_op_DescribeTable.go index 00ab3b88346..f2a5d299b76 100644 --- a/service/dynamodb/api_op_DescribeTable.go +++ b/service/dynamodb/api_op_DescribeTable.go @@ -272,12 +272,12 @@ func tableExistsStateRetryable(ctx context.Context, input *DescribeTableInput, o } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.TableStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.TableStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } diff --git a/service/ec2/api_op_DescribeBundleTasks.go b/service/ec2/api_op_DescribeBundleTasks.go index de1dcb1c307..6d24a9d0dfe 100644 --- a/service/ec2/api_op_DescribeBundleTasks.go +++ b/service/ec2/api_op_DescribeBundleTasks.go @@ -295,16 +295,21 @@ func bundleTaskCompleteStateRetryable(ctx context.Context, input *DescribeBundle expectedValue := "complete" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.BundleTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.BundleTaskState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -321,13 +326,18 @@ func bundleTaskCompleteStateRetryable(ctx context.Context, input *DescribeBundle } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.BundleTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.BundleTaskState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ec2/api_op_DescribeConversionTasks.go b/service/ec2/api_op_DescribeConversionTasks.go index b25a89c543e..5012541dbab 100644 --- a/service/ec2/api_op_DescribeConversionTasks.go +++ b/service/ec2/api_op_DescribeConversionTasks.go @@ -266,16 +266,21 @@ func conversionTaskCancelledStateRetryable(ctx context.Context, input *DescribeC expectedValue := "cancelled" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ConversionTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ConversionTaskState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -429,16 +434,21 @@ func conversionTaskCompletedStateRetryable(ctx context.Context, input *DescribeC expectedValue := "completed" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ConversionTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ConversionTaskState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -455,13 +465,18 @@ func conversionTaskCompletedStateRetryable(ctx context.Context, input *DescribeC } expectedValue := "cancelled" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.ConversionTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ConversionTaskState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -474,13 +489,18 @@ func conversionTaskCompletedStateRetryable(ctx context.Context, input *DescribeC } expectedValue := "cancelling" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.ConversionTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ConversionTaskState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -629,16 +649,21 @@ func conversionTaskDeletedStateRetryable(ctx context.Context, input *DescribeCon expectedValue := "deleted" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ConversionTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ConversionTaskState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/ec2/api_op_DescribeCustomerGateways.go b/service/ec2/api_op_DescribeCustomerGateways.go index c8f5062a806..d68e28be846 100644 --- a/service/ec2/api_op_DescribeCustomerGateways.go +++ b/service/ec2/api_op_DescribeCustomerGateways.go @@ -295,16 +295,21 @@ func customerGatewayAvailableStateRetryable(ctx context.Context, input *Describe expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -321,13 +326,18 @@ func customerGatewayAvailableStateRetryable(ctx context.Context, input *Describe } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -340,13 +350,18 @@ func customerGatewayAvailableStateRetryable(ctx context.Context, input *Describe } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ec2/api_op_DescribeExportTasks.go b/service/ec2/api_op_DescribeExportTasks.go index 2d51430e039..b0036982241 100644 --- a/service/ec2/api_op_DescribeExportTasks.go +++ b/service/ec2/api_op_DescribeExportTasks.go @@ -259,16 +259,21 @@ func exportTaskCancelledStateRetryable(ctx context.Context, input *DescribeExpor expectedValue := "cancelled" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ExportTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ExportTaskState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -421,16 +426,21 @@ func exportTaskCompletedStateRetryable(ctx context.Context, input *DescribeExpor expectedValue := "completed" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ExportTaskState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ExportTaskState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/ec2/api_op_DescribeImages.go b/service/ec2/api_op_DescribeImages.go index f6451263fa5..2a560c9f5b2 100644 --- a/service/ec2/api_op_DescribeImages.go +++ b/service/ec2/api_op_DescribeImages.go @@ -378,16 +378,21 @@ func imageAvailableStateRetryable(ctx context.Context, input *DescribeImagesInpu expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ImageState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ImageState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -404,13 +409,18 @@ func imageAvailableStateRetryable(ctx context.Context, input *DescribeImagesInpu } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.ImageState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ImageState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ec2/api_op_DescribeInstanceStatus.go b/service/ec2/api_op_DescribeInstanceStatus.go index 6055e2b3698..11df6878c6c 100644 --- a/service/ec2/api_op_DescribeInstanceStatus.go +++ b/service/ec2/api_op_DescribeInstanceStatus.go @@ -431,16 +431,21 @@ func systemStatusOkStateRetryable(ctx context.Context, input *DescribeInstanceSt expectedValue := "ok" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.SummaryStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.SummaryStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/ec2/api_op_DescribeInstances.go b/service/ec2/api_op_DescribeInstances.go index feee6c55e99..af288e71f78 100644 --- a/service/ec2/api_op_DescribeInstances.go +++ b/service/ec2/api_op_DescribeInstances.go @@ -668,16 +668,21 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances expectedValue := "stopped" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.InstanceStateName) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.InstanceStateName value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -694,13 +699,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "pending" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.InstanceStateName) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.InstanceStateName value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -713,13 +723,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "terminated" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.InstanceStateName) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.InstanceStateName value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -867,16 +882,21 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan expectedValue := "terminated" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.InstanceStateName) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.InstanceStateName value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -893,13 +913,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "pending" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.InstanceStateName) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.InstanceStateName value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -912,13 +937,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "stopping" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.InstanceStateName) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.InstanceStateName value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ec2/api_op_DescribeSnapshots.go b/service/ec2/api_op_DescribeSnapshots.go index 05160b7f398..bf353a8a8e4 100644 --- a/service/ec2/api_op_DescribeSnapshots.go +++ b/service/ec2/api_op_DescribeSnapshots.go @@ -457,16 +457,21 @@ func snapshotCompletedStateRetryable(ctx context.Context, input *DescribeSnapsho expectedValue := "completed" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.SnapshotState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.SnapshotState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/ec2/api_op_DescribeSubnets.go b/service/ec2/api_op_DescribeSubnets.go index 4c18e259f90..200f48e8850 100644 --- a/service/ec2/api_op_DescribeSubnets.go +++ b/service/ec2/api_op_DescribeSubnets.go @@ -404,16 +404,21 @@ func subnetAvailableStateRetryable(ctx context.Context, input *DescribeSubnetsIn expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.SubnetState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.SubnetState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/ec2/api_op_DescribeVolumes.go b/service/ec2/api_op_DescribeVolumes.go index fec88b8fb1d..a05b7224f0a 100644 --- a/service/ec2/api_op_DescribeVolumes.go +++ b/service/ec2/api_op_DescribeVolumes.go @@ -429,16 +429,21 @@ func volumeAvailableStateRetryable(ctx context.Context, input *DescribeVolumesIn expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.VolumeState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VolumeState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -455,13 +460,18 @@ func volumeAvailableStateRetryable(ctx context.Context, input *DescribeVolumesIn } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.VolumeState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VolumeState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -609,16 +619,21 @@ func volumeInUseStateRetryable(ctx context.Context, input *DescribeVolumesInput, expectedValue := "in-use" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.VolumeState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VolumeState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -635,13 +650,18 @@ func volumeInUseStateRetryable(ctx context.Context, input *DescribeVolumesInput, } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.VolumeState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VolumeState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ec2/api_op_DescribeVpcs.go b/service/ec2/api_op_DescribeVpcs.go index 9cb2c0a6940..804aa148cce 100644 --- a/service/ec2/api_op_DescribeVpcs.go +++ b/service/ec2/api_op_DescribeVpcs.go @@ -400,16 +400,21 @@ func vpcAvailableStateRetryable(ctx context.Context, input *DescribeVpcsInput, o expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.VpcState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VpcState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/ec2/api_op_DescribeVpnConnections.go b/service/ec2/api_op_DescribeVpnConnections.go index 6cb5d560a92..46efcb548b8 100644 --- a/service/ec2/api_op_DescribeVpnConnections.go +++ b/service/ec2/api_op_DescribeVpnConnections.go @@ -310,16 +310,21 @@ func vpnConnectionAvailableStateRetryable(ctx context.Context, input *DescribeVp expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.VpnState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VpnState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -336,13 +341,18 @@ func vpnConnectionAvailableStateRetryable(ctx context.Context, input *DescribeVp } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.VpnState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VpnState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -355,13 +365,18 @@ func vpnConnectionAvailableStateRetryable(ctx context.Context, input *DescribeVp } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.VpnState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VpnState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -510,16 +525,21 @@ func vpnConnectionDeletedStateRetryable(ctx context.Context, input *DescribeVpnC expectedValue := "deleted" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.VpnState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VpnState value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -536,13 +556,18 @@ func vpnConnectionDeletedStateRetryable(ctx context.Context, input *DescribeVpnC } expectedValue := "pending" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.VpnState) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.VpnState value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ecr/api_op_DescribeImageScanFindings.go b/service/ecr/api_op_DescribeImageScanFindings.go index b0125ee5b2e..db61523d202 100644 --- a/service/ecr/api_op_DescribeImageScanFindings.go +++ b/service/ecr/api_op_DescribeImageScanFindings.go @@ -390,12 +390,12 @@ func imageScanCompleteStateRetryable(ctx context.Context, input *DescribeImageSc } expectedValue := "COMPLETE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ScanStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ScanStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -407,12 +407,12 @@ func imageScanCompleteStateRetryable(ctx context.Context, input *DescribeImageSc } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ScanStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ScanStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ecr/api_op_GetLifecyclePolicyPreview.go b/service/ecr/api_op_GetLifecyclePolicyPreview.go index 5b9f6143e59..c7567ee8746 100644 --- a/service/ecr/api_op_GetLifecyclePolicyPreview.go +++ b/service/ecr/api_op_GetLifecyclePolicyPreview.go @@ -405,12 +405,12 @@ func lifecyclePolicyPreviewCompleteStateRetryable(ctx context.Context, input *Ge } expectedValue := "COMPLETE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.LifecyclePolicyPreviewStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.LifecyclePolicyPreviewStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -422,12 +422,12 @@ func lifecyclePolicyPreviewCompleteStateRetryable(ctx context.Context, input *Ge } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.LifecyclePolicyPreviewStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.LifecyclePolicyPreviewStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ecs/api_op_DescribeServices.go b/service/ecs/api_op_DescribeServices.go index 194680a96fc..f5bdc65d8e7 100644 --- a/service/ecs/api_op_DescribeServices.go +++ b/service/ecs/api_op_DescribeServices.go @@ -273,13 +273,18 @@ func servicesInactiveStateRetryable(ctx context.Context, input *DescribeServices } expectedValue := "MISSING" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -292,13 +297,18 @@ func servicesInactiveStateRetryable(ctx context.Context, input *DescribeServices } expectedValue := "INACTIVE" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, nil } } diff --git a/service/ecs/api_op_DescribeTasks.go b/service/ecs/api_op_DescribeTasks.go index 98d2f9499ec..ad1d7e5d0fc 100644 --- a/service/ecs/api_op_DescribeTasks.go +++ b/service/ecs/api_op_DescribeTasks.go @@ -271,13 +271,18 @@ func tasksRunningStateRetryable(ctx context.Context, input *DescribeTasksInput, } expectedValue := "STOPPED" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -290,13 +295,18 @@ func tasksRunningStateRetryable(ctx context.Context, input *DescribeTasksInput, } expectedValue := "MISSING" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -310,16 +320,21 @@ func tasksRunningStateRetryable(ctx context.Context, input *DescribeTasksInput, expectedValue := "RUNNING" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -471,16 +486,21 @@ func tasksStoppedStateRetryable(ctx context.Context, input *DescribeTasksInput, expectedValue := "STOPPED" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } diff --git a/service/eks/api_op_DescribeAddon.go b/service/eks/api_op_DescribeAddon.go index 72c5371a24f..0fe9f938633 100644 --- a/service/eks/api_op_DescribeAddon.go +++ b/service/eks/api_op_DescribeAddon.go @@ -265,12 +265,12 @@ func addonActiveStateRetryable(ctx context.Context, input *DescribeAddonInput, o } expectedValue := "CREATE_FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AddonStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AddonStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -282,12 +282,12 @@ func addonActiveStateRetryable(ctx context.Context, input *DescribeAddonInput, o } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AddonStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AddonStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -433,12 +433,12 @@ func addonDeletedStateRetryable(ctx context.Context, input *DescribeAddonInput, } expectedValue := "DELETE_FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AddonStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AddonStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/eks/api_op_DescribeCluster.go b/service/eks/api_op_DescribeCluster.go index ea18cbb4389..a517280f142 100644 --- a/service/eks/api_op_DescribeCluster.go +++ b/service/eks/api_op_DescribeCluster.go @@ -265,12 +265,12 @@ func clusterActiveStateRetryable(ctx context.Context, input *DescribeClusterInpu } expectedValue := "DELETING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -282,12 +282,12 @@ func clusterActiveStateRetryable(ctx context.Context, input *DescribeClusterInpu } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -299,12 +299,12 @@ func clusterActiveStateRetryable(ctx context.Context, input *DescribeClusterInpu } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -450,12 +450,12 @@ func clusterDeletedStateRetryable(ctx context.Context, input *DescribeClusterInp } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -467,12 +467,12 @@ func clusterDeletedStateRetryable(ctx context.Context, input *DescribeClusterInp } expectedValue := "CREATING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/eks/api_op_DescribeNodegroup.go b/service/eks/api_op_DescribeNodegroup.go index ae6b8db6f8e..d30e76d020a 100644 --- a/service/eks/api_op_DescribeNodegroup.go +++ b/service/eks/api_op_DescribeNodegroup.go @@ -264,12 +264,12 @@ func nodegroupActiveStateRetryable(ctx context.Context, input *DescribeNodegroup } expectedValue := "CREATE_FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NodegroupStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NodegroupStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -281,12 +281,12 @@ func nodegroupActiveStateRetryable(ctx context.Context, input *DescribeNodegroup } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NodegroupStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NodegroupStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -432,12 +432,12 @@ func nodegroupDeletedStateRetryable(ctx context.Context, input *DescribeNodegrou } expectedValue := "DELETE_FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NodegroupStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NodegroupStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/elasticache/api_op_DescribeCacheClusters.go b/service/elasticache/api_op_DescribeCacheClusters.go index c3161c33feb..a1a8e1e6d6c 100644 --- a/service/elasticache/api_op_DescribeCacheClusters.go +++ b/service/elasticache/api_op_DescribeCacheClusters.go @@ -379,16 +379,21 @@ func cacheClusterAvailableStateRetryable(ctx context.Context, input *DescribeCac expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -405,13 +410,18 @@ func cacheClusterAvailableStateRetryable(ctx context.Context, input *DescribeCac } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -424,13 +434,18 @@ func cacheClusterAvailableStateRetryable(ctx context.Context, input *DescribeCac } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -443,13 +458,18 @@ func cacheClusterAvailableStateRetryable(ctx context.Context, input *DescribeCac } expectedValue := "incompatible-network" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -462,13 +482,18 @@ func cacheClusterAvailableStateRetryable(ctx context.Context, input *DescribeCac } expectedValue := "restore-failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/elasticache/api_op_DescribeReplicationGroups.go b/service/elasticache/api_op_DescribeReplicationGroups.go index 7915823eb50..002008c8d66 100644 --- a/service/elasticache/api_op_DescribeReplicationGroups.go +++ b/service/elasticache/api_op_DescribeReplicationGroups.go @@ -363,16 +363,21 @@ func replicationGroupAvailableStateRetryable(ctx context.Context, input *Describ expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -389,13 +394,18 @@ func replicationGroupAvailableStateRetryable(ctx context.Context, input *Describ } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -545,16 +555,21 @@ func replicationGroupDeletedStateRetryable(ctx context.Context, input *DescribeR expectedValue := "deleted" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -571,13 +586,18 @@ func replicationGroupDeletedStateRetryable(ctx context.Context, input *DescribeR } expectedValue := "available" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironments.go b/service/elasticbeanstalk/api_op_DescribeEnvironments.go index d0ac8713714..f0a7f7b42c5 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironments.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironments.go @@ -293,16 +293,21 @@ func environmentExistsStateRetryable(ctx context.Context, input *DescribeEnviron expectedValue := "Ready" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.EnvironmentStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -320,16 +325,21 @@ func environmentExistsStateRetryable(ctx context.Context, input *DescribeEnviron expectedValue := "Launching" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.EnvironmentStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -482,16 +492,21 @@ func environmentTerminatedStateRetryable(ctx context.Context, input *DescribeEnv expectedValue := "Terminated" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.EnvironmentStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -509,16 +524,21 @@ func environmentTerminatedStateRetryable(ctx context.Context, input *DescribeEnv expectedValue := "Terminating" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.EnvironmentStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -670,16 +690,21 @@ func environmentUpdatedStateRetryable(ctx context.Context, input *DescribeEnviro expectedValue := "Ready" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.EnvironmentStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -697,16 +722,21 @@ func environmentUpdatedStateRetryable(ctx context.Context, input *DescribeEnviro expectedValue := "Updating" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.EnvironmentStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go index 541cbba7daf..3fa0bbdcf7c 100644 --- a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go +++ b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go @@ -268,13 +268,18 @@ func anyInstanceInServiceStateRetryable(ctx context.Context, input *DescribeInst } expectedValue := "InService" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, nil } } diff --git a/service/elastictranscoder/api_op_ReadJob.go b/service/elastictranscoder/api_op_ReadJob.go index 1c2628f8918..a1a3330bf82 100644 --- a/service/elastictranscoder/api_op_ReadJob.go +++ b/service/elastictranscoder/api_op_ReadJob.go @@ -259,12 +259,12 @@ func jobCompleteStateRetryable(ctx context.Context, input *ReadJobInput, output } expectedValue := "Complete" - value, ok := pathValue.(string) + value, ok := pathValue.(*string) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) } - if value == expectedValue { + if string(*value) == expectedValue { return false, nil } } @@ -276,12 +276,12 @@ func jobCompleteStateRetryable(ctx context.Context, input *ReadJobInput, output } expectedValue := "Canceled" - value, ok := pathValue.(string) + value, ok := pathValue.(*string) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) } - if value == expectedValue { + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -293,12 +293,12 @@ func jobCompleteStateRetryable(ctx context.Context, input *ReadJobInput, output } expectedValue := "Error" - value, ok := pathValue.(string) + value, ok := pathValue.(*string) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) } - if value == expectedValue { + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/emr/api_op_DescribeCluster.go b/service/emr/api_op_DescribeCluster.go index 39e53394755..aedea11af60 100644 --- a/service/emr/api_op_DescribeCluster.go +++ b/service/emr/api_op_DescribeCluster.go @@ -261,12 +261,12 @@ func clusterRunningStateRetryable(ctx context.Context, input *DescribeClusterInp } expectedValue := "RUNNING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -278,12 +278,12 @@ func clusterRunningStateRetryable(ctx context.Context, input *DescribeClusterInp } expectedValue := "WAITING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -295,12 +295,12 @@ func clusterRunningStateRetryable(ctx context.Context, input *DescribeClusterInp } expectedValue := "TERMINATING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -312,12 +312,12 @@ func clusterRunningStateRetryable(ctx context.Context, input *DescribeClusterInp } expectedValue := "TERMINATED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -329,12 +329,12 @@ func clusterRunningStateRetryable(ctx context.Context, input *DescribeClusterInp } expectedValue := "TERMINATED_WITH_ERRORS" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -480,12 +480,12 @@ func clusterTerminatedStateRetryable(ctx context.Context, input *DescribeCluster } expectedValue := "TERMINATED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -497,12 +497,12 @@ func clusterTerminatedStateRetryable(ctx context.Context, input *DescribeCluster } expectedValue := "TERMINATED_WITH_ERRORS" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ClusterState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/emr/api_op_DescribeStep.go b/service/emr/api_op_DescribeStep.go index 592af42c4c6..f6a0138902a 100644 --- a/service/emr/api_op_DescribeStep.go +++ b/service/emr/api_op_DescribeStep.go @@ -264,12 +264,12 @@ func stepCompleteStateRetryable(ctx context.Context, input *DescribeStepInput, o } expectedValue := "COMPLETED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.StepState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.StepState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -281,12 +281,12 @@ func stepCompleteStateRetryable(ctx context.Context, input *DescribeStepInput, o } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.StepState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.StepState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -298,12 +298,12 @@ func stepCompleteStateRetryable(ctx context.Context, input *DescribeStepInput, o } expectedValue := "CANCELLED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.StepState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.StepState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/iotsitewise/api_op_DescribeAsset.go b/service/iotsitewise/api_op_DescribeAsset.go index ca1e43022d4..76cb1ba2fa8 100644 --- a/service/iotsitewise/api_op_DescribeAsset.go +++ b/service/iotsitewise/api_op_DescribeAsset.go @@ -339,12 +339,12 @@ func assetActiveStateRetryable(ctx context.Context, input *DescribeAssetInput, o } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AssetState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AssetState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -356,12 +356,12 @@ func assetActiveStateRetryable(ctx context.Context, input *DescribeAssetInput, o } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AssetState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AssetState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/iotsitewise/api_op_DescribeAssetModel.go b/service/iotsitewise/api_op_DescribeAssetModel.go index f5eb9173c9b..0a0899aefd5 100644 --- a/service/iotsitewise/api_op_DescribeAssetModel.go +++ b/service/iotsitewise/api_op_DescribeAssetModel.go @@ -342,12 +342,12 @@ func assetModelActiveStateRetryable(ctx context.Context, input *DescribeAssetMod } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AssetModelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AssetModelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -359,12 +359,12 @@ func assetModelActiveStateRetryable(ctx context.Context, input *DescribeAssetMod } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.AssetModelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.AssetModelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/iotsitewise/api_op_DescribePortal.go b/service/iotsitewise/api_op_DescribePortal.go index 278f9da14da..4228e014843 100644 --- a/service/iotsitewise/api_op_DescribePortal.go +++ b/service/iotsitewise/api_op_DescribePortal.go @@ -357,12 +357,12 @@ func portalActiveStateRetryable(ctx context.Context, input *DescribePortalInput, } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.PortalState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.PortalState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } diff --git a/service/kinesis/api_op_DescribeStream.go b/service/kinesis/api_op_DescribeStream.go index 47f9b8baf33..831d803028f 100644 --- a/service/kinesis/api_op_DescribeStream.go +++ b/service/kinesis/api_op_DescribeStream.go @@ -286,12 +286,12 @@ func streamExistsStateRetryable(ctx context.Context, input *DescribeStreamInput, } expectedValue := "ACTIVE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.StreamStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.StreamStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } diff --git a/service/lambda/api_op_GetFunctionConfiguration.go b/service/lambda/api_op_GetFunctionConfiguration.go index 8ce5a5660d0..b7d8602098e 100644 --- a/service/lambda/api_op_GetFunctionConfiguration.go +++ b/service/lambda/api_op_GetFunctionConfiguration.go @@ -377,12 +377,12 @@ func functionActiveStateRetryable(ctx context.Context, input *GetFunctionConfigu } expectedValue := "Active" - value, ok := pathValue.(string) + value, ok := pathValue.(types.State) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -394,12 +394,12 @@ func functionActiveStateRetryable(ctx context.Context, input *GetFunctionConfigu } expectedValue := "Failed" - value, ok := pathValue.(string) + value, ok := pathValue.(types.State) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -411,12 +411,12 @@ func functionActiveStateRetryable(ctx context.Context, input *GetFunctionConfigu } expectedValue := "Pending" - value, ok := pathValue.(string) + value, ok := pathValue.(types.State) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -562,12 +562,12 @@ func functionUpdatedStateRetryable(ctx context.Context, input *GetFunctionConfig } expectedValue := "Successful" - value, ok := pathValue.(string) + value, ok := pathValue.(types.LastUpdateStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -579,12 +579,12 @@ func functionUpdatedStateRetryable(ctx context.Context, input *GetFunctionConfig } expectedValue := "Failed" - value, ok := pathValue.(string) + value, ok := pathValue.(types.LastUpdateStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -596,12 +596,12 @@ func functionUpdatedStateRetryable(ctx context.Context, input *GetFunctionConfig } expectedValue := "InProgress" - value, ok := pathValue.(string) + value, ok := pathValue.(types.LastUpdateStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } diff --git a/service/medialive/api_op_DescribeChannel.go b/service/medialive/api_op_DescribeChannel.go index 1717027b0f4..09a1d24148e 100644 --- a/service/medialive/api_op_DescribeChannel.go +++ b/service/medialive/api_op_DescribeChannel.go @@ -309,12 +309,12 @@ func channelCreatedStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "IDLE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -326,12 +326,12 @@ func channelCreatedStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "CREATING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -350,12 +350,12 @@ func channelCreatedStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "CREATE_FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -501,12 +501,12 @@ func channelDeletedStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "DELETED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -518,12 +518,12 @@ func channelDeletedStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "DELETING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -676,12 +676,12 @@ func channelRunningStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "RUNNING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -693,12 +693,12 @@ func channelRunningStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "STARTING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -851,12 +851,12 @@ func channelStoppedStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "IDLE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -868,12 +868,12 @@ func channelStoppedStateRetryable(ctx context.Context, input *DescribeChannelInp } expectedValue := "STOPPING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.ChannelState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } diff --git a/service/medialive/api_op_DescribeInput.go b/service/medialive/api_op_DescribeInput.go index df5a944dda3..2154392e3ac 100644 --- a/service/medialive/api_op_DescribeInput.go +++ b/service/medialive/api_op_DescribeInput.go @@ -312,12 +312,12 @@ func inputAttachedStateRetryable(ctx context.Context, input *DescribeInputInput, } expectedValue := "ATTACHED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.InputState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -329,12 +329,12 @@ func inputAttachedStateRetryable(ctx context.Context, input *DescribeInputInput, } expectedValue := "DETACHED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.InputState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -487,12 +487,12 @@ func inputDeletedStateRetryable(ctx context.Context, input *DescribeInputInput, } expectedValue := "DELETED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.InputState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -504,12 +504,12 @@ func inputDeletedStateRetryable(ctx context.Context, input *DescribeInputInput, } expectedValue := "DELETING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.InputState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -662,12 +662,12 @@ func inputDetachedStateRetryable(ctx context.Context, input *DescribeInputInput, } expectedValue := "DETACHED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.InputState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -679,12 +679,12 @@ func inputDetachedStateRetryable(ctx context.Context, input *DescribeInputInput, } expectedValue := "CREATING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.InputState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -696,12 +696,12 @@ func inputDetachedStateRetryable(ctx context.Context, input *DescribeInputInput, } expectedValue := "ATTACHED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.InputState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } diff --git a/service/medialive/api_op_DescribeMultiplex.go b/service/medialive/api_op_DescribeMultiplex.go index d24935e51af..eeab195c8e0 100644 --- a/service/medialive/api_op_DescribeMultiplex.go +++ b/service/medialive/api_op_DescribeMultiplex.go @@ -288,12 +288,12 @@ func multiplexCreatedStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "IDLE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -305,12 +305,12 @@ func multiplexCreatedStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "CREATING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -329,12 +329,12 @@ func multiplexCreatedStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "CREATE_FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -480,12 +480,12 @@ func multiplexDeletedStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "DELETED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -497,12 +497,12 @@ func multiplexDeletedStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "DELETING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -655,12 +655,12 @@ func multiplexRunningStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "RUNNING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -672,12 +672,12 @@ func multiplexRunningStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "STARTING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -830,12 +830,12 @@ func multiplexStoppedStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "IDLE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -847,12 +847,12 @@ func multiplexStoppedStateRetryable(ctx context.Context, input *DescribeMultiple } expectedValue := "STOPPING" - value, ok := pathValue.(string) + value, ok := pathValue.(types.MultiplexState) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } diff --git a/service/neptune/api_op_DescribeDBInstances.go b/service/neptune/api_op_DescribeDBInstances.go index c41ec592d75..023d4d05532 100644 --- a/service/neptune/api_op_DescribeDBInstances.go +++ b/service/neptune/api_op_DescribeDBInstances.go @@ -379,16 +379,21 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -405,13 +410,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -424,13 +434,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -443,13 +458,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -462,13 +482,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "incompatible-restore" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -481,13 +506,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "incompatible-parameters" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/opsworks/api_op_DescribeDeployments.go b/service/opsworks/api_op_DescribeDeployments.go index ab97b94c52c..b8d8dd77975 100644 --- a/service/opsworks/api_op_DescribeDeployments.go +++ b/service/opsworks/api_op_DescribeDeployments.go @@ -271,16 +271,21 @@ func deploymentSuccessfulStateRetryable(ctx context.Context, input *DescribeDepl expectedValue := "successful" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -297,13 +302,18 @@ func deploymentSuccessfulStateRetryable(ctx context.Context, input *DescribeDepl } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/opsworks/api_op_DescribeInstances.go b/service/opsworks/api_op_DescribeInstances.go index 06f283521a1..f2e03c4f05e 100644 --- a/service/opsworks/api_op_DescribeInstances.go +++ b/service/opsworks/api_op_DescribeInstances.go @@ -271,16 +271,21 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI expectedValue := "online" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -297,13 +302,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "setup_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -316,13 +326,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "shutting_down" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -335,13 +350,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "start_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -354,13 +374,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "stopped" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -373,13 +398,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "stopping" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -392,13 +422,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "terminating" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -411,13 +446,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "terminated" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -430,13 +470,18 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI } expectedValue := "stop_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -584,16 +629,21 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan expectedValue := "registered" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -610,13 +660,18 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "setup_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -629,13 +684,18 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "shutting_down" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -648,13 +708,18 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "stopped" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -667,13 +732,18 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "stopping" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -686,13 +756,18 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "terminating" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -705,13 +780,18 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "terminated" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -724,13 +804,18 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "stop_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -878,16 +963,21 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances expectedValue := "stopped" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -904,13 +994,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "booting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -923,13 +1018,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "pending" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -942,13 +1042,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "rebooting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -961,13 +1066,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "requested" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -980,13 +1090,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "running_setup" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -999,13 +1114,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "setup_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1018,13 +1138,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "start_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1037,13 +1162,18 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances } expectedValue := "stop_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1191,16 +1321,21 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan expectedValue := "terminated" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -1224,13 +1359,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "booting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1243,13 +1383,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "online" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1262,13 +1407,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "pending" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1281,13 +1431,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "rebooting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1300,13 +1455,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "requested" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1319,13 +1479,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "running_setup" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1338,13 +1503,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "setup_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -1357,13 +1527,18 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan } expectedValue := "start_failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go index ed8f12fac14..67783844615 100644 --- a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go +++ b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go @@ -281,12 +281,12 @@ func nodeAssociatedStateRetryable(ctx context.Context, input *DescribeNodeAssoci } expectedValue := "SUCCESS" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NodeAssociationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NodeAssociationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -298,12 +298,12 @@ func nodeAssociatedStateRetryable(ctx context.Context, input *DescribeNodeAssoci } expectedValue := "FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NodeAssociationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NodeAssociationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/rds/api_op_DescribeDBClusterSnapshots.go b/service/rds/api_op_DescribeDBClusterSnapshots.go index 31feba2ce10..e7081487f4b 100644 --- a/service/rds/api_op_DescribeDBClusterSnapshots.go +++ b/service/rds/api_op_DescribeDBClusterSnapshots.go @@ -439,16 +439,21 @@ func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *Descri expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -465,13 +470,18 @@ func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *Descri } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -484,13 +494,18 @@ func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *Descri } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -503,13 +518,18 @@ func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *Descri } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -522,13 +542,18 @@ func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *Descri } expectedValue := "incompatible-restore" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -541,13 +566,18 @@ func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *Descri } expectedValue := "incompatible-parameters" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -724,13 +754,18 @@ func dBClusterSnapshotDeletedStateRetryable(ctx context.Context, input *Describe } expectedValue := "creating" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -743,13 +778,18 @@ func dBClusterSnapshotDeletedStateRetryable(ctx context.Context, input *Describe } expectedValue := "modifying" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -762,13 +802,18 @@ func dBClusterSnapshotDeletedStateRetryable(ctx context.Context, input *Describe } expectedValue := "rebooting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -781,13 +826,18 @@ func dBClusterSnapshotDeletedStateRetryable(ctx context.Context, input *Describe } expectedValue := "resetting-master-credentials" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/rds/api_op_DescribeDBInstances.go b/service/rds/api_op_DescribeDBInstances.go index f8fb61ebd15..d78589a9bbd 100644 --- a/service/rds/api_op_DescribeDBInstances.go +++ b/service/rds/api_op_DescribeDBInstances.go @@ -391,16 +391,21 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -417,13 +422,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -436,13 +446,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -455,13 +470,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -474,13 +494,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "incompatible-restore" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -493,13 +518,18 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns } expectedValue := "incompatible-parameters" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/rds/api_op_DescribeDBSnapshots.go b/service/rds/api_op_DescribeDBSnapshots.go index 871d6fd63d7..7c1fa4ac18e 100644 --- a/service/rds/api_op_DescribeDBSnapshots.go +++ b/service/rds/api_op_DescribeDBSnapshots.go @@ -441,16 +441,21 @@ func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSna expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -467,13 +472,18 @@ func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSna } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -486,13 +496,18 @@ func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSna } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -505,13 +520,18 @@ func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSna } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -524,13 +544,18 @@ func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSna } expectedValue := "incompatible-restore" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -543,13 +568,18 @@ func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSna } expectedValue := "incompatible-parameters" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/redshift/api_op_DescribeClusterSnapshots.go b/service/redshift/api_op_DescribeClusterSnapshots.go index de739a3bf32..15a34e8aa54 100644 --- a/service/redshift/api_op_DescribeClusterSnapshots.go +++ b/service/redshift/api_op_DescribeClusterSnapshots.go @@ -439,16 +439,21 @@ func snapshotAvailableStateRetryable(ctx context.Context, input *DescribeCluster expectedValue := "available" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -465,13 +470,18 @@ func snapshotAvailableStateRetryable(ctx context.Context, input *DescribeCluster } expectedValue := "failed" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -484,13 +494,18 @@ func snapshotAvailableStateRetryable(ctx context.Context, input *DescribeCluster } expectedValue := "deleted" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/redshift/api_op_DescribeClusters.go b/service/redshift/api_op_DescribeClusters.go index bfe0dba514a..45ff9852dbe 100644 --- a/service/redshift/api_op_DescribeClusters.go +++ b/service/redshift/api_op_DescribeClusters.go @@ -389,16 +389,21 @@ func clusterRestoredStateRetryable(ctx context.Context, input *DescribeClustersI expectedValue := "completed" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) != expectedValue { match = false } } @@ -415,13 +420,18 @@ func clusterRestoredStateRetryable(ctx context.Context, input *DescribeClustersI } expectedValue := "deleting" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(*string) + if !ok { + return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue) + } + + if string(*value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/rekognition/api_op_DescribeProjectVersions.go b/service/rekognition/api_op_DescribeProjectVersions.go index d8d83add0bc..c7d43563f7f 100644 --- a/service/rekognition/api_op_DescribeProjectVersions.go +++ b/service/rekognition/api_op_DescribeProjectVersions.go @@ -370,16 +370,21 @@ func projectVersionRunningStateRetryable(ctx context.Context, input *DescribePro expectedValue := "RUNNING" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ProjectVersionStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -396,13 +401,18 @@ func projectVersionRunningStateRetryable(ctx context.Context, input *DescribePro } expectedValue := "FAILED" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.ProjectVersionStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -555,16 +565,21 @@ func projectVersionTrainingCompletedStateRetryable(ctx context.Context, input *D expectedValue := "TRAINING_COMPLETED" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(types.ProjectVersionStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } @@ -581,13 +596,18 @@ func projectVersionTrainingCompletedStateRetryable(ctx context.Context, input *D } expectedValue := "TRAINING_FAILED" - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } for _, v := range listOfValues { - if v == expectedValue { + value, ok := v.(types.ProjectVersionStatus) + if !ok { + return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue) + } + + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/sagemaker/api_op_DescribeNotebookInstance.go b/service/sagemaker/api_op_DescribeNotebookInstance.go index c445fe14dc8..ceba66e0769 100644 --- a/service/sagemaker/api_op_DescribeNotebookInstance.go +++ b/service/sagemaker/api_op_DescribeNotebookInstance.go @@ -351,12 +351,12 @@ func notebookInstanceInServiceStateRetryable(ctx context.Context, input *Describ } expectedValue := "InService" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NotebookInstanceStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -368,12 +368,12 @@ func notebookInstanceInServiceStateRetryable(ctx context.Context, input *Describ } expectedValue := "Failed" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NotebookInstanceStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -521,12 +521,12 @@ func notebookInstanceStoppedStateRetryable(ctx context.Context, input *DescribeN } expectedValue := "Stopped" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NotebookInstanceStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -538,12 +538,12 @@ func notebookInstanceStoppedStateRetryable(ctx context.Context, input *DescribeN } expectedValue := "Failed" - value, ok := pathValue.(string) + value, ok := pathValue.(types.NotebookInstanceStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/schemas/api_op_DescribeCodeBinding.go b/service/schemas/api_op_DescribeCodeBinding.go index 0d11cbeaa8a..024d2b2bae2 100644 --- a/service/schemas/api_op_DescribeCodeBinding.go +++ b/service/schemas/api_op_DescribeCodeBinding.go @@ -281,12 +281,12 @@ func codeBindingExistsStateRetryable(ctx context.Context, input *DescribeCodeBin } expectedValue := "CREATE_COMPLETE" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CodeGenerationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CodeGenerationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -298,12 +298,12 @@ func codeBindingExistsStateRetryable(ctx context.Context, input *DescribeCodeBin } expectedValue := "CREATE_IN_PROGRESS" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CodeGenerationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CodeGenerationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -315,12 +315,12 @@ func codeBindingExistsStateRetryable(ctx context.Context, input *DescribeCodeBin } expectedValue := "CREATE_FAILED" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CodeGenerationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CodeGenerationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ses/api_op_GetIdentityVerificationAttributes.go b/service/ses/api_op_GetIdentityVerificationAttributes.go index 916b2e599e2..574c94d6c03 100644 --- a/service/ses/api_op_GetIdentityVerificationAttributes.go +++ b/service/ses/api_op_GetIdentityVerificationAttributes.go @@ -284,16 +284,21 @@ func identityExistsStateRetryable(ctx context.Context, input *GetIdentityVerific expectedValue := "Success" var match = true - listOfValues, ok := pathValue.([]string) + listOfValues, ok := pathValue.([]interface{}) if !ok { - return false, fmt.Errorf("waiter comparator expected []string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected list got %T", pathValue) } if len(listOfValues) == 0 { match = false } for _, v := range listOfValues { - if v != expectedValue { + value, ok := v.(string) + if !ok { + return false, fmt.Errorf("waiter comparator expected string value, got %T", pathValue) + } + + if string(value) != expectedValue { match = false } } diff --git a/service/signer/api_op_DescribeSigningJob.go b/service/signer/api_op_DescribeSigningJob.go index 451e451ea70..14f4039986c 100644 --- a/service/signer/api_op_DescribeSigningJob.go +++ b/service/signer/api_op_DescribeSigningJob.go @@ -319,12 +319,12 @@ func successfulSigningJobStateRetryable(ctx context.Context, input *DescribeSign } expectedValue := "Succeeded" - value, ok := pathValue.(string) + value, ok := pathValue.(types.SigningStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.SigningStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -336,12 +336,12 @@ func successfulSigningJobStateRetryable(ctx context.Context, input *DescribeSign } expectedValue := "Failed" - value, ok := pathValue.(string) + value, ok := pathValue.(types.SigningStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.SigningStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } diff --git a/service/ssm/api_op_GetCommandInvocation.go b/service/ssm/api_op_GetCommandInvocation.go index 9f4fd748cf5..35990ce7ac9 100644 --- a/service/ssm/api_op_GetCommandInvocation.go +++ b/service/ssm/api_op_GetCommandInvocation.go @@ -391,12 +391,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "Pending" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -408,12 +408,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "InProgress" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -425,12 +425,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "Delayed" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return true, nil } } @@ -442,12 +442,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "Success" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, nil } } @@ -459,12 +459,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "Cancelled" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -476,12 +476,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "TimedOut" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -493,12 +493,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "Failed" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } } @@ -510,12 +510,12 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } expectedValue := "Cancelling" - value, ok := pathValue.(string) + value, ok := pathValue.(types.CommandInvocationStatus) if !ok { - return false, fmt.Errorf("waiter comparator expected string value got %T", pathValue) + return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue) } - if value == expectedValue { + if string(value) == expectedValue { return false, fmt.Errorf("waiter state transitioned to Failure") } }