Use '_Values' for validations (hashicorp#14601).

zachfeld · Mar 14, 2022 · 937eca2 · 937eca2
1 parent de8c5b7
commit 937eca2
Showing 1 changed file with 17 additions and 35 deletions.
diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go
@@ -107,15 +107,11 @@ func ResourceService() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"type": {
-							Type:     schema.TypeString,
-							ForceNew: true,
-							Optional: true,
-							Default:  ecs.DeploymentControllerTypeEcs,
-							ValidateFunc: validation.StringInSlice([]string{
-								ecs.DeploymentControllerTypeCodeDeploy,
-								ecs.DeploymentControllerTypeEcs,
-								ecs.DeploymentControllerTypeExternal,
-							}, false),
+							Type:         schema.TypeString,
+							ForceNew:     true,
+							Optional:     true,
+							Default:      ecs.DeploymentControllerTypeEcs,
+							ValidateFunc: validation.StringInSlice(ecs.DeploymentControllerType_Values(), false),
 						},
 					},
 				},
@@ -253,13 +249,9 @@ func ResourceService() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"type": {
-							Type:     schema.TypeString,
-							Required: true,
-							ValidateFunc: validation.StringInSlice([]string{
-								ecs.PlacementStrategyTypeBinpack,
-								ecs.PlacementStrategyTypeRandom,
-								ecs.PlacementStrategyTypeSpread,
-							}, false),
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice(ecs.PlacementStrategyType_Values(), false),
 						},
 						"field": {
 							Type:     schema.TypeString,
@@ -289,12 +281,9 @@ func ResourceService() *schema.Resource {
 							Optional: true,
 						},
 						"type": {
-							Type:     schema.TypeString,
-							Required: true,
-							ValidateFunc: validation.StringInSlice([]string{
-								ecs.PlacementConstraintTypeDistinctInstance,
-								ecs.PlacementConstraintTypeMemberOf,
-							}, false),
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice(ecs.PlacementConstraintType_Values(), false),
 						},
 					},
 				},
@@ -313,21 +302,14 @@ func ResourceService() *schema.Resource {
 					}
 					return false
 				},
-				ValidateFunc: validation.StringInSlice([]string{
-					ecs.PropagateTagsService,
-					ecs.PropagateTagsTaskDefinition,
-					ecs.PropagateTagsNone,
-				}, false),
+				ValidateFunc: validation.StringInSlice(ecs.PropagateTags_Values(), false),
 			},
 			"scheduling_strategy": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-				Default:  ecs.SchedulingStrategyReplica,
-				ValidateFunc: validation.StringInSlice([]string{
-					ecs.SchedulingStrategyDaemon,
-					ecs.SchedulingStrategyReplica,
-				}, false),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				Default:      ecs.SchedulingStrategyReplica,
+				ValidateFunc: validation.StringInSlice(ecs.SchedulingStrategy_Values(), false),
 			},
 			"service_registries": {
 				Type:     schema.TypeList,