Revert "Define capacity fields to string expressions"

This reverts commit 8c3b4b9.

provider/capacity.go

@@ -1,10 +1,7 @@
 package provider
 
 type capacity struct {
-	Desired           int    `mapstructure:"desired"`
-	DesiredExpression string `mapstructure:"desired_expression"`
-	Max               int    `mapstructure:"max"`
-	MaxExpression     string `mapstructure:"max_expression"`
-	Min               int    `mapstructure:"min"`
-	MinExpression     string `mapstructure:"min_expression"`
+	Desired string `mapstructure:"desired"`
+	Max     string `mapstructure:"max"`
+	Min     string `mapstructure:"min"`
 }

provider/capacity_resource.go

@@ -8,26 +8,14 @@ func capacityResource() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"desired": &schema.Schema{
-				Type:     schema.TypeInt,
-				Optional: true,
-			},
-			"desired_expression": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 			},
 			"max": &schema.Schema{
-				Type:     schema.TypeInt,
-				Optional: true,
-			},
-			"max_expression": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 			},
 			"min": &schema.Schema{
-				Type:     schema.TypeInt,
-				Optional: true,
-			},
-			"min_expression": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 			},

provider/deploy_stage_cluster_capacity.go

@@ -1,53 +1,21 @@
 package provider
 
 import (
-	"strconv"
-
 	"github.com/jgramoll/terraform-provider-spinnaker/client"
 )
 
 func fromClientCapacity(clientCapacity *client.Capacity) *[]*capacity {
 	if clientCapacity == nil {
 		return nil
 	}
-	newCapacity := capacity{}
-	if n, err := strconv.Atoi(clientCapacity.Max); err == nil {
-		newCapacity.Max = n
-	} else {
-		newCapacity.MaxExpression = clientCapacity.Max
-	}
-	if n, err := strconv.Atoi(clientCapacity.Min); err == nil {
-		newCapacity.Min = n
-	} else {
-		newCapacity.MinExpression = clientCapacity.Min
-	}
-	if n, err := strconv.Atoi(clientCapacity.Desired); err == nil {
-		newCapacity.Desired = n
-	} else {
-		newCapacity.DesiredExpression = clientCapacity.Desired
-	}
+	newCapacity := capacity(*clientCapacity)
 	return &[]*capacity{&newCapacity}
 }
 
 func toClientCapacity(c *[]*capacity) *client.Capacity {
 	if c != nil {
 		for _, c := range *c {
-			newCapacity := client.Capacity{}
-			if c.MaxExpression != "" {
-				newCapacity.Max = c.MaxExpression
-			} else {
-				newCapacity.Max = strconv.Itoa(c.Max)
-			}
-			if c.MinExpression != "" {
-				newCapacity.Min = c.MinExpression
-			} else {
-				newCapacity.Min = strconv.Itoa(c.Min)
-			}
-			if c.DesiredExpression != "" {
-				newCapacity.Desired = c.DesiredExpression
-			} else {
-				newCapacity.Desired = strconv.Itoa(c.Desired)
-			}
+			newCapacity := client.Capacity(*c)
 			return &newCapacity
 		}
 	}