aws_spot_instance_request.instance_interruption_behaviour -> instance_interruption_behavior (#310)

https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/spot_instance_request#instance_interruption_behavior
https://www.hashicorp.com/blog/terraform-aws-provider-4-0-refactors-s3-bucket-resource
https://github.com/hashicorp/terraform-provider-aws/releases/tag/v4.0.0

Author: PatMyron

docs/rules/README.md

@@ -1269,7 +1269,7 @@ These rules enforce best practices and naming conventions:
 |aws_spot_fleet_request_invalid_allocation_strategy|✔|
 |aws_spot_fleet_request_invalid_fleet_type|✔|
 |aws_spot_fleet_request_invalid_instance_interruption_behaviour|✔|
-|aws_spot_instance_request_invalid_instance_interruption_behaviour|✔|
+|aws_spot_instance_request_invalid_instance_interruption_behavior|✔|
 |aws_ssm_activation_invalid_description|✔|
 |aws_ssm_activation_invalid_iam_role|✔|
 |aws_ssm_activation_invalid_name|✔|

…valid_instance_interruption_behaviour.go …nvalid_instance_interruption_behavior.gorules/models/aws_spot_instance_request_invalid_instance_interruption_behaviour.go renamed to rules/models/aws_spot_instance_request_invalid_instance_interruption_behavior.go rules/models/aws_spot_instance_request_invalid_instance_interruption_behaviour.go renamed to rules/models/aws_spot_instance_request_invalid_instance_interruption_behavior.go

@@ -10,18 +10,18 @@ import (
 	"github.com/terraform-linters/tflint-plugin-sdk/tflint"
 )
 
-// AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule checks the pattern is valid
-type AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule struct {
+// AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule checks the pattern is valid
+type AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule struct {
 	resourceType  string
 	attributeName string
 	enum          []string
 }
 
-// NewAwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule returns new rule with default attributes
-func NewAwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule() *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule {
-	return &AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule{
+// NewAwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule returns new rule with default attributes
+func NewAwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule() *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule {
+	return &AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule{
 		resourceType:  "aws_spot_instance_request",
-		attributeName: "instance_interruption_behaviour",
+		attributeName: "instance_interruption_behavior",
 		enum: []string{
 			"hibernate",
 			"stop",
@@ -31,27 +31,27 @@ func NewAwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule() *AwsSpo
 }
 
 // Name returns the rule name
-func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule) Name() string {
-	return "aws_spot_instance_request_invalid_instance_interruption_behaviour"
+func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule) Name() string {
+	return "aws_spot_instance_request_invalid_instance_interruption_behavior"
 }
 
 // Enabled returns whether the rule is enabled by default
-func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule) Enabled() bool {
+func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule) Enabled() bool {
 	return true
 }
 
 // Severity returns the rule severity
-func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule) Severity() string {
+func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule) Severity() string {
 	return tflint.ERROR
 }
 
 // Link returns the rule reference link
-func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule) Link() string {
+func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule) Link() string {
 	return ""
 }
 
 // Check checks the pattern is valid
-func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule) Check(runner tflint.Runner) error {
+func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule) Check(runner tflint.Runner) error {
 	log.Printf("[TRACE] Check `%s` rule", r.Name())
 
 	return runner.WalkResourceAttributes(r.resourceType, r.attributeName, func(attribute *hcl.Attribute) error {
@@ -68,7 +68,7 @@ func (r *AwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule) Check(r
 			if !found {
 				runner.EmitIssueOnExpr(
 					r,
-					fmt.Sprintf(`"%s" is an invalid value as instance_interruption_behaviour`, truncateLongMessage(val)),
+					fmt.Sprintf(`"%s" is an invalid value as instance_interruption_behavior`, truncateLongMessage(val)),
 					attribute.Expr,
 				)
 			}

rules/models/mappings/ec2.hcl

@@ -383,7 +383,7 @@ mapping "aws_spot_instance_request" {
   spot_type                       = String
   launch_group                    = String
   block_duration_minutes          = Integer
-  instance_interruption_behaviour = InstanceInterruptionBehavior
+  instance_interruption_behavior  = InstanceInterruptionBehavior
   valid_until                     = DateTime
   valid_from                      = DateTime
   tags                            = TagSpecificationList

rules/models/provider.go

@@ -1197,7 +1197,7 @@ var Rules = []tflint.Rule{
 	NewAwsSpotFleetRequestInvalidAllocationStrategyRule(),
 	NewAwsSpotFleetRequestInvalidFleetTypeRule(),
 	NewAwsSpotFleetRequestInvalidInstanceInterruptionBehaviourRule(),
-	NewAwsSpotInstanceRequestInvalidInstanceInterruptionBehaviourRule(),
+	NewAwsSpotInstanceRequestInvalidInstanceInterruptionBehaviorRule(),
 	NewAwsSsmActivationInvalidDescriptionRule(),
 	NewAwsSsmActivationInvalidIAMRoleRule(),
 	NewAwsSsmActivationInvalidNameRule(),