Update instance pools key and Instance distribution change check (#613)

(cherry picked from commit 9ee1678)

Author: vishalbollu

cli/cmd/lib_cluster_config.go

@@ -25,7 +25,6 @@ import (
 	"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"
 )
@@ -88,6 +87,11 @@ func getUpdateClusterConfig(cachedClusterConfig *clusterconfig.ClusterConfig, aw
 			return nil, err
 		}
 
+		err = userClusterConfig.AutoFillSpot()
+		if err != nil {
+			return nil, err
+		}
+
 		userClusterConfig.ClusterName = cachedClusterConfig.ClusterName
 		userClusterConfig.Region = cachedClusterConfig.Region
 
@@ -115,7 +119,7 @@ func getUpdateClusterConfig(cachedClusterConfig *clusterconfig.ClusterConfig, aw
 				return nil, clusterconfig.ErrorConfiguredWhenSpotIsNotEnabled(clusterconfig.SpotConfigKey)
 			}
 
-			if slices.StrSliceElementsMatch(userClusterConfig.SpotConfig.InstanceDistribution, cachedClusterConfig.SpotConfig.InstanceDistribution) {
+			if !strset.New(userClusterConfig.SpotConfig.InstanceDistribution...).IsEqual(strset.New(cachedClusterConfig.SpotConfig.InstanceDistribution...)) {
 				return nil, errors.Wrap(ErrorConfigCannotBeChangedOnUpdate(clusterconfig.InstanceDistributionKey, cachedClusterConfig.SpotConfig.InstanceDistribution), clusterconfig.SpotConfigKey)
 			}
 

docs/cluster/config.md

@@ -60,7 +60,7 @@ spot_config:
   max_price: 0.096
 
   # number of spot instance pools across which to allocate spot instances [1, 20] (default: 2)
-  spot_instance_pools: 2
+  instance_pools: 2
 
 # docker image paths
 image_predictor_serve: cortexlabs/predictor-serve:0.11.0

pkg/lib/clusterconfig/config_key.go

@@ -27,7 +27,7 @@ const (
 	OnDemandBaseCapacityKey                = "on_demand_base_capacity"
 	OnDemandPercentageAboveBaseCapacityKey = "on_demand_percentage_above_base_capacity"
 	MaxPriceKey                            = "max_price"
-	InstancePoolsKey                       = "spot_instance_pools"
+	InstancePoolsKey                       = "instance_pools"
 	ClusterNameKey                         = "cluster_name"
 	RegionKey                              = "region"
 	BucketKey                              = "bucket"