Skip to content

Commit 129be2a

Browse files
wata727wata727
authored
Bump aws-sdk-go submodule and Terraform provider (terraform-linters#122)
* Bump aws-sdk-go module * Bump terraform-provider-aws
1 parent 1a1d528 commit 129be2a

12 files changed

+149
-49
lines changed

‎aws/mock/iam.go

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ module github.com/terraform-linters/tflint-ruleset-aws
33
go 1.16
44

55
require (
6-
github.com/aws/aws-sdk-go v1.38.25
6+
github.com/aws/aws-sdk-go v1.38.53
77
github.com/dave/dst v0.26.2
88
github.com/golang/mock v1.5.0
99
github.com/google/go-cmp v0.5.6
1010
github.com/hashicorp/aws-sdk-go-base v0.7.1
1111
github.com/hashicorp/hcl/v2 v2.10.0
12-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.5.0
12+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.1
1313
github.com/mitchellh/go-homedir v1.1.0
1414
github.com/onsi/ginkgo v1.14.2 // indirect
1515
github.com/onsi/gomega v1.10.4 // indirect
1616
github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e
1717
github.com/terraform-linters/tflint-plugin-sdk v0.8.2
18-
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210416160120-9a609f330537
18+
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210603220658-c16ad68fc0b6
1919
github.com/zclconf/go-cty v1.8.3
2020
)

‎go.sum

+67-43
Large diffs are not rendered by default.

‎rules/models/aws-sdk-go

Submodule aws-sdk-go updated 528 files

‎rules/models/aws_ecs_service_invalid_launch_type.go

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func NewAwsEcsServiceInvalidLaunchTypeRule() *AwsEcsServiceInvalidLaunchTypeRule
2525
enum: []string{
2626
"EC2",
2727
"FARGATE",
28+
"EXTERNAL",
2829
},
2930
}
3031
}

‎rules/models/aws_efs_file_system_invalid_kms_key_id.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func NewAwsEfsFileSystemInvalidKmsKeyIDRule() *AwsEfsFileSystemInvalidKmsKeyIDRu
2525
resourceType: "aws_efs_file_system",
2626
attributeName: "kms_key_id",
2727
max: 2048,
28-
pattern: regexp.MustCompile(`^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|alias/[a-zA-Z0-9/_-]+|(arn:aws[-a-z]*:kms:[a-z0-9-]+:\d{12}:((key/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(alias/[a-zA-Z0-9/_-]+))))$`),
28+
pattern: regexp.MustCompile(`^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|mrk-[0-9a-f]{32}|alias/[a-zA-Z0-9/_-]+|(arn:aws[-a-z]*:kms:[a-z0-9-]+:\d{12}:((key/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(key/mrk-[0-9a-f]{32})|(alias/[a-zA-Z0-9/_-]+))))$`),
2929
}
3030
}
3131

@@ -68,7 +68,7 @@ func (r *AwsEfsFileSystemInvalidKmsKeyIDRule) Check(runner tflint.Runner) error
6868
if !r.pattern.MatchString(val) {
6969
runner.EmitIssueOnExpr(
7070
r,
71-
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|alias/[a-zA-Z0-9/_-]+|(arn:aws[-a-z]*:kms:[a-z0-9-]+:\d{12}:((key/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(alias/[a-zA-Z0-9/_-]+))))$`),
71+
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|mrk-[0-9a-f]{32}|alias/[a-zA-Z0-9/_-]+|(arn:aws[-a-z]*:kms:[a-z0-9-]+:\d{12}:((key/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(key/mrk-[0-9a-f]{32})|(alias/[a-zA-Z0-9/_-]+))))$`),
7272
attribute.Expr,
7373
)
7474
}

‎rules/models/aws_instance_invalid_type.go

+4
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
346346
"z1d.6xlarge",
347347
"z1d.12xlarge",
348348
"z1d.metal",
349+
"u-6tb1.56xlarge",
350+
"u-6tb1.112xlarge",
351+
"u-9tb1.112xlarge",
352+
"u-12tb1.112xlarge",
349353
"u-6tb1.metal",
350354
"u-9tb1.metal",
351355
"u-12tb1.metal",

‎rules/models/aws_launch_configuration_invalid_type.go

+4
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
346346
"z1d.6xlarge",
347347
"z1d.12xlarge",
348348
"z1d.metal",
349+
"u-6tb1.56xlarge",
350+
"u-6tb1.112xlarge",
351+
"u-9tb1.112xlarge",
352+
"u-12tb1.112xlarge",
349353
"u-6tb1.metal",
350354
"u-9tb1.metal",
351355
"u-12tb1.metal",

‎rules/models/aws_launch_template_invalid_instance_type.go

+4
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
346346
"z1d.6xlarge",
347347
"z1d.12xlarge",
348348
"z1d.metal",
349+
"u-6tb1.56xlarge",
350+
"u-6tb1.112xlarge",
351+
"u-9tb1.112xlarge",
352+
"u-12tb1.112xlarge",
349353
"u-6tb1.metal",
350354
"u-9tb1.metal",
351355
"u-12tb1.metal",

‎rules/models/aws_ssm_document_invalid_document_type.go

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ func NewAwsSsmDocumentInvalidDocumentTypeRule() *AwsSsmDocumentInvalidDocumentTy
3333
"DeploymentStrategy",
3434
"ChangeCalendar",
3535
"Automation.ChangeTemplate",
36+
"ProblemAnalysis",
37+
"ProblemAnalysisTemplate",
3638
},
3739
}
3840
}

‎rules/models/aws_transfer_server_invalid_identity_provider_type.go

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func NewAwsTransferServerInvalidIdentityProviderTypeRule() *AwsTransferServerInv
2525
enum: []string{
2626
"SERVICE_MANAGED",
2727
"API_GATEWAY",
28+
"AWS_DIRECTORY_SERVICE",
2829
},
2930
}
3031
}

‎rules/tags/resources.go

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)