Skip to content

Commit

Permalink
Update AWS provider/module and generated content
Browse files Browse the repository at this point in the history
  • Loading branch information
@wata727 @github-actions
wata727 authored and github-actions[bot] committed Nov 17, 2024
1 parent baaecb8 commit c9bb5fe
Show file tree
Hide file tree
Showing 15 changed files with 151 additions and 23 deletions.
2 changes: 1 addition & 1 deletion rules/models/aws-sdk-ruby
Submodule aws-sdk-ruby updated 4147 files
8 changes: 4 additions & 4 deletions rules/models/aws_datasync_location_s3_invalid_s3_bucket_arn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,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: 268,
pattern: regexp.MustCompile(`^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
}
}

Expand Down Expand Up @@ -74,14 +74,14 @@ func (r *AwsDatasyncLocationS3InvalidS3BucketArnRule) Check(runner tflint.Runner
if len(val) > r.max {
runner.EmitIssue(
r,
"s3_bucket_arn must be 156 characters or less",
"s3_bucket_arn must be 268 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:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
attribute.Expr.Range(),
)
}
Expand Down
2 changes: 1 addition & 1 deletion rules/models/aws_datasync_location_s3_invalid_s3_bucket_arn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ resource "aws_datasync_location_s3" "foo" {
Expected: helper.Issues{
{
Rule: NewAwsDatasyncLocationS3InvalidS3BucketArnRule(),
Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster"), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\-0-9]*:[0-9]*:.*$`),
Message: fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster"), `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:[a-z\-0-9]*:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-.]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$|^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):s3:::[a-zA-Z0-9.\-_]{1,255}$`),
},
},
},
Expand Down
1 change: 1 addition & 0 deletions rules/models/aws_imagebuilder_component_invalid_platform.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func NewAwsImagebuilderComponentInvalidPlatformRule() *AwsImagebuilderComponentI
enum: []string{
"Windows",
"Linux",
"macOS",
},
}
}
Expand Down
36 changes: 36 additions & 0 deletions rules/models/aws_instance_invalid_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,42 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
"g6e.16xlarge",
"g6e.24xlarge",
"g6e.48xlarge",
"c8g.medium",
"c8g.large",
"c8g.xlarge",
"c8g.2xlarge",
"c8g.4xlarge",
"c8g.8xlarge",
"c8g.12xlarge",
"c8g.16xlarge",
"c8g.24xlarge",
"c8g.48xlarge",
"c8g.metal-24xl",
"c8g.metal-48xl",
"m8g.medium",
"m8g.large",
"m8g.xlarge",
"m8g.2xlarge",
"m8g.4xlarge",
"m8g.8xlarge",
"m8g.12xlarge",
"m8g.16xlarge",
"m8g.24xlarge",
"m8g.48xlarge",
"m8g.metal-24xl",
"m8g.metal-48xl",
"x8g.medium",
"x8g.large",
"x8g.xlarge",
"x8g.2xlarge",
"x8g.4xlarge",
"x8g.8xlarge",
"x8g.12xlarge",
"x8g.16xlarge",
"x8g.24xlarge",
"x8g.48xlarge",
"x8g.metal-24xl",
"x8g.metal-48xl",
},
}
}
Expand Down
1 change: 1 addition & 0 deletions rules/models/aws_lambda_function_invalid_runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu
"provided.al2023",
"python3.12",
"java21",
"python3.13",
},
}
}
Expand Down
36 changes: 36 additions & 0 deletions rules/models/aws_launch_configuration_invalid_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,42 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
"g6e.16xlarge",
"g6e.24xlarge",
"g6e.48xlarge",
"c8g.medium",
"c8g.large",
"c8g.xlarge",
"c8g.2xlarge",
"c8g.4xlarge",
"c8g.8xlarge",
"c8g.12xlarge",
"c8g.16xlarge",
"c8g.24xlarge",
"c8g.48xlarge",
"c8g.metal-24xl",
"c8g.metal-48xl",
"m8g.medium",
"m8g.large",
"m8g.xlarge",
"m8g.2xlarge",
"m8g.4xlarge",
"m8g.8xlarge",
"m8g.12xlarge",
"m8g.16xlarge",
"m8g.24xlarge",
"m8g.48xlarge",
"m8g.metal-24xl",
"m8g.metal-48xl",
"x8g.medium",
"x8g.large",
"x8g.xlarge",
"x8g.2xlarge",
"x8g.4xlarge",
"x8g.8xlarge",
"x8g.12xlarge",
"x8g.16xlarge",
"x8g.24xlarge",
"x8g.48xlarge",
"x8g.metal-24xl",
"x8g.metal-48xl",
},
}
}
Expand Down
36 changes: 36 additions & 0 deletions rules/models/aws_launch_template_invalid_instance_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,42 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
"g6e.16xlarge",
"g6e.24xlarge",
"g6e.48xlarge",
"c8g.medium",
"c8g.large",
"c8g.xlarge",
"c8g.2xlarge",
"c8g.4xlarge",
"c8g.8xlarge",
"c8g.12xlarge",
"c8g.16xlarge",
"c8g.24xlarge",
"c8g.48xlarge",
"c8g.metal-24xl",
"c8g.metal-48xl",
"m8g.medium",
"m8g.large",
"m8g.xlarge",
"m8g.2xlarge",
"m8g.4xlarge",
"m8g.8xlarge",
"m8g.12xlarge",
"m8g.16xlarge",
"m8g.24xlarge",
"m8g.48xlarge",
"m8g.metal-24xl",
"m8g.metal-48xl",
"x8g.medium",
"x8g.large",
"x8g.xlarge",
"x8g.2xlarge",
"x8g.4xlarge",
"x8g.8xlarge",
"x8g.12xlarge",
"x8g.16xlarge",
"x8g.24xlarge",
"x8g.48xlarge",
"x8g.metal-24xl",
"x8g.metal-48xl",
},
}
}
Expand Down
1 change: 1 addition & 0 deletions rules/models/aws_organizations_policy_invalid_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func NewAwsOrganizationsPolicyInvalidTypeRule() *AwsOrganizationsPolicyInvalidTy
attributeName: "type",
enum: []string{
"SERVICE_CONTROL_POLICY",
"RESOURCE_CONTROL_POLICY",
"TAG_POLICY",
"BACKUP_POLICY",
"AISERVICES_OPT_OUT_POLICY",
Expand Down
4 changes: 4 additions & 0 deletions rules/models/aws_route53_record_invalid_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ func NewAwsRoute53RecordInvalidTypeRule() *AwsRoute53RecordInvalidTypeRule {
"AAAA",
"CAA",
"DS",
"TLSA",
"SSHFP",
"SVCB",
"HTTPS",
},
}
}
Expand Down
1 change: 1 addition & 0 deletions rules/models/aws_route53_zone_association_invalid_vpc_region.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func NewAwsRoute53ZoneAssociationInvalidVpcRegionRule() *AwsRoute53ZoneAssociati
"sa-east-1",
"ca-central-1",
"cn-north-1",
"cn-northwest-1",
"af-south-1",
"eu-south-1",
"eu-south-2",
Expand Down
7 changes: 7 additions & 0 deletions rules/models/aws_sagemaker_notebook_instance_invalid_instance_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ func NewAwsSagemakerNotebookInstanceInvalidInstanceTypeRule() *AwsSagemakerNoteb
"ml.inf1.2xlarge",
"ml.inf1.6xlarge",
"ml.inf1.24xlarge",
"ml.trn1.2xlarge",
"ml.trn1.32xlarge",
"ml.trn1n.32xlarge",
"ml.inf2.xlarge",
"ml.inf2.8xlarge",
"ml.inf2.24xlarge",
"ml.inf2.48xlarge",
"ml.p4d.24xlarge",
"ml.p4de.24xlarge",
"ml.p5.48xlarge",
Expand Down
5 changes: 5 additions & 0 deletions rules/tags/resources.go
View file

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

32 changes: 16 additions & 16 deletions tools/provider-schema/.terraform.lock.hcl
View file

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

2 changes: 1 addition & 1 deletion tools/provider-schema/schema.json
View file

Large diffs are not rendered by default.

0 comments on commit c9bb5fe

Please sign in to comment.