Fix feedback

Author: Lagoja

internal/boxcli/services.go

@@ -40,7 +40,7 @@ func (flags *serviceUpFlags) register(cmd *cobra.Command) {
 	cmd.Flags().StringArrayVar(
 		&flags.processComposeFlags, "pcflags", []string{}, "pass flags directly to process compose")
 	cmd.Flags().IntVarP(
-		&flags.pcport, "pcport", "p", 0, "specify the port for process-compose to use. You can also set the pcport by exporting PC_PORT_NUM")
+		&flags.pcport, "pcport", "p", 0, "specify the port for process-compose to use. You can also set the pcport by exporting DEVBOX_PC_PORT_NUM")
 }
 
 func (flags *serviceStopFlags) register(cmd *cobra.Command) {
@@ -268,9 +268,9 @@ func startProcessManager(
 		servicesFlags.runInCurrentShell,
 		args,
 		devopt.ProcessComposeOpts{
-			Background: flags.background,
-			ExtraFlags: flags.processComposeFlags,
-			PCPort:     flags.pcport,
+			Background:         flags.background,
+			ExtraFlags:         flags.processComposeFlags,
+			ProcessComposePort: flags.pcport,
 		},
 	)
 }

internal/devbox/devopt/devboxopts.go

@@ -18,9 +18,9 @@ type Opts struct {
 }
 
 type ProcessComposeOpts struct {
-	ExtraFlags []string
-	Background bool
-	PCPort     int
+	ExtraFlags         []string
+	Background         bool
+	ProcessComposePort int
 }
 
 type GenerateOpts struct {

internal/devbox/services.go

@@ -218,8 +218,8 @@ func (d *Devbox) StartProcessManager(
 		for _, flag := range processComposeOpts.ExtraFlags {
 			args = append(args, "--pcflags", flag)
 		}
-		if processComposeOpts.PCPort != 0 {
-			args = append(args, "--pcport", strconv.Itoa(processComposeOpts.PCPort))
+		if processComposeOpts.ProcessComposePort != 0 {
+			args = append(args, "--pcport", strconv.Itoa(processComposeOpts.ProcessComposePort))
 		}
 
 		return d.runDevboxServicesScript(ctx, args)
@@ -258,10 +258,10 @@ func (d *Devbox) StartProcessManager(
 		svcs,
 		d.projectDir,
 		services.ProcessComposeOpts{
-			BinPath:    processComposeBinPath,
-			Background: processComposeOpts.Background,
-			ExtraFlags: processComposeOpts.ExtraFlags,
-			PCPort:     processComposeOpts.PCPort,
+			BinPath:            processComposeBinPath,
+			Background:         processComposeOpts.Background,
+			ExtraFlags:         processComposeOpts.ExtraFlags,
+			ProcessComposePort: processComposeOpts.ProcessComposePort,
 		},
 	)
 }

internal/services/manager.go

@@ -41,10 +41,10 @@ type globalProcessComposeConfig struct {
 }
 
 type ProcessComposeOpts struct {
-	BinPath    string
-	ExtraFlags []string
-	Background bool
-	PCPort     int
+	BinPath            string
+	ExtraFlags         []string
+	Background         bool
+	ProcessComposePort int
 }
 
 func newGlobalProcessComposeConfig() *globalProcessComposeConfig {
@@ -129,15 +129,11 @@ func StartProcessManager(
 	config := readGlobalProcessComposeJSON(configFile)
 	config.File = configFile
 
-	port, err := selectPort(processComposeConfig.PCPort)
+	port, err := selectPort(processComposeConfig.ProcessComposePort)
 	if err != nil {
 		return fmt.Errorf("failed to select port: %v", err)
 	}
 
-	if !isPortAvailable(port) {
-		return fmt.Errorf("port %d is already in use", port)
-	}
-
 	// Start building the process-compose command
 	flags := []string{"-p", strconv.Itoa(port)}
 	upCommand := []string{"up"}

internal/services/ports.go

@@ -41,12 +41,11 @@ func getAvailablePort() (int, error) {
 			return 0, errors.WithStack(err)
 		}
 
-		l, err := net.ListenTCP("tcp", addr)
-		if err != nil {
+		if isPortAvailable(addr.Port) != nil {
 			return 0, errors.WithStack(err)
 		}
-		defer l.Close()
-		return l.Addr().(*net.TCPAddr).Port, nil
+
+		return addr.Port, nil
 	}
 
 	for range 1000 {
@@ -65,18 +64,18 @@ func getAvailablePort() (int, error) {
 
 func selectPort(configPort int) (int, error) {
 	if configPort != 0 {
-		return configPort, nil
+		return configPort, isPortAvailable(configPort)
 	}
 
-	if portStr, exists := os.LookupEnv("PC_PORT_NUM"); exists {
+	if portStr, exists := os.LookupEnv("DEVBOX_PC_PORT_NUM"); exists {
 		port, err := strconv.Atoi(portStr)
 		if err != nil {
-			return 0, fmt.Errorf("invalid PC_PORT_NUM environment variable: %v", err)
+			return 0, fmt.Errorf("invalid DEVBOX_PC_PORT_NUM environment variable: %v", err)
 		}
 		if port <= 0 {
-			return 0, fmt.Errorf("invalid PC_PORT_NUM environment variable: ports cannot be less than 0")
+			return 0, fmt.Errorf("invalid DEVBOX_PC_PORT_NUM environment variable: ports cannot be less than 0")
 		}
-		return port, nil
+		return port, isPortAvailable(port)
 	}
 
 	return getAvailablePort()
@@ -86,11 +85,11 @@ func isAllowed(port int) bool {
 	return port > 1024 && disallowedPorts[port] == ""
 }
 
-func isPortAvailable(port int) bool {
+func isPortAvailable(port int) error {
 	ln, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
 	if err != nil {
-		return false
+		return fmt.Errorf("port %d is already in use", port)
 	}
 	ln.Close()
-	return true
+	return nil
 }