Remove unused region parameter from SpotInstancePrice() (#1739)

Author: deliahu

cli/cmd/lib_cluster_config_aws.go

@@ -493,7 +493,7 @@ func confirmInstallClusterConfig(clusterConfig *clusterconfig.Config, awsCreds A
 	workerPriceStr := s.DollarsMaxPrecision(apiInstancePrice) + " each"
 	isSpot := clusterConfig.Spot != nil && *clusterConfig.Spot
 	if isSpot {
-		spotPrice, err := awsClient.SpotInstancePrice(*clusterConfig.Region, *clusterConfig.InstanceType)
+		spotPrice, err := awsClient.SpotInstancePrice(*clusterConfig.InstanceType)
 		workerPriceStr += " (spot pricing unavailable)"
 		if err == nil && spotPrice != 0 {
 			workerPriceStr = fmt.Sprintf("%s - %s each (varies based on spot price)", s.DollarsMaxPrecision(spotPrice), s.DollarsMaxPrecision(apiInstancePrice))

pkg/lib/aws/ec2.go

@@ -42,7 +42,7 @@ func IsARMInstance(instanceType string) bool {
 	return _armInstanceRegex.MatchString(instanceType)
 }
 
-func (c *Client) SpotInstancePrice(region string, instanceType string) (float64, error) {
+func (c *Client) SpotInstancePrice(instanceType string) (float64, error) {
 	result, err := c.EC2().DescribeSpotPriceHistory(&ec2.DescribeSpotPriceHistoryInput{
 		InstanceTypes:       []*string{aws.String(instanceType)},
 		ProductDescriptions: []*string{aws.String("Linux/UNIX")},
@@ -70,11 +70,11 @@ func (c *Client) SpotInstancePrice(region string, instanceType string) (float64,
 	}
 
 	if min == math.MaxFloat64 {
-		return 0, ErrorNoValidSpotPrices(instanceType, region)
+		return 0, ErrorNoValidSpotPrices(instanceType, c.Region)
 	}
 
 	if min <= 0 {
-		return 0, ErrorNoValidSpotPrices(instanceType, region)
+		return 0, ErrorNoValidSpotPrices(instanceType, c.Region)
 	}
 
 	return min, nil

pkg/operator/endpoints/info.go

@@ -78,7 +78,7 @@ func getNodeInfos() ([]schema.NodeInfo, int, error) {
 			if spotPrice, ok := spotPriceCache[instanceType]; ok {
 				price = spotPrice
 			} else {
-				spotPrice, err := config.AWS.SpotInstancePrice(*config.Cluster.Region, instanceType)
+				spotPrice, err := config.AWS.SpotInstancePrice(instanceType)
 				if err == nil && spotPrice != 0 {
 					price = spotPrice
 					spotPriceCache[instanceType] = spotPrice

pkg/operator/operator/cron.go

@@ -104,7 +104,7 @@ func InstanceTelemetryAWS() error {
 		onDemandPrice := aws.InstanceMetadatas[*config.Cluster.Region][instanceType].Price
 		price := onDemandPrice
 		if isSpot {
-			spotPrice, err := config.AWS.SpotInstancePrice(*config.Cluster.Region, instanceType)
+			spotPrice, err := config.AWS.SpotInstancePrice(instanceType)
 			if err == nil && spotPrice != 0 {
 				price = spotPrice
 			}

pkg/types/clusterconfig/cluster_config_aws.go

@@ -635,7 +635,7 @@ func (cc *Config) Validate(awsClient *aws.Client) error {
 				return errors.Wrap(err, SpotConfigKey, InstanceDistributionKey)
 			}
 
-			spotInstancePrice, awsErr := awsClient.SpotInstancePrice(instanceMetadata.Region, instanceMetadata.Type)
+			spotInstancePrice, awsErr := awsClient.SpotInstancePrice(instanceMetadata.Type)
 			if awsErr == nil {
 				if err := CheckSpotInstancePriceCompatibility(primaryInstance, instanceMetadata, cc.SpotConfig.MaxPrice, spotInstancePrice); err != nil {
 					return errors.Wrap(err, SpotConfigKey, InstanceDistributionKey)