Bump aws-sdk-go submodule and Terraform provider schema (#151)

wata727 · web-flow · commit dd2461d27a19 · 2021-08-07T22:53:21.000+09:00
* Bump aws-sdk-go module

* Bump provider schema
diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
@@ -1 +1 @@
-Subproject commit 9d0b11d1aad3b307768ce7db618a0c7305583197
+Subproject commit 9f71301f8e1f1677110b1653dccc2bf3b576d502
diff --git a/rules/models/aws_appsync_graphql_api_invalid_authentication_type.go b/rules/models/aws_appsync_graphql_api_invalid_authentication_type.go
@@ -27,6 +27,7 @@ func NewAwsAppsyncGraphqlAPIInvalidAuthenticationTypeRule() *AwsAppsyncGraphqlAP
 			"AWS_IAM",
 			"AMAZON_COGNITO_USER_POOLS",
 			"OPENID_CONNECT",
+			"AWS_LAMBDA",
 		},
 	}
 }
diff --git a/rules/models/aws_glue_trigger_invalid_type.go b/rules/models/aws_glue_trigger_invalid_type.go
@@ -26,6 +26,7 @@ func NewAwsGlueTriggerInvalidTypeRule() *AwsGlueTriggerInvalidTypeRule {
 			"SCHEDULED",
 			"CONDITIONAL",
 			"ON_DEMAND",
+			"EVENT",
 		},
 	}
 }
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -258,6 +258,8 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"g3.8xlarge",
 			"g3.16xlarge",
 			"g3s.xlarge",
+			"g4ad.xlarge",
+			"g4ad.2xlarge",
 			"g4ad.4xlarge",
 			"g4ad.8xlarge",
 			"g4ad.16xlarge",
diff --git a/rules/models/aws_lambda_permission_invalid_principal.go b/rules/models/aws_lambda_permission_invalid_principal.go
@@ -23,7 +23,7 @@ func NewAwsLambdaPermissionInvalidPrincipalRule() *AwsLambdaPermissionInvalidPri
 	return &AwsLambdaPermissionInvalidPrincipalRule{
 		resourceType:  "aws_lambda_permission",
 		attributeName: "principal",
-		pattern:       regexp.MustCompile(`^.*$`),
+		pattern:       regexp.MustCompile(`^[^\s]+$`),
 	}
 }
 
@@ -59,7 +59,7 @@ func (r *AwsLambdaPermissionInvalidPrincipalRule) Check(runner tflint.Runner) er
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssueOnExpr(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[^\s]+$`),
 					attribute.Expr,
 				)
 			}
diff --git a/rules/models/aws_lambda_permission_invalid_source_account.go b/rules/models/aws_lambda_permission_invalid_source_account.go
@@ -15,6 +15,7 @@ import (
 type AwsLambdaPermissionInvalidSourceAccountRule struct {
 	resourceType  string
 	attributeName string
+	max           int
 	pattern       *regexp.Regexp
 }
 
@@ -23,6 +24,7 @@ func NewAwsLambdaPermissionInvalidSourceAccountRule() *AwsLambdaPermissionInvali
 	return &AwsLambdaPermissionInvalidSourceAccountRule{
 		resourceType:  "aws_lambda_permission",
 		attributeName: "source_account",
+		max:           12,
 		pattern:       regexp.MustCompile(`^\d{12}$`),
 	}
 }
@@ -56,6 +58,13 @@ func (r *AwsLambdaPermissionInvalidSourceAccountRule) Check(runner tflint.Runner
 		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
 
 		return runner.EnsureNoError(err, func() error {
+			if len(val) > r.max {
+				runner.EmitIssueOnExpr(
+					r,
+					"source_account must be 12 characters or less",
+					attribute.Expr,
+				)
+			}
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssueOnExpr(
 					r,
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -258,6 +258,8 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"g3.8xlarge",
 			"g3.16xlarge",
 			"g3s.xlarge",
+			"g4ad.xlarge",
+			"g4ad.2xlarge",
 			"g4ad.4xlarge",
 			"g4ad.8xlarge",
 			"g4ad.16xlarge",
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -258,6 +258,8 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"g3.8xlarge",
 			"g3.16xlarge",
 			"g3s.xlarge",
+			"g4ad.xlarge",
+			"g4ad.2xlarge",
 			"g4ad.4xlarge",
 			"g4ad.8xlarge",
 			"g4ad.16xlarge",
diff --git a/rules/models/aws_route53_health_check_invalid_type.go b/rules/models/aws_route53_health_check_invalid_type.go
@@ -30,6 +30,7 @@ func NewAwsRoute53HealthCheckInvalidTypeRule() *AwsRoute53HealthCheckInvalidType
 			"TCP",
 			"CALCULATED",
 			"CLOUDWATCH_METRIC",
+			"RECOVERY_CONTROL",
 		},
 	}
 }
diff --git a/rules/tags/resources.go b/rules/tags/resources.go
diff --git a/tools/provider-schema/.terraform-version b/tools/provider-schema/.terraform-version
@@ -1 +1 @@
-1.0.3
+1.0.4
diff --git a/tools/provider-schema/.terraform.lock.hcl b/tools/provider-schema/.terraform.lock.hcl
diff --git a/tools/provider-schema/provider.tf b/tools/provider-schema/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "3.48.0"
+      version = "3.53.0"
     }
   }
 }
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,6 +27,7 @@ func NewAwsAppsyncGraphqlAPIInvalidAuthenticationTypeRule() *AwsAppsyncGraphqlAP`
`27`	`27`	`"AWS_IAM",`
`28`	`28`	`"AMAZON_COGNITO_USER_POOLS",`
`29`	`29`	`"OPENID_CONNECT",`
	`30`	`+ "AWS_LAMBDA",`
`30`	`31`	`},`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ func NewAwsGlueTriggerInvalidTypeRule() *AwsGlueTriggerInvalidTypeRule {`
`26`	`26`	`"SCHEDULED",`
`27`	`27`	`"CONDITIONAL",`
`28`	`28`	`"ON_DEMAND",`
	`29`	`+ "EVENT",`
`29`	`30`	`},`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func NewAwsLambdaPermissionInvalidPrincipalRule() *AwsLambdaPermissionInvalidPri`
`23`	`23`	`return &AwsLambdaPermissionInvalidPrincipalRule{`
`24`	`24`	`resourceType: "aws_lambda_permission",`
`25`	`25`	`attributeName: "principal",`
`26`		- pattern: regexp.MustCompile(`^.*$`),
	`26`	+ pattern: regexp.MustCompile(`^[^\s]+$`),
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -59,7 +59,7 @@ func (r *AwsLambdaPermissionInvalidPrincipalRule) Check(runner tflint.Runner) er`
`59`	`59`	`if !r.pattern.MatchString(val) {`
`60`	`60`	`runner.EmitIssueOnExpr(`
`61`	`61`	`r,`
`62`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^.*$`),
	`62`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[^\s]+$`),
`63`	`63`	`attribute.Expr,`
`64`	`64`	`)`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ func NewAwsRoute53HealthCheckInvalidTypeRule() *AwsRoute53HealthCheckInvalidType`
`30`	`30`	`"TCP",`
`31`	`31`	`"CALCULATED",`
`32`	`32`	`"CLOUDWATCH_METRIC",`
	`33`	`+ "RECOVERY_CONTROL",`
`33`	`34`	`},`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`aws = {`
`4`	`4`	`source = "hashicorp/aws"`
`5`		`- version = "3.48.0"`
	`5`	`+ version = "3.53.0"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`