Merge pull request #828 from terraform-linters/bump_aws_provider

Bump terraform-provider-aws to v2.68.0 from v2.65.0

Author: wata727

Makefile

@@ -20,7 +20,7 @@ lint:
 clean:
 	rm -rf dist/
 
-code: prepare
+code:
 	go generate ./...
 
 .PHONY: prepare test build install lint clean code

docs/guides/compatibility.md

@@ -3,7 +3,7 @@
 Some inspections implicitly assume the behavior of a specific version of provider plugins or Terraform. This always assumes the latest version and is as follows:
 
 - Terraform v0.12.28
-- AWS Provider v2.65.0
+- AWS Provider v2.68.0
 
 Of course, TFLint may work correctly if you run it on other versions. But, false positives/negatives can occur based on this assumption.
 

go.mod

@@ -22,9 +22,9 @@ require (
 	github.com/sourcegraph/jsonrpc2 v0.0.0-20190106185902-35a74f039c6a
 	github.com/spf13/afero v1.3.0
 	github.com/terraform-linters/tflint-plugin-sdk v0.2.0
-	github.com/terraform-providers/terraform-provider-aws v2.65.0+incompatible
+	github.com/terraform-providers/terraform-provider-aws v2.68.0+incompatible
 	github.com/zclconf/go-cty v1.5.1
 	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
 )
 
-replace github.com/terraform-providers/terraform-provider-aws v2.65.0+incompatible => github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200604234259-3853d337c01a
+replace github.com/terraform-providers/terraform-provider-aws v2.68.0+incompatible => github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200625234409-8688f3adfb43

go.sum

@@ -75,10 +75,8 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.30.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.32.7 h1:H4VgdCSF1cHw0VD8zGc98T1bGdACoLkh/vK2L6wgOUU=
-github.com/aws/aws-sdk-go v1.32.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.32.3/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.32.11 h1:1nYF+Tfccn/hnAZsuwPPMSCVUVnx3j6LKOpx/WhgH0A=
 github.com/aws/aws-sdk-go v1.32.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
@@ -280,6 +278,8 @@ github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mo
 github.com/hashicorp/go-msgpack v0.5.4/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
+github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
 github.com/hashicorp/go-plugin v1.2.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
 github.com/hashicorp/go-plugin v1.3.0 h1:4d/wJojzvHV1I4i/rrjVaeuyxWrLzDE1mDCyDy8fXS8=
@@ -330,7 +330,6 @@ github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8j
 github.com/hashicorp/terraform-json v0.5.0 h1:7TV3/F3y7QVSuN4r9BEXqnWqrAyeOtON8f0wvREtyzs=
 github.com/hashicorp/terraform-json v0.5.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
 github.com/hashicorp/terraform-plugin-sdk v1.7.0/go.mod h1:OjgQmey5VxnPej/buEhe+YqKm0KNvV3QqU4hkqHqPCY=
-github.com/hashicorp/terraform-plugin-sdk v1.13.1/go.mod h1:HiWIPD/T9HixIhQUwaSoDQxo4BLFdmiBi/Qz5gjB8Q0=
 github.com/hashicorp/terraform-plugin-sdk v1.14.0 h1:sUKcw7OHqDXhBarlHjv+/yMCr8eEb1lO8CGQ3pEEFiE=
 github.com/hashicorp/terraform-plugin-sdk v1.14.0/go.mod h1:t62Xy+m7Zjq5tA2vrs8Wuo/TQ0sc9Mx9MjXL3+7MHBQ=
 github.com/hashicorp/terraform-plugin-test v1.2.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs=
@@ -423,8 +422,6 @@ github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0X
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@@ -598,8 +595,8 @@ github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod h1:0PfYo
 github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod h1:wk2XFUg6egk4tSDNZtXeKfe2G6690UVyt163PuUxBZk=
 github.com/terraform-linters/tflint-plugin-sdk v0.2.0 h1:kLNBJatWgylUL1Iieys3DnaCVHChTMEqft5BW7+NVyk=
 github.com/terraform-linters/tflint-plugin-sdk v0.2.0/go.mod h1:QoSqSV/8GSOrQy3OStK3EEdsA3yZm13My4BQcnx3Zic=
-github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200604234259-3853d337c01a h1:ujCTSJYKH0UMgO2tNl9PD8imfkf3jQdvgE+4NOjp78k=
-github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200604234259-3853d337c01a/go.mod h1:qu2Yl7WdzjH6gyX9SrG8vuSgqNlNRlP7hmCPXnPvFRc=
+github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200625234409-8688f3adfb43 h1:tt30KJTNH0vBqyvbVhW+QHa2I1ciwh1XmyIl/m5fjJ4=
+github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200625234409-8688f3adfb43/go.mod h1:0U3OgA2uDYSc7gNkdWA92+/BxWXwuYhWqqZ4UhM1RCw=
 github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod h1:2aQ6n/BtChAl1y2S60vebhyJyZXBsuAI5G4+lHrT1Ew=
 github.com/tetafro/godot v0.3.3/go.mod h1:pT6/T8+h6//L/LwQcFc4C0xpfy1euZwzS1sHdrFCms0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=

rules/awsrules/models/aws-sdk-go

@@ -108,6 +108,15 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"r5ad.12xlarge",
 			"r5ad.16xlarge",
 			"r5ad.24xlarge",
+			"r6g.metal",
+			"r6g.medium",
+			"r6g.large",
+			"r6g.xlarge",
+			"r6g.2xlarge",
+			"r6g.4xlarge",
+			"r6g.8xlarge",
+			"r6g.12xlarge",
+			"r6g.16xlarge",
 			"x1.16xlarge",
 			"x1.32xlarge",
 			"x1e.xlarge",
@@ -181,6 +190,15 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"c5n.4xlarge",
 			"c5n.9xlarge",
 			"c5n.18xlarge",
+			"c6g.metal",
+			"c6g.medium",
+			"c6g.large",
+			"c6g.xlarge",
+			"c6g.2xlarge",
+			"c6g.4xlarge",
+			"c6g.8xlarge",
+			"c6g.12xlarge",
+			"c6g.16xlarge",
 			"cc1.4xlarge",
 			"cc2.8xlarge",
 			"g2.2xlarge",

rules/awsrules/models/aws_fsx_lustre_file_system_invalid_export_path.go

@@ -108,6 +108,15 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"r5ad.12xlarge",
 			"r5ad.16xlarge",
 			"r5ad.24xlarge",
+			"r6g.metal",
+			"r6g.medium",
+			"r6g.large",
+			"r6g.xlarge",
+			"r6g.2xlarge",
+			"r6g.4xlarge",
+			"r6g.8xlarge",
+			"r6g.12xlarge",
+			"r6g.16xlarge",
 			"x1.16xlarge",
 			"x1.32xlarge",
 			"x1e.xlarge",
@@ -181,6 +190,15 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"c5n.4xlarge",
 			"c5n.9xlarge",
 			"c5n.18xlarge",
+			"c6g.metal",
+			"c6g.medium",
+			"c6g.large",
+			"c6g.xlarge",
+			"c6g.2xlarge",
+			"c6g.4xlarge",
+			"c6g.8xlarge",
+			"c6g.12xlarge",
+			"c6g.16xlarge",
 			"cc1.4xlarge",
 			"cc2.8xlarge",
 			"g2.2xlarge",

rules/awsrules/models/aws_fsx_lustre_file_system_invalid_import_path.go

@@ -108,6 +108,15 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"r5ad.12xlarge",
 			"r5ad.16xlarge",
 			"r5ad.24xlarge",
+			"r6g.metal",
+			"r6g.medium",
+			"r6g.large",
+			"r6g.xlarge",
+			"r6g.2xlarge",
+			"r6g.4xlarge",
+			"r6g.8xlarge",
+			"r6g.12xlarge",
+			"r6g.16xlarge",
 			"x1.16xlarge",
 			"x1.32xlarge",
 			"x1e.xlarge",
@@ -181,6 +190,15 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"c5n.4xlarge",
 			"c5n.9xlarge",
 			"c5n.18xlarge",
+			"c6g.metal",
+			"c6g.medium",
+			"c6g.large",
+			"c6g.xlarge",
+			"c6g.2xlarge",
+			"c6g.4xlarge",
+			"c6g.8xlarge",
+			"c6g.12xlarge",
+			"c6g.16xlarge",
 			"cc1.4xlarge",
 			"cc2.8xlarge",
 			"g2.2xlarge",

rules/awsrules/models/aws_instance_invalid_type.go

@@ -15,6 +15,7 @@ import (
 type AwsOrganizationsAccountInvalidParentIDRule struct {
 	resourceType  string
 	attributeName string
+	max           int
 	pattern       *regexp.Regexp
 }
 
@@ -23,6 +24,7 @@ func NewAwsOrganizationsAccountInvalidParentIDRule() *AwsOrganizationsAccountInv
 	return &AwsOrganizationsAccountInvalidParentIDRule{
 		resourceType:  "aws_organizations_account",
 		attributeName: "parent_id",
+		max:           100,
 		pattern:       regexp.MustCompile(`^(r-[0-9a-z]{4,32})|(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$`),
 	}
 }
@@ -56,6 +58,13 @@ func (r *AwsOrganizationsAccountInvalidParentIDRule) Check(runner *tflint.Runner
 		err := runner.EvaluateExpr(attribute.Expr, &val)
 
 		return runner.EnsureNoError(err, func() error {
+			if len(val) > r.max {
+				runner.EmitIssue(
+					r,
+					"parent_id must be 100 characters or less",
+					attribute.Expr.Range(),
+				)
+			}
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,