Update AWS provider/module and generated content (#471)

github-actions[bot] · bendrucker · web-flow · commit 011f827f91f3 · 2023-04-22T22:00:42.000+09:00
Co-authored-by: bendrucker &lt;bendrucker@users.noreply.github.com&gt;
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.245
 	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.245 h1:KtY2s4q31/kn33AdV63R5t77mdxsI7rq3YT7Mgo805M=
+github.com/aws/aws-sdk-go v1.44.245/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
@@ -1 +1 @@
-Subproject commit cf6d104c9d69fbab925d65849626f910ec099389
+Subproject commit 98e9083d675c3371d0f1ad97e6a1cbfc9b0293a3
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_lambda_function_invalid_runtime.go b/rules/models/aws_lambda_function_invalid_runtime.go
@@ -53,6 +53,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu
 			"provided",
 			"provided.al2",
 			"nodejs18.x",
+			"python3.10",
 		},
 	}
 }
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

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ func NewAwsEcsAccountSettingDefaultInvalidNameRule() *AwsEcsAccountSettingDefaul`
`30`	`30`	`"containerInstanceLongArnFormat",`
`31`	`31`	`"awsvpcTrunking",`
`32`	`32`	`"containerInsights",`
	`33`	`+ "fargateFIPSMode",`
`33`	`34`	`},`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -663,6 +663,11 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {`
`663`	`663`	`"r7g.12xlarge",`
`664`	`664`	`"r7g.16xlarge",`
`665`	`665`	`"r7g.metal",`
	`666`	`+ "c6in.metal",`
	`667`	`+ "m6in.metal",`
	`668`	`+ "m6idn.metal",`
	`669`	`+ "r6in.metal",`
	`670`	`+ "r6idn.metal",`
`666`	`671`	`},`
`667`	`672`	`}`
`668`	`673`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ func NewAwsLambdaFunctionInvalidRuntimeRule() *AwsLambdaFunctionInvalidRuntimeRu`
`53`	`53`	`"provided",`
`54`	`54`	`"provided.al2",`
`55`	`55`	`"nodejs18.x",`
	`56`	`+ "python3.10",`
`56`	`57`	`},`
`57`	`58`	`}`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -663,6 +663,11 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy`
`663`	`663`	`"r7g.12xlarge",`
`664`	`664`	`"r7g.16xlarge",`
`665`	`665`	`"r7g.metal",`
	`666`	`+ "c6in.metal",`
	`667`	`+ "m6in.metal",`
	`668`	`+ "m6idn.metal",`
	`669`	`+ "r6in.metal",`
	`670`	`+ "r6idn.metal",`
`666`	`671`	`},`
`667`	`672`	`}`
`668`	`673`	`}`
Original file line number	Diff line number	Diff line change
`@@ -663,6 +663,11 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst`
`663`	`663`	`"r7g.12xlarge",`
`664`	`664`	`"r7g.16xlarge",`
`665`	`665`	`"r7g.metal",`
	`666`	`+ "c6in.metal",`
	`667`	`+ "m6in.metal",`
	`668`	`+ "m6idn.metal",`
	`669`	`+ "r6in.metal",`
	`670`	`+ "r6idn.metal",`
`666`	`671`	`},`
`667`	`672`	`}`
`668`	`673`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func NewAwsSagemakerFeatureGroupInvalidFeatureGroupNameRule() *AwsSagemakerFeatu`
`29`	`29`	`attributeName: "feature_group_name",`
`30`	`30`	`max: 64,`
`31`	`31`	`min: 1,`
`32`		- pattern: regexp.MustCompile(`^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,63}`),
	`32`	+ pattern: regexp.MustCompile(`^[a-zA-Z0-9]([_-]*[a-zA-Z0-9]){0,63}`),
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`@@ -93,7 +93,7 @@ func (r *AwsSagemakerFeatureGroupInvalidFeatureGroupNameRule) Check(runner tflin`
`93`	`93`	`if !r.pattern.MatchString(val) {`
`94`	`94`	`runner.EmitIssue(`
`95`	`95`	`r,`
`96`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,63}`),
	`96`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[a-zA-Z0-9]([_-]*[a-zA-Z0-9]){0,63}`),
`97`	`97`	`attribute.Expr.Range(),`
`98`	`98`	`)`
`99`	`99`	`}`