Validate the project name when it's entered, fixes ddev#514

pkg/ddevapp/config.go

@@ -280,7 +280,7 @@ func (app *DdevApp) ValidateConfig() error {
 	// validate hostname
 	match := hostRegex.MatchString(app.GetHostname())
 	if !match {
-		return fmt.Errorf("%s is not a valid hostname. Please enter a site name in your configuration that will allow for a valid hostname. See https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_hostnames for valid hostname requirements", app.GetHostname())
+		return fmt.Errorf("%s is not a valid hostname. Please enter a project name in your configuration that will allow for a valid hostname. See https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_hostnames for valid hostname requirements", app.GetHostname())
 	}
 
 	// validate apptype
@@ -446,14 +446,13 @@ func (app *DdevApp) RenderComposeYAML() (string, error) {
 	return doc.String(), err
 }
 
-// Define an application name.
+// prompt for a project name.
 func (app *DdevApp) promptForName() error {
 	provider, err := app.GetProvider()
 	if err != nil {
 		return err
 	}
 
-	namePrompt := "Project name"
 	if app.Name == "" {
 		dir, err := os.Getwd()
 		// if working directory name is invalid for hostnames, we shouldn't suggest it
@@ -463,9 +462,7 @@ func (app *DdevApp) promptForName() error {
 		}
 	}
 
-	namePrompt = fmt.Sprintf("%s (%s)", namePrompt, app.Name)
-	fmt.Print(namePrompt + ": ")
-	app.Name = util.GetInput(app.Name)
+	app.Name = util.Prompt("Project name", app.Name)
 	return provider.ValidateField("Name", app.Name)
 }
 

pkg/ddevapp/config_test.go

@@ -447,7 +447,7 @@ func TestValidate(t *testing.T) {
 
 	app.Name = "Invalid!"
 	err = app.ValidateConfig()
-	assert.EqualError(err, fmt.Sprintf("%s is not a valid hostname. Please enter a site name in your configuration that will allow for a valid hostname. See https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_hostnames for valid hostname requirements", app.GetHostname()))
+	assert.EqualError(err, fmt.Sprintf("%s is not a valid hostname. Please enter a project name in your configuration that will allow for a valid hostname. See https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_hostnames for valid hostname requirements", app.GetHostname()))
 
 	app.Docroot = "testdata"
 	app.Name = "valid"

pkg/ddevapp/providerDefault.go

@@ -1,6 +1,9 @@
 package ddevapp
 
-import "os"
+import (
+	"fmt"
+	"os"
+)
 
 // DefaultProvider provides a no-op for the provider plugin interface methods.
 type DefaultProvider struct{}
@@ -12,6 +15,14 @@ func (p *DefaultProvider) Init(app *DdevApp) error {
 
 // ValidateField provides a no-op for the ValidateField operation.
 func (p *DefaultProvider) ValidateField(field, value string) error {
+	if field == "Name" {
+		// validate project name
+		match := hostRegex.MatchString(value)
+		if !match {
+			return fmt.Errorf("%s is not a valid project name. Please enter a project name in your configuration that will allow for a valid hostname. See https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_hostnames for valid hostname requirements", value)
+		}
+
+	}
 	return nil
 }