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

Co-authored-by: wata727 <9624059+wata727@users.noreply.github.com>
terraform-linters · May 3, 2024 · e23251a · e23251a
1 parent 829ced0
commit e23251a
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 39 deletions.
diff --git a/aws/mock/ec2.go b/aws/mock/ec2.go
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.22.2
 
 require (
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/aws/aws-sdk-go v1.51.16
+	github.com/aws/aws-sdk-go v1.52.1
 	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.16 h1:vnWKK8KjbftEkuPX8bRj3WHsLy1uhotn0eXptpvrxJI=
-github.com/aws/aws-sdk-go v1.51.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.52.1 h1:pYpPIuvVsawYDR0Nt3VrceizUAbtpTN3Z7xBzcZWwfI=
+github.com/aws/aws-sdk-go v1.52.1/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/dave/dst v0.27.3 h1:P1HPoMza3cMEquVf9kKy8yXsFirry4zEnWOdYPOoIzY=

diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
diff --git a/rules/models/aws_datasync_agent_invalid_name.go b/rules/models/aws_datasync_agent_invalid_name.go
@@ -18,7 +18,6 @@ type AwsDatasyncAgentInvalidNameRule struct {
 	resourceType  string
 	attributeName string
 	max           int
-	min           int
 	pattern       *regexp.Regexp
 }
 
@@ -28,7 +27,6 @@ func NewAwsDatasyncAgentInvalidNameRule() *AwsDatasyncAgentInvalidNameRule {
 		resourceType:  "aws_datasync_agent",
 		attributeName: "name",
 		max:           256,
-		min:           1,
 		pattern:       regexp.MustCompile(`^[a-zA-Z0-9\s+=._:@/-]+$`),
 	}
 }
@@ -80,13 +78,6 @@ func (r *AwsDatasyncAgentInvalidNameRule) Check(runner tflint.Runner) error {
 					attribute.Expr.Range(),
 				)
 			}
-			if len(val) < r.min {
-				runner.EmitIssue(
-					r,
-					"name must be 1 characters or higher",
-					attribute.Expr.Range(),
-				)
-			}
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,

diff --git a/rules/models/aws_datasync_task_invalid_name.go b/rules/models/aws_datasync_task_invalid_name.go
@@ -18,7 +18,6 @@ type AwsDatasyncTaskInvalidNameRule struct {
 	resourceType  string
 	attributeName string
 	max           int
-	min           int
 	pattern       *regexp.Regexp
 }
 
@@ -28,7 +27,6 @@ func NewAwsDatasyncTaskInvalidNameRule() *AwsDatasyncTaskInvalidNameRule {
 		resourceType:  "aws_datasync_task",
 		attributeName: "name",
 		max:           256,
-		min:           1,
 		pattern:       regexp.MustCompile(`^[a-zA-Z0-9\s+=._:@/-]+$`),
 	}
 }
@@ -80,13 +78,6 @@ func (r *AwsDatasyncTaskInvalidNameRule) Check(runner tflint.Runner) error {
 					attribute.Expr.Range(),
 				)
 			}
-			if len(val) < r.min {
-				runner.EmitIssue(
-					r,
-					"name must be 1 characters or higher",
-					attribute.Expr.Range(),
-				)
-			}
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,

diff --git a/rules/models/aws_quicksight_user_invalid_user_role.go b/rules/models/aws_quicksight_user_invalid_user_role.go
@@ -30,6 +30,9 @@ func NewAwsQuicksightUserInvalidUserRoleRule() *AwsQuicksightUserInvalidUserRole
 			"READER",
 			"RESTRICTED_AUTHOR",
 			"RESTRICTED_READER",
+			"ADMIN_PRO",
+			"AUTHOR_PRO",
+			"READER_PRO",
 		},
 	}
 }

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