Added tcp-port flag and UI Improves

Author: barckcode

cmd/deploy.go

@@ -3,11 +3,12 @@ package cmd
 import (
 	"fmt"
 	"os"
-
-	"github.com/spf13/cobra"
+	"regexp"
+	"strings"
 
 	"github.com/helmcode/coderun-cli/internal/client"
 	"github.com/helmcode/coderun-cli/internal/utils"
+	"github.com/spf13/cobra"
 )
 
 // deployCmd represents the deploy command
@@ -17,10 +18,12 @@ var deployCmd = &cobra.Command{
 	Long: `Deploy a Docker container to the CodeRun platform.
 
 Examples:
-  coderun deploy nginx:latest
-  coderun deploy my-app:v1.0 --replicas=3 --cpu=500m --memory=1Gi
-  coderun deploy my-app:latest --http-port=8080 --env-file=.env
-  coderun deploy my-app:latest --replicas=2 --cpu=200m --memory=512Mi --http-port=3000 --env-file=production.env`,
+  coderun deploy nginx:latest --name my-nginx
+  coderun deploy my-app:v1.0 --name my-app --replicas 3 --cpu 500m --memory 1Gi
+  coderun deploy my-app:latest --name web-app --http-port 8080 --env-file .env
+  coderun deploy redis:latest --name my-redis --tcp-port 6379
+  coderun deploy postgres:latest --name my-db --tcp-port 5432 --env-file database.env
+  coderun deploy my-app:latest --name prod-app --replicas 2 --cpu 200m --memory 512Mi --http-port 3000 --env-file production.env`,
 	Args: cobra.ExactArgs(1),
 	Run:  runDeploy,
 }
@@ -30,6 +33,7 @@ var (
 	cpu      string
 	memory   string
 	httpPort int
+	tcpPort  int
 	envFile  string
 	appName  string
 )
@@ -42,8 +46,62 @@ func init() {
 	deployCmd.Flags().StringVar(&cpu, "cpu", "", "CPU resource limit (e.g., 100m, 0.5)")
 	deployCmd.Flags().StringVar(&memory, "memory", "", "Memory resource limit (e.g., 128Mi, 1Gi)")
 	deployCmd.Flags().IntVar(&httpPort, "http-port", 0, "HTTP port to expose")
+	deployCmd.Flags().IntVar(&tcpPort, "tcp-port", 0, "TCP port to expose")
 	deployCmd.Flags().StringVar(&envFile, "env-file", "", "Path to environment file")
-	deployCmd.Flags().StringVar(&appName, "name", "", "Application name (optional, auto-generated if not provided)")
+	deployCmd.Flags().StringVar(&appName, "name", "", "Application name (required, 3-30 chars, lowercase letters/numbers/hyphens only)")
+}
+
+// parseValidationError tries to parse backend validation errors and return user-friendly messages
+func parseValidationError(errorMsg string) string {
+	// Convert to lowercase for easier matching
+	lowerError := strings.ToLower(errorMsg)
+
+	// App name validation errors
+	if strings.Contains(lowerError, "app_name") {
+		if strings.Contains(lowerError, "at least 3 characters") {
+			return "App name must be at least 3 characters long. Use --name to specify one (e.g., --name my-app)"
+		}
+		if strings.Contains(lowerError, "at most 30 characters") || strings.Contains(lowerError, "no more than 30") {
+			return "App name must be no more than 30 characters long"
+		}
+		if strings.Contains(lowerError, "lowercase") || strings.Contains(lowerError, "letters") || strings.Contains(lowerError, "hyphens") {
+			return "App name must contain only lowercase letters, numbers, and hyphens"
+		}
+		return "Invalid app name. Use --name to specify one (3-30 chars, lowercase letters/numbers/hyphens only)"
+	}
+
+	// Port validation errors
+	if strings.Contains(lowerError, "both http_port and tcp_port") || strings.Contains(lowerError, "both ports") {
+		return "Cannot specify both --http-port and --tcp-port. Choose one type of port"
+	}
+	if strings.Contains(lowerError, "http_port") || strings.Contains(lowerError, "tcp_port") || strings.Contains(lowerError, "port") {
+		return "Port must be a valid number between 1 and 65535"
+	}
+
+	// Resource validation errors
+	if strings.Contains(lowerError, "cpu") && (strings.Contains(lowerError, "invalid") || strings.Contains(lowerError, "format")) {
+		return "Invalid CPU value. Use format like '100m' or '0.5'"
+	}
+	if strings.Contains(lowerError, "memory") && (strings.Contains(lowerError, "invalid") || strings.Contains(lowerError, "format")) {
+		return "Invalid memory value. Use format like '128Mi' or '1Gi'"
+	}
+
+	// Image validation errors
+	if strings.Contains(lowerError, "image") && strings.Contains(lowerError, "at least 1") {
+		return "Image name cannot be empty"
+	}
+
+	// Generic validation error
+	if strings.Contains(lowerError, "422") || strings.Contains(lowerError, "validation") {
+		return "Validation error: Please check your input parameters"
+	}
+
+	// If we can't parse it, return a cleaner version of the original error
+	if strings.Contains(errorMsg, "HTTP 422:") {
+		return "Validation error: Please check your input parameters and try again"
+	}
+
+	return errorMsg
 }
 
 func runDeploy(cmd *cobra.Command, args []string) {
@@ -72,6 +130,49 @@ func runDeploy(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
+	// Validate that only one of HTTP or TCP port is specified
+	if httpPort > 0 && tcpPort > 0 {
+		fmt.Println("Cannot specify both --http-port and --tcp-port")
+		os.Exit(1)
+	}
+
+	// Validate app name if provided
+	if appName != "" {
+		if len(appName) < 3 {
+			fmt.Println("App name must be at least 3 characters long")
+			os.Exit(1)
+		}
+		if len(appName) > 30 {
+			fmt.Println("App name must be no more than 30 characters long")
+			os.Exit(1)
+		}
+		// Validate format using regex: only lowercase letters, numbers, and hyphens
+		matched, _ := regexp.MatchString(`^[a-z0-9-]+$`, appName)
+		if !matched {
+			fmt.Println("App name must contain only lowercase letters, numbers, and hyphens")
+			os.Exit(1)
+		}
+		// Cannot start or end with hyphen
+		if strings.HasPrefix(appName, "-") || strings.HasSuffix(appName, "-") {
+			fmt.Println("App name cannot start or end with a hyphen")
+			os.Exit(1)
+		}
+	} else {
+		fmt.Println("App name is required. Use --name to specify one (e.g., --name my-app)")
+		fmt.Println("App name must be 3-30 characters long and contain only lowercase letters, numbers, and hyphens")
+		os.Exit(1)
+	}
+
+	// Validate port ranges
+	if httpPort > 0 && (httpPort < 1 || httpPort > 65535) {
+		fmt.Println("HTTP port must be between 1 and 65535")
+		os.Exit(1)
+	}
+	if tcpPort > 0 && (tcpPort < 1 || tcpPort > 65535) {
+		fmt.Println("TCP port must be between 1 and 65535")
+		os.Exit(1)
+	}
+
 	// Parse environment file if provided
 	var envVars map[string]string
 	if envFile != "" {
@@ -98,6 +199,11 @@ func runDeploy(cmd *cobra.Command, args []string) {
 		deployReq.HTTPPort = &httpPort
 	}
 
+	// Add TCP port if specified
+	if tcpPort > 0 {
+		deployReq.TCPPort = &tcpPort
+	}
+
 	// Create client and deploy
 	apiClient := client.NewClient(config.BaseURL)
 	apiClient.SetToken(config.AccessToken)
@@ -106,9 +212,13 @@ func runDeploy(cmd *cobra.Command, args []string) {
 	if httpPort > 0 {
 		fmt.Println("ℹ️  Note: Deploy with HTTP port may take several minutes (waiting for TLS certificate)")
 	}
+	if tcpPort > 0 {
+		fmt.Println("ℹ️  Note: Deploy with TCP port will be available in the NodePort range (30000-32767)")
+	}
 	deployment, err := apiClient.CreateDeployment(&deployReq)
 	if err != nil {
-		fmt.Printf("Deployment failed: %v\n", err)
+		userFriendlyError := parseValidationError(err.Error())
+		fmt.Printf("Deployment failed: %s\n", userFriendlyError)
 		os.Exit(1)
 	}
 
@@ -127,6 +237,15 @@ func runDeploy(cmd *cobra.Command, args []string) {
 	if deployment.HTTPPort != nil {
 		fmt.Printf("HTTP Port: %d\n", *deployment.HTTPPort)
 	}
+	if deployment.TCPPort != nil {
+		fmt.Printf("TCP Port: %d\n", *deployment.TCPPort)
+	}
+	if deployment.TCPNodePort != nil {
+		fmt.Printf("TCP NodePort: %d\n", *deployment.TCPNodePort)
+	}
+	if deployment.TCPConnection != nil {
+		fmt.Printf("TCP Connection: %s\n", *deployment.TCPConnection)
+	}
 	if len(deployment.EnvironmentVars) > 0 {
 		fmt.Printf("Environment Variables: %d\n", len(deployment.EnvironmentVars))
 	}

cmd/list.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -25,6 +26,79 @@ func init() {
 	rootCmd.AddCommand(listCmd)
 }
 
+// calculateColumnWidths calculates the optimal width for each column based on content
+func calculateColumnWidths(deployments []client.DeploymentResponse) (int, int, int, int, int, int, int) {
+	// Minimum widths for headers
+	idWidth := len("ID")
+	appNameWidth := len("App Name")
+	imageWidth := len("Image")
+	replicasWidth := len("Replicas")
+	statusWidth := len("Status")
+	connectionWidth := len("Connection")
+	createdWidth := len("Created")
+
+	// Check content and adjust widths
+	for _, deployment := range deployments {
+		if len(deployment.ID) > idWidth {
+			idWidth = len(deployment.ID)
+		}
+		if len(deployment.AppName) > appNameWidth {
+			appNameWidth = len(deployment.AppName)
+		}
+		if len(deployment.Image) > imageWidth {
+			imageWidth = len(deployment.Image)
+		}
+
+		replicasStr := fmt.Sprintf("%d", deployment.Replicas)
+		if len(replicasStr) > replicasWidth {
+			replicasWidth = len(replicasStr)
+		}
+
+		if len(deployment.Status) > statusWidth {
+			statusWidth = len(deployment.Status)
+		}
+
+		connection := getConnectionString(&deployment)
+		if len(connection) > connectionWidth {
+			connectionWidth = len(connection)
+		}
+
+		createdStr := deployment.CreatedAt.Format("2006-01-02 15:04")
+		if len(createdStr) > createdWidth {
+			createdWidth = len(createdStr)
+		}
+	}
+
+	// Add some padding
+	return idWidth + 2, appNameWidth + 2, imageWidth + 2, replicasWidth + 2, statusWidth + 2, connectionWidth + 2, createdWidth + 2
+}
+
+// getConnectionString generates a user-friendly connection string based on the deployment type
+func getConnectionString(deployment *client.DeploymentResponse) string {
+	// HTTP deployments - use the URL field from backend if available
+	if deployment.URL != nil && *deployment.URL != "" {
+		return *deployment.URL
+	}
+
+	// Fallback for HTTP deployments if URL is not set yet
+	if deployment.HTTPPort != nil {
+		return fmt.Sprintf("https://%s.helmcode.com", deployment.AppName)
+	}
+
+	// TCP deployments - prefer TCPConnection field if available
+	if deployment.TCPConnection != nil && *deployment.TCPConnection != "" {
+		return *deployment.TCPConnection
+	}
+
+	// TCP with NodePort but no connection string yet
+	if deployment.TCPPort != nil && deployment.TCPNodePort != nil {
+		return fmt.Sprintf("67.207.79.206:%d", *deployment.TCPNodePort)
+	}
+
+	// No exposed ports
+	return "Internal only"
+}
+
 func runList(cmd *cobra.Command, args []string) {
 	// Load config
 	config, err := utils.LoadConfig()
@@ -54,36 +128,44 @@ func runList(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	// Display deployments with full IDs
-	fmt.Printf("%-36s %-20s %-30s %-8s %-10s %-16s\n",
-		"ID", "App Name", "Image", "Replicas", "Status", "Created")
-	fmt.Printf("%-36s %-20s %-30s %-8s %-10s %-16s\n",
-		"------------------------------------", "--------------------", "------------------------------",
-		"--------", "----------", "----------------")
+	// Calculate optimal column widths
+	idWidth, appNameWidth, imageWidth, replicasWidth, statusWidth, connectionWidth, createdWidth := calculateColumnWidths(deploymentList.Deployments)
 
-	// Add rows with full IDs
-	for _, deployment := range deploymentList.Deployments {
-		// Truncate app name if too long
-		appName := deployment.AppName
-		if len(appName) > 20 {
-			appName = appName[:18] + ".."
-		}
+	// Create format strings for headers and rows
+	headerFormat := fmt.Sprintf("%%-%ds %%-%ds %%-%ds %%-%ds %%-%ds %%-%ds %%-%ds\n",
+		idWidth, appNameWidth, imageWidth, replicasWidth, statusWidth, connectionWidth, createdWidth)
 
-		// Truncate image if too long
-		image := deployment.Image
-		if len(image) > 30 {
-			image = image[:28] + ".."
-		}
+	separatorFormat := fmt.Sprintf("%%-%ds %%-%ds %%-%ds %%-%ds %%-%ds %%-%ds %%-%ds\n",
+		idWidth, appNameWidth, imageWidth, replicasWidth, statusWidth, connectionWidth, createdWidth)
 
+	// Display headers
+	fmt.Printf(headerFormat, "ID", "App Name", "Image", "Replicas", "Status", "Connection", "Created")
+
+	// Display separator
+	fmt.Printf(separatorFormat,
+		strings.Repeat("-", idWidth),
+		strings.Repeat("-", appNameWidth),
+		strings.Repeat("-", imageWidth),
+		strings.Repeat("-", replicasWidth),
+		strings.Repeat("-", statusWidth),
+		strings.Repeat("-", connectionWidth),
+		strings.Repeat("-", createdWidth))
+
+	// Display rows
+	for _, deployment := range deploymentList.Deployments {
 		// Format created date
 		createdAt := deployment.CreatedAt.Format("2006-01-02 15:04")
 
-		fmt.Printf("%-36s %-20s %-30s %-8d %-10s %-16s\n",
+		// Generate connection string (no truncation)
+		connection := getConnectionString(&deployment)
+
+		fmt.Printf(headerFormat,
 			deployment.ID,
-			appName,
-			image,
-			deployment.Replicas,
+			deployment.AppName,
+			deployment.Image,
+			fmt.Sprintf("%d", deployment.Replicas),
 			deployment.Status,
+			connection,
 			createdAt)
 	}
 }

cmd/logs.go

@@ -24,7 +24,7 @@ Shows the most recent logs from all pods in the deployment.
 
 Examples:
   coderun logs abc12345-6789-def0-1234-567890abcdef
-  coderun logs abc12345-6789-def0-1234-567890abcdef --lines=200`,
+  coderun logs abc12345-6789-def0-1234-567890abcdef --lines 200`,
 	Args: cobra.ExactArgs(1),
 	Run:  runLogs,
 }

cmd/root.go

@@ -13,7 +13,7 @@ in a Kubernetes cluster with ease. Deploy your applications with simple commands
 
 Examples:
   coderun login                                    # Authenticate with your account
-  coderun deploy nginx:latest --replicas=2        # Deploy nginx with 2 replicas
+  coderun deploy nginx:latest --replicas 2        # Deploy nginx with 2 replicas
   coderun list                                     # List all your deployments
   coderun status <DEPLOYMENT_ID>                  # Check status by deployment ID`,
 }

cmd/status.go

@@ -80,6 +80,10 @@ func runStatus(cmd *cobra.Command, args []string) {
 		}
 	}
 
+	if status.TCPConnection != nil {
+		fmt.Printf("TCP Connection: %s\n", *status.TCPConnection)
+	}
+
 	if len(status.Pods) > 0 {
 		fmt.Printf("\n� Pods:\n")
 		for i, pod := range status.Pods {