@automattic/vip 4.1.4 → 4.1.6

package/cmd/vip-next/commands/devenv_create_appinfo.go

@@ -1,158 +0,0 @@
-package commands
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/Khan/genqlient/graphql"
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-
-	"github.com/Automattic/vip/internal/gql"
-)
-
-// createDefaults are the wizard pre-selected values derived from an app/env when
-// `@app.env dev-env create` is used. Mirrors Node's getOptionsFromAppInfo
-// (dev-environment-cli.ts:257) — the subset that seeds the create wizard.
-type createDefaults struct {
-	Title               string
-	Multisite           bool
-	PHP                 string
-	WordPress           string
-	MediaRedirectDomain string
-}
-
-// buildCreateDefaults maps resolved app/env fields to wizard defaults. Title
-// falls back env name → app name (Node: env.name || app.name || ”).
-func buildCreateDefaults(appName, envName string, isMultisite bool, primaryDomain, php, wordpress string) createDefaults {
-	title := envName
-	if title == "" {
-		title = appName
-	}
-	return createDefaults{
-		Title:               title,
-		Multisite:           isMultisite,
-		PHP:                 php,
-		WordPress:           wordpress,
-		MediaRedirectDomain: primaryDomain,
-	}
-}
-
-// fetchAppCreateDefaults best-effort resolves the @app.env alias (propagated
-// into --app/--env by the root) and fetches the app info that pre-populates the
-// create wizard. Returns nil when no app was given or anything fails — matching
-// Node, which wraps getApplicationInformation in try/catch and continues with
-// generic defaults after a warning (vip-dev-env-create.js).
-func fetchAppCreateDefaults(cmd *cobra.Command) *createDefaults {
-	appKey := strings.TrimSpace(lookupRootFlag(cmd, "app"))
-	if appKey == "" {
-		return nil // local create; no app context
-	}
-	cfg := GetConfig()
-	if cfg.GQLClient == nil {
-		return nil // auth-bypassed without a client; nothing to fetch
-	}
-	envKey := strings.TrimSpace(lookupRootFlag(cmd, "env"))
-
-	warn := func(err error) *createDefaults {
-		fmt.Fprintln(cmd.ErrOrStderr(),
-			color.YellowString("Warning:"),
-			fmt.Sprintf("failed to fetch application %q information: %v", appKey, err))
-		return nil
-	}
-
-	appID, err := resolveAppIDForCreate(cmd.Context(), cfg.GQLClient, appKey)
-	if err != nil {
-		return warn(err)
-	}
-	resp, err := gql.DevEnvAppInfo(cmd.Context(), cfg.GQLClient, appID)
-	if err != nil {
-		return warn(err)
-	}
-	if resp == nil || resp.App == nil {
-		return warn(fmt.Errorf("no app matching %q found", appKey))
-	}
-	env := pickCreateEnv(resp.App.Environments, envKey)
-	if env == nil {
-		return warn(fmt.Errorf("no matching environment for %q", appKey))
-	}
-
-	d := buildCreateDefaults(
-		strVal(resp.App.Name), strVal(env.Name), boolVal(env.IsMultisite),
-		primaryDomainName(env), softwareVersion(env, "php"), softwareVersion(env, "wordpress"),
-	)
-	return &d
-}
-
-// resolveAppIDForCreate turns the --app key into a numeric app ID: a numeric key
-// is used directly; a name is resolved via ResolveAppByName (first match).
-func resolveAppIDForCreate(ctx context.Context, client graphql.Client, appKey string) (int64, error) {
-	if id, err := strconv.ParseInt(appKey, 10, 64); err == nil {
-		return id, nil
-	}
-	resp, err := gql.ResolveAppByName(ctx, client, appKey)
-	if err != nil {
-		return 0, err
-	}
-	if resp == nil || resp.Apps == nil || len(resp.Apps.Edges) == 0 || resp.Apps.Edges[0] == nil || resp.Apps.Edges[0].Id == nil {
-		return 0, fmt.Errorf("no app matching name %q found", appKey)
-	}
-	return *resp.Apps.Edges[0].Id, nil
-}
-
-// pickCreateEnv selects the env matching envType; if envType is empty and there
-// is exactly one env, that one is used (Node's single-env shortcut). Returns nil
-// when no unambiguous match exists.
-func pickCreateEnv(envs []*gql.DevEnvAppInfoAppEnvironmentsAppEnvironment, envType string) *gql.DevEnvAppInfoAppEnvironmentsAppEnvironment {
-	if envType != "" {
-		for _, e := range envs {
-			if e != nil && strVal(e.Type) == envType {
-				return e
-			}
-		}
-		return nil
-	}
-	if len(envs) == 1 {
-		return envs[0]
-	}
-	return nil
-}
-
-func primaryDomainName(env *gql.DevEnvAppInfoAppEnvironmentsAppEnvironment) string {
-	if env.PrimaryDomain == nil {
-		return ""
-	}
-	return env.PrimaryDomain.Name
-}
-
-// softwareVersion returns the env's current php or wordpress version, or "".
-func softwareVersion(env *gql.DevEnvAppInfoAppEnvironmentsAppEnvironment, component string) string {
-	ss := env.SoftwareSettings
-	if ss == nil {
-		return ""
-	}
-	switch component {
-	case "php":
-		if ss.Php != nil && ss.Php.Current != nil {
-			return ss.Php.Current.Version
-		}
-	case "wordpress":
-		if ss.Wordpress != nil && ss.Wordpress.Current != nil {
-			return ss.Wordpress.Current.Version
-		}
-	}
-	return ""
-}
-
-func strVal(p *string) string {
-	if p == nil {
-		return ""
-	}
-	return *p
-}
-
-func boolVal(p *bool) bool {
-	return p != nil && *p
-}

package/cmd/vip-next/commands/devenv_create_appinfo_test.go

@@ -1,29 +0,0 @@
-package commands
-
-import "testing"
-
-func TestBuildCreateDefaultsPrefersEnvName(t *testing.T) {
-	d := buildCreateDefaults("my-app", "cantina-trunk-staging", false, "example.com", "8.2", "6.4")
-	if d.Title != "cantina-trunk-staging" {
-		t.Fatalf("title = %q, want env name", d.Title)
-	}
-	if d.Multisite {
-		t.Fatalf("multisite should be false")
-	}
-	if d.PHP != "8.2" || d.WordPress != "6.4" {
-		t.Fatalf("php/wordpress not mapped: %+v", d)
-	}
-	if d.MediaRedirectDomain != "example.com" {
-		t.Fatalf("mediaRedirectDomain not mapped: %q", d.MediaRedirectDomain)
-	}
-}
-
-func TestBuildCreateDefaultsFallsBackToAppName(t *testing.T) {
-	d := buildCreateDefaults("my-app", "", true, "", "", "")
-	if d.Title != "my-app" {
-		t.Fatalf("title = %q, want app name fallback", d.Title)
-	}
-	if !d.Multisite {
-		t.Fatalf("multisite should be true")
-	}
-}

package/cmd/vip-next/commands/devenv_create_test.go

@@ -1,269 +0,0 @@
-package commands
-
-import "testing"
-
-func TestResolveCreateConfigNonInteractiveDefaults(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "x"}); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err := resolveCreateConfig(c, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.Slug != "x" {
-		t.Fatalf("Slug = %q", cfg.Slug)
-	}
-	if cfg.Title != "VIP Dev" {
-		t.Fatalf("Title default = %q, want VIP Dev", cfg.Title)
-	}
-	if cfg.MultisiteMode != "" {
-		t.Fatalf("MultisiteMode default = %q, want single site", cfg.MultisiteMode)
-	}
-	if cfg.PHP != "8.4" {
-		t.Fatalf("PHP default = %q, want 8.4", cfg.PHP)
-	}
-	if cfg.PHPMyAdmin || cfg.Xdebug || cfg.Mailpit || cfg.Photon || cfg.Elasticsearch {
-		t.Fatalf("service toggles should default off: %+v", cfg)
-	}
-	if cfg.Start {
-		t.Fatal("Start must default FALSE (register 2.22)")
-	}
-}
-
-// Register 2.22. Node's `dev-env create` only writes files — it ends by
-// printing "To start the environment run: vip dev-env start"
-// (vip-dev-env-create.js:173-179) and never starts anything. vip-next defaulted
-// --start to true, and Start escalates to `sudo /bin/sh` to edit /etc/hosts and
-// install a CA, so a CI script that used create as a cheap file-writing step
-// pulled images, mutated the system trust store, and could block forever on a
-// sudo prompt. The FLAG stays (it is registered vip-next surface); the DEFAULT
-// must match Node.
-func TestResolveCreateConfigStartDefaultsFalse(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "x"}); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err := resolveCreateConfig(c, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.Start {
-		t.Fatal("create must not start (and must not reach sudo) unless --start is passed")
-	}
-}
-
-// The flag itself must survive — it is registered vip-next surface (cutover
-// register section 4), so `--start` still starts.
-func TestResolveCreateConfigStartFlagStillWorks(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "x", "--start"}); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err := resolveCreateConfig(c, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !cfg.Start {
-		t.Fatal("--start must still start the environment")
-	}
-}
-
-// Register 2.21 for create: Node resolves create's slug through the same
-// getEnvironmentName, so a configured repo creates the CONFIGURED environment,
-// not "vip-local". Without this, create and start/destroy target different
-// environments in the same repo.
-func TestResolveCreateConfigUsesConfigurationFileSlug(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	t.Setenv("XDG_DATA_HOME", t.TempDir())
-	repo := t.TempDir()
-	writeDevEnvConfig(t, repo, "configured-site")
-	t.Chdir(repo)
-
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse(nil); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err := resolveCreateConfig(c, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.Slug != "configured-site" {
-		t.Fatalf("Slug = %q, want configured-site from .wpvip/vip-dev-env.yml", cfg.Slug)
-	}
-}
-
-// Node rejects an unsupported PHP version up front, in promptForArguments,
-// BEFORE createEnvironment writes anything (resolvePhpVersion,
-// dev-environment-cli.ts:778-782). vip-next passed any bare version straight
-// through to the image name, so a typo only surfaced as an opaque
-// `docker pull` failure AFTER the environment was already on disk.
-func TestResolveCreateConfigRejectsUnsupportedPHPVersion(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "x", "--php", "8.9"}); err != nil {
-		t.Fatal(err)
-	}
-	_, err := resolveCreateConfig(c, nil)
-	if err == nil {
-		t.Fatal("an unsupported PHP version must be rejected before the environment is written")
-	}
-	if want := "Unknown or unsupported PHP version: 8.9."; err.Error() != want {
-		t.Errorf("error = %q, want %q", err, want)
-	}
-}
-
-func TestResolveCreateConfigAcceptsSupportedPHPVersions(t *testing.T) {
-	for _, v := range []string{"8.2", "8.3", "8.4", "8.5"} {
-		t.Setenv("VIP_NON_INTERACTIVE", "1")
-		c := devEnvCreateCmd()
-		if err := c.Flags().Parse([]string{"--slug", "x", "--php", v}); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := resolveCreateConfig(c, nil); err != nil {
-			t.Errorf("PHP %s must be accepted: %v", v, err)
-		}
-	}
-}
-
-// An explicit image reference stays a deliberate vip-next superset (Node only
-// accepts the four canonical image strings). Validation targets the typo case,
-// not the escape hatch.
-func TestResolveCreateConfigAcceptsExplicitPHPImage(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "x", "--php", "ghcr.io/automattic/vip-container-images/php-fpm:8.3"}); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := resolveCreateConfig(c, nil); err != nil {
-		t.Errorf("explicit image references must keep working: %v", err)
-	}
-}
-
-// --slug still beats the configuration file on create.
-func TestResolveCreateConfigFlagSlugBeatsConfigurationFile(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	t.Setenv("XDG_DATA_HOME", t.TempDir())
-	repo := t.TempDir()
-	writeDevEnvConfig(t, repo, "configured-site")
-	t.Chdir(repo)
-
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "explicit"}); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err := resolveCreateConfig(c, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.Slug != "explicit" {
-		t.Fatalf("Slug = %q, want explicit", cfg.Slug)
-	}
-}
-
-func TestResolveCreateConfigAppDefaultsSeedConfig(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "with-app"}); err != nil {
-		t.Fatal(err)
-	}
-	defaults := &createDefaults{
-		Title: "cantina-trunk-staging", Multisite: true, PHP: "8.2",
-		WordPress: "6.4", MediaRedirectDomain: "cantina.example.com",
-	}
-	cfg, err := resolveCreateConfig(c, defaults)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.Title != "cantina-trunk-staging" {
-		t.Fatalf("Title = %q, want app env name", cfg.Title)
-	}
-	if cfg.MultisiteMode != "subdomain" {
-		t.Fatalf("MultisiteMode = %q, want subdomain (app is multisite)", cfg.MultisiteMode)
-	}
-	if cfg.PHP != "8.2" || cfg.WordPress != "6.4" {
-		t.Fatalf("php/wordpress defaults not applied: %+v", cfg)
-	}
-	if cfg.MediaDomain != "cantina.example.com" {
-		t.Fatalf("MediaDomain = %q, want app primary domain", cfg.MediaDomain)
-	}
-}
-
-// A passed flag still wins over an @app.env default.
-func TestResolveCreateConfigFlagBeatsAppDefault(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	c := devEnvCreateCmd()
-	if err := c.Flags().Parse([]string{"--slug", "x", "--title", "Override"}); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err := resolveCreateConfig(c, &createDefaults{Title: "from-app"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.Title != "Override" {
-		t.Fatalf("Title = %q, want flag to win", cfg.Title)
-	}
-}
-
-func TestResolveCreateConfigFlagsWin(t *testing.T) {
-	t.Setenv("VIP_NON_INTERACTIVE", "1")
-	// Routed through parseDevEnv (the production argv path) because
-	// --multisite is now one of Node's optional-value options: the
-	// space-separated `--multisite subdirectory` form is reassembled by the
-	// optional-value normalizer, not by pflag.
-	c := parseDevEnv(t,
-		"create", "--slug", "y", "--title", "My Site", "--multisite", "subdirectory",
-		"--php", "8.4", "--wordpress", "6.5", "--phpmyadmin", "--xdebug",
-		"--start=false",
-	)
-	cfg, err := resolveCreateConfig(c, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.Title != "My Site" || cfg.MultisiteMode != "subdirectory" || cfg.PHP != "8.4" || cfg.WordPress != "6.5" {
-		t.Fatalf("flags not honored: %+v", cfg)
-	}
-	if !cfg.PHPMyAdmin || !cfg.Xdebug {
-		t.Fatalf("bool flags not honored: %+v", cfg)
-	}
-	if cfg.Start {
-		t.Fatal("--start=false not honored")
-	}
-}
-
-func TestPHPVersionForLabel(t *testing.T) {
-	if phpVersionForLabel("8.4 (recommended)") != "8.4" {
-		t.Fatal("recommended label should map to 8.4")
-	}
-	if phpVersionForLabel("8.5 (experimental)") != "8.5" {
-		t.Fatal("experimental label should map to 8.5")
-	}
-	if phpVersionForLabel("8.2") != "8.2" {
-		t.Fatal("plain label should map to its version")
-	}
-}
-
-func TestParseWordPressTags(t *testing.T) {
-	body := []byte(`[
-		{"ref":"7.0","tag":"7.0","prerelease":false},
-		{"ref":"6.9.4","tag":"6.9","prerelease":false},
-		{"ref":"6.9.3","tag":"6.9","prerelease":false},
-		{"ref":"","tag":"","prerelease":false}
-	]`)
-	got := parseWordPressTags(body)
-	want := []string{"7.0", "6.9"} // deduped, blank dropped, manifest order kept
-	if len(got) != len(want) {
-		t.Fatalf("parseWordPressTags = %v, want %v", got, want)
-	}
-	for i := range want {
-		if got[i] != want[i] {
-			t.Fatalf("parseWordPressTags[%d] = %q, want %q", i, got[i], want[i])
-		}
-	}
-	if parseWordPressTags([]byte("not json")) != nil {
-		t.Fatal("invalid JSON should yield nil (caller falls back to trunk)")
-	}
-}

package/cmd/vip-next/commands/devenv_data.go

@@ -1,86 +0,0 @@
-package commands
-
-import (
-	"errors"
-
-	"github.com/spf13/cobra"
-
-	"github.com/Automattic/vip/internal/appctx"
-	"github.com/Automattic/vip/internal/devenv"
-)
-
-// devenvImportSQL is the seam tests replace to observe the ImportOptions the
-// cobra layer builds without touching Docker.
-var devenvImportSQL = devenv.ImportSQL
-
-func newDevEnvImportCmd() *cobra.Command {
-	imp := &cobra.Command{Use: "import", Short: "Import data into a local environment"}
-	imp.AddCommand(newDevEnvImportSQLCmd(), newDevEnvImportMediaCmd())
-	return imp
-}
-
-func newDevEnvImportSQLCmd() *cobra.Command {
-	var searchReplace []string
-	var inPlace, skipValidate, skipReindex, quiet bool
-	c := &cobra.Command{
-		Use:           "sql <file>",
-		Short:         "Import a SQL file into a local environment",
-		Args:          cobra.ExactArgs(1),
-		SilenceUsage:  true,
-		SilenceErrors: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if args[0] == "" {
-				return errors.New("you must pass a SQL file path")
-			}
-			slug, err := ResolveSlug(cmd)
-			if err != nil {
-				return err
-			}
-			return devenvImportSQL(cmd.Context(), slug, args[0], devenv.ImportOptions{
-				SearchReplace: searchReplace,
-				InPlace:       inPlace,
-				SkipValidate:  skipValidate,
-				SkipReindex:   skipReindex,
-				Quiet:         quiet,
-				Out:           cmd.OutOrStdout(),
-				// Hand the cobra command down so the irreversible --in-place
-				// gate honours the --non-interactive FLAG, not just
-				// VIP_NON_INTERACTIVE. internal/devenv has no command of its
-				// own to give appctx.
-				Confirm: func(message string, defaultYes bool) (bool, error) {
-					return appctx.Confirm(cmd, message, defaultYes)
-				},
-			})
-		},
-	}
-	addSlugFlag(c)
-	c.Flags().StringArrayVarP(&searchReplace, "search-replace", "r", nil, `"from,to" replacement applied during import (repeatable).`)
-	c.Flags().BoolVarP(&inPlace, "in-place", "i", false, "Search-replace the source SQL file in place (saves the changes).")
-	// One flag, two effects — Node's own grouping (dev-env-import-sql.ts:83).
-	c.Flags().BoolVar(&skipValidate, "skip-validate", false, "Skip the SQL file validation and the running-environment check.")
-	c.Flags().BoolVarP(&skipReindex, "skip-reindex", "k", false, "Skip the Elasticsearch reindex after import.")
-	c.Flags().BoolVarP(&quiet, "quiet", "q", false, "Skip confirmation and suppress informational messages.")
-	return c
-}
-
-func newDevEnvImportMediaCmd() *cobra.Command {
-	c := &cobra.Command{
-		Use:           "media <directory>",
-		Short:         "Import media files into a local environment",
-		Args:          cobra.ExactArgs(1),
-		SilenceUsage:  true,
-		SilenceErrors: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if args[0] == "" {
-				return errors.New("you must pass a media directory path")
-			}
-			slug, err := ResolveSlug(cmd)
-			if err != nil {
-				return err
-			}
-			return devenv.ImportMedia(cmd.Context(), slug, args[0])
-		},
-	}
-	addSlugFlag(c)
-	return c
-}

package/cmd/vip-next/commands/devenv_data_confirm_test.go

@@ -1,49 +0,0 @@
-package commands
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/Automattic/vip/internal/devenv"
-)
-
-// Slice-3 left `dev-env import sql --in-place` calling appctx.Confirm(nil, …),
-// so the in-place gate saw VIP_NON_INTERACTIVE but never the --non-interactive
-// FLAG: on a TTY, `--non-interactive` still stopped to ask. The cobra command
-// must hand its own *cobra.Command down so the flag is honoured.
-func TestDevEnvImportSQLInPlacePassesNonInteractiveFlag(t *testing.T) {
-	src := filepath.Join(t.TempDir(), "dump.sql")
-	if err := os.WriteFile(src, []byte("-- MySQL dump\n"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-
-	var sawCmd bool
-	prev := devenvImportSQL
-	devenvImportSQL = func(_ context.Context, _, _ string, o devenv.ImportOptions) error {
-		if o.Confirm == nil {
-			t.Error("dev-env import sql must inject a cobra-aware Confirm so --non-interactive is honoured")
-			return nil
-		}
-		// The injected confirm must consult the command's flags. With
-		// --non-interactive set it has to refuse instead of prompting.
-		_, err := o.Confirm("Are you sure?", false)
-		sawCmd = err != nil
-		return nil
-	}
-	defer func() { devenvImportSQL = prev }()
-
-	cmd := newDevEnvImportSQLCmd()
-	_ = cmd.Flags().Set("slug", "e")
-	cmd.Flags().Bool("non-interactive", true, "")
-	_ = cmd.Flags().Set("non-interactive", "true")
-	cmd.SetContext(context.Background())
-
-	if err := cmd.RunE(cmd, []string{src}); err != nil {
-		t.Fatalf("RunE: %v", err)
-	}
-	if !sawCmd {
-		t.Error("--non-interactive must make the in-place confirm refuse, not prompt")
-	}
-}

package/cmd/vip-next/commands/devenv_debug_test.go

@@ -1,34 +0,0 @@
-package commands
-
-import (
-	"bytes"
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/Automattic/vip/internal/debuglog"
-)
-
-func TestDevEnvEnvvarDebugDoesNotLeakValue(t *testing.T) {
-	seedEnvvarEnv(t)
-	for _, ns := range []string{"@automattic/vip:bin:config:envvar", "@automattic/vip:bin:dev-environment"} {
-		var out, diagnostic bytes.Buffer
-		cmd := newDevEnvEnvvarCmd()
-		cmd.SetOut(&out)
-		cmd.SetErr(&out)
-		cmd.SetContext(debuglog.WithLogger(context.Background(), ns, &diagnostic))
-		cmd.SetArgs([]string{"set", "PASSWORD", "secret-env-value", "--slug", "only-one"})
-		if err := cmd.Execute(); err != nil {
-			t.Fatal(err)
-		}
-		if ns == "@automattic/vip:bin:config:envvar" && (!strings.Contains(diagnostic.String(), "set") || !strings.Contains(diagnostic.String(), "PASSWORD")) {
-			t.Fatalf("missing envvar diagnostic: %s", &diagnostic)
-		}
-		if strings.Contains(diagnostic.String(), "secret-env-value") {
-			t.Fatalf("secret in diagnostics: %s", &diagnostic)
-		}
-		if strings.Contains(out.String(), "@automattic") {
-			t.Fatalf("debug contaminated stdout: %s", &out)
-		}
-	}
-}

package/cmd/vip-next/commands/devenv_e2e_gate_test.go

@@ -1,17 +0,0 @@
-//go:build devenv_e2e
-
-package commands
-
-import (
-	"os"
-	"testing"
-
-	"github.com/Automattic/vip/internal/devenv/e2esafety"
-)
-
-func TestMain(m *testing.M) {
-	if e2esafety.Skip(os.Getenv, os.Stdout) {
-		os.Exit(0)
-	}
-	os.Exit(m.Run())
-}

package/cmd/vip-next/commands/devenv_e2e_test.go

@@ -1,34 +0,0 @@
-//go:build devenv_e2e
-
-// Package commands devenv_e2e harness — the manual gate for the dev-env command
-// cutover. Run with: go test -tags devenv_e2e -run TestDevEnvE2E ./cmd/vip-next/commands/ -v
-//
-// These exercise the real Docker/PTY/platform paths and need: a running Docker,
-// a TTY (for exec/shell), and (for sync) `vip login`. They are skipped unless
-// VIP_DEVENV_E2E=1 is set, so an accidental tagged run does not hang.
-package commands
-
-import "testing"
-
-// TestDevEnvE2ELifecycle documents the create→start→exec→logs→stop→destroy path.
-func TestDevEnvE2ELifecycle(t *testing.T) {
-	t.Skip("MANUAL ONLY: create --slug e2e --start; exec -- wp option get home; logs; stop; destroy --yes")
-}
-
-// TestDevEnvE2EImport documents import sql/media into a running env.
-func TestDevEnvE2EImport(t *testing.T) {
-	t.Skip("MANUAL ONLY: import sql <dump> with --search-replace; import media <dir>; verify in container")
-}
-
-// TestDevEnvE2EEnvVar documents envvar set → rebuild → verify-in-container.
-func TestDevEnvE2EEnvVar(t *testing.T) {
-	t.Skip("MANUAL ONLY: envvar set MY_VAR hi; vip dev-env start; exec -- sh -c 'echo $MY_VAR'")
-}
-
-// TestDevEnvE2ESync documents the optional real-platform smoke test. Automated
-// multisite coverage uses fixture SQL/SDS in internal/devenv and never sends a
-// sync/export payload to the real API. This manual check still needs explicit
-// human authorization, login, and a deliberately selected app/environment.
-func TestDevEnvE2ESync(t *testing.T) {
-	t.Skip("MANUAL ONLY WITH EXPLICIT AUTHORIZATION: vip login; vip @app.env dev-env sync sql --slug e2e; verify prod URLs rewritten locally")
-}