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

github-actions[bot] · bendrucker · web-flow · commit e8337515f14a · 2024-07-01T13:00:31.000-07:00
Co-authored-by: bendrucker &lt;808808+bendrucker@users.noreply.github.com&gt;
diff --git a/go.mod b/go.mod
@@ -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
diff --git a/go.sum b/go.sum
@@ -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=
diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
@@ -1 +1 @@
-Subproject commit 9bdfe74403d6ddc12d5f08a2638b242924ae8444
+Subproject commit 9607ced1cc4b6b39263b9017eea3185ec15636ee
diff --git a/rules/models/aws_acmpca_certificate_invalid_signing_algorithm.go b/rules/models/aws_acmpca_certificate_invalid_signing_algorithm.go
@@ -31,6 +31,7 @@ func NewAwsAcmpcaCertificateInvalidSigningAlgorithmRule() *AwsAcmpcaCertificateI
 			"SHA256WITHRSA",
 			"SHA384WITHRSA",
 			"SHA512WITHRSA",
+			"SM3WITHSM2",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_policy_invalid_scalable_dimension.go b/rules/models/aws_appautoscaling_policy_invalid_scalable_dimension.go
@@ -47,6 +47,7 @@ func NewAwsAppautoscalingPolicyInvalidScalableDimensionRule() *AwsAppautoscaling
 			"neptune:cluster:ReadReplicaCount",
 			"sagemaker:variant:DesiredProvisionedConcurrency",
 			"sagemaker:inference-component:DesiredCopyCount",
+			"workspaces:workspacespool:DesiredUserSessions",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_policy_invalid_service_namespace.go b/rules/models/aws_appautoscaling_policy_invalid_service_namespace.go
@@ -39,6 +39,7 @@ func NewAwsAppautoscalingPolicyInvalidServiceNamespaceRule() *AwsAppautoscalingP
 			"kafka",
 			"elasticache",
 			"neptune",
+			"workspaces",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_scheduled_action_invalid_scalable_dimension.go b/rules/models/aws_appautoscaling_scheduled_action_invalid_scalable_dimension.go
@@ -47,6 +47,7 @@ func NewAwsAppautoscalingScheduledActionInvalidScalableDimensionRule() *AwsAppau
 			"neptune:cluster:ReadReplicaCount",
 			"sagemaker:variant:DesiredProvisionedConcurrency",
 			"sagemaker:inference-component:DesiredCopyCount",
+			"workspaces:workspacespool:DesiredUserSessions",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_scheduled_action_invalid_service_namespace.go b/rules/models/aws_appautoscaling_scheduled_action_invalid_service_namespace.go
@@ -39,6 +39,7 @@ func NewAwsAppautoscalingScheduledActionInvalidServiceNamespaceRule() *AwsAppaut
 			"kafka",
 			"elasticache",
 			"neptune",
+			"workspaces",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_target_invalid_scalable_dimension.go b/rules/models/aws_appautoscaling_target_invalid_scalable_dimension.go
@@ -47,6 +47,7 @@ func NewAwsAppautoscalingTargetInvalidScalableDimensionRule() *AwsAppautoscaling
 			"neptune:cluster:ReadReplicaCount",
 			"sagemaker:variant:DesiredProvisionedConcurrency",
 			"sagemaker:inference-component:DesiredCopyCount",
+			"workspaces:workspacespool:DesiredUserSessions",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_target_invalid_service_namespace.go b/rules/models/aws_appautoscaling_target_invalid_service_namespace.go
@@ -39,6 +39,7 @@ func NewAwsAppautoscalingTargetInvalidServiceNamespaceRule() *AwsAppautoscalingT
 			"kafka",
 			"elasticache",
 			"neptune",
+			"workspaces",
 		},
 	}
 }
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -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",
 		},
 	}
 }
diff --git a/rules/models/aws_kinesisanalyticsv2_application_invalid_runtime_environment.go b/rules/models/aws_kinesisanalyticsv2_application_invalid_runtime_environment.go
@@ -35,6 +35,7 @@ func NewAwsKinesisanalyticsv2ApplicationInvalidRuntimeEnvironmentRule() *AwsKine
 			"FLINK-1_15",
 			"ZEPPELIN-FLINK-3_0",
 			"FLINK-1_18",
+			"FLINK-1_19",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -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",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -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",
 		},
 	}
 }
diff --git a/rules/models/aws_workspaces_directory_invalid_directory_id.go b/rules/models/aws_workspaces_directory_invalid_directory_id.go
@@ -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}$)`),
 	}
 }
 
@@ -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(),
 				)
 			}
diff --git a/rules/models/aws_workspaces_workspace_invalid_directory_id.go b/rules/models/aws_workspaces_workspace_invalid_directory_id.go
@@ -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}$)`),
 	}
 }
 
@@ -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(),
 				)
 			}
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
`@@ -31,6 +31,7 @@ func NewAwsAcmpcaCertificateInvalidSigningAlgorithmRule() *AwsAcmpcaCertificateI`
`31`	`31`	`"SHA256WITHRSA",`
`32`	`32`	`"SHA384WITHRSA",`
`33`	`33`	`"SHA512WITHRSA",`
	`34`	`+ "SM3WITHSM2",`
`34`	`35`	`},`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ func NewAwsAppautoscalingPolicyInvalidScalableDimensionRule() *AwsAppautoscaling`
`47`	`47`	`"neptune:cluster:ReadReplicaCount",`
`48`	`48`	`"sagemaker:variant:DesiredProvisionedConcurrency",`
`49`	`49`	`"sagemaker:inference-component:DesiredCopyCount",`
	`50`	`+ "workspaces:workspacespool:DesiredUserSessions",`
`50`	`51`	`},`
`51`	`52`	`}`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ func NewAwsAppautoscalingPolicyInvalidServiceNamespaceRule() *AwsAppautoscalingP`
`39`	`39`	`"kafka",`
`40`	`40`	`"elasticache",`
`41`	`41`	`"neptune",`
	`42`	`+ "workspaces",`
`42`	`43`	`},`
`43`	`44`	`}`
`44`	`45`	`}`