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

wata727 · web-flow · commit 2751dc501532 · 2023-11-18T22:42:19.000+09:00
diff --git a/aws/mock/ec2.go b/aws/mock/ec2.go
diff --git a/aws/mock/rds.go b/aws/mock/rds.go
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21.1
 
 require (
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/aws/aws-sdk-go v1.47.3
+	github.com/aws/aws-sdk-go v1.48.0
 	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.47.3 h1:e0H6NFXiniCpR8Lu3lTphVdRaeRCDLAeRyTHd1tJSd8=
-github.com/aws/aws-sdk-go v1.47.3/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.48.0 h1:1SeJ8agckRDQvnSCt1dGZYAwUaoD2Ixj6IaXB4LCv8Q=
+github.com/aws/aws-sdk-go v1.48.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/dave/dst v0.27.3 h1:P1HPoMza3cMEquVf9kKy8yXsFirry4zEnWOdYPOoIzY=
 github.com/dave/dst v0.27.3/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc=
diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
@@ -1 +1 @@
-Subproject commit 4ed8ea3c4300e3459e71cc4ed47c50e749552cc7
+Subproject commit f01214679b2087f1078dc502284327f584684b78
diff --git a/rules/models/aws_ecr_pull_through_cache_rule_invalid_ecr_repository_prefix.go b/rules/models/aws_ecr_pull_through_cache_rule_invalid_ecr_repository_prefix.go
@@ -27,9 +27,9 @@ func NewAwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule() *AwsEcrPullTh
 	return &AwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule{
 		resourceType:  "aws_ecr_pull_through_cache_rule",
 		attributeName: "ecr_repository_prefix",
-		max:           20,
+		max:           30,
 		min:           2,
-		pattern:       regexp.MustCompile(`^[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
+		pattern:       regexp.MustCompile(`^(?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
 	}
 }
 
@@ -76,7 +76,7 @@ func (r *AwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule) Check(runner
 			if len(val) > r.max {
 				runner.EmitIssue(
 					r,
-					"ecr_repository_prefix must be 20 characters or less",
+					"ecr_repository_prefix must be 30 characters or less",
 					attribute.Expr.Range(),
 				)
 			}
@@ -90,7 +90,7 @@ func (r *AwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule) Check(runner
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -796,6 +796,7 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"r7i.16xlarge",
 			"r7i.24xlarge",
 			"r7i.48xlarge",
+			"dl2q.24xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_lambda_function_invalid_runtime.go b/rules/models/aws_lambda_function_invalid_runtime.go
@@ -57,6 +57,10 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu
 			"java17",
 			"ruby3.2",
 			"python3.11",
+			"nodejs20.x",
+			"provided.al2023",
+			"python3.12",
+			"java21",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -796,6 +796,7 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"r7i.16xlarge",
 			"r7i.24xlarge",
 			"r7i.48xlarge",
+			"dl2q.24xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -796,6 +796,7 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"r7i.16xlarge",
 			"r7i.24xlarge",
 			"r7i.48xlarge",
+			"dl2q.24xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_quicksight_data_source_invalid_type.go b/rules/models/aws_quicksight_data_source_invalid_type.go
@@ -51,6 +51,9 @@ func NewAwsQuicksightDataSourceInvalidTypeRule() *AwsQuicksightDataSourceInvalid
 			"AMAZON_OPENSEARCH",
 			"EXASOL",
 			"DATABRICKS",
+			"STARBURST",
+			"TRINO",
+			"BIGQUERY",
 		},
 	}
 }
diff --git a/rules/models/aws_sagemaker_device_fleet_invalid_description.go b/rules/models/aws_sagemaker_device_fleet_invalid_description.go
@@ -29,7 +29,7 @@ func NewAwsSagemakerDeviceFleetInvalidDescriptionRule() *AwsSagemakerDeviceFleet
 		attributeName: "description",
 		max:           800,
 		min:           1,
-		pattern:       regexp.MustCompile(`^[\S\s]+$`),
+		pattern:       regexp.MustCompile(`^[-a-zA-Z0-9_.,;:! ]*$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsSagemakerDeviceFleetInvalidDescriptionRule) Check(runner tflint.Runn
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[\S\s]+$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[-a-zA-Z0-9_.,;:! ]*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_transfer_access_invalid_home_directory.go b/rules/models/aws_transfer_access_invalid_home_directory.go
@@ -27,7 +27,7 @@ func NewAwsTransferAccessInvalidHomeDirectoryRule() *AwsTransferAccessInvalidHom
 		resourceType:  "aws_transfer_access",
 		attributeName: "home_directory",
 		max:           1024,
-		pattern:       regexp.MustCompile(`^$|/.*$`),
+		pattern:       regexp.MustCompile(`^(|/.*)$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsTransferAccessInvalidHomeDirectoryRule) Check(runner tflint.Runner)
 			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), `^(|/.*)$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_transfer_access_invalid_role.go b/rules/models/aws_transfer_access_invalid_role.go
@@ -29,7 +29,7 @@ func NewAwsTransferAccessInvalidRoleRule() *AwsTransferAccessInvalidRoleRule {
 		attributeName: "role",
 		max:           2048,
 		min:           20,
-		pattern:       regexp.MustCompile(`^arn:.*role/.*$`),
+		pattern:       regexp.MustCompile(`^arn:.*role/\S+$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsTransferAccessInvalidRoleRule) Check(runner tflint.Runner) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/\S+$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_transfer_server_invalid_invocation_role.go b/rules/models/aws_transfer_server_invalid_invocation_role.go
@@ -29,7 +29,7 @@ func NewAwsTransferServerInvalidInvocationRoleRule() *AwsTransferServerInvalidIn
 		attributeName: "invocation_role",
 		max:           2048,
 		min:           20,
-		pattern:       regexp.MustCompile(`^arn:.*role/.*$`),
+		pattern:       regexp.MustCompile(`^arn:.*role/\S+$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsTransferServerInvalidInvocationRoleRule) Check(runner tflint.Runner)
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/\S+$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_transfer_server_invalid_logging_role.go b/rules/models/aws_transfer_server_invalid_logging_role.go
@@ -29,7 +29,7 @@ func NewAwsTransferServerInvalidLoggingRoleRule() *AwsTransferServerInvalidLoggi
 		attributeName: "logging_role",
 		max:           2048,
 		min:           20,
-		pattern:       regexp.MustCompile(`^arn:.*role/.*$`),
+		pattern:       regexp.MustCompile(`^arn:.*role/\S+$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsTransferServerInvalidLoggingRoleRule) Check(runner tflint.Runner) er
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/\S+$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_transfer_user_invalid_home_directory.go b/rules/models/aws_transfer_user_invalid_home_directory.go
@@ -27,7 +27,7 @@ func NewAwsTransferUserInvalidHomeDirectoryRule() *AwsTransferUserInvalidHomeDir
 		resourceType:  "aws_transfer_user",
 		attributeName: "home_directory",
 		max:           1024,
-		pattern:       regexp.MustCompile(`^$|/.*$`),
+		pattern:       regexp.MustCompile(`^(|/.*)$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsTransferUserInvalidHomeDirectoryRule) Check(runner tflint.Runner) er
 			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), `^(|/.*)$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_transfer_user_invalid_role.go b/rules/models/aws_transfer_user_invalid_role.go
@@ -29,7 +29,7 @@ func NewAwsTransferUserInvalidRoleRule() *AwsTransferUserInvalidRoleRule {
 		attributeName: "role",
 		max:           2048,
 		min:           20,
-		pattern:       regexp.MustCompile(`^arn:.*role/.*$`),
+		pattern:       regexp.MustCompile(`^arn:.*role/\S+$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsTransferUserInvalidRoleRule) Check(runner tflint.Runner) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:.*role/\S+$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/generator/main.go b/rules/models/generator/main.go
@@ -73,6 +73,7 @@ func main() {
 
 		for _, mapping := range mappingFile.Mappings {
 			for attribute, value := range mapping.Attrs {
+				fmt.Printf("Checking `%s.%s`\n", mapping.Resource, attribute)
 				shapeName := value.Expr.Variables()[0].RootName()
 				if shapeName == "any" {
 					continue
diff --git a/rules/models/mappings/sqs.hcl b/rules/models/mappings/sqs.hcl
@@ -3,17 +3,17 @@ import = "aws-sdk-go/models/apis/sqs/2012-11-05/api-2.json"
 mapping "aws_sqs_queue" {
   name                              = String
   name_prefix                       = any
-  visibility_timeout_seconds        = Integer
-  message_retention_seconds         = Integer
-  max_message_size                  = Integer
-  delay_seconds                     = Integer
-  receive_wait_time_seconds         = Integer
+  visibility_timeout_seconds        = NullableInteger
+  message_retention_seconds         = NullableInteger
+  max_message_size                  = NullableInteger
+  delay_seconds                     = NullableInteger
+  receive_wait_time_seconds         = NullableInteger
   policy                            = String
   redrive_policy                    = String
   fifo_queue                        = Boolean
   content_based_deduplication       = Boolean
   kms_master_key_id                 = String
-  kms_data_key_reuse_period_seconds = Integer
+  kms_data_key_reuse_period_seconds = NullableInteger
   tags                              = TagMap
 }
 
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
`@@ -27,9 +27,9 @@ func NewAwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule() *AwsEcrPullTh`
`27`	`27`	`return &AwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule{`
`28`	`28`	`resourceType: "aws_ecr_pull_through_cache_rule",`
`29`	`29`	`attributeName: "ecr_repository_prefix",`
`30`		`- max: 20,`
	`30`	`+ max: 30,`
`31`	`31`	`min: 2,`
`32`		- pattern: regexp.MustCompile(`^[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
	`32`	+ pattern: regexp.MustCompile(`^(?:[a-z0-9]+(?:[._-][a-z0-9]+)/)[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`@@ -76,7 +76,7 @@ func (r *AwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule) Check(runner`
`76`	`76`	`if len(val) > r.max {`
`77`	`77`	`runner.EmitIssue(`
`78`	`78`	`r,`
`79`		`- "ecr_repository_prefix must be 20 characters or less",`
	`79`	`+ "ecr_repository_prefix must be 30 characters or less",`
`80`	`80`	`attribute.Expr.Range(),`
`81`	`81`	`)`
`82`	`82`	`}`
`@@ -90,7 +90,7 @@ func (r *AwsEcrPullThroughCacheRuleInvalidEcrRepositoryPrefixRule) Check(runner`
`90`	`90`	`if !r.pattern.MatchString(val) {`
`91`	`91`	`runner.EmitIssue(`
`92`	`92`	`r,`
`93`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
	`93`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?:[a-z0-9]+(?:[._-][a-z0-9]+)/)[a-z0-9]+(?:[._-][a-z0-9]+)*$`),
`94`	`94`	`attribute.Expr.Range(),`
`95`	`95`	`)`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,7 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {`
`796`	`796`	`"r7i.16xlarge",`
`797`	`797`	`"r7i.24xlarge",`
`798`	`798`	`"r7i.48xlarge",`
	`799`	`+ "dl2q.24xlarge",`
`799`	`800`	`},`
`800`	`801`	`}`
`801`	`802`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,10 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu`
`57`	`57`	`"java17",`
`58`	`58`	`"ruby3.2",`
`59`	`59`	`"python3.11",`
	`60`	`+ "nodejs20.x",`
	`61`	`+ "provided.al2023",`
	`62`	`+ "python3.12",`
	`63`	`+ "java21",`
`60`	`64`	`},`
`61`	`65`	`}`
`62`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,7 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy`
`796`	`796`	`"r7i.16xlarge",`
`797`	`797`	`"r7i.24xlarge",`
`798`	`798`	`"r7i.48xlarge",`
	`799`	`+ "dl2q.24xlarge",`
`799`	`800`	`},`
`800`	`801`	`}`
`801`	`802`	`}`
Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,7 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst`
`796`	`796`	`"r7i.16xlarge",`
`797`	`797`	`"r7i.24xlarge",`
`798`	`798`	`"r7i.48xlarge",`
	`799`	`+ "dl2q.24xlarge",`
`799`	`800`	`},`
`800`	`801`	`}`
`801`	`802`	`}`