@automattic/vip 4.1.4 → 4.1.6

package/internal/upload/multipart_test.go

@@ -1,210 +0,0 @@
-package upload
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	json "encoding/json/v2"
-)
-
-// multipartStub implements presign + CreateMultipartUpload + UploadPart +
-// CompleteMultipartUpload endpoints.
-type multipartStub struct {
-	t            *testing.T
-	mu           sync.Mutex
-	parts        map[int][]byte
-	maxInFlight  int32
-	inFlight     int32
-	failPart2    int32 // fail part #2 this many times (network-level close)
-	complete     []byte
-	completeBody []byte
-}
-
-const signedCompleteMultipartBody = `<?xml version="1.0" encoding="UTF-8"?><CompleteMultipartUpload xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Part><ETag>etag-1</ETag><PartNumber>1</PartNumber></Part><Part><ETag>etag-2</ETag><PartNumber>2</PartNumber></Part><Part><ETag>etag-3</ETag><PartNumber>3</PartNumber></Part></CompleteMultipartUpload>`
-
-func newMultipartTest(t *testing.T) (*multipartStub, *Client) {
-	st := &multipartStub{t: t, parts: map[int][]byte{}}
-	mux := http.NewServeMux()
-	srv := httptest.NewServer(mux)
-	t.Cleanup(srv.Close)
-
-	mux.HandleFunc("/upload/site-import-presigned-url", func(w http.ResponseWriter, r *http.Request) {
-		var args SignedRequestArgs
-		b, _ := io.ReadAll(r.Body)
-		if err := json.Unmarshal(b, &args); err != nil {
-			st.t.Errorf("bad presign body: %v", err)
-		}
-		switch args.Action {
-		case "CreateMultipartUpload":
-			fmt.Fprintf(w, `{"url":"%s/s3create","options":{"method":"POST","headers":{}}}`, srv.URL)
-		case "UploadPart":
-			fmt.Fprintf(w, `{"url":"%s/s3part/%d","options":{"method":"PUT","headers":{}}}`, srv.URL, args.PartNumber)
-		case "CompleteMultipartUpload":
-			st.mu.Lock()
-			st.complete = b
-			st.mu.Unlock()
-			fmt.Fprintf(w, `{"url":"%s/s3complete","options":{"method":"POST","headers":{"Content-Length":"%d","Content-Type":"application/xml"},"body":%q}}`, srv.URL, len(signedCompleteMultipartBody), signedCompleteMultipartBody)
-		default:
-			st.t.Errorf("unexpected action %q", args.Action)
-		}
-	})
-	mux.HandleFunc("/s3create", func(w http.ResponseWriter, _ *http.Request) {
-		_, _ = w.Write([]byte(`<?xml version="1.0"?><InitiateMultipartUploadResult><Bucket>b</Bucket><Key>k</Key><UploadId>UPLOAD123</UploadId></InitiateMultipartUploadResult>`))
-	})
-	mux.HandleFunc("/s3part/", func(w http.ResponseWriter, r *http.Request) {
-		cur := atomic.AddInt32(&st.inFlight, 1)
-		defer atomic.AddInt32(&st.inFlight, -1)
-		for {
-			max := atomic.LoadInt32(&st.maxInFlight)
-			if cur <= max || atomic.CompareAndSwapInt32(&st.maxInFlight, max, cur) {
-				break
-			}
-		}
-		var n int
-		_, _ = fmt.Sscanf(r.URL.Path, "/s3part/%d", &n)
-		if n == 2 && atomic.AddInt32(&st.failPart2, -1) >= 0 {
-			// network-level failure: hijack + close so the client sees a
-			// transport error (the only thing fetch-retry retries).
-			hj, ok := w.(http.Hijacker)
-			if !ok {
-				st.t.Fatal("hijack unsupported")
-			}
-			conn, _, err := hj.Hijack()
-			if err != nil {
-				st.t.Fatal(err)
-			}
-			conn.Close()
-			return
-		}
-		body, _ := io.ReadAll(r.Body)
-		st.mu.Lock()
-		st.parts[n] = body
-		st.mu.Unlock()
-		w.Header().Set("ETag", fmt.Sprintf(`"etag-%d"`, n))
-		w.WriteHeader(http.StatusOK)
-	})
-	mux.HandleFunc("/s3complete", func(w http.ResponseWriter, r *http.Request) {
-		st.mu.Lock()
-		st.completeBody, _ = io.ReadAll(r.Body)
-		st.mu.Unlock()
-		_, _ = w.Write([]byte(`<?xml version="1.0"?><CompleteMultipartUploadResult><Location>l</Location><Bucket>b</Bucket><Key>k</Key><ETag>"final"</ETag></CompleteMultipartUploadResult>`))
-	})
-	return st, &Client{APIHost: srv.URL, Token: "tok", HTTPClient: srv.Client(),
-		retryDelay: func(int) time.Duration { return 0 }}
-}
-
-func TestMultipartHappyPath(t *testing.T) {
-	st, c := newMultipartTest(t)
-	content := bytes.Repeat([]byte("x"), 40) // partSize 16 → 3 parts: 16,16,8
-	p := filepath.Join(t.TempDir(), "big.sql")
-	if err := os.WriteFile(p, content, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	meta, _ := GetFileMeta(p)
-	if _, err := c.uploadUsingMultipart(context.Background(), 1, 2, meta, 16, nil); err != nil {
-		t.Fatal(err)
-	}
-	if len(st.parts[1]) != 16 || len(st.parts[2]) != 16 || len(st.parts[3]) != 8 {
-		t.Errorf("part sizes: %d/%d/%d", len(st.parts[1]), len(st.parts[2]), len(st.parts[3]))
-	}
-	comp := string(st.complete)
-	if !strings.Contains(comp, `"ETag":"etag-1"`) || !strings.Contains(comp, `"PartNumber":3`) {
-		t.Errorf("complete body = %s", comp)
-	}
-	if got := string(st.completeBody); got != signedCompleteMultipartBody {
-		t.Errorf("S3 completion body = %q, want signed body %q", got, signedCompleteMultipartBody)
-	}
-}
-
-func TestMultipartPartRetrySucceeds(t *testing.T) {
-	st, c := newMultipartTest(t)
-	atomic.StoreInt32(&st.failPart2, 2) // fail part 2 twice, succeed third
-	content := bytes.Repeat([]byte("y"), 40)
-	p := filepath.Join(t.TempDir(), "big.sql")
-	if err := os.WriteFile(p, content, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	meta, _ := GetFileMeta(p)
-	if _, err := c.uploadUsingMultipart(context.Background(), 1, 2, meta, 16, nil); err != nil {
-		t.Fatal(err)
-	}
-	if len(st.parts[2]) != 16 {
-		t.Errorf("part 2 not uploaded after retries")
-	}
-}
-
-func TestMultipartPartRetryExhausts(t *testing.T) {
-	st, c := newMultipartTest(t)
-	atomic.StoreInt32(&st.failPart2, 99) // never recovers
-	content := bytes.Repeat([]byte("y"), 40)
-	p := filepath.Join(t.TempDir(), "big.sql")
-	if err := os.WriteFile(p, content, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	meta, _ := GetFileMeta(p)
-	if _, err := c.uploadUsingMultipart(context.Background(), 1, 2, meta, 16, nil); err == nil {
-		t.Fatal("want error after retry exhaustion")
-	}
-}
-
-func TestMultipartConcurrencyCap(t *testing.T) {
-	st, c := newMultipartTest(t)
-	content := bytes.Repeat([]byte("z"), 16*12) // 12 parts
-	p := filepath.Join(t.TempDir(), "big.sql")
-	if err := os.WriteFile(p, content, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	meta, _ := GetFileMeta(p)
-	if _, err := c.uploadUsingMultipart(context.Background(), 1, 2, meta, 16, nil); err != nil {
-		t.Fatal(err)
-	}
-	if got := atomic.LoadInt32(&st.maxInFlight); got > MaxConcurrentPartUploads {
-		t.Errorf("max in-flight = %d, want <= %d", got, MaxConcurrentPartUploads)
-	}
-}
-
-func TestUploadImportFileGzRename(t *testing.T) {
-	for in, want := range map[string]string{
-		"dump.sql":    "dump.sql.gz",
-		"dump.sql.gz": "dump.sql.gz",
-		"DUMP.SQL.GZ": "DUMP.SQL.gz",
-	} {
-		if got := gzRename(in); got != want {
-			t.Errorf("gzRename(%q) = %q, want %q", in, got, want)
-		}
-	}
-}
-
-func TestUploadImportFileSmallUsesPutObject(t *testing.T) {
-	var sawPut bool
-	c := stubPresignServer(t, func(w http.ResponseWriter, r *http.Request) {
-		sawPut = true
-		w.WriteHeader(http.StatusOK)
-	})
-	p := writeTemp(t, "dump.sql", []byte("SELECT 1;\n"))
-	meta, _ := GetFileMeta(p)
-	res, err := c.UploadImportFile(context.Background(), 1, 2, meta, "md5", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !sawPut {
-		t.Error("small file must take the PutObject path")
-	}
-	if res.Meta.BaseName != "dump.sql" || res.Meta.IsCompressed {
-		t.Errorf("meta = %+v (small file must not be compressed)", res.Meta)
-	}
-	if len(res.Checksum) != 32 {
-		t.Errorf("checksum = %q", res.Checksum)
-	}
-}

package/internal/upload/orchestrate.go

@@ -1,81 +0,0 @@
-package upload
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/Automattic/vip/internal/debuglog"
-)
-
-// UploadResult mirrors uploadImportFileToS3's return
-// (client-file-uploader.ts:222).
-type UploadResult struct {
-	Meta     FileMeta
-	Checksum string // hex md5 (or sha256) of the file as uploaded
-	Result   string
-}
-
-// gzRename mirrors Node's basename.replace(/(.gz)?$/i, '.gz') (ts:193):
-// idempotently ensure a single .gz suffix, replacing an existing
-// (case-insensitive) one.
-func gzRename(base string) string {
-	if l := strings.ToLower(base); strings.HasSuffix(l, ".gz") {
-		base = base[:len(base)-3]
-	}
-	return base + ".gz"
-}
-
-// UploadImportFile ports uploadImportFileToS3 (client-file-uploader.ts:163):
-//  1. gzip-compress when not already compressed and >= CompressThreshold,
-//  2. checksum the (possibly compressed) file,
-//  3. PutObject below MultipartThreshold, multipart at/above it.
-func (c *Client) UploadImportFile(ctx context.Context, appID, envID int64, meta FileMeta, hashType string, progressCb func(string)) (*UploadResult, error) {
-	debuglog.Printf(ctx, "vip:lib/client-file-uploader", "File: bytes=%d compressed=%t", meta.FileSize, meta.IsCompressed)
-	if !meta.IsCompressed && meta.FileSize >= CompressThreshold {
-		debuglog.Printf(ctx, "vip:lib/client-file-uploader", "Compressing file prior to transfer")
-		originalSize := meta.FileSize
-		tmpDir, err := os.MkdirTemp("", "vip-client-file-uploader")
-		if err != nil {
-			return nil, fmt.Errorf("Unable to create temporary working directory: %s", err.Error())
-		}
-		meta.BaseName = gzRename(meta.BaseName)
-		compressed := filepath.Join(tmpDir, meta.BaseName)
-		if err := GzipFile(meta.FileName, compressed); err != nil {
-			return nil, err
-		}
-		meta.FileName = compressed
-		meta.IsCompressed = true
-		fi, err := os.Stat(compressed)
-		if err != nil {
-			return nil, err
-		}
-		meta.FileSize = fi.Size()
-		debuglog.Printf(ctx, "vip:lib/client-file-uploader", "Compression complete: bytes=%d saved_bytes=%d", meta.FileSize, originalSize-meta.FileSize)
-	}
-
-	if hashType == "" {
-		hashType = "md5"
-	}
-	debuglog.Printf(ctx, "vip:lib/client-file-uploader", "Calculating file checksum")
-	checksum, err := FileHash(meta.FileName, hashType)
-	if err != nil {
-		return nil, err
-	}
-
-	debuglog.Printf(ctx, "vip:lib/client-file-uploader", "Calculated file checksum")
-
-	var result string
-	if meta.FileSize < MultipartThreshold {
-		result, err = c.uploadUsingPutObject(ctx, appID, envID, meta, progressCb)
-	} else {
-		result, err = c.uploadUsingMultipart(ctx, appID, envID, meta, UploadPartSize, progressCb)
-	}
-	if err != nil {
-		return nil, err
-	}
-	debuglog.Printf(ctx, "vip:lib/client-file-uploader", "Upload complete: bytes=%d", meta.FileSize)
-	return &UploadResult{Meta: meta, Checksum: checksum, Result: result}, nil
-}

package/internal/upload/parts.go

@@ -1,39 +0,0 @@
-package upload
-
-import "errors"
-
-// PartBoundary mirrors Node's PartBoundaries (client-file-uploader.ts:479).
-// End is inclusive, like Node's createReadStream({start, end}) range.
-type PartBoundary struct {
-	Start    int64
-	End      int64
-	Index    int
-	PartSize int64
-}
-
-// GetPartBoundaries ports getPartBoundaries (client-file-uploader.ts:485).
-func GetPartBoundaries(fileSize int64) ([]PartBoundary, error) {
-	return getPartBoundariesWithSize(fileSize, UploadPartSize)
-}
-
-// getPartBoundariesWithSize is GetPartBoundaries with an explicit part
-// size so tests don't need 16MB fixtures.
-func getPartBoundariesWithSize(fileSize, partSize int64) ([]PartBoundary, error) {
-	if fileSize < 1 {
-		return nil, errors.New("fileSize must be greater than zero")
-	}
-	numParts := (fileSize + partSize - 1) / partSize
-	parts := make([]PartBoundary, 0, numParts)
-	for i := int64(0); i < numParts; i++ {
-		start := i * partSize
-		remaining := fileSize - start
-		end := start + partSize - 1
-		if remaining <= partSize {
-			end = start + remaining - 1
-		}
-		parts = append(parts, PartBoundary{
-			Start: start, End: end, Index: int(i), PartSize: end + 1 - start,
-		})
-	}
-	return parts, nil
-}

package/internal/upload/parts_test.go

@@ -1,39 +0,0 @@
-package upload
-
-import "testing"
-
-func TestGetPartBoundaries(t *testing.T) {
-	// Node client-file-uploader.ts:485. UploadPartSize = 16 MiB.
-	const mb = int64(1024 * 1024)
-	cases := []struct {
-		name     string
-		fileSize int64
-		want     []PartBoundary
-	}{
-		{"one byte", 1, []PartBoundary{{Start: 0, End: 0, Index: 0, PartSize: 1}}},
-		{"exactly one part", 16 * mb, []PartBoundary{{Start: 0, End: 16*mb - 1, Index: 0, PartSize: 16 * mb}}},
-		{"one part plus one byte", 16*mb + 1, []PartBoundary{
-			{Start: 0, End: 16*mb - 1, Index: 0, PartSize: 16 * mb},
-			{Start: 16 * mb, End: 16 * mb, Index: 1, PartSize: 1},
-		}},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			got, err := GetPartBoundaries(tc.fileSize)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if len(got) != len(tc.want) {
-				t.Fatalf("len = %d, want %d", len(got), len(tc.want))
-			}
-			for i := range got {
-				if got[i] != tc.want[i] {
-					t.Errorf("part %d = %+v, want %+v", i, got[i], tc.want[i])
-				}
-			}
-		})
-	}
-	if _, err := GetPartBoundaries(0); err == nil {
-		t.Error("fileSize 0 should error (Node: 'fileSize must be greater than zero')")
-	}
-}

package/internal/upload/presign.go

@@ -1,103 +0,0 @@
-package upload
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"time"
-
-	json "encoding/json/v2"
-
-	"github.com/Automattic/vip/internal/httpproxy"
-)
-
-// Client issues presigned-request lookups against the VIP API and the
-// resulting S3 uploads. APIHost/Token come from commands.GetConfig();
-// HTTPClient defaults to httpproxy.Client().
-type Client struct {
-	APIHost    string
-	Token      string
-	HTTPClient *http.Client
-	// retryDelay overrides the backoff in tests. nil = Node's
-	// 2^attempt * 1s (fetch-retry config, client-file-uploader.ts:24).
-	retryDelay func(attempt int) time.Duration
-}
-
-func (c *Client) httpClient() *http.Client {
-	if c.HTTPClient != nil {
-		return c.HTTPClient
-	}
-	// NOT http.DefaultClient: the presign call carries the bearer token (or
-	// WPVIP_DEPLOY_TOKEN) and the S3 PUTs carry a presigned URL whose query
-	// string is itself the credential. See internal/httpproxy.
-	return httpproxy.Client()
-}
-
-// SignedRequestArgs ports GetSignedUploadRequestDataArgs
-// (client-file-uploader.ts:56). EtagResults is the multipart completion
-// payload: a list of {"ETag": ..., "PartNumber": ...} objects.
-type SignedRequestArgs struct {
-	Action      string           `json:"action"`
-	AppID       int64            `json:"appId"`
-	EnvID       int64            `json:"envId"`
-	BaseName    string           `json:"basename"`
-	EtagResults []map[string]any `json:"etagResults,omitempty"`
-	PartNumber  int              `json:"partNumber,omitempty"`
-	UploadID    string           `json:"uploadId,omitempty"`
-}
-
-// PresignedRequest mirrors Node's PresignedRequest
-// (client-file-uploader.ts:236).
-type PresignedRequest struct {
-	URL     string `json:"url"`
-	Options struct {
-		Method  string            `json:"method"`
-		Headers map[string]string `json:"headers"`
-		Body    string            `json:"body,omitempty"`
-	} `json:"options"`
-}
-
-// GetSignedUploadRequestData ports getSignedUploadRequestData
-// (client-file-uploader.ts:411): POST /upload/site-import-presigned-url
-// with the CLI token, or WPVIP_DEPLOY_TOKEN when set (ts:420 — the
-// deploy-token bypass skips the keychain credential entirely).
-func (c *Client) GetSignedUploadRequestData(ctx context.Context, args SignedRequestArgs) (*PresignedRequest, error) {
-	body, err := json.Marshal(args)
-	if err != nil {
-		return nil, err
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost,
-		c.APIHost+"/upload/site-import-presigned-url", bytes.NewReader(body))
-	if err != nil {
-		return nil, err
-	}
-	token := c.Token
-	if t := os.Getenv("WPVIP_DEPLOY_TOKEN"); t != "" {
-		token = t
-	}
-	req.Header.Set("Authorization", "Bearer "+token)
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := c.httpClient().Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		// Node: throw new Error((await response.text()) || statusText)
-		// — client-file-uploader.ts:433.
-		text, _ := io.ReadAll(resp.Body)
-		if len(text) > 0 {
-			return nil, fmt.Errorf("%s", text)
-		}
-		return nil, fmt.Errorf("%s", resp.Status)
-	}
-	var pr PresignedRequest
-	if err := json.UnmarshalRead(resp.Body, &pr); err != nil {
-		return nil, err
-	}
-	return &pr, nil
-}

package/internal/upload/presign_test.go

@@ -1,128 +0,0 @@
-package upload
-
-import (
-	"context"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	json "encoding/json/v2"
-)
-
-func TestGetSignedUploadRequestData(t *testing.T) {
-	var gotBody map[string]any
-	var gotAuth string
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/upload/site-import-presigned-url" {
-			t.Errorf("path = %s", r.URL.Path)
-		}
-		gotAuth = r.Header.Get("Authorization")
-		b, _ := io.ReadAll(r.Body)
-		_ = json.Unmarshal(b, &gotBody)
-		w.Header().Set("Content-Type", "application/json")
-		_, _ = w.Write([]byte(`{"url":"https://s3.example/x","options":{"method":"PUT","headers":{"X-Amz-Meta":"1"}}}`))
-	}))
-	defer srv.Close()
-
-	c := &Client{APIHost: srv.URL, Token: "tok", HTTPClient: srv.Client()}
-	req, err := c.GetSignedUploadRequestData(context.Background(), SignedRequestArgs{
-		Action: "PutObject", AppID: 1, EnvID: 2, BaseName: "dump.sql",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if req.URL != "https://s3.example/x" || req.Options.Method != "PUT" {
-		t.Errorf("req = %+v", req)
-	}
-	if req.Options.Headers["X-Amz-Meta"] != "1" {
-		t.Errorf("headers = %v", req.Options.Headers)
-	}
-	if gotAuth != "Bearer tok" {
-		t.Errorf("auth = %q", gotAuth)
-	}
-	if gotBody["action"] != "PutObject" || gotBody["basename"] != "dump.sql" {
-		t.Errorf("body = %v", gotBody)
-	}
-}
-
-func TestGetSignedUploadRequestDataDeployTokenOverride(t *testing.T) {
-	t.Setenv("WPVIP_DEPLOY_TOKEN", "deploy-tok")
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if got := r.Header.Get("Authorization"); got != "Bearer deploy-tok" {
-			t.Errorf("auth = %q", got)
-		}
-		_, _ = w.Write([]byte(`{"url":"u","options":{"method":"PUT","headers":{}}}`))
-	}))
-	defer srv.Close()
-	c := &Client{APIHost: srv.URL, Token: "tok", HTTPClient: srv.Client()}
-	if _, err := c.GetSignedUploadRequestData(context.Background(), SignedRequestArgs{
-		Action: "PutObject", AppID: 1, EnvID: 2, BaseName: "x",
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetSignedUploadRequestDataNon200(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		http.Error(w, "no can do", http.StatusForbidden)
-	}))
-	defer srv.Close()
-	c := &Client{APIHost: srv.URL, Token: "tok", HTTPClient: srv.Client()}
-	_, err := c.GetSignedUploadRequestData(context.Background(), SignedRequestArgs{
-		Action: "PutObject", AppID: 1, EnvID: 2, BaseName: "x",
-	})
-	// Node: throw new Error(await response.text() || statusText) — ts:433.
-	// http.Error appends a newline; the body is used verbatim.
-	if err == nil || err.Error() != "no can do\n" {
-		t.Errorf("err = %v", err)
-	}
-}
-
-func TestDoWithRetryRetriesNetworkErrorsOnly(t *testing.T) {
-	attempts := 0
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		attempts++
-		w.WriteHeader(http.StatusInternalServerError)
-	}))
-	defer srv.Close()
-	c := &Client{HTTPClient: srv.Client(), retryDelay: func(int) time.Duration { return 0 }}
-	req, _ := http.NewRequest(http.MethodGet, srv.URL, nil)
-	resp, err := c.doWithRetry(req, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-	// fetch-retry's default retryOn does NOT retry on HTTP status — only
-	// network errors. 500 must come back after exactly 1 attempt.
-	if attempts != 1 {
-		t.Errorf("attempts = %d, want 1 (no status-code retries)", attempts)
-	}
-	if resp.StatusCode != 500 {
-		t.Errorf("status = %d", resp.StatusCode)
-	}
-}
-
-type roundTripFunc func(*http.Request) (*http.Response, error)
-
-func (f roundTripFunc) RoundTrip(r *http.Request) (*http.Response, error) { return f(r) }
-
-func TestDoWithRetryNetworkErrorExhaustsAfter4(t *testing.T) {
-	attempts := 0
-	c := &Client{
-		HTTPClient: &http.Client{Transport: roundTripFunc(func(*http.Request) (*http.Response, error) {
-			attempts++
-			return nil, io.ErrUnexpectedEOF
-		})},
-		retryDelay: func(int) time.Duration { return 0 },
-	}
-	req, _ := http.NewRequest(http.MethodGet, "http://example.invalid", nil)
-	if _, err := c.doWithRetry(req, nil); err == nil {
-		t.Fatal("want error")
-	}
-	// retries: 3 → 4 total attempts (fetch-retry semantics)
-	if attempts != 4 {
-		t.Errorf("attempts = %d, want 4", attempts)
-	}
-}

package/internal/upload/proxy_test.go

@@ -1,55 +0,0 @@
-package upload
-
-import (
-	"context"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-)
-
-// TestPresignRequestHonoursVIPProxy pins cutover item 2.14 on the second path
-// that carries the bearer token: POST /upload/site-import-presigned-url. The
-// default client was http.DefaultClient, which ignores VIP_PROXY/SOCKS_PROXY
-// and honours HTTPS_PROXY without the VIP_USE_SYSTEM_PROXY opt-in Node requires.
-//
-// Live loopback target, closed SOCKS port: no Go proxy resolver would ever
-// proxy a loopback host, so reaching the server proves the request went direct.
-func TestPresignRequestHonoursVIPProxy(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		_, _ = w.Write([]byte(`{"url":"https://s3.example/x","options":{"method":"PUT","headers":{}}}`))
-	}))
-	defer srv.Close()
-
-	for _, k := range []string{
-		"SOCKS_PROXY", "socks_proxy", "HTTPS_PROXY", "https_proxy",
-		"HTTP_PROXY", "http_proxy", "ALL_PROXY", "all_proxy",
-		"NO_PROXY", "no_proxy", "VIP_USE_SYSTEM_PROXY", "vip_proxy",
-		"WPVIP_DEPLOY_TOKEN",
-	} {
-		t.Setenv(k, "")
-	}
-	t.Setenv("VIP_PROXY", "socks5://"+closedProxyAddr(t))
-
-	c := &Client{APIHost: srv.URL, Token: "bearer-token-under-test"}
-	_, err := c.GetSignedUploadRequestData(context.Background(), SignedRequestArgs{
-		Action: "AssertMultipartUpload", AppID: 1, EnvID: 2, BaseName: "x.sql",
-	})
-	if err == nil {
-		t.Fatal("presign request succeeded; VIP_PROXY was ignored and the bearer token went direct")
-	}
-}
-
-func closedProxyAddr(t *testing.T) string {
-	t.Helper()
-	l, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-	addr := l.Addr().String()
-	if err := l.Close(); err != nil {
-		t.Fatalf("close: %v", err)
-	}
-	return addr
-}