From ffcd5e809aa69c1b93bf94034dfb2b745e2b912e Mon Sep 17 00:00:00 2001 From: shankar0123 Date: Thu, 30 Apr 2026 22:42:47 +0000 Subject: [PATCH] chore(fmt): catch vendor_e2e files missed by Phase 1 sweep filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up to commit 7cb453a. The Phase 1 sweep ran: gofmt -w $(gofmt -l . | grep -v vendor) The 'grep -v vendor' filter was meant to exclude the vendor/ directory but also matched filenames containing 'vendor' as a substring — namely: deploy/test/vendor_e2e_helpers.go deploy/test/vendor_e2e_phase3_to_13_test.go Both files had gofmt-pending struct-field alignment that the sweep should have caught. CI run 25192862937 (Go Build & Test) surfaced them at the new gofmt-drift step. Fix: re-run the sweep with an anchored filter (grep -v '^vendor/') that only excludes the vendor directory at repo root, not any filename containing 'vendor'. Same gofmt-standard reformat as 7cb453a: struct-tag column realignment and minor whitespace adjustments. No semantic changes. Verified via 'git diff --ignore-all-space --shortstat'. --- deploy/test/vendor_e2e_helpers.go | 22 ++++++++++----------- deploy/test/vendor_e2e_phase3_to_13_test.go | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/deploy/test/vendor_e2e_helpers.go b/deploy/test/vendor_e2e_helpers.go index 623ae9c..769704d 100644 --- a/deploy/test/vendor_e2e_helpers.go +++ b/deploy/test/vendor_e2e_helpers.go @@ -44,17 +44,17 @@ type vendorSidecar struct { } var sidecarMap = map[string]vendorSidecar{ - "apache": {name: "apache-test", hostPort: "127.0.0.1:20443"}, - "haproxy": {name: "haproxy-test", hostPort: "127.0.0.1:20444"}, - "traefik": {name: "traefik-test", hostPort: "127.0.0.1:20445"}, - "caddy": {name: "caddy-test", hostPort: "127.0.0.1:20446", healthPath: "http://127.0.0.1:22019/config/"}, - "envoy": {name: "envoy-test", hostPort: "127.0.0.1:20447"}, - "postfix": {name: "postfix-test", hostPort: "127.0.0.1:20465"}, - "dovecot": {name: "dovecot-test", hostPort: "127.0.0.1:20993"}, - "openssh": {name: "openssh-test", hostPort: "127.0.0.1:20022"}, - "f5-mock": {name: "f5-mock-icontrol", hostPort: "127.0.0.1:20443"}, - "k8s-kind": {name: "k8s-kind-test", hostPort: ""}, - "windows-iis": {name: "windows-iis-test", hostPort: "127.0.0.1:20448"}, + "apache": {name: "apache-test", hostPort: "127.0.0.1:20443"}, + "haproxy": {name: "haproxy-test", hostPort: "127.0.0.1:20444"}, + "traefik": {name: "traefik-test", hostPort: "127.0.0.1:20445"}, + "caddy": {name: "caddy-test", hostPort: "127.0.0.1:20446", healthPath: "http://127.0.0.1:22019/config/"}, + "envoy": {name: "envoy-test", hostPort: "127.0.0.1:20447"}, + "postfix": {name: "postfix-test", hostPort: "127.0.0.1:20465"}, + "dovecot": {name: "dovecot-test", hostPort: "127.0.0.1:20993"}, + "openssh": {name: "openssh-test", hostPort: "127.0.0.1:20022"}, + "f5-mock": {name: "f5-mock-icontrol", hostPort: "127.0.0.1:20443"}, + "k8s-kind": {name: "k8s-kind-test", hostPort: ""}, + "windows-iis": {name: "windows-iis-test", hostPort: "127.0.0.1:20448"}, } // requireSidecar skips the test cleanly when the sidecar isn't diff --git a/deploy/test/vendor_e2e_phase3_to_13_test.go b/deploy/test/vendor_e2e_phase3_to_13_test.go index 11461d9..2f287e0 100644 --- a/deploy/test/vendor_e2e_phase3_to_13_test.go +++ b/deploy/test/vendor_e2e_phase3_to_13_test.go @@ -15,7 +15,8 @@ // environments without `docker compose --profile deploy-e2e up -d`). // // Per frozen decision 0.6: discoverable via -// go test -tags integration -run 'VendorEdge_' +// +// go test -tags integration -run 'VendorEdge_' package integration import (