Update Process Compose to 0.85.0 (#1820)

## Summary

Devbox will now install process-compose 0.85.0 if an older version (or
no version) is installed on the user's system

If an older version of process compose was installed in the utility
profile, Devbox will remove that older version first. This PR provides a
general way to remove packages (either from Flakes or Nixpkgs) from the
utils profile

This PR also fixes a bug where using `devbox services up` with the
`--config` flag would cause process compose to fail.

This PR doesn't add any new 0.85.0 features, though that could be a
follow up.

## How was it tested?

* Install an older version in the utils profile, check that this
upgrades
* Remove process-compose from the utlis profile, check that 0.85.0 is
installed
* This should be pre-released first, for more extensive testing

Author: Lagoja

examples/stacks/lapp-stack/devbox.json

@@ -1,14 +1,14 @@
 {
   "packages": [
     "[email protected]",
-    "postgresql@14",
     "[email protected]",
     "php81Extensions.pgsql@latest",
-    "[email protected]"
+    "[email protected]",
+    "postgresql@14"
   ],
   "env": {
-    "PGPORT": "5432",
-    "PGHOST": "/tmp/devbox/lapp"
+    "PGHOST": "/tmp/devbox/lapp",
+    "PGPORT": "5432"
   },
   "shell": {
     "scripts": {
@@ -19,10 +19,11 @@
       ],
       "init_db": "initdb",
       "run_test": [
-        "mkdir -p /tmp/devbox/lapp",
+        "mkdir -p /tmp/devbox/lapp", 
         "initdb",
-        "devbox services start",
-        "echo 'sleep 1 second for the postgres server to initialize.' && sleep 1",
+        "devbox services up -b",
+        "echo 'sleep 5 second for the postgres server to initialize.' && sleep 5",
+        "cat .devbox/compose.log",
         "dropdb --if-exists devbox_lapp",
         "createdb devbox_lapp",
         "psql devbox_lapp < setup_postgres_db.sql",

examples/stacks/lapp-stack/devbox.lock

@@ -62,7 +62,7 @@
     },
     "[email protected]": {
       "last_modified": "2023-09-04T16:24:30Z",
-      "plugin_version": "0.0.2",
+      "plugin_version": "0.0.3",
       "resolved": "github:NixOS/nixpkgs/3c15feef7770eb5500a4b8792623e2d6f598c9c1#php81",
       "source": "devbox-search",
       "version": "8.1.23",
@@ -82,23 +82,22 @@
       }
     },
     "postgresql@14": {
-      "last_modified": "2023-08-30T00:25:28Z",
-      "plugin_version": "0.0.2",
-      "resolved": "github:NixOS/nixpkgs/a63a64b593dcf2fe05f7c5d666eb395950f36bc9#postgresql",
+      "last_modified": "2023-10-21T19:15:59Z",
+      "resolved": "github:NixOS/nixpkgs/51d906d2341c9e866e48c2efcaac0f2d70bfd43e#postgresql",
       "source": "devbox-search",
       "version": "14.9",
       "systems": {
         "aarch64-darwin": {
-          "store_path": "/nix/store/x6058p5djhvn57fqyqfs4hvf193m847j-postgresql-14.9"
+          "store_path": "/nix/store/fp6hphss6sm5r4bflhl35y9mfpl1hmqv-postgresql-14.9"
         },
         "aarch64-linux": {
-          "store_path": "/nix/store/0gfagnjbaqlgzf17hrc5pzfr170s6wdl-postgresql-14.9"
+          "store_path": "/nix/store/ijc70wkgbgc2l8y2va049wrdgrlxd6js-postgresql-14.9"
         },
         "x86_64-darwin": {
-          "store_path": "/nix/store/hd25shwpmqcki920ii1cxhh95qa51kfh-postgresql-14.9"
+          "store_path": "/nix/store/rbicral6k0rzk99wvmj1fd24qc2dc7g3-postgresql-14.9"
         },
         "x86_64-linux": {
-          "store_path": "/nix/store/vfcdf4n8f7mxx4rby11f7vhhpi62474m-postgresql-14.9"
+          "store_path": "/nix/store/ki3srrjjzqalvh0hd9lmqavp5v9wr9jp-postgresql-14.9"
         }
       }
     }

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/cloudflare/ahocorasick v0.0.0-20210425175752-730270c3e184
 	github.com/creekorful/mvnparser v1.5.0
 	github.com/denisbrodbeck/machineid v1.0.1
-	github.com/f1bonacc1/process-compose v0.43.1
+	github.com/f1bonacc1/process-compose v0.85.0
 	github.com/fatih/color v1.16.0
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/getsentry/sentry-go v0.27.0

go.sum

@@ -136,8 +136,8 @@ github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5Jflh
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/f1bonacc1/process-compose v0.43.1 h1:XAN7ohegNfMFxYnj59g2jN7y6HfnJWhDCGtD/nN/TbE=
-github.com/f1bonacc1/process-compose v0.43.1/go.mod h1:jvg1NakjJd8V1LjGKu21HLLOVxbwkOHEgkaDjSWRXc0=
+github.com/f1bonacc1/process-compose v0.85.0 h1:BD3nRHRTLO5jqB5zG1Bu6UJ1Qh5wAkyOWQQ6OKtRRnQ=
+github.com/f1bonacc1/process-compose v0.85.0/go.mod h1:NFkS+lyAyKCokif7KvtO3H8MpjD0W4r3PReLn3x4yiQ=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -361,12 +361,8 @@ github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBU
 github.com/zaffka/mongodb-boltdb-mock v0.0.0-20221014194232-b4bb03fbe3a0/go.mod h1:GsDD1qsG+86MeeCG7ndi6Ei3iGthKL3wQ7PTFigDfNY=
 github.com/zealic/go2node v0.1.0 h1:ofxpve08cmLJBwFdI0lPCk9jfwGWOSD+s6216x0oAaA=
 github.com/zealic/go2node v0.1.0/go.mod h1:GrkFr+HctXwP7vzcU9RsgtAeJjTQ6Ud0IPCQAqpTfBg=
-go.jetpack.io/envsec v0.0.16-0.20240111222345-e1fd0e1204ca h1:7Ocnr+mVZTCG8MHlcAdW5d8ir7eqZTmD8S/aEskjXWk=
-go.jetpack.io/envsec v0.0.16-0.20240111222345-e1fd0e1204ca/go.mod h1:kCgRGNSHU5AgQXQGUenohPPDoUd87SRL00uOzQsa+Q8=
 go.jetpack.io/envsec v0.0.16-0.20240214025624-d233cf877eec h1:IvdOF1C8tAxvKEauWBd/4IWXZfeyXh5vmcfTrcTBPvQ=
 go.jetpack.io/envsec v0.0.16-0.20240214025624-d233cf877eec/go.mod h1:koTmI1q2QKqtxaX4P/7r5ygODwgJQ56FKoKRfzpZ0bM=
-go.jetpack.io/pkg v0.0.0-20240108193620-a28b84329d15 h1:ztX3CydpNKLePPMRmWgdi4HcxE/AXY6HViOJOmmYNiA=
-go.jetpack.io/pkg v0.0.0-20240108193620-a28b84329d15/go.mod h1:kGUL8aZ7ddvoGro0AQxXos9GKn5Qw0J18qW7d5FP4Ws=
 go.jetpack.io/pkg v0.0.0-20240213204231-ec96be3d78fb h1:ELaZEV3BL+/GDfPxWPXt6ODNig/VlywWhfAC4P8EG5A=
 go.jetpack.io/pkg v0.0.0-20240213204231-ec96be3d78fb/go.mod h1:kGUL8aZ7ddvoGro0AQxXos9GKn5Qw0J18qW7d5FP4Ws=
 go.jetpack.io/typeid v1.0.0 h1:8gQ+iYGdyiQ0Pr40ydSB/PzMOIwlXX5DTojp1CBeSPQ=

internal/devbox/devbox.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"runtime/trace"
 	"slices"
 	"strconv"
@@ -31,6 +32,7 @@ import (
 	"go.jetpack.io/devbox/internal/searcher"
 	"go.jetpack.io/devbox/internal/shellgen"
 	"go.jetpack.io/devbox/internal/telemetry"
+	"go.jetpack.io/devbox/internal/vercheck"
 
 	"go.jetpack.io/devbox/internal/boxcli/usererr"
 	"go.jetpack.io/devbox/internal/cmdutil"
@@ -51,9 +53,9 @@ import (
 const (
 
 	// shellHistoryFile keeps the history of commands invoked inside devbox shell
-	shellHistoryFile = ".devbox/shell_history"
-
-	arbitraryCmdFilename = ".cmd"
+	shellHistoryFile            = ".devbox/shell_history"
+	processComposeTargetVersion = "v0.85.0"
+	arbitraryCmdFilename        = ".cmd"
 )
 
 type Devbox struct {
@@ -746,7 +748,7 @@ func (d *Devbox) StartProcessManager(
 	processComposePath, err := utilityLookPath("process-compose")
 	if err != nil {
 		fmt.Fprintln(d.stderr, "Installing process-compose. This may take a minute but will only happen once.")
-		if err = d.addDevboxUtilityPackage(ctx, "github:F1bonacc1/process-compose/v0.43.1"); err != nil {
+		if err = d.addDevboxUtilityPackage(ctx, "github:F1bonacc1/process-compose/"+processComposeTargetVersion); err != nil {
 			return err
 		}
 
@@ -757,6 +759,28 @@ func (d *Devbox) StartProcessManager(
 			return err
 		}
 	}
+	re := regexp.MustCompile(`(?m)Version:\s*(v\d*\.\d*\.\d*)`)
+	pcVersionString, err := exec.Command(processComposePath, "version").Output()
+	if err != nil {
+		fmt.Fprintln(d.stderr, "failed to get process-compose version")
+		return err
+	}
+
+	pcVersion := re.FindStringSubmatch(strings.TrimSpace(string(pcVersionString)))[1]
+
+	if vercheck.SemverCompare(pcVersion, processComposeTargetVersion) < 0 {
+		fmt.Fprintln(d.stderr, "Upgrading process-compose to "+processComposeTargetVersion+"...")
+		oldProcessComposePkg := "github:F1bonacc1/process-compose/" + pcVersion + "#defaultPackage." + nix.System()
+		newProcessComposePkg := "github:F1bonacc1/process-compose/" + processComposeTargetVersion
+		// Find the old process Compose package
+		if err := d.removeDevboxUtilityPackage(oldProcessComposePkg); err != nil {
+			return err
+		}
+
+		if err = d.addDevboxUtilityPackage(ctx, newProcessComposePkg); err != nil {
+			return err
+		}
+	}
 
 	// Start the process manager
 

internal/devbox/util.go

@@ -5,12 +5,14 @@ package devbox
 
 import (
 	"context"
+	"fmt"
 	"io/fs"
 	"os"
 	"path/filepath"
 
 	"github.com/pkg/errors"
 	"go.jetpack.io/devbox/internal/devpkg"
+	"go.jetpack.io/devbox/internal/nix"
 	"go.jetpack.io/devbox/internal/nix/nixprofile"
 
 	"go.jetpack.io/devbox/internal/xdg"
@@ -32,14 +34,38 @@ func (d *Devbox) addDevboxUtilityPackage(ctx context.Context, pkgName string) er
 		return err
 	}
 
-	return nixprofile.ProfileInstall(ctx, &nixprofile.ProfileInstallArgs{
+	return nix.ProfileInstall(ctx, &nix.ProfileInstallArgs{
 		Installable: installable,
-		PackageName: pkgName,
 		ProfilePath: profilePath,
 		Writer:      d.stderr,
 	})
 }
 
+func (d *Devbox) removeDevboxUtilityPackage(pkgName string) error {
+	pkg := devpkg.PackageFromStringWithDefaults(pkgName, d.lockfile)
+	installable, err := pkg.Installable()
+	if err != nil {
+		return err
+	}
+
+	utilityProfilePath, err := utilityNixProfilePath()
+	if err != nil {
+		return err
+	}
+
+	profile, err := nixprofile.ProfileListItems(d.stderr, utilityProfilePath)
+	if err != nil {
+		return err
+	}
+
+	for i, profileItem := range profile {
+		if profileItem.MatchesUnlockedReference(installable) {
+			return nix.ProfileRemove(utilityProfilePath, fmt.Sprint(i))
+		}
+	}
+	return nil
+}
+
 func utilityLookPath(binName string) (string, error) {
 	binPath, err := utilityBinPath()
 	if err != nil {

internal/nix/nixprofile/item.go

@@ -75,6 +75,10 @@ func (i *NixProfileListItem) Matches(pkg *devpkg.Package, locker lock.Locker) bo
 	return pkg.Equals(devpkg.PackageFromStringWithDefaults(i.unlockedReference, locker))
 }
 
+func (i *NixProfileListItem) MatchesUnlockedReference(installable string) bool {
+	return i.unlockedReference == installable
+}
+
 func (i *NixProfileListItem) addedByStorePath() bool {
 	return i.unlockedReference == ""
 }

internal/nix/nixprofile/profile.go

@@ -5,14 +5,11 @@ package nixprofile
 
 import (
 	"bufio"
-	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 
-	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/samber/lo"
 	"go.jetpack.io/devbox/internal/devpkg"
@@ -210,39 +207,3 @@ func parseNixProfileListItemLegacy(line string) (*NixProfileListItem, error) {
 		nixStorePaths:     nixStorePaths,
 	}, nil
 }
-
-type ProfileInstallArgs struct {
-	CustomStepMessage string
-	Installable       string
-	Offline           bool
-	PackageName       string
-	ProfilePath       string
-	Writer            io.Writer
-}
-
-// ProfileInstall calls nix profile install with default profile
-func ProfileInstall(ctx context.Context, args *ProfileInstallArgs) error {
-	stepMsg := args.PackageName
-	if args.CustomStepMessage != "" {
-		stepMsg = args.CustomStepMessage
-		// Only print this first one if we have a custom message. Otherwise it feels
-		// repetitive.
-		fmt.Fprintf(args.Writer, "%s\n", stepMsg)
-	}
-
-	err := nix.ProfileInstall(ctx, &nix.ProfileInstallArgs{
-		Installable: args.Installable,
-		Offline:     args.Offline,
-		ProfilePath: args.ProfilePath,
-		Writer:      args.Writer,
-	})
-	if err != nil {
-		fmt.Fprintf(args.Writer, "%s: ", stepMsg)
-		color.New(color.FgRed).Fprintf(args.Writer, "Fail\n")
-		return redact.Errorf("error running \"nix profile install\": %w", err)
-	}
-
-	fmt.Fprintf(args.Writer, "%s: ", stepMsg)
-	color.New(color.FgGreen).Fprintf(args.Writer, "Success\n")
-	return nil
-}

internal/services/client.go

@@ -14,7 +14,7 @@ import (
 	"github.com/f1bonacc1/process-compose/src/types"
 )
 
-type processStates = types.ProcessStates
+type processStates = types.ProcessesState
 
 type Process struct {
 	Name     string

internal/services/manager.go

@@ -219,7 +219,8 @@ func runProcessManagerInForeground(cmd *exec.Cmd, config *globalProcessComposeCo
 }
 
 func runProcessManagerInBackground(cmd *exec.Cmd, config *globalProcessComposeConfig, port int, projectDir string) error {
-	logfile, err := os.OpenFile(processComposeLogfile, os.O_CREATE|os.O_WRONLY|os.O_APPEND|os.O_TRUNC, 0o664)
+	logdir := filepath.Join(projectDir, processComposeLogfile)
+	logfile, err := os.OpenFile(logdir, os.O_CREATE|os.O_WRONLY|os.O_APPEND|os.O_TRUNC, 0o664)
 	if err != nil {
 		return fmt.Errorf("failed to open process-compose log file: %w", err)
 	}