Update base.config package reference on update/resolve (#483)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: dan-manges

.rwx/integration/resolve-update-test.yml

@@ -103,6 +103,39 @@ tasks:
     env:
       RWX_ACCESS_TOKEN: ${{ secrets.RWX_ACCESS_TOKEN }}
 
+  - key: test-update-packages-bumps-base-config
+    use: rwx-cli
+    run: |
+      set -euo pipefail
+
+      tmpdir=$(mktemp -d)
+      mkdir -p "$tmpdir/.rwx"
+      cat > "$tmpdir/.rwx/ci.yml" << 'EOF'
+      base:
+        image: ubuntu:24.04
+        config: rwx/base 1.0.0
+      tasks:
+        - key: noop
+          run: echo hello
+      EOF
+
+      rwx update packages -d "$tmpdir"
+      if grep -q "config: rwx/base 1.0.0" "$tmpdir/.rwx/ci.yml"; then
+        echo "update packages did not bump base.config from 1.0.0"
+        cat "$tmpdir/.rwx/ci.yml"
+        rm -rf "$tmpdir"
+        exit 1
+      fi
+      if ! grep -qE "config: rwx/base [0-9]+\.[0-9]+\.[0-9]+" "$tmpdir/.rwx/ci.yml"; then
+        echo "update packages did not leave base.config with a pinned version"
+        cat "$tmpdir/.rwx/ci.yml"
+        rm -rf "$tmpdir"
+        exit 1
+      fi
+      rm -rf "$tmpdir"
+    env:
+      RWX_ACCESS_TOKEN: ${{ secrets.RWX_ACCESS_TOKEN }}
+
   - key: test-update-base-updates-base-image
     use: rwx-cli
     run: |

cmd/rwx/update.go

@@ -38,7 +38,8 @@ var (
 		Long: "Update base images in RWX run configurations.\n" +
 			"Adds a base image to run configurations that don't have one, and migrates\n" +
 			"deprecated 'os' and 'tag' fields to the new 'image' and 'config' format.",
-		Use: "base [flags] [files...]",
+		Use:    "base [flags] [files...]",
+		Hidden: true,
 	}
 
 	updatePackagesCmd = &cobra.Command{

internal/cli/service_packages.go

@@ -194,6 +194,56 @@ func (s Service) parsePackageVersion(str string) PackageVersion {
 	}
 }
 
+func (s Service) updatePackageReferenceAtPath(
+	doc *YAMLDoc,
+	yamlPath string,
+	original string,
+	update bool,
+	packageVersions *api.PackageVersionsResult,
+	versionPicker func(versions api.PackageVersionsResult, rwxPackage string, major string) (string, error),
+	replacements map[string]string,
+) (bool, error) {
+	// Expressions can't be statically resolved, so skip them
+	if strings.Contains(original, "${{") {
+		return false, nil
+	}
+
+	packageVersion := s.parsePackageVersion(original)
+	if packageVersion.Name == "" {
+		return false, nil
+	} else if !update && packageVersion.MajorVersion != "" {
+		return false, nil
+	}
+
+	newName := packageVersions.Renames[packageVersion.Name]
+	if newName == "" {
+		newName = packageVersion.Name
+	}
+
+	targetPackageVersion, err := versionPicker(*packageVersions, newName, packageVersion.MajorVersion)
+	if err != nil {
+		fmt.Fprintln(s.Stderr, err.Error())
+		return false, nil
+	}
+
+	newPackage := fmt.Sprintf("%s %s", newName, targetPackageVersion)
+	if newPackage == original {
+		return false, nil
+	}
+
+	if err := doc.ReplaceAtPath(yamlPath, newPackage); err != nil {
+		return false, err
+	}
+
+	if newName != packageVersion.Name {
+		replacements[packageVersion.Original] = fmt.Sprintf("%s %s", newName, targetPackageVersion)
+	} else {
+		replacements[packageVersion.Original] = targetPackageVersion
+	}
+
+	return true, nil
+}
+
 func (s Service) resolveOrUpdatePackagesForFiles(mintFiles []*MintYAMLFile, update bool, versionPicker func(versions api.PackageVersionsResult, rwxPackage string, major string) (string, error)) (map[string]string, error) {
 	packageVersions, err := s.APIClient.GetPackageVersions()
 	if err != nil {
@@ -216,50 +266,32 @@ func (s Service) resolveOrUpdatePackagesForFiles(mintFiles []*MintYAMLFile, upda
 		}
 
 		err = file.Doc.ForEachNode(nodePath, func(node ast.Node) error {
-			// Expressions can't be statically resolved, so skip them
-			if strings.Contains(node.String(), "${{") {
-				return nil
-			}
-
-			packageVersion := s.parsePackageVersion(node.String())
-			if packageVersion.Name == "" {
-				return nil
-			} else if !update && packageVersion.MajorVersion != "" {
-				return nil
-			}
-
-			newName := packageVersions.Renames[packageVersion.Name]
-			if newName == "" {
-				newName = packageVersion.Name
-			}
-
-			targetPackageVersion, err := versionPicker(*packageVersions, newName, packageVersion.MajorVersion)
+			changed, err := s.updatePackageReferenceAtPath(file.Doc, node.GetPath(), node.String(), update, packageVersions, versionPicker, replacements)
 			if err != nil {
-				fmt.Fprintln(s.Stderr, err.Error())
-				return nil
-			}
-
-			newPackage := fmt.Sprintf("%s %s", newName, targetPackageVersion)
-			if newPackage == node.String() {
-				return nil
-			}
-
-			if err = file.Doc.ReplaceAtPath(node.GetPath(), newPackage); err != nil {
 				return err
 			}
-
-			if newName != packageVersion.Name {
-				replacements[packageVersion.Original] = fmt.Sprintf("%s %s", newName, targetPackageVersion)
-			} else {
-				replacements[packageVersion.Original] = targetPackageVersion
+			if changed {
+				hasChange = true
 			}
-			hasChange = true
 			return nil
 		})
 		if err != nil {
 			return nil, errors.Wrap(err, "unable to replace package references")
 		}
 
+		if file.Doc.IsRunDefinition() {
+			baseConfig := file.Doc.TryReadStringAtPath("$.base.config")
+			if baseConfig != "" && baseConfig != "none" {
+				changed, err := s.updatePackageReferenceAtPath(file.Doc, "$.base.config", baseConfig, update, packageVersions, versionPicker, replacements)
+				if err != nil {
+					return nil, errors.Wrap(err, "unable to replace base.config package reference")
+				}
+				if changed {
+					hasChange = true
+				}
+			}
+		}
+
 		if hasChange {
 			docs[file.Entry.OriginalPath] = file.Doc
 		}

internal/cli/service_resolve_packages_test.go

@@ -290,4 +290,100 @@ tasks:
 			})
 		})
 	})
+
+	t.Run("resolves base.config package reference", func(t *testing.T) {
+		t.Run("pins a versionless base.config to the latest version", func(t *testing.T) {
+			s := setupTest(t)
+
+			s.mockAPI.MockGetPackageVersions = func() (*api.PackageVersionsResult, error) {
+				return &api.PackageVersionsResult{
+					LatestMajor: map[string]string{"rwx/base": "1.2.3"},
+				}, nil
+			}
+
+			originalContents := `base:
+  image: ubuntu:24.04
+  config: rwx/base
+
+tasks:
+  - key: foo
+    run: echo hello
+`
+			err := os.WriteFile(filepath.Join(s.tmp, "foo.yaml"), []byte(originalContents), 0o644)
+			require.NoError(t, err)
+
+			_, err = s.service.ResolvePackages(cli.ResolvePackagesConfig{
+				Files:               []string{filepath.Join(s.tmp, "foo.yaml")},
+				LatestVersionPicker: cli.PickLatestMajorVersion,
+			})
+			require.NoError(t, err)
+
+			contents, err := os.ReadFile(filepath.Join(s.tmp, "foo.yaml"))
+			require.NoError(t, err)
+			require.Contains(t, string(contents), "config: rwx/base 1.2.3")
+		})
+
+		t.Run("leaves an already-pinned base.config untouched", func(t *testing.T) {
+			s := setupTest(t)
+
+			s.mockAPI.MockGetPackageVersions = func() (*api.PackageVersionsResult, error) {
+				return &api.PackageVersionsResult{
+					LatestMajor: map[string]string{"rwx/base": "1.2.3"},
+				}, nil
+			}
+
+			originalContents := `base:
+  image: ubuntu:24.04
+  config: rwx/base 1.0.0
+
+tasks:
+  - key: foo
+    run: echo hello
+`
+			err := os.WriteFile(filepath.Join(s.tmp, "foo.yaml"), []byte(originalContents), 0o644)
+			require.NoError(t, err)
+
+			_, err = s.service.ResolvePackages(cli.ResolvePackagesConfig{
+				Files:               []string{filepath.Join(s.tmp, "foo.yaml")},
+				LatestVersionPicker: cli.PickLatestMajorVersion,
+			})
+			require.NoError(t, err)
+
+			contents, err := os.ReadFile(filepath.Join(s.tmp, "foo.yaml"))
+			require.NoError(t, err)
+			require.Equal(t, originalContents, string(contents))
+		})
+
+		t.Run("leaves config: none untouched", func(t *testing.T) {
+			s := setupTest(t)
+
+			s.mockAPI.MockGetPackageVersions = func() (*api.PackageVersionsResult, error) {
+				return &api.PackageVersionsResult{
+					LatestMajor: map[string]string{"nodejs/install": "1.2.3"},
+				}, nil
+			}
+
+			originalContents := `base:
+  image: ubuntu:24.04
+  config: none
+
+tasks:
+  - key: foo
+    call: nodejs/install
+`
+			err := os.WriteFile(filepath.Join(s.tmp, "foo.yaml"), []byte(originalContents), 0o644)
+			require.NoError(t, err)
+
+			_, err = s.service.ResolvePackages(cli.ResolvePackagesConfig{
+				Files:               []string{filepath.Join(s.tmp, "foo.yaml")},
+				LatestVersionPicker: cli.PickLatestMajorVersion,
+			})
+			require.NoError(t, err)
+
+			contents, err := os.ReadFile(filepath.Join(s.tmp, "foo.yaml"))
+			require.NoError(t, err)
+			require.Contains(t, string(contents), "config: none")
+			require.Contains(t, string(contents), "call: nodejs/install 1.2.3")
+		})
+	})
 }