Merge pull request #31516 from PatMyron/patch-1

source enum validations from AWS Go SDK
hashicorp · May 30, 2023 · 7ac2dd9 · 7ac2dd9
2 parents 509e3c1 + 249323a
commit 7ac2dd9
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 100 deletions.
diff --git a/internal/service/cognitoidentity/pool_roles_attachment.go b/internal/service/cognitoidentity/pool_roles_attachment.go
@@ -65,14 +65,9 @@ func ResourcePoolRolesAttachment() *schema.Resource {
 										ValidateFunc: validRoleMappingsRulesClaim,
 									},
 									"match_type": {
-										Type:     schema.TypeString,
-										Required: true,
-										ValidateFunc: validation.StringInSlice([]string{
-											cognitoidentity.MappingRuleMatchTypeEquals,
-											cognitoidentity.MappingRuleMatchTypeContains,
-											cognitoidentity.MappingRuleMatchTypeStartsWith,
-											cognitoidentity.MappingRuleMatchTypeNotEqual,
-										}, false),
+										Type:         schema.TypeString,
+										Required:     true,
+										ValidateFunc: validation.StringInSlice(cognitoidentity.MappingRuleMatchType_Values(), false),
 									},
 									"role_arn": {
 										Type:         schema.TypeString,

diff --git a/internal/service/configservice/organization_custom_policy_rule.go b/internal/service/configservice/organization_custom_policy_rule.go
@@ -76,15 +76,9 @@ func ResourceOrganizationCustomPolicyRule() *schema.Resource {
 				),
 			},
 			"maximum_execution_frequency": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					configservice.MaximumExecutionFrequencyOneHour,
-					configservice.MaximumExecutionFrequencyThreeHours,
-					configservice.MaximumExecutionFrequencySixHours,
-					configservice.MaximumExecutionFrequencyTwelveHours,
-					configservice.MaximumExecutionFrequencyTwentyFourHours,
-				}, false),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice(configservice.MaximumExecutionFrequency_Values(), false),
 			},
 			"name": {
 				Type:         schema.TypeString,

diff --git a/internal/service/configservice/organization_custom_rule.go b/internal/service/configservice/organization_custom_rule.go
@@ -71,15 +71,9 @@ func ResourceOrganizationCustomRule() *schema.Resource {
 				ValidateFunc: validation.StringLenBetween(1, 256),
 			},
 			"maximum_execution_frequency": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					configservice.MaximumExecutionFrequencyOneHour,
-					configservice.MaximumExecutionFrequencyThreeHours,
-					configservice.MaximumExecutionFrequencySixHours,
-					configservice.MaximumExecutionFrequencyTwelveHours,
-					configservice.MaximumExecutionFrequencyTwentyFourHours,
-				}, false),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice(configservice.MaximumExecutionFrequency_Values(), false),
 			},
 			"name": {
 				Type:         schema.TypeString,

diff --git a/internal/service/configservice/organization_managed_rule.go b/internal/service/configservice/organization_managed_rule.go
@@ -67,15 +67,9 @@ func ResourceOrganizationManagedRule() *schema.Resource {
 				),
 			},
 			"maximum_execution_frequency": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					configservice.MaximumExecutionFrequencyOneHour,
-					configservice.MaximumExecutionFrequencyThreeHours,
-					configservice.MaximumExecutionFrequencySixHours,
-					configservice.MaximumExecutionFrequencyTwelveHours,
-					configservice.MaximumExecutionFrequencyTwentyFourHours,
-				}, false),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice(configservice.MaximumExecutionFrequency_Values(), false),
 			},
 			"name": {
 				Type:         schema.TypeString,

diff --git a/internal/service/configservice/validate.go b/internal/service/configservice/validate.go
@@ -7,11 +7,5 @@ import (
 )
 
 func validExecutionFrequency() schema.SchemaValidateFunc {
-	return validation.StringInSlice([]string{
-		configservice.MaximumExecutionFrequencyOneHour,
-		configservice.MaximumExecutionFrequencyThreeHours,
-		configservice.MaximumExecutionFrequencySixHours,
-		configservice.MaximumExecutionFrequencyTwelveHours,
-		configservice.MaximumExecutionFrequencyTwentyFourHours,
-	}, false)
+	return validation.StringInSlice(configservice.MaximumExecutionFrequency_Values(), false)
 }
diff --git a/internal/service/ec2/ec2_availability_zones_data_source.go b/internal/service/ec2/ec2_availability_zones_data_source.go
@@ -51,14 +51,9 @@ func DataSourceAvailabilityZones() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"state": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					ec2.AvailabilityZoneStateAvailable,
-					ec2.AvailabilityZoneStateInformation,
-					ec2.AvailabilityZoneStateImpaired,
-					ec2.AvailabilityZoneStateUnavailable,
-				}, false),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice(ec2.AvailabilityZoneState_Values(), false),
 			},
 			"zone_ids": {
 				Type:     schema.TypeList,

diff --git a/internal/service/guardduty/ipset.go b/internal/service/guardduty/ipset.go
@@ -50,17 +50,10 @@ func ResourceIPSet() *schema.Resource {
 				Required: true,
 			},
 			"format": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					guardduty.IpSetFormatTxt,
-					guardduty.IpSetFormatStix,
-					guardduty.IpSetFormatOtxCsv,
-					guardduty.IpSetFormatAlienVault,
-					guardduty.IpSetFormatProofPoint,
-					guardduty.IpSetFormatFireEye,
-				}, false),
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringInSlice(guardduty.IpSetFormat_Values(), false),
 			},
 			"location": {
 				Type:     schema.TypeString,

diff --git a/internal/service/guardduty/threatintelset.go b/internal/service/guardduty/threatintelset.go
@@ -50,17 +50,10 @@ func ResourceThreatIntelSet() *schema.Resource {
 				Required: true,
 			},
 			"format": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					guardduty.ThreatIntelSetFormatTxt,
-					guardduty.ThreatIntelSetFormatStix,
-					guardduty.ThreatIntelSetFormatOtxCsv,
-					guardduty.ThreatIntelSetFormatAlienVault,
-					guardduty.ThreatIntelSetFormatProofPoint,
-					guardduty.ThreatIntelSetFormatFireEye,
-				}, false),
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringInSlice(guardduty.ThreatIntelSetFormat_Values(), false),
 			},
 			"location": {
 				Type:     schema.TypeString,

diff --git a/internal/service/opensearch/domain.go b/internal/service/opensearch/domain.go
@@ -278,13 +278,9 @@ func ResourceDomain() *schema.Resource {
 							Optional: true,
 						},
 						"warm_type": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ValidateFunc: validation.StringInSlice([]string{
-								opensearchservice.OpenSearchWarmPartitionInstanceTypeUltrawarm1MediumSearch,
-								opensearchservice.OpenSearchWarmPartitionInstanceTypeUltrawarm1LargeSearch,
-								"ultrawarm1.xlarge.search",
-							}, false),
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice(opensearchservice.OpenSearchWarmPartitionInstanceType_Values(), false),
 						},
 						"zone_awareness_config": {
 							Type:             schema.TypeList,

diff --git a/internal/service/redshift/event_subscription.go b/internal/service/redshift/event_subscription.go
@@ -94,15 +94,9 @@ func ResourceEventSubscription() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"source_type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					"cluster",
-					"cluster-parameter-group",
-					"cluster-security-group",
-					"cluster-snapshot",
-					"scheduled-action",
-				}, false),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice(redshift.SourceType_Values(), false),
 			},
 			"status": {
 				Type:     schema.TypeString,

diff --git a/internal/service/route53/health_check.go b/internal/service/route53/health_check.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
-	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -131,17 +130,8 @@ func ResourceHealthCheck() *schema.Resource {
 				MinItems: 3,
 				MaxItems: 64,
 				Elem: &schema.Schema{
-					Type: schema.TypeString,
-					ValidateFunc: validation.StringInSlice([]string{
-						endpoints.UsWest1RegionID,
-						endpoints.UsWest2RegionID,
-						endpoints.UsEast1RegionID,
-						endpoints.EuWest1RegionID,
-						endpoints.SaEast1RegionID,
-						endpoints.ApSoutheast1RegionID,
-						endpoints.ApSoutheast2RegionID,
-						endpoints.ApNortheast1RegionID,
-					}, true),
+					Type:         schema.TypeString,
+					ValidateFunc: validation.StringInSlice(route53.HealthCheckRegion_Values(), false),
 				},
 				Optional: true,
 			},