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

github-actions[bot] · wata727 · web-flow · commit 6bf7b877b1f9 · 2024-10-14T23:01:44.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 c11769cb38fc091807c95b0872f099e67ef23193
+Subproject commit 87460b996cab53cc30aa71f182ca3c69432943e0
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -845,6 +845,14 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"r8g.metal-24xl",
 			"r8g.metal-48xl",
 			"mac2-m1ultra.metal",
+			"g6e.xlarge",
+			"g6e.2xlarge",
+			"g6e.4xlarge",
+			"g6e.8xlarge",
+			"g6e.12xlarge",
+			"g6e.16xlarge",
+			"g6e.24xlarge",
+			"g6e.48xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -845,6 +845,14 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"r8g.metal-24xl",
 			"r8g.metal-48xl",
 			"mac2-m1ultra.metal",
+			"g6e.xlarge",
+			"g6e.2xlarge",
+			"g6e.4xlarge",
+			"g6e.8xlarge",
+			"g6e.12xlarge",
+			"g6e.16xlarge",
+			"g6e.24xlarge",
+			"g6e.48xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -845,6 +845,14 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"r8g.metal-24xl",
 			"r8g.metal-48xl",
 			"mac2-m1ultra.metal",
+			"g6e.xlarge",
+			"g6e.2xlarge",
+			"g6e.4xlarge",
+			"g6e.8xlarge",
+			"g6e.12xlarge",
+			"g6e.16xlarge",
+			"g6e.24xlarge",
+			"g6e.48xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_organizations_policy_invalid_type.go b/rules/models/aws_organizations_policy_invalid_type.go
@@ -29,6 +29,7 @@ func NewAwsOrganizationsPolicyInvalidTypeRule() *AwsOrganizationsPolicyInvalidTy
 			"TAG_POLICY",
 			"BACKUP_POLICY",
 			"AISERVICES_OPT_OUT_POLICY",
+			"CHATBOT_POLICY",
 		},
 	}
 }
diff --git a/rules/models/aws_resourcegroups_group_invalid_name.go b/rules/models/aws_resourcegroups_group_invalid_name.go
@@ -29,7 +29,7 @@ func NewAwsResourcegroupsGroupInvalidNameRule() *AwsResourcegroupsGroupInvalidNa
 		attributeName: "name",
 		max:           300,
 		min:           1,
-		pattern:       regexp.MustCompile(`^[a-zA-Z0-9_\.-]+$`),
+		pattern:       regexp.MustCompile(`^[a-zA-Z0-9_\.-]{1,300}|[a-zA-Z0-9_\.-]{1,150}/[a-z0-9]{26}$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsResourcegroupsGroupInvalidNameRule) Check(runner tflint.Runner) erro
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9_\.-]+$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9_\.-]{1,300}|[a-zA-Z0-9_\.-]{1,150}/[a-z0-9]{26}$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_storagegateway_cached_iscsi_volume_invalid_source_volume_arn.go b/rules/models/aws_storagegateway_cached_iscsi_volume_invalid_source_volume_arn.go
@@ -3,6 +3,9 @@
 package models
 
 import (
+	"fmt"
+	"regexp"
+
 	"github.com/terraform-linters/tflint-plugin-sdk/hclext"
 	"github.com/terraform-linters/tflint-plugin-sdk/logger"
 	"github.com/terraform-linters/tflint-plugin-sdk/tflint"
@@ -16,6 +19,7 @@ type AwsStoragegatewayCachedIscsiVolumeInvalidSourceVolumeArnRule struct {
 	attributeName string
 	max           int
 	min           int
+	pattern       *regexp.Regexp
 }
 
 // NewAwsStoragegatewayCachedIscsiVolumeInvalidSourceVolumeArnRule returns new rule with default attributes
@@ -25,6 +29,7 @@ func NewAwsStoragegatewayCachedIscsiVolumeInvalidSourceVolumeArnRule() *AwsStora
 		attributeName: "source_volume_arn",
 		max:           500,
 		min:           50,
+		pattern:       regexp.MustCompile(`^arn:(aws(|-cn|-us-gov|-iso[A-Za-z0-9_-]*)):storagegateway:[a-z\-0-9]+:[0-9]+:gateway\/(.+)\/volume\/vol-(\S+)$`),
 	}
 }
 
@@ -82,6 +87,13 @@ func (r *AwsStoragegatewayCachedIscsiVolumeInvalidSourceVolumeArnRule) Check(run
 					attribute.Expr.Range(),
 				)
 			}
+			if !r.pattern.MatchString(val) {
+				runner.EmitIssue(
+					r,
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws(|-cn|-us-gov|-iso[A-Za-z0-9_-]*)):storagegateway:[a-z\-0-9]+:[0-9]+:gateway\/(.+)\/volume\/vol-(\S+)$`),
+					attribute.Expr.Range(),
+				)
+			}
 			return nil
 		}, nil)
 		if err != nil {
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
`@@ -29,6 +29,7 @@ func NewAwsOrganizationsPolicyInvalidTypeRule() *AwsOrganizationsPolicyInvalidTy`
`29`	`29`	`"TAG_POLICY",`
`30`	`30`	`"BACKUP_POLICY",`
`31`	`31`	`"AISERVICES_OPT_OUT_POLICY",`
	`32`	`+ "CHATBOT_POLICY",`
`32`	`33`	`},`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func NewAwsResourcegroupsGroupInvalidNameRule() *AwsResourcegroupsGroupInvalidNa`
`29`	`29`	`attributeName: "name",`
`30`	`30`	`max: 300,`
`31`	`31`	`min: 1,`
`32`		- pattern: regexp.MustCompile(`^[a-zA-Z0-9_\.-]+$`),
	`32`	+ pattern: regexp.MustCompile(`^[a-zA-Z0-9_\.-]{1,300}\|[a-zA-Z0-9_\.-]{1,150}/[a-z0-9]{26}$`),
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`@@ -90,7 +90,7 @@ func (r *AwsResourcegroupsGroupInvalidNameRule) Check(runner tflint.Runner) erro`
`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-zA-Z0-9_\.-]+$`),
	`93`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9_\.-]{1,300}\|[a-zA-Z0-9_\.-]{1,150}/[a-z0-9]{26}$`),
`94`	`94`	`attribute.Expr.Range(),`
`95`	`95`	`)`
`96`	`96`	`}`