Bump github.com/aws/aws-sdk-go from 1.35.14 to 1.35.19 (#965)

* Bump github.com/aws/aws-sdk-go from 1.35.14 to 1.35.19 Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.35.14 to 1.35.19. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.35.14...v1.35.19) Signed-off-by: dependabot[bot] <support@github.com>
terraform-linters · Nov 2, 2020 · 19683cc · 19683cc
1 parent 418b662
commit 19683cc
Show file tree

Hide file tree

Showing 13 changed files with 159 additions and 19 deletions.
diff --git a/client/aws_ec2_mock.go b/client/aws_ec2_mock.go
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/terraform-linters/tflint
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go v1.35.14
+	github.com/aws/aws-sdk-go v1.35.19
 	github.com/fatih/color v1.10.0
 	github.com/golang/mock v1.4.4
 	github.com/google/go-cmp v0.5.2

diff --git a/go.sum b/go.sum
@@ -113,8 +113,8 @@ github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3A
 github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.35.2/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
-github.com/aws/aws-sdk-go v1.35.14 h1:nucVVXXjAr9UkmYCBWxQWRuYa5KOlaXjuJGg2ulW0K0=
-github.com/aws/aws-sdk-go v1.35.14/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
+github.com/aws/aws-sdk-go v1.35.19 h1:vdIqQnOIqTNtvnOdt9r3Bf/FiCJ7KV/7O2BIj4TPx2w=
+github.com/aws/aws-sdk-go v1.35.19/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
 github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=

diff --git a/rules/awsrules/models/aws-sdk-go b/rules/awsrules/models/aws-sdk-go
diff --git a/rules/awsrules/models/aws_appautoscaling_policy_invalid_scalable_dimension.go b/rules/awsrules/models/aws_appautoscaling_policy_invalid_scalable_dimension.go
@@ -35,11 +35,9 @@ func NewAwsAppautoscalingPolicyInvalidScalableDimensionRule() *AwsAppautoscaling
 			"sagemaker:variant:DesiredInstanceCount",
 			"custom-resource:ResourceType:Property",
 			"comprehend:document-classifier-endpoint:DesiredInferenceUnits",
-			"comprehend:entity-recognizer-endpoint:DesiredInferenceUnits",
 			"lambda:function:ProvisionedConcurrency",
 			"cassandra:table:ReadCapacityUnits",
 			"cassandra:table:WriteCapacityUnits",
-			"kafka:broker-storage:VolumeSize",
 		},
 	}
 }

diff --git a/rules/awsrules/models/aws_appautoscaling_policy_invalid_service_namespace.go b/rules/awsrules/models/aws_appautoscaling_policy_invalid_service_namespace.go
@@ -34,7 +34,6 @@ func NewAwsAppautoscalingPolicyInvalidServiceNamespaceRule() *AwsAppautoscalingP
 			"comprehend",
 			"lambda",
 			"cassandra",
-			"kafka",
 		},
 	}
 }

diff --git a/rules/awsrules/models/aws_appautoscaling_scheduled_action_invalid_scalable_dimension.go b/rules/awsrules/models/aws_appautoscaling_scheduled_action_invalid_scalable_dimension.go
@@ -35,11 +35,9 @@ func NewAwsAppautoscalingScheduledActionInvalidScalableDimensionRule() *AwsAppau
 			"sagemaker:variant:DesiredInstanceCount",
 			"custom-resource:ResourceType:Property",
 			"comprehend:document-classifier-endpoint:DesiredInferenceUnits",
-			"comprehend:entity-recognizer-endpoint:DesiredInferenceUnits",
 			"lambda:function:ProvisionedConcurrency",
 			"cassandra:table:ReadCapacityUnits",
 			"cassandra:table:WriteCapacityUnits",
-			"kafka:broker-storage:VolumeSize",
 		},
 	}
 }

diff --git a/rules/awsrules/models/aws_appautoscaling_scheduled_action_invalid_service_namespace.go b/rules/awsrules/models/aws_appautoscaling_scheduled_action_invalid_service_namespace.go
@@ -34,7 +34,6 @@ func NewAwsAppautoscalingScheduledActionInvalidServiceNamespaceRule() *AwsAppaut
 			"comprehend",
 			"lambda",
 			"cassandra",
-			"kafka",
 		},
 	}
 }

diff --git a/rules/awsrules/models/aws_appautoscaling_target_invalid_scalable_dimension.go b/rules/awsrules/models/aws_appautoscaling_target_invalid_scalable_dimension.go
@@ -35,11 +35,9 @@ func NewAwsAppautoscalingTargetInvalidScalableDimensionRule() *AwsAppautoscaling
 			"sagemaker:variant:DesiredInstanceCount",
 			"custom-resource:ResourceType:Property",
 			"comprehend:document-classifier-endpoint:DesiredInferenceUnits",
-			"comprehend:entity-recognizer-endpoint:DesiredInferenceUnits",
 			"lambda:function:ProvisionedConcurrency",
 			"cassandra:table:ReadCapacityUnits",
 			"cassandra:table:WriteCapacityUnits",
-			"kafka:broker-storage:VolumeSize",
 		},
 	}
 }

diff --git a/rules/awsrules/models/aws_appautoscaling_target_invalid_service_namespace.go b/rules/awsrules/models/aws_appautoscaling_target_invalid_service_namespace.go
@@ -34,7 +34,6 @@ func NewAwsAppautoscalingTargetInvalidServiceNamespaceRule() *AwsAppautoscalingT
 			"comprehend",
 			"lambda",
 			"cassandra",
-			"kafka",
 		},
 	}
 }

diff --git a/rules/awsrules/models/aws_datasync_location_s3_invalid_s3_bucket_arn.go b/rules/awsrules/models/aws_datasync_location_s3_invalid_s3_bucket_arn.go
@@ -24,8 +24,8 @@ func NewAwsDatasyncLocationS3InvalidS3BucketArnRule() *AwsDatasyncLocationS3Inva
 	return &AwsDatasyncLocationS3InvalidS3BucketArnRule{
 		resourceType:  "aws_datasync_location_s3",
 		attributeName: "s3_bucket_arn",
-		max:           156,
-		pattern:       regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\-0-9]*:[0-9]*:.*$`),
+		max:           76,
+		pattern:       regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::([^/]*)$`),
 	}
 }
 
@@ -61,14 +61,14 @@ func (r *AwsDatasyncLocationS3InvalidS3BucketArnRule) Check(runner *tflint.Runne
 			if len(val) > r.max {
 				runner.EmitIssue(
 					r,
-					"s3_bucket_arn must be 156 characters or less",
+					"s3_bucket_arn must be 76 characters or less",
 					attribute.Expr.Range(),
 				)
 			}
 			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):(s3|s3-outposts):[a-z\-0-9]*:[0-9]*:.*$`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::([^/]*)$`),
 					attribute.Expr.Range(),
 				)
 			}

diff --git a/rules/awsrules/models/aws_datasync_location_s3_invalid_s3_bucket_arn_test.go b/rules/awsrules/models/aws_datasync_location_s3_invalid_s3_bucket_arn_test.go
@@ -23,7 +23,7 @@ resource "aws_datasync_location_s3" "foo" {
 			Expected: tflint.Issues{
 				{
 					Rule:    NewAwsDatasyncLocationS3InvalidS3BucketArnRule(),
-					Message: `"arn:aws:eks:us-east-1:123456789012:cluster/my-cluster" does not match valid pattern ^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\-0-9]*:[0-9]*:.*$`,
+					Message: `"arn:aws:eks:us-east-1:123456789012:cluster/my-cluster" does not match valid pattern ^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::([^/]*)$`,
 				},
 			},
 		},

diff --git a/rules/awsrules/models/aws_s3_bucket_object_invalid_storage_class.go b/rules/awsrules/models/aws_s3_bucket_object_invalid_storage_class.go
@@ -30,7 +30,6 @@ func NewAwsS3BucketObjectInvalidStorageClassRule() *AwsS3BucketObjectInvalidStor
 			"INTELLIGENT_TIERING",
 			"GLACIER",
 			"DEEP_ARCHIVE",
-			"OUTPOSTS",
 		},
 	}
 }