From d8d3d707fbc65a780f0340c545ee9a036b392d78 Mon Sep 17 00:00:00 2001 From: BillionClaw Date: Sun, 19 Apr 2026 11:56:33 +0800 Subject: [PATCH] fix(common): remove testing package import from production code The testing package was imported in capabilities.go only to call testing.Testing() for detecting test builds. This pulls the testing package into production binaries. Replace with build-tag-based approach: isTestBuild is true when built with -tags test and false otherwise. Signed-off-by: BillionClaw --- pkg/chart/common/capabilities.go | 3 +-- pkg/chart/common/capabilities_prod.go | 20 ++++++++++++++++++++ pkg/chart/common/capabilities_testbuild.go | 20 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkg/chart/common/capabilities_prod.go create mode 100644 pkg/chart/common/capabilities_testbuild.go diff --git a/pkg/chart/common/capabilities.go b/pkg/chart/common/capabilities.go index 20f4953cf..b87143684 100644 --- a/pkg/chart/common/capabilities.go +++ b/pkg/chart/common/capabilities.go @@ -20,7 +20,6 @@ import ( "slices" "strconv" "strings" - "testing" "github.com/Masterminds/semver/v3" "k8s.io/client-go/kubernetes/scheme" @@ -146,7 +145,7 @@ func makeDefaultCapabilities() (*Capabilities, error) { // Test builds don't include debug info / module info // (And even if they did, we probably want stable capabilities for tests anyway) // Return a default value for test builds - if testing.Testing() { + if isTestBuild { return newCapabilities(kubeVersionMajorTesting, kubeVersionMinorTesting) } diff --git a/pkg/chart/common/capabilities_prod.go b/pkg/chart/common/capabilities_prod.go new file mode 100644 index 000000000..e622835b9 --- /dev/null +++ b/pkg/chart/common/capabilities_prod.go @@ -0,0 +1,20 @@ +//go:build !test + +/* +Copyright The Helm Authors. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package common + +const isTestBuild = false diff --git a/pkg/chart/common/capabilities_testbuild.go b/pkg/chart/common/capabilities_testbuild.go new file mode 100644 index 000000000..4d5576bc4 --- /dev/null +++ b/pkg/chart/common/capabilities_testbuild.go @@ -0,0 +1,20 @@ +//go:build test + +/* +Copyright The Helm Authors. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package common + +const isTestBuild = true