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

Update generated rules #566

Merged
merged 1 commit into from
Oct 26, 2023
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
100 changes: 100 additions & 0 deletions aws/mock/ec2.go

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

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21.1

require (
github.com/agext/levenshtein v1.2.2 // indirect
github.com/aws/aws-sdk-go v1.45.11
github.com/aws/aws-sdk-go v1.46.4
github.com/dave/dst v0.27.3
github.com/fatih/color v1.13.0 // indirect
github.com/golang/mock v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki
github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.45.11 h1:8qiSrA12+NRr+2MVpMApi3JxtiFFjDVU1NeWe+80bYg=
github.com/aws/aws-sdk-go v1.45.11/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go v1.46.4 h1:48tKgtm9VMPkb6y7HuYlsfhQmoIRAsTEXTsWLVlty4M=
github.com/aws/aws-sdk-go v1.46.4/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/dave/dst v0.27.3 h1:P1HPoMza3cMEquVf9kKy8yXsFirry4zEnWOdYPOoIzY=
github.com/dave/dst v0.27.3/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc=
Expand Down
2 changes: 1 addition & 1 deletion rules/models/aws-sdk-go
Submodule aws-sdk-go updated 523 files
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func NewAwsEc2CapacityReservationInvalidInstancePlatformRule() *AwsEc2CapacityRe
"RHEL with HA",
"RHEL with HA and SQL Server Standard",
"RHEL with HA and SQL Server Enterprise",
"Ubuntu Pro",
},
}
}
Expand Down
51 changes: 51 additions & 0 deletions rules/models/aws_instance_invalid_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,57 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
"r7gd.8xlarge",
"r7gd.12xlarge",
"r7gd.16xlarge",
"r7a.medium",
"r7a.large",
"r7a.xlarge",
"r7a.2xlarge",
"r7a.4xlarge",
"r7a.8xlarge",
"r7a.12xlarge",
"r7a.16xlarge",
"r7a.24xlarge",
"r7a.32xlarge",
"r7a.48xlarge",
"c7i.large",
"c7i.xlarge",
"c7i.2xlarge",
"c7i.4xlarge",
"c7i.8xlarge",
"c7i.12xlarge",
"c7i.16xlarge",
"c7i.24xlarge",
"c7i.48xlarge",
"mac2-m2pro.metal",
"r7iz.large",
"r7iz.xlarge",
"r7iz.2xlarge",
"r7iz.4xlarge",
"r7iz.8xlarge",
"r7iz.12xlarge",
"r7iz.16xlarge",
"r7iz.32xlarge",
"c7a.medium",
"c7a.large",
"c7a.xlarge",
"c7a.2xlarge",
"c7a.4xlarge",
"c7a.8xlarge",
"c7a.12xlarge",
"c7a.16xlarge",
"c7a.24xlarge",
"c7a.32xlarge",
"c7a.48xlarge",
"c7a.metal-48xl",
"r7a.metal-48xl",
"r7i.large",
"r7i.xlarge",
"r7i.2xlarge",
"r7i.4xlarge",
"r7i.8xlarge",
"r7i.12xlarge",
"r7i.16xlarge",
"r7i.24xlarge",
"r7i.48xlarge",
},
}
}
Expand Down
51 changes: 51 additions & 0 deletions rules/models/aws_launch_configuration_invalid_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,57 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
"r7gd.8xlarge",
"r7gd.12xlarge",
"r7gd.16xlarge",
"r7a.medium",
"r7a.large",
"r7a.xlarge",
"r7a.2xlarge",
"r7a.4xlarge",
"r7a.8xlarge",
"r7a.12xlarge",
"r7a.16xlarge",
"r7a.24xlarge",
"r7a.32xlarge",
"r7a.48xlarge",
"c7i.large",
"c7i.xlarge",
"c7i.2xlarge",
"c7i.4xlarge",
"c7i.8xlarge",
"c7i.12xlarge",
"c7i.16xlarge",
"c7i.24xlarge",
"c7i.48xlarge",
"mac2-m2pro.metal",
"r7iz.large",
"r7iz.xlarge",
"r7iz.2xlarge",
"r7iz.4xlarge",
"r7iz.8xlarge",
"r7iz.12xlarge",
"r7iz.16xlarge",
"r7iz.32xlarge",
"c7a.medium",
"c7a.large",
"c7a.xlarge",
"c7a.2xlarge",
"c7a.4xlarge",
"c7a.8xlarge",
"c7a.12xlarge",
"c7a.16xlarge",
"c7a.24xlarge",
"c7a.32xlarge",
"c7a.48xlarge",
"c7a.metal-48xl",
"r7a.metal-48xl",
"r7i.large",
"r7i.xlarge",
"r7i.2xlarge",
"r7i.4xlarge",
"r7i.8xlarge",
"r7i.12xlarge",
"r7i.16xlarge",
"r7i.24xlarge",
"r7i.48xlarge",
},
}
}
Expand Down
51 changes: 51 additions & 0 deletions rules/models/aws_launch_template_invalid_instance_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,57 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
"r7gd.8xlarge",
"r7gd.12xlarge",
"r7gd.16xlarge",
"r7a.medium",
"r7a.large",
"r7a.xlarge",
"r7a.2xlarge",
"r7a.4xlarge",
"r7a.8xlarge",
"r7a.12xlarge",
"r7a.16xlarge",
"r7a.24xlarge",
"r7a.32xlarge",
"r7a.48xlarge",
"c7i.large",
"c7i.xlarge",
"c7i.2xlarge",
"c7i.4xlarge",
"c7i.8xlarge",
"c7i.12xlarge",
"c7i.16xlarge",
"c7i.24xlarge",
"c7i.48xlarge",
"mac2-m2pro.metal",
"r7iz.large",
"r7iz.xlarge",
"r7iz.2xlarge",
"r7iz.4xlarge",
"r7iz.8xlarge",
"r7iz.12xlarge",
"r7iz.16xlarge",
"r7iz.32xlarge",
"c7a.medium",
"c7a.large",
"c7a.xlarge",
"c7a.2xlarge",
"c7a.4xlarge",
"c7a.8xlarge",
"c7a.12xlarge",
"c7a.16xlarge",
"c7a.24xlarge",
"c7a.32xlarge",
"c7a.48xlarge",
"c7a.metal-48xl",
"r7a.metal-48xl",
"r7i.large",
"r7i.xlarge",
"r7i.2xlarge",
"r7i.4xlarge",
"r7i.8xlarge",
"r7i.12xlarge",
"r7i.16xlarge",
"r7i.24xlarge",
"r7i.48xlarge",
},
}
}
Expand Down
1 change: 1 addition & 0 deletions rules/models/aws_servicecatalog_product_invalid_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func NewAwsServicecatalogProductInvalidTypeRule() *AwsServicecatalogProductInval
"MARKETPLACE",
"TERRAFORM_OPEN_SOURCE",
"TERRAFORM_CLOUD",
"EXTERNAL",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func NewAwsServicecatalogProvisioningArtifactInvalidTypeRule() *AwsServicecatalo
"MARKETPLACE_CAR",
"TERRAFORM_OPEN_SOURCE",
"TERRAFORM_CLOUD",
"EXTERNAL",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func NewAwsStoragegatewayNfsFileShareInvalidKmsKeyArnRule() *AwsStoragegatewayNf
attributeName: "kms_key_arn",
max: 2048,
min: 7,
pattern: regexp.MustCompile(`^(^arn:(aws|aws-cn|aws-us-gov):kms:([a-zA-Z0-9-]+):([0-9]+):(key|alias)/(\S+)$)|(^alias/(\S+)$)$`),
pattern: regexp.MustCompile(`^(^arn:(aws(|-cn|-us-gov|-iso[A-Za-z0-9_-]*)):kms:([a-zA-Z0-9-]+):([0-9]+):(key|alias)/(\S+)$)|(^alias/(\S+)$)$`),
}
}

Expand Down Expand Up @@ -90,7 +90,7 @@ func (r *AwsStoragegatewayNfsFileShareInvalidKmsKeyArnRule) Check(runner tflint.
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):kms:([a-zA-Z0-9-]+):([0-9]+):(key|alias)/(\S+)$)|(^alias/(\S+)$)$`),
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(^arn:(aws(|-cn|-us-gov|-iso[A-Za-z0-9_-]*)):kms:([a-zA-Z0-9-]+):([0-9]+):(key|alias)/(\S+)$)|(^alias/(\S+)$)$`),
attribute.Expr.Range(),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func NewAwsStoragegatewayNfsFileShareInvalidRoleArnRule() *AwsStoragegatewayNfsF
attributeName: "role_arn",
max: 2048,
min: 20,
pattern: regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov):iam::([0-9]+):role/(\S+)$`),
pattern: regexp.MustCompile(`^arn:(aws(|-cn|-us-gov|-iso[A-Za-z0-9_-]*)):iam::([0-9]+):role/(\S+)$`),
}
}

Expand Down Expand Up @@ -90,7 +90,7 @@ func (r *AwsStoragegatewayNfsFileShareInvalidRoleArnRule) Check(runner tflint.Ru
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):iam::([0-9]+):role/(\S+)$`),
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^arn:(aws(|-cn|-us-gov|-iso[A-Za-z0-9_-]*)):iam::([0-9]+):role/(\S+)$`),
attribute.Expr.Range(),
)
}
Expand Down
Loading
Loading