From dfbac70efab64cdff81a98719e2a99353c275782 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 3 Aug 2025 17:50:16 +0200 Subject: [PATCH] remove some remnants from CLI "experimental" config option Experimental is always enabled (977d3ae046ec6c64be8788a8712251ed547a2bdb), and the `Experimental` field in plugin metadata was deprecated in 977d3ae046ec6c64be8788a8712251ed547a2bdb and removed in commit 6a50c4f70054cf6e60124d911e4ca8754617e21d. Signed-off-by: Sebastiaan van Stijn --- cli-plugins/manager/candidate_test.go | 10 +++++----- e2e/internal/fixtures/fixtures.go | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cli-plugins/manager/candidate_test.go b/cli-plugins/manager/candidate_test.go index e8df429099..b54f6a967a 100644 --- a/cli-plugins/manager/candidate_test.go +++ b/cli-plugins/manager/candidate_test.go @@ -36,10 +36,9 @@ func TestValidateCandidate(t *testing.T) { builtinName = metadata.NamePrefix + "builtin" builtinAlias = metadata.NamePrefix + "alias" - badPrefixPath = "/usr/local/libexec/cli-plugins/wobble" - badNamePath = "/usr/local/libexec/cli-plugins/docker-123456" - goodPluginPath = "/usr/local/libexec/cli-plugins/" + goodPluginName - metaExperimental = `{"SchemaVersion": "0.1.0", "Vendor": "e2e-testing", "Experimental": true}` + badPrefixPath = "/usr/local/libexec/cli-plugins/wobble" + badNamePath = "/usr/local/libexec/cli-plugins/docker-123456" + goodPluginPath = "/usr/local/libexec/cli-plugins/" + goodPluginName ) fakeroot := &cobra.Command{Use: "docker"} @@ -72,7 +71,8 @@ func TestValidateCandidate(t *testing.T) { {name: "empty vendor", c: &fakeCandidate{path: goodPluginPath, exec: true, meta: `{"SchemaVersion": "0.1.0", "Vendor": ""}`}, invalid: "plugin metadata does not define a vendor"}, // This one should work {name: "valid", c: &fakeCandidate{path: goodPluginPath, exec: true, meta: `{"SchemaVersion": "0.1.0", "Vendor": "e2e-testing"}`}}, - {name: "experimental + allowing experimental", c: &fakeCandidate{path: goodPluginPath, exec: true, meta: metaExperimental}}, + // Including the deprecated "experimental" field should not break processing. + {name: "with legacy experimental", c: &fakeCandidate{path: goodPluginPath, exec: true, meta: `{"SchemaVersion": "0.1.0", "Vendor": "e2e-testing", "Experimental": true}`}}, } { t.Run(tc.name, func(t *testing.T) { p, err := newPlugin(tc.c, fakeroot.Commands()) diff --git a/e2e/internal/fixtures/fixtures.go b/e2e/internal/fixtures/fixtures.go index f6c49f50c7..3c47f8d7ff 100644 --- a/e2e/internal/fixtures/fixtures.go +++ b/e2e/internal/fixtures/fixtures.go @@ -44,8 +44,7 @@ func SetupConfigWithNotaryURL(t *testing.T, path, notaryURL string) fs.Dir { "%s": { "auth": "ZWlhaXM6cGFzc3dvcmQK" } - }, - "experimental": "enabled" + } } `, notaryURL)), fs.WithDir("trust", fs.WithDir("private"))) return *dir