ci: Prefer constants for string literals

.ci/.semgrep-constants.yml

@@ -370,6 +370,16 @@ rules:
       - pattern: '"database_name"'
     severity: ERROR
     fix: "names.AttrDatabaseName"
+  - id: literal-default_action-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrDefaultAction` for the string literal "default_action"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"default_action"'
+    severity: ERROR
+    fix: "names.AttrDefaultAction"
   - id: literal-default_value-string-constant
     languages: [go]
     message: Use the constant `names.AttrDefaultValue` for the string literal "default_value"
@@ -580,6 +590,16 @@ rules:
       - pattern: '"expression"'
     severity: ERROR
     fix: "names.AttrExpression"
+  - id: literal-external_id-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrExternalID` for the string literal "external_id"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"external_id"'
+    severity: ERROR
+    fix: "names.AttrExternalID"
   - id: literal-family-string-constant
     languages: [go]
     message: Use the constant `names.AttrFamily` for the string literal "family"
@@ -620,6 +640,16 @@ rules:
       - pattern: '"filter"'
     severity: ERROR
     fix: "names.AttrFilter"
+  - id: literal-force_delete-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrForceDelete` for the string literal "force_delete"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"force_delete"'
+    severity: ERROR
+    fix: "names.AttrForceDelete"
   - id: literal-force_destroy-string-constant
     languages: [go]
     message: Use the constant `names.AttrForceDestroy` for the string literal "force_destroy"
@@ -870,6 +900,16 @@ rules:
       - pattern: '"key_id"'
     severity: ERROR
     fix: "names.AttrKeyID"
+  - id: literal-language_code-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrLanguageCode` for the string literal "language_code"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"language_code"'
+    severity: ERROR
+    fix: "names.AttrLanguageCode"
   - id: literal-last_updated_date-string-constant
     languages: [go]
     message: Use the constant `names.AttrLastUpdatedDate` for the string literal "last_updated_date"
@@ -920,6 +960,16 @@ rules:
       - pattern: '"max"'
     severity: ERROR
     fix: "names.AttrMax"
+  - id: literal-max_capacity-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrMaxCapacity` for the string literal "max_capacity"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"max_capacity"'
+    severity: ERROR
+    fix: "names.AttrMaxCapacity"
   - id: literal-message-string-constant
     languages: [go]
     message: Use the constant `names.AttrMessage` for the string literal "message"
@@ -1180,6 +1230,16 @@ rules:
       - pattern: '"profile"'
     severity: ERROR
     fix: "names.AttrProfile"
+  - id: literal-propagate_tags-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrPropagateTags` for the string literal "propagate_tags"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"propagate_tags"'
+    severity: ERROR
+    fix: "names.AttrPropagateTags"
   - id: literal-properties-string-constant
     languages: [go]
     message: Use the constant `names.AttrProperties` for the string literal "properties"
@@ -1200,6 +1260,16 @@ rules:
       - pattern: '"protocol"'
     severity: ERROR
     fix: "names.AttrProtocol"
+  - id: literal-provider_name-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrProviderName` for the string literal "provider_name"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"provider_name"'
+    severity: ERROR
+    fix: "names.AttrProviderName"
   - id: literal-public_key-string-constant
     languages: [go]
     message: Use the constant `names.AttrPublicKey` for the string literal "public_key"
@@ -1450,6 +1520,16 @@ rules:
       - pattern: '"service_name"'
     severity: ERROR
     fix: "names.AttrServiceName"
+  - id: literal-service_role-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrServiceRole` for the string literal "service_role"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"service_role"'
+    severity: ERROR
+    fix: "names.AttrServiceRole"
   - id: literal-service_role_arn-string-constant
     languages: [go]
     message: Use the constant `names.AttrServiceRoleARN` for the string literal "service_role_arn"
@@ -1520,6 +1600,16 @@ rules:
       - pattern: '"skip_requesting_account_id"'
     severity: ERROR
     fix: "names.AttrSkipRequestingAccountID"
+  - id: literal-snapshot_id-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrSnapshotID` for the string literal "snapshot_id"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"snapshot_id"'
+    severity: ERROR
+    fix: "names.AttrSnapshotID"
   - id: literal-source-string-constant
     languages: [go]
     message: Use the constant `names.AttrSource` for the string literal "source"
@@ -1580,6 +1670,16 @@ rules:
       - pattern: '"status"'
     severity: ERROR
     fix: "names.AttrStatus"
+  - id: literal-status_code-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrStatusCode` for the string literal "status_code"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"status_code"'
+    severity: ERROR
+    fix: "names.AttrStatusCode"
   - id: literal-status_message-string-constant
     languages: [go]
     message: Use the constant `names.AttrStatusMessage` for the string literal "status_message"
@@ -1590,6 +1690,16 @@ rules:
       - pattern: '"status_message"'
     severity: ERROR
     fix: "names.AttrStatusMessage"
+  - id: literal-status_reason-string-constant
+    languages: [go]
+    message: Use the constant `names.AttrStatusReason` for the string literal "status_reason"
+    paths:
+      include:
+        - "internal/service/**/*.go"
+    patterns:
+      - pattern: '"status_reason"'
+    severity: ERROR
+    fix: "names.AttrStatusReason"
   - id: literal-storage_type-string-constant
     languages: [go]
     message: Use the constant `names.AttrStorageType` for the string literal "storage_type"

internal/service/apigateway/documentation_part.go

@@ -61,7 +61,7 @@ func resourceDocumentationPart() *schema.Resource {
 							Optional: true,
 							ForceNew: true,
 						},
-						"status_code": {
+						names.AttrStatusCode: {
 							Type:     schema.TypeString,
 							Optional: true,
 							ForceNew: true,
@@ -260,7 +260,7 @@ func expandDocumentationPartLocation(l []interface{}) *types.DocumentationPartLo
 	if v, ok := loc[names.AttrPath]; ok {
 		out.Path = aws.String(v.(string))
 	}
-	if v, ok := loc["status_code"]; ok {
+	if v, ok := loc[names.AttrStatusCode]; ok {
 		out.StatusCode = aws.String(v.(string))
 	}
 	return out
@@ -286,7 +286,7 @@ func flattenDocumentationPartLocation(l *types.DocumentationPartLocation) []inte
 	}
 
 	if v := l.StatusCode; v != nil {
-		m["status_code"] = aws.ToString(v)
+		m[names.AttrStatusCode] = aws.ToString(v)
 	}
 
 	m[names.AttrType] = string(l.Type)

internal/service/apigateway/gateway_response.go

@@ -20,6 +20,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
+	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 // @SDKResource("aws_api_gateway_gateway_response", name="Gateway Response")
@@ -66,7 +67,7 @@ func resourceGatewayResponse() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"status_code": {
+			names.AttrStatusCode: {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
@@ -91,7 +92,7 @@ func resourceGatewayResponsePut(ctx context.Context, d *schema.ResourceData, met
 		input.ResponseTemplates = flex.ExpandStringValueMap(v.(map[string]interface{}))
 	}
 
-	if v, ok := d.GetOk("status_code"); ok {
+	if v, ok := d.GetOk(names.AttrStatusCode); ok {
 		input.StatusCode = aws.String(v.(string))
 	}
 
@@ -127,7 +128,7 @@ func resourceGatewayResponseRead(ctx context.Context, d *schema.ResourceData, me
 	d.Set("response_parameters", gatewayResponse.ResponseParameters)
 	d.Set("response_templates", gatewayResponse.ResponseTemplates)
 	d.Set("response_type", gatewayResponse.ResponseType)
-	d.Set("status_code", gatewayResponse.StatusCode)
+	d.Set(names.AttrStatusCode, gatewayResponse.StatusCode)
 
 	return diags
 }

internal/service/apigateway/gateway_response_test.go

@@ -35,7 +35,7 @@ func TestAccAPIGatewayGatewayResponse_basic(t *testing.T) {
 				Config: testAccGatewayResponseConfig_basic(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGatewayResponseExists(ctx, resourceName, &conf),
-					resource.TestCheckResourceAttr(resourceName, "status_code", "401"),
+					resource.TestCheckResourceAttr(resourceName, names.AttrStatusCode, "401"),
 					resource.TestCheckResourceAttr(resourceName, "response_parameters.gatewayresponse.header.Authorization", "'Basic'"),
 					resource.TestCheckResourceAttr(resourceName, "response_templates.application/xml", "#set($inputRoot = $input.path('$'))\n{ }"),
 					resource.TestCheckNoResourceAttr(resourceName, "response_templates.application/json"),
@@ -51,7 +51,7 @@ func TestAccAPIGatewayGatewayResponse_basic(t *testing.T) {
 				Config: testAccGatewayResponseConfig_update(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGatewayResponseExists(ctx, resourceName, &conf),
-					resource.TestCheckResourceAttr(resourceName, "status_code", "477"),
+					resource.TestCheckResourceAttr(resourceName, names.AttrStatusCode, "477"),
 					resource.TestCheckResourceAttr(resourceName, "response_templates.application/json", "{'message':$context.error.messageString}"),
 					resource.TestCheckNoResourceAttr(resourceName, "response_templates.application/xml"),
 					resource.TestCheckNoResourceAttr(resourceName, "response_parameters.gatewayresponse.header.Authorization"),

internal/service/apigateway/integration_response.go

@@ -42,7 +42,7 @@ func resourceIntegrationResponse() *schema.Resource {
 				httpMethod := idParts[2]
 				statusCode := idParts[3]
 				d.Set("http_method", httpMethod)
-				d.Set("status_code", statusCode)
+				d.Set(names.AttrStatusCode, statusCode)
 				d.Set(names.AttrResourceID, resourceID)
 				d.Set("rest_api_id", restApiID)
 				d.SetId(fmt.Sprintf("agir-%s-%s-%s-%s", restApiID, resourceID, httpMethod, statusCode))
@@ -86,7 +86,7 @@ func resourceIntegrationResponse() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"status_code": {
+			names.AttrStatusCode: {
 				Type:     schema.TypeString,
 				Required: true,
 			},
@@ -102,7 +102,7 @@ func resourceIntegrationResponsePut(ctx context.Context, d *schema.ResourceData,
 		HttpMethod: aws.String(d.Get("http_method").(string)),
 		ResourceId: aws.String(d.Get(names.AttrResourceID).(string)),
 		RestApiId:  aws.String(d.Get("rest_api_id").(string)),
-		StatusCode: aws.String(d.Get("status_code").(string)),
+		StatusCode: aws.String(d.Get(names.AttrStatusCode).(string)),
 	}
 
 	if v, ok := d.GetOk("content_handling"); ok {
@@ -128,7 +128,7 @@ func resourceIntegrationResponsePut(ctx context.Context, d *schema.ResourceData,
 	}
 
 	if d.IsNewResource() {
-		d.SetId(fmt.Sprintf("agir-%s-%s-%s-%s", d.Get("rest_api_id").(string), d.Get(names.AttrResourceID).(string), d.Get("http_method").(string), d.Get("status_code").(string)))
+		d.SetId(fmt.Sprintf("agir-%s-%s-%s-%s", d.Get("rest_api_id").(string), d.Get(names.AttrResourceID).(string), d.Get("http_method").(string), d.Get(names.AttrStatusCode).(string)))
 	}
 
 	return append(diags, resourceIntegrationResponseRead(ctx, d, meta)...)
@@ -138,7 +138,7 @@ func resourceIntegrationResponseRead(ctx context.Context, d *schema.ResourceData
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).APIGatewayClient(ctx)
 
-	integrationResponse, err := findIntegrationResponseByFourPartKey(ctx, conn, d.Get("http_method").(string), d.Get(names.AttrResourceID).(string), d.Get("rest_api_id").(string), d.Get("status_code").(string))
+	integrationResponse, err := findIntegrationResponseByFourPartKey(ctx, conn, d.Get("http_method").(string), d.Get(names.AttrResourceID).(string), d.Get("rest_api_id").(string), d.Get(names.AttrStatusCode).(string))
 
 	if !d.IsNewResource() && tfresource.NotFound(err) {
 		log.Printf("[WARN] API Gateway Integration Response (%s) not found, removing from state", d.Id())
@@ -172,7 +172,7 @@ func resourceIntegrationResponseDelete(ctx context.Context, d *schema.ResourceDa
 		HttpMethod: aws.String(d.Get("http_method").(string)),
 		ResourceId: aws.String(d.Get(names.AttrResourceID).(string)),
 		RestApiId:  aws.String(d.Get("rest_api_id").(string)),
-		StatusCode: aws.String(d.Get("status_code").(string)),
+		StatusCode: aws.String(d.Get(names.AttrStatusCode).(string)),
 	})
 
 	if errs.IsA[*types.NotFoundException](err) {

internal/service/apigateway/integration_response_test.go

@@ -42,7 +42,7 @@ func TestAccAPIGatewayIntegrationResponse_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "response_templates.application/json", ""),
 					resource.TestCheckResourceAttr(resourceName, "response_templates.application/xml", "#set($inputRoot = $input.path('$'))\n{ }"),
 					resource.TestCheckResourceAttr(resourceName, "selection_pattern", ".*"),
-					resource.TestCheckResourceAttr(resourceName, "status_code", "400"),
+					resource.TestCheckResourceAttr(resourceName, names.AttrStatusCode, "400"),
 				),
 			},
 			{
@@ -61,7 +61,7 @@ func TestAccAPIGatewayIntegrationResponse_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "response_templates.application/json", "$input.path('$')"),
 					resource.TestCheckResourceAttr(resourceName, "response_templates.application/xml", ""),
 					resource.TestCheckResourceAttr(resourceName, "selection_pattern", ""),
-					resource.TestCheckResourceAttr(resourceName, "status_code", "400"),
+					resource.TestCheckResourceAttr(resourceName, names.AttrStatusCode, "400"),
 				),
 			},
 		},
@@ -101,7 +101,7 @@ func testAccCheckIntegrationResponseExists(ctx context.Context, n string, v *api
 
 		conn := acctest.Provider.Meta().(*conns.AWSClient).APIGatewayClient(ctx)
 
-		output, err := tfapigateway.FindIntegrationResponseByFourPartKey(ctx, conn, rs.Primary.Attributes["http_method"], rs.Primary.Attributes[names.AttrResourceID], rs.Primary.Attributes["rest_api_id"], rs.Primary.Attributes["status_code"])
+		output, err := tfapigateway.FindIntegrationResponseByFourPartKey(ctx, conn, rs.Primary.Attributes["http_method"], rs.Primary.Attributes[names.AttrResourceID], rs.Primary.Attributes["rest_api_id"], rs.Primary.Attributes[names.AttrStatusCode])
 
 		if err != nil {
 			return err
@@ -122,7 +122,7 @@ func testAccCheckIntegrationResponseDestroy(ctx context.Context) resource.TestCh
 				continue
 			}
 
-			_, err := tfapigateway.FindIntegrationResponseByFourPartKey(ctx, conn, rs.Primary.Attributes["http_method"], rs.Primary.Attributes[names.AttrResourceID], rs.Primary.Attributes["rest_api_id"], rs.Primary.Attributes["status_code"])
+			_, err := tfapigateway.FindIntegrationResponseByFourPartKey(ctx, conn, rs.Primary.Attributes["http_method"], rs.Primary.Attributes[names.AttrResourceID], rs.Primary.Attributes["rest_api_id"], rs.Primary.Attributes[names.AttrStatusCode])
 
 			if tfresource.NotFound(err) {
 				continue
@@ -146,7 +146,7 @@ func testAccIntegrationResponseImportStateIdFunc(resourceName string) resource.I
 			return "", fmt.Errorf("Not found: %s", resourceName)
 		}
 
-		return fmt.Sprintf("%s/%s/%s/%s", rs.Primary.Attributes["rest_api_id"], rs.Primary.Attributes[names.AttrResourceID], rs.Primary.Attributes["http_method"], rs.Primary.Attributes["status_code"]), nil
+		return fmt.Sprintf("%s/%s/%s/%s", rs.Primary.Attributes["rest_api_id"], rs.Primary.Attributes[names.AttrResourceID], rs.Primary.Attributes["http_method"], rs.Primary.Attributes[names.AttrStatusCode]), nil
 	}
 }