test(cmd): drop devel build tag, add upgrade integration tests

The devel tag no longer changed any build (version_devel.go was removed
earlier), it only gated the integration tests out of the normal suite. Drop
it entirely: remove //go:build devel from the harness and integration tests,
the -tags devel flags from the Makefile and CI, and the related doc mentions.

Add in-process integration tests for `zcli upgrade` covering --check (0/1/2),
explicit --version, and the already-up-to-date path, driven through the
harness with the version API stubbed via ZEROPS_VERSION_API_URL.

Un-tagging exposed pre-existing lint debt in the test files (these were never
linted before): drop the unused ctx param from the harness Run (clearing the
nil-context hits), use exec.CommandContext, and exclude musttag for _test.go
(tests marshal internal persisted structs that rely on default JSON keys).

Author: l-hellmann

.github/workflows/main.yml

@@ -39,7 +39,7 @@ jobs:
           go-version-file: "go.mod"
 
       - name: test-integration
-        run: go test -v -tags devel ./src/cmd/...
+        run: go test -v ./src/cmd/...
 
   lint:
     name: lint

.golangci.yaml

@@ -95,6 +95,11 @@ linters:
       - linters: [staticcheck]
         path: src/cmdRunner/run.go
         text: "ST1005:"
+      # Integration tests marshal internal persisted structs (e.g.
+      # cliStorage.Data) to seed on-disk state. Those types intentionally rely
+      # on Go's default field-name JSON keys, so don't require explicit tags.
+      - linters: [musttag]
+        path: _test\.go$
 
 issues:
   max-same-issues: 0

CLAUDE.md

@@ -10,8 +10,8 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 - `make test` — runs `go test -v ./cmd/... ./src/...`. Run a single test with `go test -v -run TestName ./src/<pkg>/...`.
 - `make lint` — runs the pinned `./bin/golangci-lint` for darwin/arm64, linux/amd64, and windows/amd64. Config: `.golangci.yaml`.
-- `make build-dev` — build a dev binary for the host into `./bin/zcli` (build tag `devel`, debug-friendly via `-gcflags='all=-l -N'`, version injected from git).
-- `make all` — cross-builds dev binaries for windows-amd, linux-amd, darwin-amd, darwin-arm. Single-target builds: `make linux-amd` etc. All build targets share the `DEV_BUILD` recipe in the Makefile (version metadata, devel tag, gcflags).
+- `make build-dev` — build a dev binary for the host into `./bin/zcli` (debug-friendly via `-gcflags='all=-l -N'`, version injected from git).
+- `make all` — cross-builds dev binaries for windows-amd, linux-amd, darwin-amd, darwin-arm. Single-target builds: `make linux-amd` etc. All build targets share the `DEV_BUILD` recipe in the Makefile (version metadata, gcflags).
 - `make install` — production install into `~/.local/bin/zcli` (same path as the public `install.sh` script). Stripped/optimized, version from `git describe`, same flag set as `.goreleaser.yaml`.
 - `make install-dev` — installs to `$GOBIN` (or `$GOPATH/bin`) as `zcli-dev` so it sits with other Go dev tools and coexists on PATH with a production `zcli`.
 - `make goreleaser-check` / `make goreleaser-snapshot` — validate `.goreleaser.yaml` and dry-run a release build to `./dist`.

Makefile

@@ -22,7 +22,7 @@ DEV_INSTALL_DIR  := $(or $(shell go env GOBIN),$(shell go env GOPATH)/bin)
 # Dev-build version metadata (matches what tools/build.sh used to compose).
 DEV_VERSION := $(shell git rev-parse --abbrev-ref HEAD):$(shell git describe --tags 2>/dev/null)-($(shell git config --get user.name):<$(shell git config --get user.email)>)
 # -gcflags disables inlining and optimizations so the binary is dlv-friendly.
-DEV_BUILD := go build -tags devel \
+DEV_BUILD := go build \
 	-gcflags='all=-l -N' \
 	-ldflags='-X "github.com/zeropsio/zcli/src/version.version=$(DEV_VERSION)"'
 
@@ -44,8 +44,8 @@ help: ## Show this help.
 test: ## Run the full Go test suite.
 	go test -v ./cmd/... ./src/...
 
-test-integration: ## Run the integration test suite (devel build tag).
-	go test -v -tags devel ./src/cmd/...
+test-integration: ## Run just the in-process integration tests (src/cmd).
+	go test -v ./src/cmd/...
 
 # Lint each target GOOS in turn so platform-specific build tags get covered.
 lint: $(BIN)/.golangci-lint-$(GOLANGCI_LINT_VERSION) ## Run golangci-lint for darwin/arm64, linux/amd64, windows/amd64.
@@ -55,7 +55,7 @@ lint: $(BIN)/.golangci-lint-$(GOLANGCI_LINT_VERSION) ## Run golangci-lint for da
 
 ##@ Build
 
-build-dev: ## Build a dev binary for the host into ./bin/zcli (devel tag, no optimizations).
+build-dev: ## Build a dev binary for the host into ./bin/zcli (no optimizations, dlv-friendly).
 	$(DEV_BUILD) -o $(BIN)/zcli ./cmd/zcli
 
 all: windows-amd linux-amd darwin-amd darwin-arm ## Cross-build all dev targets.
@@ -79,7 +79,7 @@ install: ## Build a production zcli (stripped, optimized) and install it into ~/
 	$(PROD_BUILD) -o $(PROD_INSTALL_DIR)/zcli ./cmd/zcli
 	@echo "installed $(PROD_INSTALL_DIR)/zcli ($(PROD_VERSION))"
 
-install-dev: ## Build a dev zcli-dev (devel tag, debug-friendly) and install it into $GOBIN.
+install-dev: ## Build a dev zcli-dev (debug-friendly) and install it into $GOBIN.
 	$(DEV_BUILD) -o $(DEV_INSTALL_DIR)/zcli-dev ./cmd/zcli
 	@echo "installed $(DEV_INSTALL_DIR)/zcli-dev"
 

README.md

@@ -144,7 +144,7 @@ Common targets (run `make help` for the full list):
 
 | Target | What it does |
 |---|---|
-| `make build-dev` | Build `./bin/zcli` with the `devel` tag, no optimizations (dlv-friendly). |
+| `make build-dev` | Build `./bin/zcli` with no optimizations (dlv-friendly). |
 | `make install` | Build a production `zcli` and install to `~/.local/bin` (same path as `install.sh`). |
 | `make install-dev` | Install a `zcli-dev` binary into `$GOBIN` (or `$GOPATH/bin`). |
 | `make test` | Run the full Go test suite. |

src/cmd/integration_harness_test.go

@@ -1,15 +1,12 @@
-//go:build devel
-
 // Shared scaffolding for the package's integration tests.
 //
-// All integration tests build under the `devel` build tag (so the
-// production-version-check HTTP call from src/version is stubbed to a no-op)
-// and run via `make test-integration`. They drive the CLI in-process through
-// cmdBuilder.RunRootCmd, point the REST client at an httptest.Server, and
-// isolate per-test state by setting ZEROPS_CLI_DATA_FILE_PATH,
-// ZEROPS_CLI_LOG_FILE_PATH, and ZEROPS_CLI_YAML_FILE_PATH to per-test temp
-// files. yamlReader's package-level cache is reset before and after each test.
-// See pushDeploy_helpers_test.go for push/deploy-specific helpers.
+// Integration tests drive the CLI in-process through cmdBuilder.RunRootCmd,
+// point the REST client at an httptest.Server, and isolate per-test state by
+// setting ZEROPS_CLI_DATA_FILE_PATH, ZEROPS_CLI_LOG_FILE_PATH, and
+// ZEROPS_CLI_YAML_FILE_PATH to per-test temp files. ZEROPS_VERSION_API_URL is
+// pointed at the test server so the background version check never reaches the
+// real API. yamlReader's package-level cache is reset before and after each
+// test. See pushDeploy_helpers_test.go for push/deploy-specific helpers.
 
 package cmd
 
@@ -63,6 +60,9 @@ func newFixture(t *testing.T) *fixture {
 	t.Setenv(constants.CliLogFilePathEnvVar, logPath)
 	t.Setenv(constants.CliZcliYamlFilePathEnvVar, yamlPath)
 	t.Setenv(constants.CliTokenEnvVar, "")
+	// Keep the background version check off the real network. Tests that
+	// exercise the version API re-point this at a registered handler.
+	t.Setenv(constants.VersionApiUrlEnvVar, server.URL+"/__version_check__")
 
 	return &fixture{
 		t:        t,
@@ -117,13 +117,16 @@ type result struct {
 	ExitCode int
 }
 
-// Run executes the CLI in-process with the given args. ctx defaults to
-// context.Background() when nil.
-func (f *fixture) Run(ctx context.Context, args ...string) result {
+// Run executes the CLI in-process with the given args, using the test's
+// context. Use RunCtx when a specific (e.g. canceled) context is needed.
+func (f *fixture) Run(args ...string) result {
+	f.t.Helper()
+	return f.RunCtx(f.t.Context(), args...)
+}
+
+// RunCtx is Run with an explicit context.
+func (f *fixture) RunCtx(ctx context.Context, args ...string) result {
 	f.t.Helper()
-	if ctx == nil {
-		ctx = context.Background()
-	}
 	var stdout, stderr bytes.Buffer
 	code := cmdBuilder.RunRootCmd(
 		ctx,

src/cmd/login_integration_test.go

@@ -1,5 +1,3 @@
-//go:build devel
-
 package cmd
 
 import (
@@ -33,7 +31,7 @@ func TestLoginCommand_PersistsTokenAndRegion(t *testing.T) {
 		"fullName": "Test User",
 	})
 
-	res := f.Run(nil, "login", "secret-token", "--region-url", f.Server.URL+"/regions")
+	res := f.Run("login", "secret-token", "--region-url", f.Server.URL+"/regions")
 
 	require.Equalf(t, 0, res.ExitCode, "stderr=%q", res.Stderr)
 	assert.Contains(t, res.Stderr, "Test User", "success message should name the user")

src/cmd/projectList_integration_test.go

@@ -1,5 +1,3 @@
-//go:build devel
-
 package cmd
 
 import (
@@ -51,7 +49,7 @@ func TestProjectListCommand(t *testing.T) {
 		}},
 	})
 
-	res := f.Run(nil, "project", "list")
+	res := f.Run("project", "list")
 
 	require.Equalf(t, 0, res.ExitCode, "stderr=%q", res.Stderr)
 	for _, want := range []string{"demo-project", "Acme Org", "00000000-0000-0000-0000-0000000000bb"} {

src/cmd/pushDeploy_bugs_test.go

@@ -1,5 +1,3 @@
-//go:build devel
-
 package cmd
 
 // This file collects integration regression tests that pin previously
@@ -34,7 +32,6 @@ func TestServicePushCommand_SetupFlagOverridesAutoMatch(t *testing.T) {
 	s := registerPushStubs(t, f, "backend")
 
 	res := f.Run(
-		nil,
 		"service", "push",
 		"--service-id", pushServiceID,
 		"--working-dir", workDir,
@@ -166,7 +163,6 @@ func TestServicePushCommand_RunningProcessWithNullAppVersionNoCrash(t *testing.T
 	// the null AppVersion and the second poll's FINISHED status completes
 	// the push.
 	res := f.Run(
-		nil,
 		"service", "push",
 		"--service-id", pushServiceID,
 		"--working-dir", workDir,

src/cmd/pushDeploy_helpers_test.go

@@ -1,5 +1,3 @@
-//go:build devel
-
 package cmd
 
 import (