Merge pull request #44609 from hashicorp/f-list-vpcs

list-resource/aws_vpc

Author: gdavison

.ci/semgrep/tflog/tflog.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-log/tflog"
+)
+
+func noAssignment() {
+	ctx := context.Background()
+
+	// ruleid: setfield-without-assign
+	tflog.SetField(ctx, "field", "value")
+}
+
+func assigned() {
+	ctx := context.Background()
+
+	// ok: setfield-without-assign
+	ctx = tflog.SetField(ctx, "field", "value")
+}
+
+func returnedContext() context.Context {
+	ctx := context.Background()
+
+	// ok: setfield-without-assign
+	return tflog.SetField(ctx, "field", "value")
+}
+
+func declareAndAssign_SameName() {
+	ctx := context.Background()
+
+	for i := 0; i < 1; i++ {
+		// ok: setfield-without-assign
+		ctx := tflog.SetField(ctx, "field", "value")
+	}
+}
+
+func declareAndAssign_Rename() {
+	outerCtx := context.Background()
+
+	for i := 0; i < 1; i++ {
+		// ok: setfield-without-assign
+		innerCtx := tflog.SetField(outerCtx, "field", "value")
+	}
+}

.ci/semgrep/tflog/tflog.yml

@@ -4,6 +4,6 @@ rules:
     message: The return value of "tflog.SetField" must be used
     patterns:
       - pattern: tflog.SetField(...)
-      - pattern-not-inside: $CTX = tflog.SetField($CTX, ...)
+      - pattern-not-inside: $CTX1 = tflog.SetField($CTX2, ...)
       - pattern-not-inside: return tflog.SetField($CTX, ...)
     severity: ERROR

go.mod

@@ -310,6 +310,8 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pquerna/otp v1.5.0
 	github.com/shopspring/decimal v1.4.0
+	go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0
+	go.opentelemetry.io/otel v1.38.0
 	golang.org/x/crypto v0.43.0
 	golang.org/x/text v0.30.0
 	golang.org/x/tools v0.38.0
@@ -370,8 +372,6 @@ require (
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/zclconf/go-cty v1.17.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect
@@ -386,3 +386,5 @@ require (
 )
 
 replace github.com/hashicorp/terraform-plugin-log => github.com/gdavison/terraform-plugin-log v0.0.0-20230928191232-6c653d8ef8fb
+
+replace github.com/hashicorp/terraform-plugin-testing => github.com/gdavison/terraform-plugin-testing v0.0.0-20251008214752-cb22fd14f84d

go.sum

@@ -596,6 +596,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gdavison/terraform-plugin-log v0.0.0-20230928191232-6c653d8ef8fb h1:HM67IMNxlkqGxAM5ymxMg2ANCcbL4oEr5cy+tGZ6fNo=
 github.com/gdavison/terraform-plugin-log v0.0.0-20230928191232-6c653d8ef8fb/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
+github.com/gdavison/terraform-plugin-testing v0.0.0-20251008214752-cb22fd14f84d h1:m3Al87LjSaNb/GWqj//HUPwYlkhxTpYO7Z5nlSF3dpY=
+github.com/gdavison/terraform-plugin-testing v0.0.0-20251008214752-cb22fd14f84d/go.mod h1:LEK/JDcSM5eupLL8D0j/CIarlOTrl2wSmQE20mX/xSU=
 github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA=
 github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
@@ -685,8 +687,6 @@ github.com/hashicorp/terraform-plugin-mux v0.21.0 h1:QsEYnzSD2c3zT8zUrUGqaFGhV/Z
 github.com/hashicorp/terraform-plugin-mux v0.21.0/go.mod h1:Qpt8+6AD7NmL0DS7ASkN0EXpDQ2J/FnnIgeUr1tzr5A=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1 h1:mlAq/OrMlg04IuJT7NpefI1wwtdpWudnEmjuQs04t/4=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1/go.mod h1:GQhpKVvvuwzD79e8/NZ+xzj+ZpWovdPAe8nfV/skwNU=
-github.com/hashicorp/terraform-plugin-testing v1.14.0-beta.1 h1:caWmY2Fv/KgDAXU7IVjcBDfIdmr/n6VRYhCLxNmlaXs=
-github.com/hashicorp/terraform-plugin-testing v1.14.0-beta.1/go.mod h1:jVm3pD9uQAT0X2RSEdcqjju2bCGv5f73DGZFU4v7EAU=
 github.com/hashicorp/terraform-registry-address v0.4.0 h1:S1yCGomj30Sao4l5BMPjTGZmCNzuv7/GDTDX99E9gTk=
 github.com/hashicorp/terraform-registry-address v0.4.0/go.mod h1:LRS1Ay0+mAiRkUyltGT+UHWkIqTFvigGn/LbMshfflE=
 github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=

internal/acctest/knownvalue/account_id.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package statecheck
+package knownvalue
 
 import (
 	"context"
@@ -34,7 +34,7 @@ func (v accountID) CheckValue(other any) error {
 
 // String returns the string representation of the value.
 func (v accountID) String() string {
-	return "Who Knows"
+	return "Account ID"
 }
 
 func AccountID() knownvalue.Check {

internal/acctest/knownvalue/global_arn_exact.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package statecheck
+package knownvalue
 
 import (
 	"context"

internal/acctest/knownvalue/global_arn_regexp.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package statecheck
+package knownvalue
 
 import (
 	"context"

internal/acctest/knownvalue/regional_arn_exact.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package statecheck
+package knownvalue
 
 import (
 	"context"

internal/acctest/knownvalue/regional_arn_regexp.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package statecheck
+package knownvalue
 
 import (
 	"context"

internal/acctest/knownvalue/regional_arn_regexp_ignore_account.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package statecheck
+package knownvalue
 
 import (
 	"fmt"