Update AWS provider/module and generated content

terraform-linters · Jul 29, 2023 · 9d66058 · 9d66058
1 parent b90ee8b
commit 9d66058
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 23 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.20
 
 require (
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/aws/aws-sdk-go v1.44.300
+	github.com/aws/aws-sdk-go v1.44.312
 	github.com/dave/dst v0.27.2
 	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/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.44.300 h1:Zn+3lqgYahIf9yfrwZ+g+hq/c3KzUBaQ8wqY/ZXiAbY=
-github.com/aws/aws-sdk-go v1.44.300/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.312 h1:llrElfzeqG/YOLFFKjg1xNpZCFJ2xraIi3PqSuP+95k=
+github.com/aws/aws-sdk-go v1.44.312/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/dave/dst v0.27.2 h1:4Y5VFTkhGLC1oddtNwuxxe36pnyLxMFXT51FOzH8Ekc=
 github.com/dave/dst v0.27.2/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc=

diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
diff --git a/rules/models/aws_cloudfront_function_invalid_runtime.go b/rules/models/aws_cloudfront_function_invalid_runtime.go
@@ -26,6 +26,7 @@ func NewAwsCloudfrontFunctionInvalidRuntimeRule() *AwsCloudfrontFunctionInvalidR
 		attributeName: "runtime",
 		enum: []string{
 			"cloudfront-js-1.0",
+			"cloudfront-js-2.0",
 		},
 	}
 }

diff --git a/rules/models/aws_elasticsearch_domain_invalid_elasticsearch_version.go b/rules/models/aws_elasticsearch_domain_invalid_elasticsearch_version.go
@@ -25,7 +25,7 @@ func NewAwsElasticsearchDomainInvalidElasticsearchVersionRule() *AwsElasticsearc
 	return &AwsElasticsearchDomainInvalidElasticsearchVersionRule{
 		resourceType:  "aws_elasticsearch_domain",
 		attributeName: "elasticsearch_version",
-		pattern:       regexp.MustCompile(`^[0-9]{1}\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\.[0-9]{1,2}$`),
+		pattern:       regexp.MustCompile(`^[0-9]{1}\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\.[0-9]{1,2}$|^OS_[0-9]{1,2}\.[0-9]{1,2}$`),
 	}
 }
 
@@ -72,7 +72,7 @@ func (r *AwsElasticsearchDomainInvalidElasticsearchVersionRule) Check(runner tfl
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[0-9]{1}\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\.[0-9]{1,2}$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[0-9]{1}\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\.[0-9]{1,2}$|^OS_[0-9]{1,2}\.[0-9]{1,2}$`),
 					attribute.Expr.Range(),
 				)
 			}

diff --git a/rules/models/aws_lambda_function_invalid_runtime.go b/rules/models/aws_lambda_function_invalid_runtime.go
@@ -56,6 +56,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu
 			"python3.10",
 			"java17",
 			"ruby3.2",
+			"python3.11",
 		},
 	}
 }

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