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

github-actions[bot] · bendrucker · web-flow · commit accba44b56bc · 2023-05-03T09:59:00.000-07:00
Co-authored-by: bendrucker &lt;bendrucker@users.noreply.github.com&gt;
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.248
+	github.com/aws/aws-sdk-go v1.44.253
 	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.248 h1:GvkxpgsxqNc03LmhXiaxKpzbyxndnex7V+OThLx4g5M=
-github.com/aws/aws-sdk-go v1.44.248/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.253 h1:iqDd0okcH4ShfFexz2zzf4VmeDFf6NOMm07pHnEb8iY=
+github.com/aws/aws-sdk-go v1.44.253/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
@@ -1 +1 @@
-Subproject commit f9284e344902fa404d47962f55f7f8bb73f5ff8d
+Subproject commit af48150b5a7dd449ae02a1354a1caadba2fd1e3b
diff --git a/rules/models/aws_datasync_task_invalid_cloudwatch_log_group_arn.go b/rules/models/aws_datasync_task_invalid_cloudwatch_log_group_arn.go
@@ -27,7 +27,7 @@ func NewAwsDatasyncTaskInvalidCloudwatchLogGroupArnRule() *AwsDatasyncTaskInvali
 		resourceType:  "aws_datasync_task",
 		attributeName: "cloudwatch_log_group_arn",
 		max:           562,
-		pattern:       regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):logs:[a-z\-0-9]*:[0-9]{12}:log-group:([^:\*]*)(:\*)?$`),
+		pattern:       regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):logs:[a-z\-0-9]+:[0-9]{12}:log-group:([^:\*]*)(:\*)?$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsDatasyncTaskInvalidCloudwatchLogGroupArnRule) Check(runner tflint.Ru
 			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):logs:[a-z\-0-9]*:[0-9]{12}:log-group:([^:\*]*)(:\*)?$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):logs:[a-z\-0-9]+:[0-9]{12}:log-group:([^:\*]*)(:\*)?$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_datasync_task_invalid_cloudwatch_log_group_arn_test.go b/rules/models/aws_datasync_task_invalid_cloudwatch_log_group_arn_test.go
@@ -24,7 +24,7 @@ resource "aws_datasync_task" "foo" {
 			Expected: helper.Issues{
 				{
 					Rule:    NewAwsDatasyncTaskInvalidCloudwatchLogGroupArnRule(),
-					Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:s3:::my_corporate_bucket"), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):logs:[a-z\-0-9]*:[0-9]{12}:log-group:([^:\*]*)(:\*)?$`),
+					Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:s3:::my_corporate_bucket"), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):logs:[a-z\-0-9]+:[0-9]{12}:log-group:([^:\*]*)(:\*)?$`),
 				},
 			},
 		},
diff --git a/rules/models/aws_directory_service_conditional_forwarder_invalid_remote_domain_name.go b/rules/models/aws_directory_service_conditional_forwarder_invalid_remote_domain_name.go
@@ -17,6 +17,7 @@ type AwsDirectoryServiceConditionalForwarderInvalidRemoteDomainNameRule struct {
 
 	resourceType  string
 	attributeName string
+	max           int
 	pattern       *regexp.Regexp
 }
 
@@ -25,6 +26,7 @@ func NewAwsDirectoryServiceConditionalForwarderInvalidRemoteDomainNameRule() *Aw
 	return &AwsDirectoryServiceConditionalForwarderInvalidRemoteDomainNameRule{
 		resourceType:  "aws_directory_service_conditional_forwarder",
 		attributeName: "remote_domain_name",
+		max:           1024,
 		pattern:       regexp.MustCompile(`^([a-zA-Z0-9]+[\\.-])+([a-zA-Z0-9])+[.]?$`),
 	}
 }
@@ -69,6 +71,13 @@ func (r *AwsDirectoryServiceConditionalForwarderInvalidRemoteDomainNameRule) Che
 		}
 
 		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
+			if len(val) > r.max {
+				runner.EmitIssue(
+					r,
+					"remote_domain_name must be 1024 characters or less",
+					attribute.Expr.Range(),
+				)
+			}
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
diff --git a/rules/models/aws_lambda_function_invalid_runtime.go b/rules/models/aws_lambda_function_invalid_runtime.go
@@ -54,6 +54,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu
 			"provided.al2",
 			"nodejs18.x",
 			"python3.10",
+			"java17",
 		},
 	}
 }
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
`@@ -27,7 +27,7 @@ func NewAwsDatasyncTaskInvalidCloudwatchLogGroupArnRule() *AwsDatasyncTaskInvali`
`27`	`27`	`resourceType: "aws_datasync_task",`
`28`	`28`	`attributeName: "cloudwatch_log_group_arn",`
`29`	`29`	`max: 562,`
`30`		- pattern: regexp.MustCompile(`^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):logs:[a-z\-0-9]:[0-9]{12}:log-group:([^:\])(:\)?$`),
	`30`	+ pattern: regexp.MustCompile(`^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):logs:[a-z\-0-9]+:[0-9]{12}:log-group:([^:\])(:\*)?$`),
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -81,7 +81,7 @@ func (r *AwsDatasyncTaskInvalidCloudwatchLogGroupArnRule) Check(runner tflint.Ru`
`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):logs:[a-z\-0-9]:[0-9]{12}:log-group:([^:\])(:\)?$`),
	`84`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):logs:[a-z\-0-9]+:[0-9]{12}:log-group:([^:\])(:\*)?$`),
`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_task" "foo" {`
`24`	`24`	`Expected: helper.Issues{`
`25`	`25`	`{`
`26`	`26`	`Rule: NewAwsDatasyncTaskInvalidCloudwatchLogGroupArnRule(),`
`27`		- Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:s3:::my_corporate_bucket"), `^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):logs:[a-z\-0-9]:[0-9]{12}:log-group:([^:\])(:\)?$`),
	`27`	+ Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:s3:::my_corporate_bucket"), `^arn:(aws\|aws-cn\|aws-us-gov\|aws-iso\|aws-iso-b):logs:[a-z\-0-9]+:[0-9]{12}:log-group:([^:\])(:\*)?$`),
`28`	`28`	`},`
`29`	`29`	`},`
`30`	`30`	`},`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu`
`54`	`54`	`"provided.al2",`
`55`	`55`	`"nodejs18.x",`
`56`	`56`	`"python3.10",`
	`57`	`+ "java17",`
`57`	`58`	`},`
`58`	`59`	`}`
`59`	`60`	`}`