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

github-actions[bot] · wata727 · web-flow · commit 0e12f2a6b340 · 2024-11-17T17:41:17.000+09:00
Co-authored-by: wata727 &lt;9624059+wata727@users.noreply.github.com&gt;
diff --git a/rules/models/aws-sdk-ruby b/rules/models/aws-sdk-ruby
@@ -1 +1 @@
-Subproject commit 87460b996cab53cc30aa71f182ca3c69432943e0
+Subproject commit 7ba5c565a83fd344d2c0d4cd8017390b162fc395
diff --git a/rules/models/aws_datasync_location_s3_invalid_s3_bucket_arn.go b/rules/models/aws_datasync_location_s3_invalid_s3_bucket_arn.go
@@ -26,8 +26,8 @@ func NewAwsDatasyncLocationS3InvalidS3BucketArnRule() *AwsDatasyncLocationS3Inva
 	return &AwsDatasyncLocationS3InvalidS3BucketArnRule{
 		resourceType:  "aws_datasync_location_s3",
 		attributeName: "s3_bucket_arn",
-		max:           156,
-		pattern:       regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\-0-9]*:[0-9]*:.*$`),
+		max:           268,
+		pattern:       regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
 	}
 }
 
@@ -74,14 +74,14 @@ func (r *AwsDatasyncLocationS3InvalidS3BucketArnRule) Check(runner tflint.Runner
 			if len(val) > r.max {
 				runner.EmitIssue(
 					r,
-					"s3_bucket_arn must be 156 characters or less",
+					"s3_bucket_arn must be 268 characters or less",
 					attribute.Expr.Range(),
 				)
 			}
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\-0-9]*:[0-9]*:.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_datasync_location_s3_invalid_s3_bucket_arn_test.go b/rules/models/aws_datasync_location_s3_invalid_s3_bucket_arn_test.go
@@ -24,7 +24,7 @@ resource "aws_datasync_location_s3" "foo" {
 			Expected: helper.Issues{
 				{
 					Rule:    NewAwsDatasyncLocationS3InvalidS3BucketArnRule(),
-					Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster"), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\-0-9]*:[0-9]*:.*$`),
+					Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster"), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
 				},
 			},
 		},
diff --git a/rules/models/aws_imagebuilder_component_invalid_platform.go b/rules/models/aws_imagebuilder_component_invalid_platform.go
@@ -27,6 +27,7 @@ func NewAwsImagebuilderComponentInvalidPlatformRule() *AwsImagebuilderComponentI
 		enum: []string{
 			"Windows",
 			"Linux",
+			"macOS",
 		},
 	}
 }
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -853,6 +853,42 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"g6e.16xlarge",
 			"g6e.24xlarge",
 			"g6e.48xlarge",
+			"c8g.medium",
+			"c8g.large",
+			"c8g.xlarge",
+			"c8g.2xlarge",
+			"c8g.4xlarge",
+			"c8g.8xlarge",
+			"c8g.12xlarge",
+			"c8g.16xlarge",
+			"c8g.24xlarge",
+			"c8g.48xlarge",
+			"c8g.metal-24xl",
+			"c8g.metal-48xl",
+			"m8g.medium",
+			"m8g.large",
+			"m8g.xlarge",
+			"m8g.2xlarge",
+			"m8g.4xlarge",
+			"m8g.8xlarge",
+			"m8g.12xlarge",
+			"m8g.16xlarge",
+			"m8g.24xlarge",
+			"m8g.48xlarge",
+			"m8g.metal-24xl",
+			"m8g.metal-48xl",
+			"x8g.medium",
+			"x8g.large",
+			"x8g.xlarge",
+			"x8g.2xlarge",
+			"x8g.4xlarge",
+			"x8g.8xlarge",
+			"x8g.12xlarge",
+			"x8g.16xlarge",
+			"x8g.24xlarge",
+			"x8g.48xlarge",
+			"x8g.metal-24xl",
+			"x8g.metal-48xl",
 		},
 	}
 }
diff --git a/rules/models/aws_lambda_function_invalid_runtime.go b/rules/models/aws_lambda_function_invalid_runtime.go
@@ -63,6 +63,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu
 			"provided.al2023",
 			"python3.12",
 			"java21",
+			"python3.13",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -853,6 +853,42 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"g6e.16xlarge",
 			"g6e.24xlarge",
 			"g6e.48xlarge",
+			"c8g.medium",
+			"c8g.large",
+			"c8g.xlarge",
+			"c8g.2xlarge",
+			"c8g.4xlarge",
+			"c8g.8xlarge",
+			"c8g.12xlarge",
+			"c8g.16xlarge",
+			"c8g.24xlarge",
+			"c8g.48xlarge",
+			"c8g.metal-24xl",
+			"c8g.metal-48xl",
+			"m8g.medium",
+			"m8g.large",
+			"m8g.xlarge",
+			"m8g.2xlarge",
+			"m8g.4xlarge",
+			"m8g.8xlarge",
+			"m8g.12xlarge",
+			"m8g.16xlarge",
+			"m8g.24xlarge",
+			"m8g.48xlarge",
+			"m8g.metal-24xl",
+			"m8g.metal-48xl",
+			"x8g.medium",
+			"x8g.large",
+			"x8g.xlarge",
+			"x8g.2xlarge",
+			"x8g.4xlarge",
+			"x8g.8xlarge",
+			"x8g.12xlarge",
+			"x8g.16xlarge",
+			"x8g.24xlarge",
+			"x8g.48xlarge",
+			"x8g.metal-24xl",
+			"x8g.metal-48xl",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -853,6 +853,42 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"g6e.16xlarge",
 			"g6e.24xlarge",
 			"g6e.48xlarge",
+			"c8g.medium",
+			"c8g.large",
+			"c8g.xlarge",
+			"c8g.2xlarge",
+			"c8g.4xlarge",
+			"c8g.8xlarge",
+			"c8g.12xlarge",
+			"c8g.16xlarge",
+			"c8g.24xlarge",
+			"c8g.48xlarge",
+			"c8g.metal-24xl",
+			"c8g.metal-48xl",
+			"m8g.medium",
+			"m8g.large",
+			"m8g.xlarge",
+			"m8g.2xlarge",
+			"m8g.4xlarge",
+			"m8g.8xlarge",
+			"m8g.12xlarge",
+			"m8g.16xlarge",
+			"m8g.24xlarge",
+			"m8g.48xlarge",
+			"m8g.metal-24xl",
+			"m8g.metal-48xl",
+			"x8g.medium",
+			"x8g.large",
+			"x8g.xlarge",
+			"x8g.2xlarge",
+			"x8g.4xlarge",
+			"x8g.8xlarge",
+			"x8g.12xlarge",
+			"x8g.16xlarge",
+			"x8g.24xlarge",
+			"x8g.48xlarge",
+			"x8g.metal-24xl",
+			"x8g.metal-48xl",
 		},
 	}
 }
diff --git a/rules/models/aws_organizations_policy_invalid_type.go b/rules/models/aws_organizations_policy_invalid_type.go
@@ -26,6 +26,7 @@ func NewAwsOrganizationsPolicyInvalidTypeRule() *AwsOrganizationsPolicyInvalidTy
 		attributeName: "type",
 		enum: []string{
 			"SERVICE_CONTROL_POLICY",
+			"RESOURCE_CONTROL_POLICY",
 			"TAG_POLICY",
 			"BACKUP_POLICY",
 			"AISERVICES_OPT_OUT_POLICY",
diff --git a/rules/models/aws_route53_record_invalid_type.go b/rules/models/aws_route53_record_invalid_type.go
@@ -38,6 +38,10 @@ func NewAwsRoute53RecordInvalidTypeRule() *AwsRoute53RecordInvalidTypeRule {
 			"AAAA",
 			"CAA",
 			"DS",
+			"TLSA",
+			"SSHFP",
+			"SVCB",
+			"HTTPS",
 		},
 	}
 }
diff --git a/rules/models/aws_route53_zone_association_invalid_vpc_region.go b/rules/models/aws_route53_zone_association_invalid_vpc_region.go
@@ -58,6 +58,7 @@ func NewAwsRoute53ZoneAssociationInvalidVpcRegionRule() *AwsRoute53ZoneAssociati
 			"sa-east-1",
 			"ca-central-1",
 			"cn-north-1",
+			"cn-northwest-1",
 			"af-south-1",
 			"eu-south-1",
 			"eu-south-2",
diff --git a/rules/models/aws_sagemaker_notebook_instance_invalid_instance_type.go b/rules/models/aws_sagemaker_notebook_instance_invalid_instance_type.go
@@ -98,6 +98,13 @@ func NewAwsSagemakerNotebookInstanceInvalidInstanceTypeRule() *AwsSagemakerNoteb
 			"ml.inf1.2xlarge",
 			"ml.inf1.6xlarge",
 			"ml.inf1.24xlarge",
+			"ml.trn1.2xlarge",
+			"ml.trn1.32xlarge",
+			"ml.trn1n.32xlarge",
+			"ml.inf2.xlarge",
+			"ml.inf2.8xlarge",
+			"ml.inf2.24xlarge",
+			"ml.inf2.48xlarge",
 			"ml.p4d.24xlarge",
 			"ml.p4de.24xlarge",
 			"ml.p5.48xlarge",
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
`@@ -26,8 +26,8 @@ func NewAwsDatasyncLocationS3InvalidS3BucketArnRule() *AwsDatasyncLocationS3Inva`
`26`	`26`	`return &AwsDatasyncLocationS3InvalidS3BucketArnRule{`
`27`	`27`	`resourceType: "aws_datasync_location_s3",`
`28`	`28`	`attributeName: "s3_bucket_arn",`
`29`		`- max: 156,`
`30`		- pattern: regexp.MustCompile(`^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):(s3\|s3-outposts):[a-z\-0-9]:[0-9]:.*$`),
	`29`	`+ max: 268,`
	`30`	+ pattern: regexp.MustCompile(`^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$\|^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$\|^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -74,14 +74,14 @@ func (r *AwsDatasyncLocationS3InvalidS3BucketArnRule) Check(runner tflint.Runner`
`74`	`74`	`if len(val) > r.max {`
`75`	`75`	`runner.EmitIssue(`
`76`	`76`	`r,`
`77`		`- "s3_bucket_arn must be 156 characters or less",`
	`77`	`+ "s3_bucket_arn must be 268 characters or less",`
`78`	`78`	`attribute.Expr.Range(),`
`79`	`79`	`)`
`80`	`80`	`}`
`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), `^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):(s3\|s3-outposts):[a-z\-0-9]:[0-9]:.*$`),
	`84`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$\|^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$\|^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
`85`	`85`	`attribute.Expr.Range(),`
`86`	`86`	`)`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ resource "aws_datasync_location_s3" "foo" {`
`24`	`24`	`Expected: helper.Issues{`
`25`	`25`	`{`
`26`	`26`	`Rule: NewAwsDatasyncLocationS3InvalidS3BucketArnRule(),`
`27`		- Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster"), `^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):(s3\|s3-outposts):[a-z\-0-9]:[0-9]:.*$`),
	`27`	+ Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster"), `^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$\|^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$\|^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
`28`	`28`	`},`
`29`	`29`	`},`
`30`	`30`	`},`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func NewAwsImagebuilderComponentInvalidPlatformRule() *AwsImagebuilderComponentI`
`27`	`27`	`enum: []string{`
`28`	`28`	`"Windows",`
`29`	`29`	`"Linux",`
	`30`	`+ "macOS",`
`30`	`31`	`},`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu`
`63`	`63`	`"provided.al2023",`
`64`	`64`	`"python3.12",`
`65`	`65`	`"java21",`
	`66`	`+ "python3.13",`
`66`	`67`	`},`
`67`	`68`	`}`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ func NewAwsRoute53RecordInvalidTypeRule() *AwsRoute53RecordInvalidTypeRule {`
`38`	`38`	`"AAAA",`
`39`	`39`	`"CAA",`
`40`	`40`	`"DS",`
	`41`	`+ "TLSA",`
	`42`	`+ "SSHFP",`
	`43`	`+ "SVCB",`
	`44`	`+ "HTTPS",`
`41`	`45`	`},`
`42`	`46`	`}`
`43`	`47`	`}`