Merge 12728b8 into 9ac493b

Symantec · Apr 5, 2019 · f786dc6 · f786dc6
2 parents 9ac493b + 12728b8
commit f786dc6
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/imagepublishers/amipublisher/libAws.go b/imagepublishers/amipublisher/libAws.go
@@ -20,6 +20,23 @@ const (
 	rootDevName        = "/dev/sda1"
 )
 
+var (
+	amiNameReplacer = strings.NewReplacer(
+		"@", "@@",
+		"~", "@tilde@",
+		"!", "@bang@",
+		"#", "@hash@",
+		"$", "@dollar@",
+		"%", "@percent@",
+		"^", "@caret@",
+		"&", "@ampersand@",
+		"*", "@asterix@", // the gaul.
+		"=", "@equal@",
+		"+", "@plus@",
+		":", ".",
+	)
+)
+
 func attachVolume(awsService *ec2.EC2, instance *ec2.Instance, volumeId string,
 	logger log.Logger) error {
 	usedBlockDevices := make(map[string]struct{})
@@ -730,7 +747,7 @@ func registerAmi(awsService *ec2.EC2, snapshotId string, s3Manifest string,
 		Architecture:       aws.String("x86_64"),
 		Description:        aws.String(imageName),
 		EnaSupport:         aws.Bool(publishOptions.EnaSupport),
-		Name:               aws.String(strings.Replace(amiName, ":", ".", -1)),
+		Name:               aws.String(amiNameReplacer.Replace(amiName)),
 		RootDeviceName:     aws.String(rootDevName),
 		SriovNetSupport:    aws.String("simple"),
 		VirtualizationType: aws.String("hvm"),