Bump aws-sdk-go submodule and Terraform provider schema (#188)

wata727 · web-flow · commit d87ffc2a0509 · 2021-10-11T01:39:54.000+09:00
* Bump aws-sdk-go module

* Bump provider schema
diff --git a/docs/rules/README.md b/docs/rules/README.md
@@ -366,6 +366,7 @@ These rules enforce best practices and naming conventions:
 |aws_elastic_beanstalk_environment_invalid_version_label|✔|
 |aws_elasticache_cluster_invalid_az_mode|✔|
 |aws_elasticsearch_domain_invalid_domain_name|✔|
+|aws_elasticsearch_domain_invalid_elasticsearch_version|✔|
 |aws_elasticsearch_domain_policy_invalid_domain_name|✔|
 |aws_elastictranscoder_pipeline_invalid_aws_kms_key_arn|✔|
 |aws_elastictranscoder_pipeline_invalid_input_bucket|✔|
diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go
@@ -1 +1 @@
-Subproject commit 0caab5abe6b25070faba0ecd2b870288d392c5d8
+Subproject commit 8bb41288c109f10ea966df106f4bc8dc428dca0d
diff --git a/rules/models/aws_alb_target_group_invalid_target_type.go b/rules/models/aws_alb_target_group_invalid_target_type.go
@@ -26,6 +26,7 @@ func NewAwsALBTargetGroupInvalidTargetTypeRule() *AwsALBTargetGroupInvalidTarget
 			"instance",
 			"ip",
 			"lambda",
+			"alb",
 		},
 	}
 }
diff --git a/rules/models/aws_ami_invalid_architecture.go b/rules/models/aws_ami_invalid_architecture.go
@@ -26,6 +26,7 @@ func NewAwsAMIInvalidArchitectureRule() *AwsAMIInvalidArchitectureRule {
 			"i386",
 			"x86_64",
 			"arm64",
+			"x86_64_mac",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_policy_invalid_scalable_dimension.go b/rules/models/aws_appautoscaling_policy_invalid_scalable_dimension.go
@@ -42,6 +42,7 @@ func NewAwsAppautoscalingPolicyInvalidScalableDimensionRule() *AwsAppautoscaling
 			"kafka:broker-storage:VolumeSize",
 			"elasticache:replication-group:NodeGroups",
 			"elasticache:replication-group:Replicas",
+			"neptune:cluster:ReadReplicaCount",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_policy_invalid_service_namespace.go b/rules/models/aws_appautoscaling_policy_invalid_service_namespace.go
@@ -36,6 +36,7 @@ func NewAwsAppautoscalingPolicyInvalidServiceNamespaceRule() *AwsAppautoscalingP
 			"cassandra",
 			"kafka",
 			"elasticache",
+			"neptune",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_scheduled_action_invalid_scalable_dimension.go b/rules/models/aws_appautoscaling_scheduled_action_invalid_scalable_dimension.go
@@ -42,6 +42,7 @@ func NewAwsAppautoscalingScheduledActionInvalidScalableDimensionRule() *AwsAppau
 			"kafka:broker-storage:VolumeSize",
 			"elasticache:replication-group:NodeGroups",
 			"elasticache:replication-group:Replicas",
+			"neptune:cluster:ReadReplicaCount",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_scheduled_action_invalid_service_namespace.go b/rules/models/aws_appautoscaling_scheduled_action_invalid_service_namespace.go
@@ -36,6 +36,7 @@ func NewAwsAppautoscalingScheduledActionInvalidServiceNamespaceRule() *AwsAppaut
 			"cassandra",
 			"kafka",
 			"elasticache",
+			"neptune",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_target_invalid_scalable_dimension.go b/rules/models/aws_appautoscaling_target_invalid_scalable_dimension.go
@@ -42,6 +42,7 @@ func NewAwsAppautoscalingTargetInvalidScalableDimensionRule() *AwsAppautoscaling
 			"kafka:broker-storage:VolumeSize",
 			"elasticache:replication-group:NodeGroups",
 			"elasticache:replication-group:Replicas",
+			"neptune:cluster:ReadReplicaCount",
 		},
 	}
 }
diff --git a/rules/models/aws_appautoscaling_target_invalid_service_namespace.go b/rules/models/aws_appautoscaling_target_invalid_service_namespace.go
@@ -36,6 +36,7 @@ func NewAwsAppautoscalingTargetInvalidServiceNamespaceRule() *AwsAppautoscalingT
 			"cassandra",
 			"kafka",
 			"elasticache",
+			"neptune",
 		},
 	}
 }
diff --git a/rules/models/aws_appsync_datasource_invalid_type.go b/rules/models/aws_appsync_datasource_invalid_type.go
@@ -29,6 +29,7 @@ func NewAwsAppsyncDatasourceInvalidTypeRule() *AwsAppsyncDatasourceInvalidTypeRu
 			"NONE",
 			"HTTP",
 			"RELATIONAL_DATABASE",
+			"AMAZON_OPENSEARCH_SERVICE",
 		},
 	}
 }
diff --git a/rules/models/aws_elasticsearch_domain_invalid_elasticsearch_version.go b/rules/models/aws_elasticsearch_domain_invalid_elasticsearch_version.go
@@ -0,0 +1,69 @@
+// This file generated by `generator/`. DO NOT EDIT
+
+package models
+
+import (
+	"fmt"
+	"log"
+	"regexp"
+
+	hcl "github.com/hashicorp/hcl/v2"
+	"github.com/terraform-linters/tflint-plugin-sdk/tflint"
+)
+
+// AwsElasticsearchDomainInvalidElasticsearchVersionRule checks the pattern is valid
+type AwsElasticsearchDomainInvalidElasticsearchVersionRule struct {
+	resourceType  string
+	attributeName string
+	pattern       *regexp.Regexp
+}
+
+// NewAwsElasticsearchDomainInvalidElasticsearchVersionRule returns new rule with default attributes
+func NewAwsElasticsearchDomainInvalidElasticsearchVersionRule() *AwsElasticsearchDomainInvalidElasticsearchVersionRule {
+	return &AwsElasticsearchDomainInvalidElasticsearchVersionRule{
+		resourceType:  "aws_elasticsearch_domain",
+		attributeName: "elasticsearch_version",
+		pattern:       regexp.MustCompile(`^[0-9]{1}\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\.[0-9]{1,2}$`),
+	}
+}
+
+// Name returns the rule name
+func (r *AwsElasticsearchDomainInvalidElasticsearchVersionRule) Name() string {
+	return "aws_elasticsearch_domain_invalid_elasticsearch_version"
+}
+
+// Enabled returns whether the rule is enabled by default
+func (r *AwsElasticsearchDomainInvalidElasticsearchVersionRule) Enabled() bool {
+	return true
+}
+
+// Severity returns the rule severity
+func (r *AwsElasticsearchDomainInvalidElasticsearchVersionRule) Severity() string {
+	return tflint.ERROR
+}
+
+// Link returns the rule reference link
+func (r *AwsElasticsearchDomainInvalidElasticsearchVersionRule) Link() string {
+	return ""
+}
+
+// Check checks the pattern is valid
+func (r *AwsElasticsearchDomainInvalidElasticsearchVersionRule) 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 {
+		var val string
+		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
+
+		return runner.EnsureNoError(err, func() error {
+			if !r.pattern.MatchString(val) {
+				runner.EmitIssueOnExpr(
+					r,
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^[0-9]{1}\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\.[0-9]{1,2}$`),
+					attribute.Expr,
+				)
+			}
+			return nil
+		})
+	})
+}
diff --git a/rules/models/aws_instance_invalid_type.go b/rules/models/aws_instance_invalid_type.go
@@ -440,6 +440,9 @@ func NewAwsInstanceInvalidTypeRule() *AwsInstanceInvalidTypeRule {
 			"x2gd.12xlarge",
 			"x2gd.16xlarge",
 			"x2gd.metal",
+			"vt1.3xlarge",
+			"vt1.6xlarge",
+			"vt1.24xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_configuration_invalid_type.go b/rules/models/aws_launch_configuration_invalid_type.go
@@ -440,6 +440,9 @@ func NewAwsLaunchConfigurationInvalidTypeRule() *AwsLaunchConfigurationInvalidTy
 			"x2gd.12xlarge",
 			"x2gd.16xlarge",
 			"x2gd.metal",
+			"vt1.3xlarge",
+			"vt1.6xlarge",
+			"vt1.24xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_launch_template_invalid_instance_type.go b/rules/models/aws_launch_template_invalid_instance_type.go
@@ -440,6 +440,9 @@ func NewAwsLaunchTemplateInvalidInstanceTypeRule() *AwsLaunchTemplateInvalidInst
 			"x2gd.12xlarge",
 			"x2gd.16xlarge",
 			"x2gd.metal",
+			"vt1.3xlarge",
+			"vt1.6xlarge",
+			"vt1.24xlarge",
 		},
 	}
 }
diff --git a/rules/models/aws_lb_target_group_invalid_target_type.go b/rules/models/aws_lb_target_group_invalid_target_type.go
@@ -26,6 +26,7 @@ func NewAwsLbTargetGroupInvalidTargetTypeRule() *AwsLbTargetGroupInvalidTargetTy
 			"instance",
 			"ip",
 			"lambda",
+			"alb",
 		},
 	}
 }
diff --git a/rules/models/provider.go b/rules/models/provider.go
@@ -305,6 +305,7 @@ var Rules = []tflint.Rule{
 	NewAwsElasticBeanstalkEnvironmentInvalidVersionLabelRule(),
 	NewAwsElastiCacheClusterInvalidAzModeRule(),
 	NewAwsElasticsearchDomainInvalidDomainNameRule(),
+	NewAwsElasticsearchDomainInvalidElasticsearchVersionRule(),
 	NewAwsElasticsearchDomainPolicyInvalidDomainNameRule(),
 	NewAwsElastictranscoderPipelineInvalidAwsKmsKeyArnRule(),
 	NewAwsElastictranscoderPipelineInvalidInputBucketRule(),
diff --git a/rules/tags/resources.go b/rules/tags/resources.go
diff --git a/tools/provider-schema/.terraform-version b/tools/provider-schema/.terraform-version
@@ -1 +1 @@
-1.0.5
+1.0.8
diff --git a/tools/provider-schema/.terraform.lock.hcl b/tools/provider-schema/.terraform.lock.hcl
diff --git a/tools/provider-schema/provider.tf b/tools/provider-schema/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "3.56.0"
+      version = "3.62.0"
     }
   }
 }
diff --git a/tools/provider-schema/schema.json b/tools/provider-schema/schema.json

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ func NewAwsALBTargetGroupInvalidTargetTypeRule() *AwsALBTargetGroupInvalidTarget`
`26`	`26`	`"instance",`
`27`	`27`	`"ip",`
`28`	`28`	`"lambda",`
	`29`	`+ "alb",`
`29`	`30`	`},`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ func NewAwsAMIInvalidArchitectureRule() *AwsAMIInvalidArchitectureRule {`
`26`	`26`	`"i386",`
`27`	`27`	`"x86_64",`
`28`	`28`	`"arm64",`
	`29`	`+ "x86_64_mac",`
`29`	`30`	`},`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ func NewAwsAppautoscalingPolicyInvalidScalableDimensionRule() *AwsAppautoscaling`
`42`	`42`	`"kafka:broker-storage:VolumeSize",`
`43`	`43`	`"elasticache:replication-group:NodeGroups",`
`44`	`44`	`"elasticache:replication-group:Replicas",`
	`45`	`+ "neptune:cluster:ReadReplicaCount",`
`45`	`46`	`},`
`46`	`47`	`}`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ func NewAwsAppautoscalingPolicyInvalidServiceNamespaceRule() *AwsAppautoscalingP`
`36`	`36`	`"cassandra",`
`37`	`37`	`"kafka",`
`38`	`38`	`"elasticache",`
	`39`	`+ "neptune",`
`39`	`40`	`},`
`40`	`41`	`}`
`41`	`42`	`}`