Add logging while creating cluster and merge functions

Author: efekarakus

ecs-cli/modules/cli/cluster/cluster_app.go

@@ -379,6 +379,7 @@ func retrieveInstanceType(cfnParams *cloudformation.CfnStackParams) (string, err
 	param, err := cfnParams.GetParameter(ParameterKeyInstanceType)
 
 	if err == cloudformation.ParameterNotFoundError {
+		logrus.Infof("Defaulting instance type to %s", cloudformation.DefaultECSInstanceType)
 		return cloudformation.DefaultECSInstanceType, nil
 	}
 	if err != nil {

ecs-cli/modules/clients/aws/amimetadata/client.go

@@ -36,12 +36,6 @@ const (
 	amazonLinux2X86GPURecommendedParameterName = "/aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended"
 )
 
-// Architecture types of EC2 instances.
-const (
-	ArchitectureTypeARM64 = "arm64"
-	ArchitectureTypeX86   = "x86"
-)
-
 // AMIMetadata is returned through ssm:GetParameters and can be used to retrieve the ImageId
 // while launching instances.
 //
@@ -78,9 +72,11 @@ func NewMetadataClient(commandConfig *config.CommandConfig) Client {
 // GetRecommendedECSLinuxAMI returns the recommended Amazon ECS-Optimized AMI Metadata given the instance type.
 func (c *metadataClient) GetRecommendedECSLinuxAMI(instanceType string) (*AMIMetadata, error) {
 	if isARM64Instance(instanceType) {
+		logrus.Infof("Using Arm ecs-optimized AMI because instance type was %s", instanceType)
 		return c.parameterValueFor(amazonLinux2ARM64RecommendedParameterName)
 	}
 	if isGPUInstance(instanceType) {
+		logrus.Infof("Using GPU ecs-optimized AMI because instance type was %s", instanceType)
 		return c.parameterValueFor(amazonLinux2X86GPURecommendedParameterName)
 	}
 	return c.parameterValueFor(amazonLinux2X86RecommendedParameterName)
@@ -108,7 +104,11 @@ func (c *metadataClient) parameterValueFor(ssmParamName string) (*AMIMetadata, e
 }
 
 func isARM64Instance(instanceType string) bool {
-	return architectureFor(instanceType) == ArchitectureTypeARM64
+	r := regexp.MustCompile("a1\\.(medium|\\d*x?large)")
+	if r.MatchString(instanceType) {
+		return true
+	}
+	return false
 }
 
 func isGPUInstance(instanceType string) bool {
@@ -123,12 +123,3 @@ func isGPUInstance(instanceType string) bool {
 	}
 	return false
 }
-
-func architectureFor(instanceType string) string {
-	r := regexp.MustCompile("a1\\.(medium|\\d*x?large)")
-	if r.MatchString(instanceType) {
-		logrus.Infof("Using Arm ecs-optimized AMI because instance type was %s", instanceType)
-		return ArchitectureTypeARM64
-	}
-	return ArchitectureTypeX86
-}