Skip to content

Commit e91401b

Browse files
authored
accessanalyzer: enable go-vcr support (#44699)
```console % make testacc PKG=accessanalyzer VCR_MODE=RECORD_ONLY VCR_PATH=/tmp/accessanalyzer-vcr-testdata/ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 f-go-vcr-accessanalyzer 🌿... TF_ACC=1 go1.24.8 test ./internal/service/accessanalyzer/... -v -count 1 -parallel 20 -timeout 360m -vet=off 2025/10/17 16:06:29 Creating Terraform AWS Provider (SDKv2-style)... 2025/10/17 16:06:29 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccAccessAnalyzer_serial (266.13s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer (223.38s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/accountUnusedAccess (12.09s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/organizationInternalAccess (0.45s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/disappears (9.44s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags (163.76s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/ComputedTag_OnUpdate_Replace (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/IgnoreTags_Overlap_DefaultTag (0.00s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags/EmptyMap (16.88s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags/EmptyTag_OnUpdate_Add (28.97s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_providerOnly (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_updateToProviderOnly (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_emptyResourceTag (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_nullNonOverlappingResourceTag (0.00s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags/basic (40.18s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_nonOverlapping (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_updateToResourceOnly (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/ComputedTag_OnCreate (0.00s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags/AddOnUpdate (19.28s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags/EmptyTag_OnUpdate_Replace (19.83s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_nullOverlappingResourceTag (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/IgnoreTags_Overlap_ResourceTag (0.00s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags/null (17.08s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/tags/EmptyTag_OnCreate (21.54s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/DefaultTags_overlapping (0.00s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/tags/ComputedTag_OnUpdate_Add (0.00s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/accountInternalAccess (26.21s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/organizationUnusedAccess (0.31s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/type_Organization (0.30s) --- SKIP: TestAccAccessAnalyzer_serial/Analyzer/upgradeV5_95_0 (0.00s) --- PASS: TestAccAccessAnalyzer_serial/Analyzer/basic (10.83s) --- PASS: TestAccAccessAnalyzer_serial/ArchiveRule (42.75s) --- PASS: TestAccAccessAnalyzer_serial/ArchiveRule/basic (11.16s) --- PASS: TestAccAccessAnalyzer_serial/ArchiveRule/disappears (9.80s) --- PASS: TestAccAccessAnalyzer_serial/ArchiveRule/update_filters (21.79s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/accessanalyzer 273.460s ```
1 parent c99645b commit e91401b

File tree

6 files changed

+135
-140
lines changed

6 files changed

+135
-140
lines changed

internal/service/accessanalyzer/accessanalyzer_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"github.com/aws/aws-sdk-go-v2/service/accessanalyzer"
1111
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
12-
"github.com/hashicorp/terraform-provider-aws/internal/conns"
1312
)
1413

1514
// AccessAnalyzer is limited to one per region, so run serially locally and in TeamCity.
@@ -39,7 +38,7 @@ func TestAccAccessAnalyzer_serial(t *testing.T) {
3938
}
4039

4140
func testAccPreCheck(ctx context.Context, t *testing.T) {
42-
conn := acctest.Provider.Meta().(*conns.AWSClient).AccessAnalyzerClient(ctx)
41+
conn := acctest.ProviderMeta(ctx, t).AccessAnalyzerClient(ctx)
4342

4443
input := accessanalyzer.ListAnalyzersInput{}
4544

internal/service/accessanalyzer/analyzer.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import (
1414
"github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1616
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
17-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
1817
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1918
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
2019
"github.com/hashicorp/terraform-provider-aws/internal/conns"
2120
"github.com/hashicorp/terraform-provider-aws/internal/enum"
2221
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2322
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
2423
"github.com/hashicorp/terraform-provider-aws/internal/flex"
24+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
2525
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
2626
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
2727
"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -40,6 +40,8 @@ const (
4040
// @Tags(identifierAttribute="arn")
4141
// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types;types.AnalyzerSummary", serialize="true")
4242
// @Testing(preCheck="testAccPreCheck")
43+
// @Testing(existsTakesT=true)
44+
// @Testing(destroyTakesT=true)
4345
func resourceAnalyzer() *schema.Resource {
4446
return &schema.Resource{
4547
CreateWithoutTimeout: resourceAnalyzerCreate,
@@ -241,7 +243,7 @@ func resourceAnalyzerRead(ctx context.Context, d *schema.ResourceData, meta any)
241243

242244
analyzer, err := findAnalyzerByName(ctx, conn, d.Id())
243245

244-
if !d.IsNewResource() && tfresource.NotFound(err) {
246+
if !d.IsNewResource() && retry.NotFound(err) {
245247
log.Printf("[WARN] IAM Access Analyzer Analyzer (%s) not found, removing from state", d.Id())
246248
d.SetId("")
247249
return diags
@@ -306,8 +308,7 @@ func findAnalyzerByName(ctx context.Context, conn *accessanalyzer.Client, name s
306308

307309
if errs.IsA[*types.ResourceNotFoundException](err) {
308310
return nil, &retry.NotFoundError{
309-
LastError: err,
310-
LastRequest: input,
311+
LastError: err,
311312
}
312313
}
313314

0 commit comments

Comments
 (0)