From 52371b906c2b8dd3d4fc264c0a6569a671248a59 Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 12 Nov 2026 11:20:36 +0800 Subject: [PATCH] build(deps): bump embedded Console to v2.7.2 for 20261112 release Signed-off-by: Feng Ruohang --- CHANGELOG.md | 4 ++-- buildscripts/release-dependency-guard/main.go | 4 ++-- .../release-dependency-guard/main_test.go | 16 ++++++++-------- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d41415660..fb1dc778e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ Package version: `20261112000000.0.0`. Publication status and artifacts are listed in [GitHub Releases](https://github.com/pgsty/silo/releases). This section covers the changes after the published 20261109 source `d998292387cc`, -adopting Go `1.27.4`, `silo-pkg v3.16.1`, embedded Console `v2.7.1`, and +adopting Go `1.27.4`, `silo-pkg v3.16.1`, embedded Console `v2.7.2`, and bundled `mcli 20261112`. See the [server compatibility notes](https://silo.pgsty.com/compatibility/server/) for behavior and upgrade boundaries. @@ -139,7 +139,7 @@ for behavior and upgrade boundaries. the matching `admin accesskey` and `idp ldap/openid accesskey` commands, and any other `update-service-account` request without `newPolicy` removed the inline policy on the receiving site and on site-replication peers for - non-root parent users. In the matching Console (`v2.7.1`), turn off **Restrict + non-root parent users. In the matching Console (`v2.7.2`), turn off **Restrict beyond user policy** or enter `{}` to remove an inline policy; clearing the editor while restriction is enabled prevents saving, save errors render inside the edit modal, and HTTP-to-HTTPS browser redirects preserve the request host diff --git a/buildscripts/release-dependency-guard/main.go b/buildscripts/release-dependency-guard/main.go index ccf5ea0ba..32048b239 100644 --- a/buildscripts/release-dependency-guard/main.go +++ b/buildscripts/release-dependency-guard/main.go @@ -50,8 +50,8 @@ func validate(modules map[string]module, consoleVersion, mcTag, mcCommit string) if _, err := selected(modules["github.com/minio/console"], "github.com/pgsty/silo-console"); err != nil { return err } - if !atLeast("v"+consoleVersion, "v2.7.1") { - return fmt.Errorf("embedded Console %s lacks the policy fixes; need 2.7.1 or newer", consoleVersion) + if !atLeast("v"+consoleVersion, "v2.7.2") { + return fmt.Errorf("embedded Console %s lacks the v2.7.2 release; need 2.7.2 or newer", consoleVersion) } mc, err := selected(modules["github.com/minio/mc"], "github.com/pgsty/mc") if err != nil { diff --git a/buildscripts/release-dependency-guard/main_test.go b/buildscripts/release-dependency-guard/main_test.go index 3d6877517..96b409170 100644 --- a/buildscripts/release-dependency-guard/main_test.go +++ b/buildscripts/release-dependency-guard/main_test.go @@ -11,14 +11,14 @@ func TestReleaseDependencySelection(t *testing.T) { name, pkg, console, tag, mcSHA string local, upstream, wantError bool }{ - {name: "coordinated", pkg: "v3.16.1", console: "2.7.1", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit}, - {name: "old-package", pkg: "v3.16.0", console: "2.7.1", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, wantError: true}, - {name: "prerelease-package", pkg: "v3.16.1-rc.1", console: "2.7.1", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, wantError: true}, - {name: "old-embedded-console", pkg: "v3.16.1", console: "2.7.0", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, wantError: true}, - {name: "old-container-client", pkg: "v3.16.1", console: "2.7.1", tag: "RELEASE.2026-11-09T00-00-00Z", mcSHA: commit, wantError: true}, - {name: "source-binary-mismatch", pkg: "v3.16.1", console: "2.7.1", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: "ffffffffffffffffffffffffffffffffffffffff", wantError: true}, - {name: "workspace-console", pkg: "v3.16.1", console: "2.7.1", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, local: true, wantError: true}, - {name: "upstream-console", pkg: "v3.16.1", console: "2.7.1", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, upstream: true, wantError: true}, + {name: "coordinated", pkg: "v3.16.1", console: "2.7.2", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit}, + {name: "old-package", pkg: "v3.16.0", console: "2.7.2", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, wantError: true}, + {name: "prerelease-package", pkg: "v3.16.1-rc.1", console: "2.7.2", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, wantError: true}, + {name: "old-embedded-console", pkg: "v3.16.1", console: "2.7.1", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, wantError: true}, + {name: "old-container-client", pkg: "v3.16.1", console: "2.7.2", tag: "RELEASE.2026-11-09T00-00-00Z", mcSHA: commit, wantError: true}, + {name: "source-binary-mismatch", pkg: "v3.16.1", console: "2.7.2", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: "ffffffffffffffffffffffffffffffffffffffff", wantError: true}, + {name: "workspace-console", pkg: "v3.16.1", console: "2.7.2", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, local: true, wantError: true}, + {name: "upstream-console", pkg: "v3.16.1", console: "2.7.2", tag: "RELEASE.2026-11-12T00-00-00Z", mcSHA: commit, upstream: true, wantError: true}, } { t.Run(tc.name, func(t *testing.T) { modules := map[string]module{ diff --git a/go.mod b/go.mod index 2b3b02273..680bad9eb 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.27.4 // Console and MC retain their historical module paths for best-effort upstream // compatibility. Pin the maintained PGSTY implementations used by SILO. -replace github.com/minio/console => github.com/pgsty/silo-console v0.0.0-20261111181657-3825ebc44451 +replace github.com/minio/console => github.com/pgsty/silo-console v0.0.0-20261112031746-0e7953ff59c4 replace github.com/minio/mc => github.com/pgsty/mc v0.0.0-20261111180825-a37a9f054fba diff --git a/go.sum b/go.sum index b59e758cd..0f4374d43 100644 --- a/go.sum +++ b/go.sum @@ -516,8 +516,8 @@ github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwp github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pgsty/mc v0.0.0-20261111180825-a37a9f054fba h1:KKLNRed2r86tWb/dqcjaAY7wiP6VmOaXe137l+Y/tLU= github.com/pgsty/mc v0.0.0-20261111180825-a37a9f054fba/go.mod h1:M/s9Mioaya7h38sTw65xqyhfDYB5L3aTkgjAr1e7ZAo= -github.com/pgsty/silo-console v0.0.0-20261111181657-3825ebc44451 h1:TRndCfb0fpRqg5Zw9qkZHCATBdet5USpBcjLCBb1GJw= -github.com/pgsty/silo-console v0.0.0-20261111181657-3825ebc44451/go.mod h1:6To0hfiYfPNTu5O0p3VpYFn6Z3od9y6YLE5wTR+TXWs= +github.com/pgsty/silo-console v0.0.0-20261112031746-0e7953ff59c4 h1:d7NNt1KDA5IUqi5ccIxyqTsZkiomZLVG1PwnXHZvv+4= +github.com/pgsty/silo-console v0.0.0-20261112031746-0e7953ff59c4/go.mod h1:6To0hfiYfPNTu5O0p3VpYFn6Z3od9y6YLE5wTR+TXWs= github.com/pgsty/silo-pkg/v3 v3.16.1 h1:jk8clnx7Fg5ZcpdzqP137XQ4SSAQDF/Kaa/12k721Os= github.com/pgsty/silo-pkg/v3 v3.16.1/go.mod h1:ktr9Y2OO6QAQU+9bkrS7GGqUwM9AQR5jITitySmMSEg= github.com/philhofer/fwd v1.2.1 h1:UtpS73q8bFgy/yH3gCq8LSNvj5gv/FowNOiWZa7uKwQ=