Merge pull request #5331 from php-coder/gh5182_new_app_invalid_name

Merged by openshift-bot

Author: OpenShift Bot

pkg/generate/app/cmd/newapp.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"io"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -44,6 +45,9 @@ const (
 // and no Dockerfile is detected in the repository.
 var ErrNoDockerfileDetected = fmt.Errorf("No Dockerfile was found in the repository and the requested build strategy is 'docker'")
 
+// the opposite of kvalidation.DNS1123LabelFmt
+var invalidNameCharactersRegexp = regexp.MustCompile("[^-a-z0-9]")
+
 // AppConfig contains all the necessary configuration for an application
 type AppConfig struct {
 	SourceRepositories util.StringList
@@ -587,14 +591,21 @@ func ensureValidUniqueName(names map[string]int, name string) (string, error) {
 	if len(name) < 2 {
 		return "", fmt.Errorf("invalid name: %s", name)
 	}
+
+	// Make all names lowercase
+	name = strings.ToLower(name)
+
+	// Remove everything except [-0-9a-z]
+	name = invalidNameCharactersRegexp.ReplaceAllString(name, "")
+
+	// Remove leading hyphen(s) that may be introduced by the previous step
+	name = strings.TrimLeft(name, "-")
+
 	if len(name) > kvalidation.DNS1123SubdomainMaxLength {
 		glog.V(4).Infof("Trimming %s to maximum allowable length (%d)\n", name, kvalidation.DNS1123SubdomainMaxLength)
 		name = name[:kvalidation.DNS1123SubdomainMaxLength]
 	}
 
-	// Make all names lowercase
-	name = strings.ToLower(name)
-
 	count, existing := names[name]
 	if !existing {
 		names[name] = 0

pkg/generate/app/cmd/newapp_test.go

@@ -1264,6 +1264,11 @@ func TestEnsureValidUniqueName(t *testing.T) {
 			input:    []string{"One", "ONE", "tWo"},
 			expected: []string{"one", "one-1", "two"},
 		},
+		{
+			name:     "non-standard characters",
+			input:    []string{"Emby.One", "test-_test", "_-_", "@-MyRepo"},
+			expected: []string{"embyone", "test-test", "", "myrepo"},
+		},
 		{
 			name:        "short name",
 			input:       []string{"t"},