Merge pull request #573 from vmware/feat/zone-placement-spread-memory

feat: add `SPREAD_MEMORY` to `r/zone` `placement_policy`

Author: frodenas

vra/resource_zone.go

@@ -8,13 +8,28 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/vmware/vra-sdk-go/pkg/client/location"
 	"github.com/vmware/vra-sdk-go/pkg/models"
 )
 
+const (
+	PlacementPolicyDefault      = "DEFAULT"
+	PlacementPolicyBinpack      = "BINPACK"
+	PlacementPolicySpread       = "SPREAD"
+	PlacementPolicySpreadMemory = "SPREAD_MEMORY"
+)
+
+var AllowedPlacementPolicies = []string{
+	PlacementPolicyDefault,
+	PlacementPolicyBinpack,
+	PlacementPolicySpread,
+	PlacementPolicySpreadMemory,
+}
+
 func resourceZone() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: resourceZoneCreate,
@@ -67,14 +82,17 @@ func resourceZone() *schema.Resource {
 			"placement_policy": {
 				Type:        schema.TypeString,
 				Default:     "DEFAULT",
-				Description: "The placement policy for the zone. One of DEFAULT, SPREAD or BINPACK.",
+				Description: fmt.Sprintf("The placement policy for the zone. One of %v.", AllowedPlacementPolicies),
 				Optional:    true,
 				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 					value := v.(string)
-					if value != "DEFAULT" && value != "SPREAD" && value != "BINPACK" {
-						errors = append(errors, fmt.Errorf(
-							"%q must be one of 'DEFAULT', 'SPREAD', 'BINPACK'", k))
+					for _, validValue := range AllowedPlacementPolicies {
+						if value == validValue {
+							return
+						}
 					}
+					errors = append(errors, fmt.Errorf(
+						"%q must be one of %s", k, strings.Join(AllowedPlacementPolicies, ", ")))
 					return
 				},
 			},

vra/resource_zone_test.go

@@ -172,7 +172,7 @@ func TestAccVRAZoneInvalidPlacementPolicy(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccCheckVRAZoneConfigInvalidPlacementPolicy(),
-				ExpectError: regexp.MustCompile("\"placement_policy\" must be one of 'DEFAULT', 'SPREAD', 'BINPACK'"),
+				ExpectError: regexp.MustCompile("\"placement_policy\" must be one of 'DEFAULT', 'BINPACK', 'SPREAD', 'SPREAD_MEMORY'"),
 			},
 		},
 	})

website/docs/d/vra_zone.html.markdown

@@ -47,7 +47,7 @@ A zone data source supports the following arguments:
 
 * `owner` - Email of the user that owns the entity.
 
-* `placement_policy` - The placement policy for the zone. One of `DEFAULT`, `SPREAD` or `BINPACK`.
+* `placement_policy` - The placement policy for the zone. One of `DEFAULT`, `BINPACK`, `SPREAD` or `SPREAD_MEMORY`.
 
 * `tags` - A set of tag keys and optional values that were set on this resource:
   * `key` - Tag’s key.

website/docs/r/vra_zone.html.markdown

@@ -43,7 +43,7 @@ A zone resource supports the following arguments:
 
 * `name` - (Required) A human-friendly name used as an identifier for the zone resource instance.
 
-* `placement_policy` - (Optional) The placement policy for the zone. One of `DEFAULT`, `SPREAD` or `BINPACK`. Default is `DEFAULT`.
+* `placement_policy` - (Optional) The placement policy for the zone. One of `DEFAULT`, `BINPACK`, `SPREAD` or `SPREAD_MEMORY`. Default is `DEFAULT`.
 
 * `region_id` - (Required) The id of the region for which this zone is created.