Skip to content

Commit 4b0d330

Browse files
committed
d/aws_mq_broker_instance_type_offerings: Switch to 'WithoutTimeout' CRUD handlers (#15090).
Acceptance test output: % make testacc TESTARGS='-run=TestAccMQBrokerInstanceTypeOfferingsDataSource_' PKG=mq ACCTEST_PARALLELISM=2 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/mq/... -v -count 1 -parallel 2 -run=TestAccMQBrokerInstanceTypeOfferingsDataSource_ -timeout 180m === RUN TestAccMQBrokerInstanceTypeOfferingsDataSource_basic === PAUSE TestAccMQBrokerInstanceTypeOfferingsDataSource_basic === CONT TestAccMQBrokerInstanceTypeOfferingsDataSource_basic --- PASS: TestAccMQBrokerInstanceTypeOfferingsDataSource_basic (18.12s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/mq 22.768s
1 parent 63a212d commit 4b0d330

File tree

1 file changed

+19
-23
lines changed

1 file changed

+19
-23
lines changed

internal/service/mq/broker_instance_type_offerings_data_source.go

+19-23
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package mq
22

33
import (
4-
"fmt"
4+
"context"
55

66
"github.com/aws/aws-sdk-go/aws"
77
"github.com/aws/aws-sdk-go/service/mq"
8+
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
89
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1011
"github.com/hashicorp/terraform-provider-aws/internal/conns"
@@ -13,7 +14,7 @@ import (
1314

1415
func DataSourceBrokerInstanceTypeOfferings() *schema.Resource {
1516
return &schema.Resource{
16-
Read: dataSourceBrokerInstanceTypeOfferingsRead,
17+
ReadWithoutTimeout: dataSourceBrokerInstanceTypeOfferingsRead,
1718

1819
Schema: map[string]*schema.Schema{
1920
"broker_instance_options": {
@@ -76,48 +77,43 @@ func DataSourceBrokerInstanceTypeOfferings() *schema.Resource {
7677
}
7778
}
7879

79-
func dataSourceBrokerInstanceTypeOfferingsRead(d *schema.ResourceData, meta interface{}) error {
80+
func dataSourceBrokerInstanceTypeOfferingsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
8081
conn := meta.(*conns.AWSClient).MQConn
8182

8283
input := &mq.DescribeBrokerInstanceOptionsInput{}
8384

84-
if v, ok := d.GetOk("host_instance_type"); ok {
85-
input.HostInstanceType = aws.String(v.(string))
86-
}
87-
8885
if v, ok := d.GetOk("engine_type"); ok {
8986
input.EngineType = aws.String(v.(string))
9087
}
9188

89+
if v, ok := d.GetOk("host_instance_type"); ok {
90+
input.HostInstanceType = aws.String(v.(string))
91+
}
92+
9293
if v, ok := d.GetOk("storage_type"); ok {
9394
input.StorageType = aws.String(v.(string))
9495
}
9596

96-
bios := make([]*mq.BrokerInstanceOption, 0)
97-
for {
98-
output, err := conn.DescribeBrokerInstanceOptions(input)
97+
var output []*mq.BrokerInstanceOption
9998

100-
if err != nil {
101-
return fmt.Errorf("error listing MQ Broker Instance Type Offerings: %w", err)
99+
err := describeBrokerInstanceOptionsPagesWithContext(ctx, conn, input, func(page *mq.DescribeBrokerInstanceOptionsOutput, lastPage bool) bool {
100+
if page == nil {
101+
return !lastPage
102102
}
103103

104-
if output == nil {
105-
return fmt.Errorf("empty response while reading MQ Broker Instance Type Offerings")
106-
}
104+
output = append(output, page.BrokerInstanceOptions...)
107105

108-
bios = append(bios, output.BrokerInstanceOptions...)
109-
110-
if aws.StringValue(output.NextToken) == "" {
111-
break
112-
}
106+
return !lastPage
107+
})
113108

114-
input.NextToken = output.NextToken
109+
if err != nil {
110+
return diag.Errorf("reading MQ Broker Instance Options: %s", err)
115111
}
116112

117113
d.SetId(meta.(*conns.AWSClient).Region)
118114

119-
if err := d.Set("broker_instance_options", flattenBrokerInstanceOptions(bios)); err != nil {
120-
return fmt.Errorf("error setting broker_instance_options: %w", err)
115+
if err := d.Set("broker_instance_options", flattenBrokerInstanceOptions(output)); err != nil {
116+
return diag.Errorf("setting broker_instance_options: %s", err)
121117
}
122118

123119
return nil

0 commit comments

Comments
 (0)