Merge pull request #2136 from tukobadnyanoba/allow-underscores-in-command-names

Allow underscores in command names

Author: FabianKramm

pkg/devspace/config/versions/v1beta11/upgrade.go

@@ -516,7 +516,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 	// commands
 	nextConfig.Commands = map[string]*next.CommandConfig{}
 	for _, command := range c.Commands {
-		commandName := encoding.Convert(command.Name)
+		commandName := encoding.ConvertCommands(command.Name)
 		nextConfig.Commands[commandName] = &next.CommandConfig{
 			Name:        commandName,
 			Command:     command.Command,

pkg/devspace/config/versions/validate.go

@@ -154,7 +154,7 @@ func validateDependencies(config *latest.Config) error {
 
 func validateCommands(config *latest.Config) error {
 	for key, command := range config.Commands {
-		if encoding.IsUnsafeName(command.Name) {
+		if encoding.IsUnsafeCommandName(command.Name) {
 			return fmt.Errorf("commands.%s has to match the following regex: %v", command.Name, encoding.UnsafeNameRegEx.String())
 		}
 		if command.Command == "" {

pkg/util/encoding/encoding.go

@@ -26,6 +26,7 @@ func SafeConcatNameMax(name []string, max int) string {
 
 var convertRegEx1 = regexp.MustCompile(`[\@/\.\:\s]+`)
 var convertRegEx2 = regexp.MustCompile(`[^a-z0-9\-]+`)
+var convertRegEx3 = regexp.MustCompile(`[^a-z0-9\-_]+`)
 
 func Convert(ID string) string {
 	ID = strings.ToLower(ID)
@@ -34,6 +35,14 @@ func Convert(ID string) string {
 	return SafeConcatName(ID)
 }
 
+func ConvertCommands(ID string) string {
+	ID = strings.ToLower(ID)
+	ID = convertRegEx1.ReplaceAllString(ID, "-")
+	ID = convertRegEx3.ReplaceAllString(ID, "")
+	return SafeConcatName(ID)
+}
+
+var UnsafeCommandNameRegEx = regexp.MustCompile(`^(([a-z0-9][a-z0-9\-_]*[a-z0-9])|([a-z0-9]))$`)
 var UnsafeNameRegEx = regexp.MustCompile(`^(([a-z0-9][a-z0-9\-]*[a-z0-9])|([a-z0-9]))$`)
 var UnsafeUpperNameRegEx = regexp.MustCompile(`^(([A-Za-z0-9][A-Za-z0-9\-_]*[A-Za-z0-9])|([A-Za-z0-9]))$`)
 
@@ -44,3 +53,7 @@ func IsUnsafeUpperName(unsafeName string) bool {
 func IsUnsafeName(unsafeName string) bool {
 	return !UnsafeNameRegEx.MatchString(unsafeName)
 }
+
+func IsUnsafeCommandName(unsafeCommandName string) bool {
+	return !UnsafeCommandNameRegEx.MatchString(unsafeCommandName)
+}