Skip to content

Commit 903f802

Browse files
ewbankkitewbankkit
committed
r/aws_mq_configuration: Switch to 'WithoutTimeout' CRUD handlers (#15090).
Acceptance test output: % make testacc TESTARGS='-run=TestAccMQConfiguration_' 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=TestAccMQConfiguration_ -timeout 180m === RUN TestAccMQConfiguration_basic === PAUSE TestAccMQConfiguration_basic === RUN TestAccMQConfiguration_withData === PAUSE TestAccMQConfiguration_withData === RUN TestAccMQConfiguration_withLdapData === PAUSE TestAccMQConfiguration_withLdapData === RUN TestAccMQConfiguration_tags === PAUSE TestAccMQConfiguration_tags === CONT TestAccMQConfiguration_basic === CONT TestAccMQConfiguration_withLdapData --- PASS: TestAccMQConfiguration_withLdapData (25.43s) === CONT TestAccMQConfiguration_withData --- PASS: TestAccMQConfiguration_basic (35.47s) === CONT TestAccMQConfiguration_tags --- PASS: TestAccMQConfiguration_withData (20.19s) --- PASS: TestAccMQConfiguration_tags (47.72s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/mq 88.212s
1 parent a4c0db0 commit 903f802

File tree

2 files changed

+28
-27
lines changed

2 files changed

+28
-27
lines changed

‎internal/service/mq/configuration.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package mq
33
import (
44
"context"
55
"encoding/base64"
6-
"fmt"
76
"log"
87
"strconv"
98

109
"github.com/aws/aws-sdk-go/aws"
1110
"github.com/aws/aws-sdk-go/service/mq"
1211
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
12+
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -22,9 +22,9 @@ import (
2222

2323
func ResourceConfiguration() *schema.Resource {
2424
return &schema.Resource{
25-
Create: resourceConfigurationCreate,
26-
Read: resourceConfigurationRead,
27-
Update: resourceConfigurationUpdate,
25+
CreateWithoutTimeout: resourceConfigurationCreate,
26+
ReadWithoutTimeout: resourceConfigurationRead,
27+
UpdateWithoutTimeout: resourceConfigurationUpdate,
2828
DeleteWithoutTimeout: schema.NoopContext, // Delete is not available in the API
2929

3030
Importer: &schema.ResourceImporter{
@@ -95,7 +95,7 @@ func ResourceConfiguration() *schema.Resource {
9595
}
9696
}
9797

98-
func resourceConfigurationCreate(d *schema.ResourceData, meta interface{}) error {
98+
func resourceConfigurationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
9999
conn := meta.(*conns.AWSClient).MQConn
100100
defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
101101
tags := defaultTagsConfig.MergeTags(tftags.New(d.Get("tags").(map[string]interface{})))
@@ -115,10 +115,10 @@ func resourceConfigurationCreate(d *schema.ResourceData, meta interface{}) error
115115
input.Tags = Tags(tags.IgnoreAWS())
116116
}
117117

118-
output, err := conn.CreateConfiguration(input)
118+
output, err := conn.CreateConfigurationWithContext(ctx, input)
119119

120120
if err != nil {
121-
return fmt.Errorf("creating MQ Configuration (%s): %w", name, err)
121+
return diag.Errorf("creating MQ Configuration (%s): %s", name, err)
122122
}
123123

124124
d.SetId(aws.StringValue(output.Id))
@@ -133,22 +133,22 @@ func resourceConfigurationCreate(d *schema.ResourceData, meta interface{}) error
133133
input.Description = aws.String(v.(string))
134134
}
135135

136-
_, err := conn.UpdateConfiguration(input)
136+
_, err := conn.UpdateConfigurationWithContext(ctx, input)
137137

138138
if err != nil {
139-
return fmt.Errorf("updating MQ Configuration (%s): %w", d.Id(), err)
139+
return diag.Errorf("updating MQ Configuration (%s): %s", d.Id(), err)
140140
}
141141
}
142142

143-
return resourceConfigurationRead(d, meta)
143+
return resourceConfigurationRead(ctx, d, meta)
144144
}
145145

146-
func resourceConfigurationRead(d *schema.ResourceData, meta interface{}) error {
146+
func resourceConfigurationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
147147
conn := meta.(*conns.AWSClient).MQConn
148148
defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
149149
ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig
150150

151-
configuration, err := FindConfigurationByID(conn, d.Id())
151+
configuration, err := FindConfigurationByID(ctx, conn, d.Id())
152152

153153
if !d.IsNewResource() && tfresource.NotFound(err) {
154154
log.Printf("[WARN] MQ Configuration (%s) not found, removing from state", d.Id())
@@ -157,7 +157,7 @@ func resourceConfigurationRead(d *schema.ResourceData, meta interface{}) error {
157157
}
158158

159159
if err != nil {
160-
return fmt.Errorf("reading MQ Configuration (%s): %w", d.Id(), err)
160+
return diag.Errorf("reading MQ Configuration (%s): %s", d.Id(), err)
161161
}
162162

163163
d.Set("arn", configuration.Arn)
@@ -169,19 +169,19 @@ func resourceConfigurationRead(d *schema.ResourceData, meta interface{}) error {
169169
d.Set("name", configuration.Name)
170170

171171
revision := strconv.FormatInt(aws.Int64Value(configuration.LatestRevision.Revision), 10)
172-
configurationRevision, err := conn.DescribeConfigurationRevision(&mq.DescribeConfigurationRevisionInput{
172+
configurationRevision, err := conn.DescribeConfigurationRevisionWithContext(ctx, &mq.DescribeConfigurationRevisionInput{
173173
ConfigurationId: aws.String(d.Id()),
174174
ConfigurationRevision: aws.String(revision),
175175
})
176176

177177
if err != nil {
178-
return fmt.Errorf("reading MQ Configuration (%s) revision (%s): %w", d.Id(), revision, err)
178+
return diag.Errorf("reading MQ Configuration (%s) revision (%s): %s", d.Id(), revision, err)
179179
}
180180

181181
data, err := base64.StdEncoding.DecodeString(aws.StringValue(configurationRevision.Data))
182182

183183
if err != nil {
184-
return fmt.Errorf("base64 decoding: %w", err)
184+
return diag.Errorf("base64 decoding: %s", err)
185185
}
186186

187187
d.Set("data", string(data))
@@ -190,17 +190,17 @@ func resourceConfigurationRead(d *schema.ResourceData, meta interface{}) error {
190190

191191
//lintignore:AWSR002
192192
if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil {
193-
return fmt.Errorf("setting tags: %w", err)
193+
return diag.Errorf("setting tags: %s", err)
194194
}
195195

196196
if err := d.Set("tags_all", tags.Map()); err != nil {
197-
return fmt.Errorf("setting tags_all: %w", err)
197+
return diag.Errorf("setting tags_all: %s", err)
198198
}
199199

200200
return nil
201201
}
202202

203-
func resourceConfigurationUpdate(d *schema.ResourceData, meta interface{}) error {
203+
func resourceConfigurationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
204204
conn := meta.(*conns.AWSClient).MQConn
205205

206206
if d.HasChanges("data", "description") {
@@ -213,30 +213,30 @@ func resourceConfigurationUpdate(d *schema.ResourceData, meta interface{}) error
213213
input.Description = aws.String(v.(string))
214214
}
215215

216-
_, err := conn.UpdateConfiguration(input)
216+
_, err := conn.UpdateConfigurationWithContext(ctx, input)
217217

218218
if err != nil {
219-
return fmt.Errorf("updating MQ Configuration (%s): %w", d.Id(), err)
219+
return diag.Errorf("updating MQ Configuration (%s): %s", d.Id(), err)
220220
}
221221
}
222222

223223
if d.HasChange("tags_all") {
224224
o, n := d.GetChange("tags_all")
225225

226-
if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
227-
return fmt.Errorf("updating MQ Configuration (%s) tags: %w", d.Get("arn").(string), err)
226+
if err := UpdateTagsWithContext(ctx, conn, d.Get("arn").(string), o, n); err != nil {
227+
return diag.Errorf("updating MQ Configuration (%s) tags: %s", d.Get("arn").(string), err)
228228
}
229229
}
230230

231-
return resourceConfigurationRead(d, meta)
231+
return resourceConfigurationRead(ctx, d, meta)
232232
}
233233

234-
func FindConfigurationByID(conn *mq.MQ, id string) (*mq.DescribeConfigurationOutput, error) {
234+
func FindConfigurationByID(ctx context.Context, conn *mq.MQ, id string) (*mq.DescribeConfigurationOutput, error) {
235235
input := &mq.DescribeConfigurationInput{
236236
ConfigurationId: aws.String(id),
237237
}
238238

239-
output, err := conn.DescribeConfiguration(input)
239+
output, err := conn.DescribeConfigurationWithContext(ctx, input)
240240

241241
if tfawserr.ErrCodeEquals(err, mq.ErrCodeNotFoundException) {
242242
return nil, &resource.NotFoundError{

‎internal/service/mq/configuration_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package mq_test
22

33
import (
4+
"context"
45
"fmt"
56
"regexp"
67
"testing"
@@ -194,7 +195,7 @@ func testAccCheckConfigurationExists(n string) resource.TestCheckFunc {
194195

195196
conn := acctest.Provider.Meta().(*conns.AWSClient).MQConn
196197

197-
_, err := tfmq.FindConfigurationByID(conn, rs.Primary.ID)
198+
_, err := tfmq.FindConfigurationByID(context.Background(), conn, rs.Primary.ID)
198199

199200
return err
200201
}

0 commit comments

Comments
 (0)