Hide unchanged spot config (#612)

* Hide unchanged spot config

* Update clusterconfig.go

* Update clusterconfig.go

(cherry picked from commit 409fab4)

Author: vishalbollu

cli/cmd/lib_cluster_config.go

@@ -24,6 +24,7 @@ import (
 	cr "github.com/cortexlabs/cortex/pkg/lib/configreader"
 	"github.com/cortexlabs/cortex/pkg/lib/errors"
 	"github.com/cortexlabs/cortex/pkg/lib/prompt"
+	"github.com/cortexlabs/cortex/pkg/lib/sets/strset"
 	"github.com/cortexlabs/cortex/pkg/lib/slices"
 	s "github.com/cortexlabs/cortex/pkg/lib/strings"
 	"github.com/cortexlabs/cortex/pkg/lib/table"
@@ -169,11 +170,31 @@ func confirmClusterConfig(clusterConfig *clusterconfig.ClusterConfig, awsCreds *
 
 	if clusterConfig.Spot != nil && *clusterConfig.Spot != *defaultConfig.Spot {
 		items = append(items, table.KV{K: clusterconfig.SpotUserFacingKey, V: s.YesNo(clusterConfig.Spot != nil && *clusterConfig.Spot)})
-		items = append(items, table.KV{K: clusterconfig.InstanceDistributionUserFacingKey, V: clusterConfig.SpotConfig.InstanceDistribution})
-		items = append(items, table.KV{K: clusterconfig.OnDemandBaseCapacityUserFacingKey, V: *clusterConfig.SpotConfig.OnDemandBaseCapacity})
-		items = append(items, table.KV{K: clusterconfig.OnDemandPercentageAboveBaseCapacityUserFacingKey, V: *clusterConfig.SpotConfig.OnDemandPercentageAboveBaseCapacity})
-		items = append(items, table.KV{K: clusterconfig.MaxPriceUserFacingKey, V: *clusterConfig.SpotConfig.MaxPrice})
-		items = append(items, table.KV{K: clusterconfig.InstancePoolsUserFacingKey, V: *clusterConfig.SpotConfig.InstancePools})
+
+		if clusterConfig.SpotConfig != nil {
+			defaultSpotConfig := clusterconfig.SpotConfig{}
+			clusterconfig.AutoGenerateSpotConfig(&defaultSpotConfig, *clusterConfig.Region, *clusterConfig.InstanceType)
+
+			if !strset.New(clusterConfig.SpotConfig.InstanceDistribution...).IsEqual(strset.New(defaultSpotConfig.InstanceDistribution...)) {
+				items = append(items, table.KV{K: clusterconfig.InstanceDistributionUserFacingKey, V: clusterConfig.SpotConfig.InstanceDistribution})
+			}
+
+			if *clusterConfig.SpotConfig.OnDemandBaseCapacity != *defaultSpotConfig.OnDemandBaseCapacity {
+				items = append(items, table.KV{K: clusterconfig.OnDemandBaseCapacityUserFacingKey, V: *clusterConfig.SpotConfig.OnDemandBaseCapacity})
+			}
+
+			if *clusterConfig.SpotConfig.OnDemandPercentageAboveBaseCapacity != *defaultSpotConfig.OnDemandPercentageAboveBaseCapacity {
+				items = append(items, table.KV{K: clusterconfig.OnDemandPercentageAboveBaseCapacityUserFacingKey, V: *clusterConfig.SpotConfig.OnDemandPercentageAboveBaseCapacity})
+			}
+
+			if *clusterConfig.SpotConfig.MaxPrice != *defaultSpotConfig.MaxPrice {
+				items = append(items, table.KV{K: clusterconfig.MaxPriceUserFacingKey, V: *clusterConfig.SpotConfig.MaxPrice})
+			}
+
+			if *clusterConfig.SpotConfig.InstancePools != *defaultSpotConfig.InstancePools {
+				items = append(items, table.KV{K: clusterconfig.InstancePoolsUserFacingKey, V: *clusterConfig.SpotConfig.InstancePools})
+			}
+		}
 	}
 	if clusterConfig.InstanceVolumeSize != defaultConfig.InstanceVolumeSize {
 		items = append(items, table.KV{K: clusterconfig.InstanceVolumeSizeUserFacingKey, V: clusterConfig.InstanceVolumeSize})

pkg/lib/clusterconfig/clusterconfig.go

@@ -27,6 +27,7 @@ import (
 	"github.com/cortexlabs/cortex/pkg/lib/hash"
 	"github.com/cortexlabs/cortex/pkg/lib/pointer"
 	"github.com/cortexlabs/cortex/pkg/lib/prompt"
+	"github.com/cortexlabs/cortex/pkg/lib/sets/strset"
 	s "github.com/cortexlabs/cortex/pkg/lib/strings"
 	"github.com/cortexlabs/cortex/pkg/lib/table"
 )
@@ -437,12 +438,8 @@ func CompatibleSpotInstances(targetInstance aws.InstanceMetadata) []aws.Instance
 	return compatibleInstances
 }
 
-func (cc *ClusterConfig) AutoFillSpot() error {
-	spotConfig := cc.SpotConfig
-	if spotConfig == nil {
-		spotConfig = &SpotConfig{}
-	}
-	chosenInstance := aws.InstanceMetadatas[*cc.Region][*cc.InstanceType]
+func AutoGenerateSpotConfig(spotConfig *SpotConfig, region string, instanceType string) error {
+	chosenInstance := aws.InstanceMetadatas[region][instanceType]
 	if len(spotConfig.InstanceDistribution) == 0 {
 		spotConfig.InstanceDistribution = append(spotConfig.InstanceDistribution, chosenInstance.Type)
 
@@ -458,19 +455,10 @@ func (cc *ClusterConfig) AutoFillSpot() error {
 			}
 		}
 	} else {
-		found := false
-		for _, instanceType := range spotConfig.InstanceDistribution {
-			if *cc.InstanceType == instanceType {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			spotConfig.InstanceDistribution = append(spotConfig.InstanceDistribution, chosenInstance.Type)
-		}
+		instanceDistributionSet := strset.New(spotConfig.InstanceDistribution...)
+		instanceDistributionSet.Remove(instanceType)
+		spotConfig.InstanceDistribution = append([]string{instanceType}, instanceDistributionSet.Slice()...)
 	}
-
 	if spotConfig.MaxPrice == nil {
 		spotConfig.MaxPrice = &chosenInstance.Price
 	}
@@ -487,7 +475,17 @@ func (cc *ClusterConfig) AutoFillSpot() error {
 		spotConfig.InstancePools = pointer.Int64(2)
 	}
 
-	cc.SpotConfig = spotConfig
+	return nil
+}
+
+func (cc *ClusterConfig) AutoFillSpot() error {
+	if cc.SpotConfig == nil {
+		cc.SpotConfig = &SpotConfig{}
+	}
+	err := AutoGenerateSpotConfig(cc.SpotConfig, *cc.Region, *cc.InstanceType)
+	if err != nil {
+		return err
+	}
 	return nil
 }