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

github-actions[bot] · wata727 · web-flow · commit be178cfc9193 · 2024-06-08T18:11:21.000+09:00
Co-authored-by: wata727 &lt;9624059+wata727@users.noreply.github.com&gt;
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.22.2
 
 require (
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/aws/aws-sdk-go v1.52.1
+	github.com/aws/aws-sdk-go v1.53.19
 	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.52.1 h1:pYpPIuvVsawYDR0Nt3VrceizUAbtpTN3Z7xBzcZWwfI=
-github.com/aws/aws-sdk-go v1.52.1/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.53.19 h1:WEuWc918RXlIaPCyU11F7hH9H1ItK+8m2c/uoQNRUok=
+github.com/aws/aws-sdk-go v1.53.19/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 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 8beb96a3de4796b3c0e2046c29fe59e0a77db409
+Subproject commit ae77b91ecc806411e9c3ebbeebbea036ed908a0d
diff --git a/rules/models/aws_alb_invalid_ip_address_type.go b/rules/models/aws_alb_invalid_ip_address_type.go
@@ -27,6 +27,7 @@ func NewAwsALBInvalidIPAddressTypeRule() *AwsALBInvalidIPAddressTypeRule {
 		enum: []string{
 			"ipv4",
 			"dualstack",
+			"dualstack-without-public-ipv4",
 		},
 	}
 }
diff --git a/rules/models/aws_glue_connection_invalid_connection_type.go b/rules/models/aws_glue_connection_invalid_connection_type.go
@@ -32,6 +32,7 @@ func NewAwsGlueConnectionInvalidConnectionTypeRule() *AwsGlueConnectionInvalidCo
 			"NETWORK",
 			"MARKETPLACE",
 			"CUSTOM",
+			"SALESFORCE",
 		},
 	}
 }
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -821,6 +821,15 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"g6.48xlarge",
 			"gr6.4xlarge",
 			"gr6.8xlarge",
+			"c7i-flex.large",
+			"c7i-flex.xlarge",
+			"c7i-flex.2xlarge",
+			"c7i-flex.4xlarge",
+			"c7i-flex.8xlarge",
+			"u7i-12tb.224xlarge",
+			"u7in-16tb.224xlarge",
+			"u7in-24tb.224xlarge",
+			"u7in-32tb.224xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -821,6 +821,15 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"g6.48xlarge",
 			"gr6.4xlarge",
 			"gr6.8xlarge",
+			"c7i-flex.large",
+			"c7i-flex.xlarge",
+			"c7i-flex.2xlarge",
+			"c7i-flex.4xlarge",
+			"c7i-flex.8xlarge",
+			"u7i-12tb.224xlarge",
+			"u7in-16tb.224xlarge",
+			"u7in-24tb.224xlarge",
+			"u7in-32tb.224xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -821,6 +821,15 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"g6.48xlarge",
 			"gr6.4xlarge",
 			"gr6.8xlarge",
+			"c7i-flex.large",
+			"c7i-flex.xlarge",
+			"c7i-flex.2xlarge",
+			"c7i-flex.4xlarge",
+			"c7i-flex.8xlarge",
+			"u7i-12tb.224xlarge",
+			"u7in-16tb.224xlarge",
+			"u7in-24tb.224xlarge",
+			"u7in-32tb.224xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_lb_invalid_ip_address_type.go b/rules/models/aws_lb_invalid_ip_address_type.go
@@ -27,6 +27,7 @@ func NewAwsLbInvalidIPAddressTypeRule() *AwsLbInvalidIPAddressTypeRule {
 		enum: []string{
 			"ipv4",
 			"dualstack",
+			"dualstack-without-public-ipv4",
 		},
 	}
 }
diff --git a/rules/models/aws_sagemaker_notebook_instance_invalid_instance_type.go b/rules/models/aws_sagemaker_notebook_instance_invalid_instance_type.go
@@ -182,6 +182,14 @@ func NewAwsSagemakerNotebookInstanceInvalidInstanceTypeRule() *AwsSagemakerNoteb
 			"ml.r6id.16xlarge",
 			"ml.r6id.24xlarge",
 			"ml.r6id.32xlarge",
+			"ml.g6.xlarge",
+			"ml.g6.2xlarge",
+			"ml.g6.4xlarge",
+			"ml.g6.8xlarge",
+			"ml.g6.12xlarge",
+			"ml.g6.16xlarge",
+			"ml.g6.24xlarge",
+			"ml.g6.48xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_transfer_ssh_key_invalid_body.go b/rules/models/aws_transfer_ssh_key_invalid_body.go
@@ -3,6 +3,9 @@
 package models
 
 import (
+	"fmt"
+	"regexp"
+
 	"github.com/terraform-linters/tflint-plugin-sdk/hclext"
 	"github.com/terraform-linters/tflint-plugin-sdk/logger"
 	"github.com/terraform-linters/tflint-plugin-sdk/tflint"
@@ -15,6 +18,7 @@ type AwsTransferSSHKeyInvalidBodyRule struct {
 	resourceType  string
 	attributeName string
 	max           int
+	pattern       *regexp.Regexp
 }
 
 // NewAwsTransferSSHKeyInvalidBodyRule returns new rule with default attributes
@@ -23,6 +27,7 @@ func NewAwsTransferSSHKeyInvalidBodyRule() *AwsTransferSSHKeyInvalidBodyRule {
 		resourceType:  "aws_transfer_ssh_key",
 		attributeName: "body",
 		max:           2048,
+		pattern:       regexp.MustCompile(`^\s*(ssh|ecdsa)-[a-z0-9-]+[ \t]+(([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{1,3})?(={0,3})?)(\s*|[ \t]+[\S \t]*\s*)$`),
 	}
 }
 
@@ -73,6 +78,13 @@ func (r *AwsTransferSSHKeyInvalidBodyRule) Check(runner tflint.Runner) error {
 					attribute.Expr.Range(),
 				)
 			}
+			if !r.pattern.MatchString(val) {
+				runner.EmitIssue(
+					r,
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^\s*(ssh|ecdsa)-[a-z0-9-]+[ \t]+(([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{1,3})?(={0,3})?)(\s*|[ \t]+[\S \t]*\s*)$`),
+					attribute.Expr.Range(),
+				)
+			}
 			return nil
 		}, nil)
 		if err != nil {
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
`@@ -27,6 +27,7 @@ func NewAwsALBInvalidIPAddressTypeRule() *AwsALBInvalidIPAddressTypeRule {`
`27`	`27`	`enum: []string{`
`28`	`28`	`"ipv4",`
`29`	`29`	`"dualstack",`
	`30`	`+ "dualstack-without-public-ipv4",`
`30`	`31`	`},`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ func NewAwsGlueConnectionInvalidConnectionTypeRule() *AwsGlueConnectionInvalidCo`
`32`	`32`	`"NETWORK",`
`33`	`33`	`"MARKETPLACE",`
`34`	`34`	`"CUSTOM",`
	`35`	`+ "SALESFORCE",`
`35`	`36`	`},`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func NewAwsLbInvalidIPAddressTypeRule() *AwsLbInvalidIPAddressTypeRule {`
`27`	`27`	`enum: []string{`
`28`	`28`	`"ipv4",`
`29`	`29`	`"dualstack",`
	`30`	`+ "dualstack-without-public-ipv4",`
`30`	`31`	`},`
`31`	`32`	`}`
`32`	`33`	`}`