Skip to content

Update AWS provider/module and generated content #655

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

Merged
merged 1 commit into from
Jul 1, 2024
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
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.22.4

require (
github.com/agext/levenshtein v1.2.2 // indirect
github.com/aws/aws-sdk-go v1.54.6
github.com/aws/aws-sdk-go v1.54.11
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.54.6 h1:HEYUib3yTt8E6vxjMWM3yAq5b+qjj/6aKA62mkgux9g=
github.com/aws/aws-sdk-go v1.54.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/aws/aws-sdk-go v1.54.11 h1:Zxuv/R+IVS0B66yz4uezhxH9FN9/G2nbxejYqAMFjxk=
github.com/aws/aws-sdk-go v1.54.11/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
github.com/dave/dst v0.27.3 h1:P1HPoMza3cMEquVf9kKy8yXsFirry4zEnWOdYPOoIzY=
Expand Down
2 changes: 1 addition & 1 deletion rules/models/aws-sdk-go
Submodule aws-sdk-go updated 113 files
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func NewAwsAcmpcaCertificateInvalidSigningAlgorithmRule() *AwsAcmpcaCertificateI
"SHA256WITHRSA",
"SHA384WITHRSA",
"SHA512WITHRSA",
"SM3WITHSM2",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func NewAwsAppautoscalingPolicyInvalidScalableDimensionRule() *AwsAppautoscaling
"neptune:cluster:ReadReplicaCount",
"sagemaker:variant:DesiredProvisionedConcurrency",
"sagemaker:inference-component:DesiredCopyCount",
"workspaces:workspacespool:DesiredUserSessions",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func NewAwsAppautoscalingPolicyInvalidServiceNamespaceRule() *AwsAppautoscalingP
"kafka",
"elasticache",
"neptune",
"workspaces",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func NewAwsAppautoscalingScheduledActionInvalidScalableDimensionRule() *AwsAppau
"neptune:cluster:ReadReplicaCount",
"sagemaker:variant:DesiredProvisionedConcurrency",
"sagemaker:inference-component:DesiredCopyCount",
"workspaces:workspacespool:DesiredUserSessions",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func NewAwsAppautoscalingScheduledActionInvalidServiceNamespaceRule() *AwsAppaut
"kafka",
"elasticache",
"neptune",
"workspaces",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func NewAwsAppautoscalingTargetInvalidScalableDimensionRule() *AwsAppautoscaling
"neptune:cluster:ReadReplicaCount",
"sagemaker:variant:DesiredProvisionedConcurrency",
"sagemaker:inference-component:DesiredCopyCount",
"workspaces:workspacespool:DesiredUserSessions",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func NewAwsAppautoscalingTargetInvalidServiceNamespaceRule() *AwsAppautoscalingT
"kafka",
"elasticache",
"neptune",
"workspaces",
},
}
}
Expand Down
15 changes: 15 additions & 0 deletions rules/models/aws_instance_invalid_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,21 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
"u7in-16tb.224xlarge",
"u7in-24tb.224xlarge",
"u7in-32tb.224xlarge",
"u7ib-12tb.224xlarge",
"c7gn.metal",
"r8g.medium",
"r8g.large",
"r8g.xlarge",
"r8g.2xlarge",
"r8g.4xlarge",
"r8g.8xlarge",
"r8g.12xlarge",
"r8g.16xlarge",
"r8g.24xlarge",
"r8g.48xlarge",
"r8g.metal-24xl",
"r8g.metal-48xl",
"mac2-m1ultra.metal",
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func NewAwsKinesisanalyticsv2ApplicationInvalidRuntimeEnvironmentRule() *AwsKine
"FLINK-1_15",
"ZEPPELIN-FLINK-3_0",
"FLINK-1_18",
"FLINK-1_19",
},
}
}
Expand Down
15 changes: 15 additions & 0 deletions rules/models/aws_launch_configuration_invalid_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,21 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
"u7in-16tb.224xlarge",
"u7in-24tb.224xlarge",
"u7in-32tb.224xlarge",
"u7ib-12tb.224xlarge",
"c7gn.metal",
"r8g.medium",
"r8g.large",
"r8g.xlarge",
"r8g.2xlarge",
"r8g.4xlarge",
"r8g.8xlarge",
"r8g.12xlarge",
"r8g.16xlarge",
"r8g.24xlarge",
"r8g.48xlarge",
"r8g.metal-24xl",
"r8g.metal-48xl",
"mac2-m1ultra.metal",
},
}
}
Expand Down
15 changes: 15 additions & 0 deletions rules/models/aws_launch_template_invalid_instance_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,21 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
"u7in-16tb.224xlarge",
"u7in-24tb.224xlarge",
"u7in-32tb.224xlarge",
"u7ib-12tb.224xlarge",
"c7gn.metal",
"r8g.medium",
"r8g.large",
"r8g.xlarge",
"r8g.2xlarge",
"r8g.4xlarge",
"r8g.8xlarge",
"r8g.12xlarge",
"r8g.16xlarge",
"r8g.24xlarge",
"r8g.48xlarge",
"r8g.metal-24xl",
"r8g.metal-48xl",
"mac2-m1ultra.metal",
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions rules/models/aws_workspaces_directory_invalid_directory_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func NewAwsWorkspacesDirectoryInvalidDirectoryIDRule() *AwsWorkspacesDirectoryIn
attributeName: "directory_id",
max: 65,
min: 10,
pattern: regexp.MustCompile(`^d-[0-9a-f]{8,63}$`),
pattern: regexp.MustCompile(`^(d-[0-9a-f]{8,63}$)|(wsd-[0-9a-z]{8,63}$)`),
}
}

Expand Down Expand Up @@ -90,7 +90,7 @@ func (r *AwsWorkspacesDirectoryInvalidDirectoryIDRule) Check(runner tflint.Runne
if !r.pattern.MatchString(val) {
runner.EmitIssue(
r,
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^d-[0-9a-f]{8,63}$`),
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(d-[0-9a-f]{8,63}$)|(wsd-[0-9a-z]{8,63}$)`),
attribute.Expr.Range(),
)
}
Expand Down
4 changes: 2 additions & 2 deletions rules/models/aws_workspaces_workspace_invalid_directory_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func NewAwsWorkspacesWorkspaceInvalidDirectoryIDRule() *AwsWorkspacesWorkspaceIn
attributeName: "directory_id",
max: 65,
min: 10,
pattern: regexp.MustCompile(`^d-[0-9a-f]{8,63}$`),
pattern: regexp.MustCompile(`^(d-[0-9a-f]{8,63}$)|(wsd-[0-9a-z]{8,63}$)`),
}
}

Expand Down Expand Up @@ -90,7 +90,7 @@ func (r *AwsWorkspacesWorkspaceInvalidDirectoryIDRule) Check(runner tflint.Runne
if !r.pattern.MatchString(val) {
runner.EmitIssue(
r,
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^d-[0-9a-f]{8,63}$`),
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(d-[0-9a-f]{8,63}$)|(wsd-[0-9a-z]{8,63}$)`),
attribute.Expr.Range(),
)
}
Expand Down
5 changes: 5 additions & 0 deletions rules/tags/resources.go

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

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

Large diffs are not rendered by default.