Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump terraform-provider-aws from v2.28.1 to v2.30.0 #463

Merged
merged 1 commit into from
Sep 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions client/aws_ec2_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/guides/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
- AWS Provider v2.28.1
- AWS Provider v2.30.0

Of course, TFLint may work correctly if you run it on other versions. But, false positives/negatives can occur based on this assumption.

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/wata727/tflint
go 1.13

require (
github.com/aws/aws-sdk-go v1.23.15
github.com/aws/aws-sdk-go v1.24.4
github.com/fatih/color v1.7.0
github.com/golang/mock v1.3.1
github.com/google/go-cmp v0.3.1
Expand Down
5 changes: 3 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,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.16.36/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.22.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.23.15 h1:ut2ZzO0A34Ds18NXvvkWWKyO4aZqQ9uZquslWzCQvGU=
github.com/aws/aws-sdk-go v1.23.15/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.24.4 h1:te5/T3qKtk6gFQUvdOJukVYX2zIUBVpJJ2tYiF3qM/s=
github.com/aws/aws-sdk-go v1.24.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
Expand Down Expand Up @@ -463,6 +463,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0 h1:Dh6fw+p6FyRl5x/FvNswO1ji0lIGzm3KP8Y9VkS9PTE=
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
Expand Down
2 changes: 1 addition & 1 deletion rules/awsrules/models/aws-sdk-go
Submodule aws-sdk-go updated 225 files
14 changes: 12 additions & 2 deletions rules/awsrules/models/aws_config_config_rule_invalid_name.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package models

import (
"log"
"regexp"

"github.com/hashicorp/hcl2/hcl"
"github.com/wata727/tflint/tflint"
Expand All @@ -15,15 +16,17 @@ type AwsConfigConfigRuleInvalidNameRule struct {
attributeName string
max int
min int
pattern *regexp.Regexp
}

// NewAwsConfigConfigRuleInvalidNameRule returns new rule with default attributes
func NewAwsConfigConfigRuleInvalidNameRule() *AwsConfigConfigRuleInvalidNameRule {
return &AwsConfigConfigRuleInvalidNameRule{
resourceType: "aws_config_config_rule",
attributeName: "name",
max: 64,
max: 128,
min: 1,
pattern: regexp.MustCompile(`^.*\S.*$`),
}
}

Expand Down Expand Up @@ -59,7 +62,7 @@ func (r *AwsConfigConfigRuleInvalidNameRule) Check(runner *tflint.Runner) error
if len(val) > r.max {
runner.EmitIssue(
r,
"name must be 64 characters or less",
"name must be 128 characters or less",
attribute.Expr.Range(),
)
}
Expand All @@ -70,6 +73,13 @@ func (r *AwsConfigConfigRuleInvalidNameRule) Check(runner *tflint.Runner) error
attribute.Expr.Range(),
)
}
if !r.pattern.MatchString(val) {
runner.EmitIssue(
r,
`name does not match valid pattern ^.*\S.*$`,
attribute.Expr.Range(),
)
}
return nil
})
})
Expand Down
6 changes: 6 additions & 0 deletions rules/awsrules/models/aws_instance_invalid_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
"g3.8xlarge",
"g3.16xlarge",
"g3s.xlarge",
"g4dn.xlarge",
"g4dn.2xlarge",
"g4dn.4xlarge",
"g4dn.8xlarge",
"g4dn.12xlarge",
"g4dn.16xlarge",
"cg1.4xlarge",
"p2.xlarge",
"p2.8xlarge",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
"g3.8xlarge",
"g3.16xlarge",
"g3s.xlarge",
"g4dn.xlarge",
"g4dn.2xlarge",
"g4dn.4xlarge",
"g4dn.8xlarge",
"g4dn.12xlarge",
"g4dn.16xlarge",
"cg1.4xlarge",
"p2.xlarge",
"p2.8xlarge",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
"g3.8xlarge",
"g3.16xlarge",
"g3s.xlarge",
"g4dn.xlarge",
"g4dn.2xlarge",
"g4dn.4xlarge",
"g4dn.8xlarge",
"g4dn.12xlarge",
"g4dn.16xlarge",
"cg1.4xlarge",
"p2.xlarge",
"p2.8xlarge",
Expand Down
4 changes: 2 additions & 2 deletions tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/wata727/tflint/tools

go 1.12
go 1.13

require (
github.com/hashicorp/hcl2 v0.0.0-20190821123243-0c888d1241f6
github.com/hashicorp/terraform v0.12.9
github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516
github.com/terraform-providers/terraform-provider-aws v2.28.1+incompatible
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20190926213315-2a971231c1ba
)

// Override since git.apache.org is down
Expand Down
Loading