Update AWS provider/module and generated content (#623)

github-actions[bot] · bendrucker · web-flow · commit 4fbfe9ddad16 · 2024-04-01T11:46:27.000-07:00
Co-authored-by: bendrucker &lt;808808+bendrucker@users.noreply.github.com&gt;
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.22.0
 
 require (
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/aws/aws-sdk-go v1.51.7
+	github.com/aws/aws-sdk-go v1.51.11
 	github.com/dave/dst v0.27.3
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/golang/mock v1.6.0
diff --git a/go.sum b/go.sum
@@ -3,8 +3,8 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.51.7 h1:RRjxHhx9RCjw5AhgpmmShq3F4JDlleSkyhYMQ2xUAe8=
-github.com/aws/aws-sdk-go v1.51.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.51.11 h1:El5VypsMIz7sFwAAj/j06JX9UGs4KAbAIEaZ57bNY4s=
+github.com/aws/aws-sdk-go v1.51.11/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
@@ -1 +1 @@
-Subproject commit e7520717955409031e3d5fcabcc2db1e3925df97
+Subproject commit 0b7b1fa64008f9856bb6e440210313ca1b16a391
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -808,6 +808,9 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"r7i.metal-48xl",
 			"r7iz.metal-16xl",
 			"r7iz.metal-32xl",
+			"c7gd.metal",
+			"m7gd.metal",
+			"r7gd.metal",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -808,6 +808,9 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"r7i.metal-48xl",
 			"r7iz.metal-16xl",
 			"r7iz.metal-32xl",
+			"c7gd.metal",
+			"m7gd.metal",
+			"r7gd.metal",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -808,6 +808,9 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"r7i.metal-48xl",
 			"r7iz.metal-16xl",
 			"r7iz.metal-32xl",
+			"c7gd.metal",
+			"m7gd.metal",
+			"r7gd.metal",
 		},
 	}
 }
diff --git a/rules/models/aws_sagemaker_domain_invalid_kms_key_id.go b/rules/models/aws_sagemaker_domain_invalid_kms_key_id.go
@@ -27,7 +27,7 @@ func NewAwsSagemakerDomainInvalidKmsKeyIDRule() *AwsSagemakerDomainInvalidKmsKey
 		resourceType:  "aws_sagemaker_domain",
 		attributeName: "kms_key_id",
 		max:           2048,
-		pattern:       regexp.MustCompile(`^.*$`),
+		pattern:       regexp.MustCompile(`^[a-zA-Z0-9:/_-]*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsSagemakerDomainInvalidKmsKeyIDRule) Check(runner tflint.Runner) erro
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9:/_-]*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_sagemaker_endpoint_configuration_invalid_kms_key_arn.go b/rules/models/aws_sagemaker_endpoint_configuration_invalid_kms_key_arn.go
@@ -27,7 +27,7 @@ func NewAwsSagemakerEndpointConfigurationInvalidKmsKeyArnRule() *AwsSagemakerEnd
 		resourceType:  "aws_sagemaker_endpoint_configuration",
 		attributeName: "kms_key_arn",
 		max:           2048,
-		pattern:       regexp.MustCompile(`^.*$`),
+		pattern:       regexp.MustCompile(`^[a-zA-Z0-9:/_-]*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsSagemakerEndpointConfigurationInvalidKmsKeyArnRule) Check(runner tfl
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9:/_-]*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_sagemaker_notebook_instance_invalid_kms_key_id.go b/rules/models/aws_sagemaker_notebook_instance_invalid_kms_key_id.go
@@ -27,7 +27,7 @@ func NewAwsSagemakerNotebookInstanceInvalidKmsKeyIDRule() *AwsSagemakerNotebookI
 		resourceType:  "aws_sagemaker_notebook_instance",
 		attributeName: "kms_key_id",
 		max:           2048,
-		pattern:       regexp.MustCompile(`^.*$`),
+		pattern:       regexp.MustCompile(`^[a-zA-Z0-9:/_-]*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsSagemakerNotebookInstanceInvalidKmsKeyIDRule) Check(runner tflint.Ru
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9:/_-]*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/tags/resources.go b/rules/tags/resources.go
diff --git a/tools/provider-schema/.terraform.lock.hcl b/tools/provider-schema/.terraform.lock.hcl
diff --git a/tools/provider-schema/schema.json b/tools/provider-schema/schema.json

Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,9 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {`
`808`	`808`	`"r7i.metal-48xl",`
`809`	`809`	`"r7iz.metal-16xl",`
`810`	`810`	`"r7iz.metal-32xl",`
	`811`	`+ "c7gd.metal",`
	`812`	`+ "m7gd.metal",`
	`813`	`+ "r7gd.metal",`
`811`	`814`	`},`
`812`	`815`	`}`
`813`	`816`	`}`
Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,9 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy`
`808`	`808`	`"r7i.metal-48xl",`
`809`	`809`	`"r7iz.metal-16xl",`
`810`	`810`	`"r7iz.metal-32xl",`
	`811`	`+ "c7gd.metal",`
	`812`	`+ "m7gd.metal",`
	`813`	`+ "r7gd.metal",`
`811`	`814`	`},`
`812`	`815`	`}`
`813`	`816`	`}`
Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,9 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst`
`808`	`808`	`"r7i.metal-48xl",`
`809`	`809`	`"r7iz.metal-16xl",`
`810`	`810`	`"r7iz.metal-32xl",`
	`811`	`+ "c7gd.metal",`
	`812`	`+ "m7gd.metal",`
	`813`	`+ "r7gd.metal",`
`811`	`814`	`},`
`812`	`815`	`}`
`813`	`816`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func NewAwsSagemakerDomainInvalidKmsKeyIDRule() *AwsSagemakerDomainInvalidKmsKey`
`27`	`27`	`resourceType: "aws_sagemaker_domain",`
`28`	`28`	`attributeName: "kms_key_id",`
`29`	`29`	`max: 2048,`
`30`		- pattern: regexp.MustCompile(`^.*$`),
	`30`	+ pattern: regexp.MustCompile(`^[a-zA-Z0-9:/_-]*$`),
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -81,7 +81,7 @@ func (r *AwsSagemakerDomainInvalidKmsKeyIDRule) Check(runner tflint.Runner) erro`
`81`	`81`	`if !r.pattern.MatchString(val) {`
`82`	`82`	`runner.EmitIssue(`
`83`	`83`	`r,`
`84`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
	`84`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9:/_-]*$`),
`85`	`85`	`attribute.Expr.Range(),`
`86`	`86`	`)`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func NewAwsSagemakerEndpointConfigurationInvalidKmsKeyArnRule() *AwsSagemakerEnd`
`27`	`27`	`resourceType: "aws_sagemaker_endpoint_configuration",`
`28`	`28`	`attributeName: "kms_key_arn",`
`29`	`29`	`max: 2048,`
`30`		- pattern: regexp.MustCompile(`^.*$`),
	`30`	+ pattern: regexp.MustCompile(`^[a-zA-Z0-9:/_-]*$`),
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -81,7 +81,7 @@ func (r *AwsSagemakerEndpointConfigurationInvalidKmsKeyArnRule) Check(runner tfl`
`81`	`81`	`if !r.pattern.MatchString(val) {`
`82`	`82`	`runner.EmitIssue(`
`83`	`83`	`r,`
`84`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
	`84`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9:/_-]*$`),
`85`	`85`	`attribute.Expr.Range(),`
`86`	`86`	`)`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func NewAwsSagemakerNotebookInstanceInvalidKmsKeyIDRule() *AwsSagemakerNotebookI`
`27`	`27`	`resourceType: "aws_sagemaker_notebook_instance",`
`28`	`28`	`attributeName: "kms_key_id",`
`29`	`29`	`max: 2048,`
`30`		- pattern: regexp.MustCompile(`^.*$`),
	`30`	+ pattern: regexp.MustCompile(`^[a-zA-Z0-9:/_-]*$`),
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -81,7 +81,7 @@ func (r *AwsSagemakerNotebookInstanceInvalidKmsKeyIDRule) Check(runner tflint.Ru`
`81`	`81`	`if !r.pattern.MatchString(val) {`
`82`	`82`	`runner.EmitIssue(`
`83`	`83`	`r,`
`84`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
	`84`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9:/_-]*$`),
`85`	`85`	`attribute.Expr.Range(),`
`86`	`86`	`)`
`87`	`87`	`}`