normalize vm name to allow "^vm-[0-9]+$" and "^[0-9]+$"

mhewedy · Nov 29, 2020 · 6cfa72d · 6cfa72d
1 parent f56934e
commit 6cfa72d
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 15 deletions.
diff --git a/command/commit.go b/command/commit.go
@@ -32,7 +32,7 @@ $ vermin commit vm_01 elk/elastic
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		imageName := args[1]
 		override, _ := cmd.Flags().GetBool("override")
 

diff --git a/command/exec.go b/command/exec.go
@@ -35,7 +35,7 @@ Execute remote command:
 $ vermin exec vm_09 cat /etc/passwd
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		command := strings.Join(args[1:], " ")
 
 		err := vms.Exec(vmName, command)

diff --git a/command/gui.go b/command/gui.go
@@ -33,7 +33,7 @@ var guiCmd = &cobra.Command{
 $ vermin gui vm_02
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		nocheck, _ := cmd.Flags().GetBool("nocheck")
 		if err := vms.GUI(vmName, nocheck); err != nil {
 			fmt.Println(err)

diff --git a/command/ip.go b/command/ip.go
@@ -37,7 +37,7 @@ To purge the IP cache:
 $ vermin ip vm_05 -p
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		purge, _ := cmd.Flags().GetBool("purge")
 		global, _ := cmd.Flags().GetBool("global")
 

diff --git a/command/port.go b/command/port.go
@@ -52,7 +52,7 @@ Forward vm port 4040 to local port 40040 and ports in range (8080 to 8088) to ra
 $ vermin port vm_01 40040:4040 9080-9088:8080-8088
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		command := strings.Join(args[1:], " ")
 
 		err := vms.PortForward(vmName, command)

diff --git a/command/remove.go b/command/remove.go
@@ -32,7 +32,7 @@ var removeCmd = &cobra.Command{
 		for _, vmName := range args {
 			force, _ := cmd.Flags().GetBool("force")
 
-			err := vms.Remove(vmName, force)
+			err := vms.Remove(normalizeVmName(vmName), force)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)

diff --git a/command/remove_image.go b/command/remove_image.go
@@ -29,10 +29,10 @@ var removeImageCmd = &cobra.Command{
 	Short: "Remove one or more Image",
 	Long:  `Remove one or more Image`,
 	Run: func(cmd *cobra.Command, args []string) {
-		for _, vmName := range args {
+		for _, imageName := range args {
 			//force, _ := cmd.Flags().GetBool("force")
 
-			err := images.Remove(vmName)
+			err := images.Remove(imageName)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)

diff --git a/command/restart.go b/command/restart.go
@@ -30,11 +30,11 @@ var restartCmd = &cobra.Command{
 	Long:  `Restart one or more VMs`,
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, vmName := range args {
-			if err := vms.Stop(vmName); err != nil {
+			if err := vms.Stop(normalizeVmName(vmName)); err != nil {
 				fmt.Println(err)
 				os.Exit(1)
 			}
-			if err := vms.Start(vmName); err != nil {
+			if err := vms.Start(normalizeVmName(vmName)); err != nil {
 				fmt.Println(err)
 				os.Exit(1)
 			}

diff --git a/command/ssh.go b/command/ssh.go
@@ -33,7 +33,7 @@ var sshCmd = &cobra.Command{
 $ vermin ssh vm_02
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		if err := vms.SecureShell(vmName); err != nil {
 			fmt.Println(err)
 			os.Exit(1)

diff --git a/command/start.go b/command/start.go
@@ -30,7 +30,7 @@ var startCmd = &cobra.Command{
 	Long:  `Start one or more stopped VMs`,
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, vmName := range args {
-			err := vms.Start(vmName)
+			err := vms.Start(normalizeVmName(vmName))
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)

diff --git a/command/stop.go b/command/stop.go
@@ -30,7 +30,7 @@ var stopCmd = &cobra.Command{
 	Long:  `Stop one or more running VMs`,
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, vmName := range args {
-			err := vms.Stop(vmName)
+			err := vms.Stop(normalizeVmName(vmName))
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)

diff --git a/command/tag.go b/command/tag.go
@@ -31,7 +31,7 @@ var tagCmd = &cobra.Command{
 You can tag a VM as many times as you want
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		tag := args[1]
 
 		remove, _ := cmd.Flags().GetBool("remove")

diff --git a/command/update.go b/command/update.go
@@ -35,7 +35,7 @@ To change the VM to use 2 cores and 512MB memory
 $ vermin update vm_01 --cpus 2 --mem 512
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		vmName := args[0]
+		vmName := normalizeVmName(args[0])
 		var script string
 		if len(args) > 1 {
 			script = args[1]

diff --git a/command/util.go b/command/util.go
@@ -5,8 +5,13 @@ import (
 	"github.com/mhewedy/vermin/config"
 	"github.com/spf13/cobra"
 	"os"
+	"regexp"
+	"strings"
 )
 
+var vmNameRegexDash = regexp.MustCompile("^vm-[0-9]+$")
+var vmNameRegexNoVM = regexp.MustCompile("^[0-9]+$")
+
 func checkFilePath(path string) {
 	if _, err := os.Stat(path); err != nil {
 		fmt.Println("file not found", path)
@@ -24,3 +29,16 @@ func exitOnError(err error) {
 		os.Exit(1)
 	}
 }
+
+func normalizeVmName(vmName string) string {
+
+	if vmNameRegexDash.MatchString(vmName) {
+		return strings.ReplaceAll(vmName, "-", "_")
+	}
+
+	if vmNameRegexNoVM.MatchString(vmName) {
+		return fmt.Sprintf("vm_%s", vmName)
+	}
+
+	return vmName
+}