Update AWS provider/module and generated content

terraform-linters · Apr 17, 2023 · d15f9c8 · d15f9c8
1 parent 6051809
commit d15f9c8
Show file tree

Hide file tree

Showing 15 changed files with 161 additions and 23 deletions.
diff --git a/aws/mock/ec2.go b/aws/mock/ec2.go
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/aws/aws-sdk-go v1.44.224
+	github.com/aws/aws-sdk-go v1.44.244
 	github.com/dave/dst v0.27.2
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/golang/mock v1.6.0

diff --git a/go.sum b/go.sum
@@ -5,8 +5,8 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ=
-github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.244 h1:QzBWLD5HjZHdRZyTMTOWtD9Pobzf1n8/CeTJB4giXi0=
+github.com/aws/aws-sdk-go v1.44.244/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=

diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
diff --git a/rules/models/aws_ecs_account_setting_default_invalid_name.go b/rules/models/aws_ecs_account_setting_default_invalid_name.go
@@ -30,6 +30,7 @@ func NewAwsEcsAccountSettingDefaultInvalidNameRule() *AwsEcsAccountSettingDefaul
 			"containerInstanceLongArnFormat",
 			"awsvpcTrunking",
 			"containerInsights",
+			"fargateFIPSMode",
 		},
 	}
 }

diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -663,6 +663,11 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"r7g.12xlarge",
 			"r7g.16xlarge",
 			"r7g.metal",
+			"c6in.metal",
+			"m6in.metal",
+			"m6idn.metal",
+			"r6in.metal",
+			"r6idn.metal",
 		},
 	}
 }

diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -663,6 +663,11 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"r7g.12xlarge",
 			"r7g.16xlarge",
 			"r7g.metal",
+			"c6in.metal",
+			"m6in.metal",
+			"m6idn.metal",
+			"r6in.metal",
+			"r6idn.metal",
 		},
 	}
 }

diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -663,6 +663,11 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"r7g.12xlarge",
 			"r7g.16xlarge",
 			"r7g.metal",
+			"c6in.metal",
+			"m6in.metal",
+			"m6idn.metal",
+			"r6in.metal",
+			"r6idn.metal",
 		},
 	}
 }

diff --git a/rules/models/aws_sagemaker_feature_group_invalid_feature_group_name.go b/rules/models/aws_sagemaker_feature_group_invalid_feature_group_name.go
@@ -29,7 +29,7 @@ func NewAwsSagemakerFeatureGroupInvalidFeatureGroupNameRule() *AwsSagemakerFeatu
 		attributeName: "feature_group_name",
 		max:           64,
 		min:           1,
-		pattern:       regexp.MustCompile(`^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,63}`),
+		pattern:       regexp.MustCompile(`^[a-zA-Z0-9]([_-]*[a-zA-Z0-9]){0,63}`),
 	}
 }
 
@@ -93,7 +93,7 @@ func (r *AwsSagemakerFeatureGroupInvalidFeatureGroupNameRule) Check(runner tflin
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,63}`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9]([_-]*[a-zA-Z0-9]){0,63}`),
 					attribute.Expr.Range(),
 				)
 			}

diff --git a/rules/models/aws_servicecatalog_product_invalid_type.go b/rules/models/aws_servicecatalog_product_invalid_type.go
@@ -29,6 +29,7 @@ func NewAwsServicecatalogProductInvalidTypeRule() *AwsServicecatalogProductInval
 		enum: []string{
 			"CLOUD_FORMATION_TEMPLATE",
 			"MARKETPLACE",
+			"TERRAFORM_OPEN_SOURCE",
 		},
 	}
 }

diff --git a/rules/models/aws_servicecatalog_provisioning_artifact_invalid_type.go b/rules/models/aws_servicecatalog_provisioning_artifact_invalid_type.go
@@ -28,6 +28,7 @@ func NewAwsServicecatalogProvisioningArtifactInvalidTypeRule() *AwsServicecatalo
 			"CLOUD_FORMATION_TEMPLATE",
 			"MARKETPLACE_AMI",
 			"MARKETPLACE_CAR",
+			"TERRAFORM_OPEN_SOURCE",
 		},
 	}
 }

diff --git a/rules/models/aws_ssm_patch_baseline_invalid_operating_system.go b/rules/models/aws_ssm_patch_baseline_invalid_operating_system.go
@@ -38,6 +38,8 @@ func NewAwsSsmPatchBaselineInvalidOperatingSystemRule() *AwsSsmPatchBaselineInva
 			"MACOS",
 			"RASPBIAN",
 			"ROCKY_LINUX",
+			"ALMA_LINUX",
+			"AMAZON_LINUX_2023",
 		},
 	}
 }

diff --git a/rules/tags/resources.go b/rules/tags/resources.go
diff --git a/tools/provider-schema/.terraform.lock.hcl b/tools/provider-schema/.terraform.lock.hcl
diff --git a/tools/provider-schema/schema.json b/tools/provider-schema/schema.json