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

github-actions[bot] · wata727 · web-flow · commit 9c3503edb76e · 2024-02-11T17:14:27.000+09:00
Co-authored-by: wata727 &lt;9624059+wata727@users.noreply.github.com&gt;
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.50.10
+	github.com/aws/aws-sdk-go v1.50.15
 	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.50.10 h1:H3NQvqRUKG+9oysCKTIyylpkqfPA7MiBtzTnu/cIGqE=
-github.com/aws/aws-sdk-go v1.50.10/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.50.15 h1:wEMnPfEQQFaoIJwuO18zq/vtG4Ft7NxQ3r9xlEi/8zg=
+github.com/aws/aws-sdk-go v1.50.15/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 6c5097623efe778facc01839b288050aa5e79c5a
+Subproject commit 6b23b0684be39d8960b5428ad23639b185904e28
diff --git a/rules/models/aws_prometheus_alert_manager_definition_invalid_workspace_id.go b/rules/models/aws_prometheus_alert_manager_definition_invalid_workspace_id.go
@@ -29,7 +29,7 @@ func NewAwsPrometheusAlertManagerDefinitionInvalidWorkspaceIDRule() *AwsPromethe
 		attributeName: "workspace_id",
 		max:           64,
 		min:           1,
-		pattern:       regexp.MustCompile(`^.*[0-9A-Za-z][-.0-9A-Z_a-z]*.*$`),
+		pattern:       regexp.MustCompile(`^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsPrometheusAlertManagerDefinitionInvalidWorkspaceIDRule) Check(runner
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*[0-9A-Za-z][-.0-9A-Z_a-z]*.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_prometheus_rule_group_namespace_invalid_name.go b/rules/models/aws_prometheus_rule_group_namespace_invalid_name.go
@@ -29,7 +29,7 @@ func NewAwsPrometheusRuleGroupNamespaceInvalidNameRule() *AwsPrometheusRuleGroup
 		attributeName: "name",
 		max:           64,
 		min:           1,
-		pattern:       regexp.MustCompile(`^.*[0-9A-Za-z][-.0-9A-Z_a-z]*.*$`),
+		pattern:       regexp.MustCompile(`^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsPrometheusRuleGroupNamespaceInvalidNameRule) Check(runner tflint.Run
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*[0-9A-Za-z][-.0-9A-Z_a-z]*.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_prometheus_rule_group_namespace_invalid_workspace_id.go b/rules/models/aws_prometheus_rule_group_namespace_invalid_workspace_id.go
@@ -29,7 +29,7 @@ func NewAwsPrometheusRuleGroupNamespaceInvalidWorkspaceIDRule() *AwsPrometheusRu
 		attributeName: "workspace_id",
 		max:           64,
 		min:           1,
-		pattern:       regexp.MustCompile(`^.*[0-9A-Za-z][-.0-9A-Z_a-z]*.*$`),
+		pattern:       regexp.MustCompile(`^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
 	}
 }
 
@@ -90,7 +90,7 @@ func (r *AwsPrometheusRuleGroupNamespaceInvalidWorkspaceIDRule) Check(runner tfl
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*[0-9A-Za-z][-.0-9A-Z_a-z]*.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
 					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
`@@ -29,7 +29,7 @@ func NewAwsPrometheusAlertManagerDefinitionInvalidWorkspaceIDRule() *AwsPromethe`
`29`	`29`	`attributeName: "workspace_id",`
`30`	`30`	`max: 64,`
`31`	`31`	`min: 1,`
`32`		- pattern: regexp.MustCompile(`^.[0-9A-Za-z][-.0-9A-Z_a-z].*$`),
	`32`	+ pattern: regexp.MustCompile(`^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`@@ -90,7 +90,7 @@ func (r *AwsPrometheusAlertManagerDefinitionInvalidWorkspaceIDRule) 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), `^.[0-9A-Za-z][-.0-9A-Z_a-z].*$`),
	`93`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[0-9A-Za-z][-.0-9A-Z_a-z]*$`),
`94`	`94`	`attribute.Expr.Range(),`
`95`	`95`	`)`
`96`	`96`	`}`