From 2bff60bac8bc695839717afb669a05c6eb487a22 Mon Sep 17 00:00:00 2001
From: Miles Crabill <mcrabill@mozilla.com>
Date: Mon, 16 Sep 2019 13:50:43 -0700
Subject: [PATCH] address review feedback

---
 builder/googlecompute/config.go      | 8 +++-----
 builder/googlecompute/config_test.go | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go
index fcead5cfe..b9d800a45 100644
--- a/builder/googlecompute/config.go
+++ b/builder/googlecompute/config.go
@@ -144,17 +144,15 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 	}
 
 	// used for ImageName and ImageFamily
-	imageErrorText := "Invalid image %s: The first character must be a lowercase letter, and all following characters must be a dash, lowercase letter, or digit, except the last character, which cannot be a dash"
+	imageErrorText := "Invalid image %s %q: The first character must be a lowercase letter, and all following characters must be a dash, lowercase letter, or digit, except the last character, which cannot be a dash"
 
 	if len(c.ImageName) > 63 {
 		errs = packer.MultiErrorAppend(errs,
 			errors.New("Invalid image name: Must not be longer than 63 characters"))
 	}
 
-	// replaces invalid characters with hyphens
-	c.ImageName = templateCleanImageName(c.ImageName)
 	if !validImageName.MatchString(c.ImageName) {
-		errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "name")))
+		errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "name", c.ImageName)))
 	}
 
 	if len(c.ImageFamily) > 63 {
@@ -164,7 +162,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 
 	if c.ImageFamily != "" {
 		if !validImageName.MatchString(c.ImageFamily) {
-			errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "family")))
+			errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "family", c.ImageFamily)))
 		}
 	}
 
diff --git a/builder/googlecompute/config_test.go b/builder/googlecompute/config_test.go
index a884d7f8b..b2f05e139 100644
--- a/builder/googlecompute/config_test.go
+++ b/builder/googlecompute/config_test.go
@@ -157,10 +157,10 @@ func TestConfigPrepare(t *testing.T) {
 			true,
 		},
 		{
-			// underscore will be replaced
+			// underscore is not allowed
 			"image_name",
 			"foo_bar",
-			false,
+			true,
 		},
 		{
 			// too long