Merge pull request #169 from YoungJinJung/feat/add-resource-tag-ebs

add resource tag for ebs

Author: YoungJinJung

Makefile

@@ -24,7 +24,7 @@ S3_RELEASE_PATH ?= s3://$(RELEASE_BUCKET)/releases/$(VERSION)
 S3_RELEASE_LATEST ?= s3://$(RELEASE_BUCKET)/releases/latest
 S3_BLEEDING_EDGE_LATEST ?= s3://$(RELEASE_BUCKET)/edge/latest
 S3_EXPERIMENTAL_LATEST ?= s3://$(RELEASE_BUCKET)/experimental/latest
-VERSION = 2.1.1
+VERSION = 2.1.2
 
 GCP_ONLY ?= false
 GCP_PROJECT ?= goployer

pkg/aws/ec2.go

@@ -358,7 +358,7 @@ func (e EC2Client) ValidateSecurityGroupsConfig(securityGroups []*string, primar
 }
 
 // CreateNewLaunchTemplate creates a new launch template
-func (e EC2Client) CreateNewLaunchTemplate(name, ami, instanceType, keyName, iamProfileName, userdata string, ebsOptimized, mixedInstancePolicyEnabled bool, securityGroups []*string, blockDevices []*ec2.LaunchTemplateBlockDeviceMappingRequest, instanceMarketOptions *schemas.InstanceMarketOptions, detailedMonitoringEnabled bool, primaryENI *schemas.ENIConfig, secondaryENIs []*schemas.ENIConfig) error {
+func (e EC2Client) CreateNewLaunchTemplate(name, ami, instanceType, keyName, iamProfileName, userdata string, ebsOptimized, mixedInstancePolicyEnabled bool, securityGroups []*string, blockDevices []*ec2.LaunchTemplateBlockDeviceMappingRequest, instanceMarketOptions *schemas.InstanceMarketOptions, detailedMonitoringEnabled bool, primaryENI *schemas.ENIConfig, secondaryENIs []*schemas.ENIConfig, tags []string) error {
 	// Validate security group configuration
 	if err := e.ValidateSecurityGroupsConfig(securityGroups, primaryENI, secondaryENIs); err != nil {
 		return err
@@ -385,6 +385,26 @@ func (e EC2Client) CreateNewLaunchTemplate(name, ami, instanceType, keyName, iam
 		LaunchTemplateName: aws.String(name),
 	}
 
+	// Add resource tags if provided
+	if len(tags) > 0 {
+		var tagSpecs []*ec2.LaunchTemplateTagSpecificationRequest
+		var ec2Tags []*ec2.Tag
+		for _, tag := range tags {
+			parts := strings.Split(tag, "=")
+			if len(parts) == 2 {
+				ec2Tags = append(ec2Tags, &ec2.Tag{
+					Key:   aws.String(parts[0]),
+					Value: aws.String(parts[1]),
+				})
+			}
+		}
+		tagSpecs = append(tagSpecs, &ec2.LaunchTemplateTagSpecificationRequest{
+			ResourceType: aws.String("volume"),
+			Tags:         ec2Tags,
+		})
+		input.LaunchTemplateData.SetTagSpecifications(tagSpecs)
+	}
+
 	if len(blockDevices) > 0 {
 		input.LaunchTemplateData.SetBlockDeviceMappings(blockDevices)
 	}
@@ -539,7 +559,7 @@ func (e EC2Client) MakeBlockDevices(blocks []schemas.BlockDevice) []*autoscaling
 
 	for _, block := range blocks {
 		enabledEBSEncrypted := block.Encrypted
-
+		Logger.Infof("Encrypt ebs %t", enabledEBSEncrypted)
 		var ebsDevice *autoscaling.Ebs
 
 		if enabledEBSEncrypted {
@@ -556,6 +576,7 @@ func (e EC2Client) MakeBlockDevices(blocks []schemas.BlockDevice) []*autoscaling
 				DeleteOnTermination: aws.Bool(block.DeleteOnTermination),
 			}
 		}
+		Logger.Infof("ebs %s", ebsDevice)
 
 		if len(block.SnapshotID) > 0 {
 			if !isValidSnapshotID(block.SnapshotID) {
@@ -569,6 +590,7 @@ func (e EC2Client) MakeBlockDevices(blocks []schemas.BlockDevice) []*autoscaling
 			DeviceName: aws.String(block.DeviceName),
 			Ebs:        ebsDevice,
 		}
+		Logger.Infof("tmp %s", tmp)
 
 		if block.VolumeType == "io1" || block.VolumeType == "io2" {
 			tmp.Ebs.Iops = aws.Int64(block.Iops)
@@ -590,18 +612,16 @@ func (e EC2Client) MakeLaunchTemplateBlockDeviceMappings(blocks []schemas.BlockD
 		var LaunchTemplateEbsBlockDevice *ec2.LaunchTemplateEbsBlockDeviceRequest
 
 		if enabledEBSEncrypted {
-			if len(block.KmsAlias) > 0 {
-				keyId, err := e.getKmsKeyIdByAlias(block.KmsAlias)
-				if err != nil {
-					Logger.Fatal(fmt.Sprintf("Error: %s", err.Error()))
-				}
-				LaunchTemplateEbsBlockDevice = &ec2.LaunchTemplateEbsBlockDeviceRequest{
-					VolumeSize:          aws.Int64(block.VolumeSize),
-					VolumeType:          aws.String(block.VolumeType),
-					Encrypted:           aws.Bool(enabledEBSEncrypted),
-					KmsKeyId:            aws.String(keyId),
-					DeleteOnTermination: aws.Bool(block.DeleteOnTermination),
-				}
+			keyId, err := e.getKmsKeyIdByAlias(block.KmsAlias)
+			if err != nil {
+				Logger.Fatal(fmt.Sprintf("Error: %s", err.Error()))
+			}
+			LaunchTemplateEbsBlockDevice = &ec2.LaunchTemplateEbsBlockDeviceRequest{
+				VolumeSize:          aws.Int64(block.VolumeSize),
+				VolumeType:          aws.String(block.VolumeType),
+				Encrypted:           aws.Bool(enabledEBSEncrypted),
+				KmsKeyId:            aws.String(keyId),
+				DeleteOnTermination: aws.Bool(block.DeleteOnTermination),
 			}
 		} else {
 			LaunchTemplateEbsBlockDevice = &ec2.LaunchTemplateEbsBlockDeviceRequest{

pkg/deployer/deployer.go

@@ -589,14 +589,14 @@ func (d *Deployer) Deploy(config schemas.Config, region schemas.RegionConfig) er
 	if err != nil {
 		return err
 	}
-
 	if d.SecurityGroup[region.Region] != nil {
 		securityGroups = append(securityGroups, d.SecurityGroup[region.Region])
 		d.Logger.Debugf("additional security group applied to %s: %s", newAsgName, *d.SecurityGroup[region.Region])
 	}
+	launchTemplateTags := d.GenerateLaunchTemplateTags(newAsgName, d.Stack.Stack, config.ExtraTags, region.Region)
 
 	blockDevices := client.EC2Service.MakeLaunchTemplateBlockDeviceMappings(d.Stack.BlockDevices)
-	d.Logger.Debugf("additional blockDevice information %s", blockDevices[0].Ebs.String())
+	d.Logger.Debugf("additional blokcDevice information %s", blockDevices)
 
 	ebsOptimized := d.Stack.EbsOptimized
 
@@ -631,6 +631,7 @@ func (d *Deployer) Deploy(config schemas.Config, region schemas.RegionConfig) er
 		region.DetailedMonitoringEnabled,
 		region.PrimaryENI,
 		region.SecondaryENIs,
+		launchTemplateTags,
 	)
 
 	if err != nil {
@@ -785,6 +786,49 @@ func (d *Deployer) CompareWithCurrentCapacity(forceManifestCapacity bool, region
 	return d.Stack.Capacity
 }
 
+// GenerateLaunchTemplateTags creates tag list for launch template
+func (d *Deployer) GenerateLaunchTemplateTags(asgName, stack string, extraTags, region string) []string {
+	var ret []string
+	var keyList []string
+
+	// Add tags from AwsConfig
+	for _, tag := range d.AwsConfig.Tags {
+		if strings.Contains(tag, "=") {
+			arr := strings.Split(tag, "=")
+			keyList = append(keyList, arr[0])
+			ret = append(ret, tag)
+		}
+	}
+
+	// Add basic tags
+	basicTags := []string{
+		fmt.Sprintf("Name=%s", asgName),
+		fmt.Sprintf("stack=%s_%s", stack, strings.ReplaceAll(region, "-", "")),
+		fmt.Sprintf("app=%s", d.AwsConfig.Name),
+	}
+
+	for _, tag := range basicTags {
+		arr := strings.Split(tag, "=")
+		key := arr[0]
+		if !tool.IsStringInArray(key, keyList) {
+			ret = append(ret, tag)
+			keyList = append(keyList, key)
+		}
+	}
+
+	// Add extraTags
+	if len(extraTags) > 0 && strings.Contains(extraTags, ",") {
+		ts := strings.Split(extraTags, ",")
+		for _, s := range ts {
+			if strings.Contains(strings.TrimSpace(s), "=") {
+				ret = append(ret, strings.TrimSpace(s))
+			}
+		}
+	}
+
+	return ret
+}
+
 // GenerateTags creates tag list for autoscaling group
 func (d *Deployer) GenerateTags(asgName, stack string, extraTags, ansibleExtraVars, region string) []*autoscaling.Tag {
 	var ret []*autoscaling.Tag