msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge branch 'helm:main' into main

Browse Source
pull/31615/head
MrJack 1 month ago committed by GitHub
parent d558f4db04 a8ab76e86f
commit df7ef06028
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
86 changed files with 331 additions and 273 deletions
Show Stats Download Patch File Download Diff File

2
.github/workflows/stale.yaml vendored
Unescape View File

@ -12,7 +12,7 @@ jobs:
issues: write issues: write
pull-requests: write pull-requests: write
steps: steps:
- uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0 - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has been marked as stale because it has been open for 90 days with no activity. This thread will be automatically closed in 30 days if no further activity occurs.' stale-issue-message: 'This issue has been marked as stale because it has been open for 90 days with no activity. This thread will be automatically closed in 30 days if no further activity occurs.'

5
.golangci.yml
Unescape View File

@ -1,6 +1,7 @@
formatters: formatters:
enable: enable:
- gofmt - gofmt
- gofumpt
- goimports - goimports
exclusions: exclusions:
@ -10,6 +11,10 @@ formatters:
gofmt: gofmt:
simplify: true simplify: true
gofumpt:
module-path: helm.sh/helm/v4
extra-rules: false
goimports: goimports:
local-prefixes: local-prefixes:
- helm.sh/helm/v4 - helm.sh/helm/v4

2
go.mod
Unescape View File

@ -34,7 +34,7 @@ require (
github.com/spf13/pflag v1.0.10 github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1 github.com/stretchr/testify v1.11.1
github.com/tetratelabs/wazero v1.12.0 github.com/tetratelabs/wazero v1.12.0
go.yaml.in/yaml/v3 v3.0.4 go.yaml.in/yaml/v3 v3.0.5
golang.org/x/crypto v0.54.0 golang.org/x/crypto v0.54.0
golang.org/x/term v0.45.0 golang.org/x/term v0.45.0
golang.org/x/text v0.40.0 golang.org/x/text v0.40.0

3
go.sum
Unescape View File

@ -376,8 +376,9 @@ go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

18
internal/chart/v3/lint/lint_test.go
Unescape View File

@ -30,14 +30,16 @@ import (
const namespace = "testNamespace" const namespace = "testNamespace"
const badChartDir = "rules/testdata/badchartfile" const (
const badValuesFileDir = "rules/testdata/badvaluesfile" badChartDir = "rules/testdata/badchartfile"
const badYamlFileDir = "rules/testdata/albatross" badValuesFileDir = "rules/testdata/badvaluesfile"
const badCrdFileDir = "rules/testdata/badcrdfile" badYamlFileDir = "rules/testdata/albatross"
const goodChartDir = "rules/testdata/goodone" badCrdFileDir = "rules/testdata/badcrdfile"
const subChartValuesDir = "rules/testdata/withsubchart" goodChartDir = "rules/testdata/goodone"
const malformedTemplate = "rules/testdata/malformed-template" subChartValuesDir = "rules/testdata/withsubchart"
const invalidChartFileDir = "rules/testdata/invalidchartfile" malformedTemplate = "rules/testdata/malformed-template"
invalidChartFileDir = "rules/testdata/invalidchartfile"
)
func TestBadChartV3(t *testing.T) { func TestBadChartV3(t *testing.T) {
var values map[string]any var values map[string]any

22
internal/chart/v3/lint/rules/chartfile_test.go
Unescape View File

@ -44,8 +44,10 @@ var (
nonExistingChartFilePath = filepath.Join(os.TempDir(), "Chart.yaml") nonExistingChartFilePath = filepath.Join(os.TempDir(), "Chart.yaml")
) )
var badChart, _ = chartutil.LoadChartfile(badChartFilePath) var (
var badChartName, _ = chartutil.LoadChartfile(badChartNamePath) badChart, _ = chartutil.LoadChartfile(badChartFilePath)
badChartName, _ = chartutil.LoadChartfile(badChartNamePath)
)
// Validation functions Test // Validation functions Test
func TestValidateChartYamlNotDirectory(t *testing.T) { func TestValidateChartYamlNotDirectory(t *testing.T) {
@ -68,7 +70,7 @@ func TestValidateChartName(t *testing.T) {
} }
func TestValidateChartVersion(t *testing.T) { func TestValidateChartVersion(t *testing.T) {
var failTest = []struct { failTest := []struct {
Version string Version string
ErrorMsg string ErrorMsg string
}{ }{
@ -80,7 +82,7 @@ func TestValidateChartVersion(t *testing.T) {
{"1", "'1' is not a valid SemVerV2"}, {"1", "'1' is not a valid SemVerV2"},
} }
var successTest = []string{"0.0.1", "0.0.1+build", "0.0.1-beta"} successTest := []string{"0.0.1", "0.0.1+build", "0.0.1-beta"}
for i, test := range failTest { for i, test := range failTest {
t.Run(strconv.Itoa(i), func(t *testing.T) { t.Run(strconv.Itoa(i), func(t *testing.T) {
@ -96,7 +98,7 @@ func TestValidateChartVersion(t *testing.T) {
} }
func TestValidateChartMaintainer(t *testing.T) { func TestValidateChartMaintainer(t *testing.T) {
var failTest = []struct { failTest := []struct {
Name string Name string
Email string Email string
ErrorMsg string ErrorMsg string
@ -106,7 +108,7 @@ func TestValidateChartMaintainer(t *testing.T) {
{"John Snow", "wrongFormatEmail.com", "invalid email"}, {"John Snow", "wrongFormatEmail.com", "invalid email"},
} }
var successTest = []struct { successTest := []struct {
Name string Name string
Email string Email string
}{ }{
@ -134,8 +136,8 @@ func TestValidateChartMaintainer(t *testing.T) {
} }
func TestValidateChartSources(t *testing.T) { func TestValidateChartSources(t *testing.T) {
var failTest = []string{"", "RiverRun", "john@winterfell", "riverrun.io"} failTest := []string{"", "RiverRun", "john@winterfell", "riverrun.io"}
var successTest = []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish"} successTest := []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish"}
for _, test := range failTest { for _, test := range failTest {
t.Run(test, func(t *testing.T) { t.Run(test, func(t *testing.T) {
badChart.Sources = []string{test} badChart.Sources = []string{test}
@ -166,8 +168,8 @@ func TestValidateChartIconPresence(t *testing.T) {
} }
func TestValidateChartIconURL(t *testing.T) { func TestValidateChartIconURL(t *testing.T) {
var failTest = []string{"RiverRun", "john@winterfell", "riverrun.io"} failTest := []string{"RiverRun", "john@winterfell", "riverrun.io"}
var successTest = []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish.png"} successTest := []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish.png"}
for _, test := range failTest { for _, test := range failTest {
t.Run(test, func(t *testing.T) { t.Run(test, func(t *testing.T) {
badChart.Icon = test badChart.Icon = test

17
internal/chart/v3/lint/rules/template_test.go
Unescape View File

@ -35,11 +35,11 @@ import (
const templateTestBasedir = "./testdata/albatross" const templateTestBasedir = "./testdata/albatross"
func TestValidateAllowedExtension(t *testing.T) { func TestValidateAllowedExtension(t *testing.T) {
var failTest = []string{"/foo", "/test.toml"} failTest := []string{"/foo", "/test.toml"}
for _, test := range failTest { for _, test := range failTest {
require.ErrorContains(t, validateAllowedExtension(test), "Valid extensions are .yaml, .yml, .tpl, or .txt", "validateAllowedExtension('%s') to return \"Valid extensions are .yaml, .yml, .tpl, or .txt\", got no error", test) require.ErrorContains(t, validateAllowedExtension(test), "Valid extensions are .yaml, .yml, .tpl, or .txt", "validateAllowedExtension('%s') to return \"Valid extensions are .yaml, .yml, .tpl, or .txt\", got no error", test)
} }
var successTest = []string{"/foo.yaml", "foo.yaml", "foo.tpl", "/foo/bar/baz.yaml", "NOTES.txt"} successTest := []string{"/foo.yaml", "foo.yaml", "foo.tpl", "/foo/bar/baz.yaml", "NOTES.txt"}
for _, test := range successTest { for _, test := range successTest {
assert.NoError(t, validateAllowedExtension(test), "validateAllowedExtension('%s') to return no error", test) assert.NoError(t, validateAllowedExtension(test), "validateAllowedExtension('%s') to return no error", test)
} }
@ -47,8 +47,10 @@ func TestValidateAllowedExtension(t *testing.T) {
var values = map[string]any{"nameOverride": "", "httpPort": 80} var values = map[string]any{"nameOverride": "", "httpPort": 80}
const namespace = "testNamespace" const (
const strict = false namespace = "testNamespace"
strict = false
)
func TestTemplateParsing(t *testing.T) { func TestTemplateParsing(t *testing.T) {
linter := support.Linter{ChartDir: templateTestBasedir} linter := support.Linter{ChartDir: templateTestBasedir}
@ -59,8 +61,10 @@ func TestTemplateParsing(t *testing.T) {
assert.ErrorContains(t, res[0].Err, "deliberateSyntaxError") assert.ErrorContains(t, res[0].Err, "deliberateSyntaxError")
} }
var wrongTemplatePath = filepath.Join(templateTestBasedir, "templates", "fail.yaml") var (
var ignoredTemplatePath = filepath.Join(templateTestBasedir, "fail.yaml.ignored") wrongTemplatePath = filepath.Join(templateTestBasedir, "templates", "fail.yaml")
ignoredTemplatePath = filepath.Join(templateTestBasedir, "fail.yaml.ignored")
)
// Test a template with all the existing features: // Test a template with all the existing features:
// namespaces, partial templates // namespaces, partial templates
@ -382,6 +386,7 @@ func TestEmptyWithCommentsManifests(t *testing.T) {
} }
require.Empty(t, linter.Messages, "Expected 0 lint errors") require.Empty(t, linter.Messages, "Expected 0 lint errors")
} }
func TestValidateListAnnotations(t *testing.T) { func TestValidateListAnnotations(t *testing.T) {
md := &k8sYamlStruct{ md := &k8sYamlStruct{
APIVersion: "v1", APIVersion: "v1",

2
internal/chart/v3/lint/support/message_test.go
Unescape View File

@ -27,7 +27,7 @@ import (
var errLint = errors.New("lint failed") var errLint = errors.New("lint failed")
func TestRunLinterRule(t *testing.T) { func TestRunLinterRule(t *testing.T) {
var tests = []struct { tests := []struct {
Severity int Severity int
LintError error LintError error
ExpectedMessages int ExpectedMessages int

1
internal/monocular/client.go
Unescape View File

@ -26,7 +26,6 @@ var ErrHostnameNotProvided = errors.New("no hostname provided")
// Client represents a client capable of communicating with the Monocular API. // Client represents a client capable of communicating with the Monocular API.
type Client struct { type Client struct {
// The base URL for requests // The base URL for requests
BaseURL string BaseURL string
} }

4
internal/plugin/installer/http_installer_test.go
Unescape View File

@ -173,7 +173,7 @@ func TestExtract(t *testing.T) {
// Write a tarball to a buffer for us to extract // Write a tarball to a buffer for us to extract
var tarbuf bytes.Buffer var tarbuf bytes.Buffer
tw := tar.NewWriter(&tarbuf) tw := tar.NewWriter(&tarbuf)
var files = []struct { files := []struct {
Name, Body string Name, Body string
Mode int64 Mode int64
}{ }{
@ -293,7 +293,7 @@ func TestExtractWithNestedDirectories(t *testing.T) {
// Write a tarball with nested directory structure // Write a tarball with nested directory structure
var tarbuf bytes.Buffer var tarbuf bytes.Buffer
tw := tar.NewWriter(&tarbuf) tw := tar.NewWriter(&tarbuf)
var files = []struct { files := []struct {
Name string Name string
Body string Body string
Mode int64 Mode int64

1
internal/plugin/installer/vcs_installer_test.go
Unescape View File

@ -106,6 +106,7 @@ func TestVCSInstallerNonExistentVersion(t *testing.T) {
} }
require.EqualErrorf(t, err, fmt.Sprintf("requested version %q does not exist for plugin %q", version, source), "expected error for version does not exists") require.EqualErrorf(t, err, fmt.Sprintf("requested version %q does not exist for plugin %q", version, source), "expected error for version does not exists")
} }
func TestVCSInstallerUpdate(t *testing.T) { func TestVCSInstallerUpdate(t *testing.T) {
ensure.HelmHome(t) ensure.HelmHome(t)

1
internal/plugin/loader.go
Unescape View File

@ -216,7 +216,6 @@ func findPlugins(pluginsDirs []string, findFn findFunc, filterFn filterFunc) ([]
var found []Plugin var found []Plugin
for _, pluginsDir := range pluginsDirs { for _, pluginsDir := range pluginsDirs {
ps, err := findFn(pluginsDir) ps, err := findFn(pluginsDir)
if err != nil { if err != nil {
return nil, err return nil, err
} }

3
internal/plugin/metadata.go
Unescape View File

@ -154,8 +154,7 @@ func buildLegacyConfig(m MetadataLegacy, pluginType string) Config {
func buildLegacyRuntimeConfig(m MetadataLegacy) RuntimeConfig { func buildLegacyRuntimeConfig(m MetadataLegacy) RuntimeConfig {
var protocolCommands []SubprocessProtocolCommand var protocolCommands []SubprocessProtocolCommand
if len(m.Downloaders) > 0 { if len(m.Downloaders) > 0 {
protocolCommands = protocolCommands = make([]SubprocessProtocolCommand, 0, len(m.Downloaders))
make([]SubprocessProtocolCommand, 0, len(m.Downloaders))
for _, d := range m.Downloaders { for _, d := range m.Downloaders {
protocolCommands = append(protocolCommands, SubprocessProtocolCommand{ protocolCommands = append(protocolCommands, SubprocessProtocolCommand{
Protocols: d.Protocols, Protocols: d.Protocols,

6
internal/plugin/verify_test.go
Unescape View File

@ -26,8 +26,10 @@ import (
"helm.sh/helm/v4/pkg/provenance" "helm.sh/helm/v4/pkg/provenance"
) )
const testKeyFile = "../../pkg/cmd/testdata/helm-test-key.secret" const (
const testPubFile = "../../pkg/cmd/testdata/helm-test-key.pub" testKeyFile = "../../pkg/cmd/testdata/helm-test-key.secret"
testPubFile = "../../pkg/cmd/testdata/helm-test-key.pub"
)
const testPluginYAML = `apiVersion: v1 const testPluginYAML = `apiVersion: v1
name: test-plugin name: test-plugin

6
internal/release/v2/release.go
Unescape View File

@ -22,8 +22,10 @@ import (
type ApplyMethod string type ApplyMethod string
const ApplyMethodClientSideApply ApplyMethod = "csa" const (
const ApplyMethodServerSideApply ApplyMethod = "ssa" ApplyMethodClientSideApply ApplyMethod = "csa"
ApplyMethodServerSideApply ApplyMethod = "ssa"
)
// Release describes a deployment of a chart, together with the chart // Release describes a deployment of a chart, together with the chart
// and the variables used to deploy that chart. // and the variables used to deploy that chart.

15
internal/release/v2/util/manifest_sorter_test.go
Unescape View File

@ -61,7 +61,8 @@ metadata:
annotations: annotations:
"helm.sh/hook": post-install "helm.sh/hook": post-install
`, `,
}, { },
{
name: []string{"third"}, name: []string{"third"},
path: "three", path: "three",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
@ -73,7 +74,8 @@ metadata:
annotations: annotations:
"helm.sh/hook": no-such-hook "helm.sh/hook": no-such-hook
`, `,
}, { },
{
name: []string{"fourth"}, name: []string{"fourth"},
path: "four", path: "four",
kind: []string{"Pod"}, kind: []string{"Pod"},
@ -84,7 +86,8 @@ metadata:
name: fourth name: fourth
annotations: annotations:
nothing: here`, nothing: here`,
}, { },
{
name: []string{"fifth"}, name: []string{"fifth"},
path: "five", path: "five",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
@ -96,14 +99,16 @@ metadata:
annotations: annotations:
"helm.sh/hook": post-delete, post-install "helm.sh/hook": post-delete, post-install
`, `,
}, { },
{
// Regression test: files with an underscore in the base name should be skipped. // Regression test: files with an underscore in the base name should be skipped.
name: []string{"sixth"}, name: []string{"sixth"},
path: "six/_six", path: "six/_six",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
hooks: map[string][]release.HookEvent{"sixth": nil}, hooks: map[string][]release.HookEvent{"sixth": nil},
manifest: `invalid manifest`, // This will fail if partial is not skipped. manifest: `invalid manifest`, // This will fail if partial is not skipped.
}, { },
{
// Regression test: files with no content should be skipped. // Regression test: files with no content should be skipped.
name: []string{"seventh"}, name: []string{"seventh"},
path: "seven", path: "seven",

12
internal/third_party/dep/fs/fs_test.go vendored
Unescape View File

@ -126,7 +126,7 @@ func TestCopyDirFail_SrcInaccessible(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUID = os.Getuid() currentUID := os.Getuid()
if currentUID == 0 { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
@ -155,7 +155,7 @@ func TestCopyDirFail_DstInaccessible(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUID = os.Getuid() currentUID := os.Getuid()
if currentUID == 0 { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
@ -217,7 +217,7 @@ func TestCopyDirFailOpen(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUID = os.Getuid() currentUID := os.Getuid()
if currentUID == 0 { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
@ -319,7 +319,7 @@ func TestCopyFileFail(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUID = os.Getuid() currentUID := os.Getuid()
if currentUID == 0 { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
@ -389,7 +389,7 @@ func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() {
} }
func TestIsDir(t *testing.T) { func TestIsDir(t *testing.T) {
var currentUID = os.Getuid() currentUID := os.Getuid()
if currentUID == 0 { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
@ -441,7 +441,7 @@ func TestIsDir(t *testing.T) {
} }
func TestIsSymlink(t *testing.T) { func TestIsSymlink(t *testing.T) {
var currentUID = os.Getuid() currentUID := os.Getuid()
if currentUID == 0 { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible

3
internal/tlsutil/tls.go
Unescape View File

@ -19,10 +19,9 @@ package tlsutil
import ( import (
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"errors"
"fmt" "fmt"
"os" "os"
"errors"
) )
type TLSConfigOptions struct { type TLSConfigOptions struct {

2
pkg/action/get_metadata_test.go
Unescape View File

@ -546,7 +546,7 @@ func TestMetadata_FormattedDepNames(t *testing.T) {
} }
func convertDeps(deps []*chart.Dependency) []ci.Dependency { func convertDeps(deps []*chart.Dependency) []ci.Dependency {
var newDeps = make([]ci.Dependency, len(deps)) newDeps := make([]ci.Dependency, len(deps))
for i, c := range deps { for i, c := range deps {
newDeps[i] = c newDeps[i] = c
} }

12
pkg/action/hooks.go
Unescape View File

@ -34,7 +34,8 @@ import (
// execHook executes all of the hooks for the given hook event. // execHook executes all of the hooks for the given hook event.
func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption, waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption,
timeout time.Duration, serverSideApply bool) error { timeout time.Duration, serverSideApply bool,
) error {
shutdown, err := cfg.execHookWithDelayedShutdown(rl, hook, waitStrategy, waitOptions, timeout, serverSideApply) shutdown, err := cfg.execHookWithDelayedShutdown(rl, hook, waitStrategy, waitOptions, timeout, serverSideApply)
if shutdown == nil { if shutdown == nil {
return err return err
@ -57,7 +58,8 @@ func shutdownNoOp() error {
// execHookWithDelayedShutdown executes all of the hooks for the given hook event and returns a shutdownHook function to trigger deletions after doing other things like e.g. retrieving logs. // execHookWithDelayedShutdown executes all of the hooks for the given hook event and returns a shutdownHook function to trigger deletions after doing other things like e.g. retrieving logs.
func (cfg *Configuration) execHookWithDelayedShutdown(rl *release.Release, hook release.HookEvent, func (cfg *Configuration) execHookWithDelayedShutdown(rl *release.Release, hook release.HookEvent,
waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption, timeout time.Duration, waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption, timeout time.Duration,
serverSideApply bool) (ExecuteShutdownFunc, error) { serverSideApply bool,
) (ExecuteShutdownFunc, error) {
executingHooks := []*release.Hook{} executingHooks := []*release.Hook{}
for _, h := range rl.Hooks { for _, h := range rl.Hooks {
@ -176,7 +178,8 @@ func (x hookByWeight) Less(i, j int) bool {
// deleteHookByPolicy deletes a hook if the hook policy instructs it to // deleteHookByPolicy deletes a hook if the hook policy instructs it to
func (cfg *Configuration) deleteHookByPolicy(h *release.Hook, policy release.HookDeletePolicy, func (cfg *Configuration) deleteHookByPolicy(h *release.Hook, policy release.HookDeletePolicy,
waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption, timeout time.Duration) error { waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption, timeout time.Duration,
) error {
// Never delete CustomResourceDefinitions; this could cause lots of // Never delete CustomResourceDefinitions; this could cause lots of
// cascading garbage collection. // cascading garbage collection.
if h.Kind == "CustomResourceDefinition" { if h.Kind == "CustomResourceDefinition" {
@ -210,7 +213,8 @@ func (cfg *Configuration) deleteHookByPolicy(h *release.Hook, policy release.Hoo
// deleteHooksByPolicy deletes all hooks if the hook policy instructs it to // deleteHooksByPolicy deletes all hooks if the hook policy instructs it to
func (cfg *Configuration) deleteHooksByPolicy(hooks []*release.Hook, policy release.HookDeletePolicy, func (cfg *Configuration) deleteHooksByPolicy(hooks []*release.Hook, policy release.HookDeletePolicy,
waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption, timeout time.Duration) error { waitStrategy kube.WaitStrategy, waitOptions []kube.WaitOption, timeout time.Duration,
) error {
for _, h := range hooks { for _, h := range hooks {
if err := cfg.deleteHookByPolicy(h, policy, waitStrategy, waitOptions, timeout); err != nil { if err := cfg.deleteHookByPolicy(h, policy, waitStrategy, waitOptions, timeout); err != nil {
return err return err

10
pkg/action/hooks_test.go
Unescape View File

@ -252,7 +252,6 @@ func (*HookFailingKubeClient) Build(reader io.Reader, _ bool) (kube.ResourceList
configMap := &v1.ConfigMap{} configMap := &v1.ConfigMap{}
err := yaml.NewYAMLOrJSONDecoder(reader, 1000).Decode(configMap) err := yaml.NewYAMLOrJSONDecoder(reader, 1000).Decode(configMap)
if err != nil { if err != nil {
return kube.ResourceList{}, err return kube.ResourceList{}, err
} }
@ -358,10 +357,12 @@ data:
}, },
}, },
}, },
}, resource.Info{ },
resource.Info{
Name: "build-config-2", Name: "build-config-2",
Namespace: "test", Namespace: "test",
}, []resource.Info{ },
[]resource.Info{
{ {
// This should be in the record for `before-hook-creation` // This should be in the record for `before-hook-creation`
Name: "build-config-1", Name: "build-config-1",
@ -382,7 +383,8 @@ data:
Name: "build-config-1", Name: "build-config-1",
Namespace: "test", Namespace: "test",
}, },
}, true, },
true,
}, },
} }

1
pkg/action/install.go
Unescape View File

@ -733,7 +733,6 @@ func writeToFile(outputDir string, name string, data string, appendData bool) er
defer f.Close() defer f.Close()
_, err = fmt.Fprintf(f, "---\n# Source: %s\n%s\n", name, data) _, err = fmt.Fprintf(f, "---\n# Source: %s\n%s\n", name, data)
if err != nil { if err != nil {
return err return err
} }

16
pkg/action/install_test.go
Unescape View File

@ -631,6 +631,7 @@ func TestInstallRelease_Wait(t *testing.T) {
is.Equal(goroutines, instAction.getGoroutineCount()) is.Equal(goroutines, instAction.getGoroutineCount())
} }
func TestInstallRelease_Wait_Interrupted(t *testing.T) { func TestInstallRelease_Wait_Interrupted(t *testing.T) {
is := assert.New(t) is := assert.New(t)
req := require.New(t) req := require.New(t)
@ -652,9 +653,12 @@ func TestInstallRelease_Wait_Interrupted(t *testing.T) {
req.ErrorContains(err, "context canceled") req.ErrorContains(err, "context canceled")
is.Equal(goroutines+1, instAction.getGoroutineCount()) // installation goroutine still is in background is.Equal(goroutines+1, instAction.getGoroutineCount()) // installation goroutine still is in background
time.Sleep(10 * time.Second) // wait for goroutine to finish // Poll until the background installation goroutine has finished.
is.Equal(goroutines, instAction.getGoroutineCount()) is.Eventually(func() bool {
return instAction.getGoroutineCount() == goroutines
}, 30*time.Second, 10*time.Millisecond)
} }
func TestInstallRelease_WaitForJobs(t *testing.T) { func TestInstallRelease_WaitForJobs(t *testing.T) {
is := assert.New(t) is := assert.New(t)
req := require.New(t) req := require.New(t)
@ -722,6 +726,7 @@ func TestInstallRelease_RollbackOnFailure(t *testing.T) {
is.ErrorContains(err, "an error occurred while uninstalling the release") is.ErrorContains(err, "an error occurred while uninstalling the release")
}) })
} }
func TestInstallRelease_RollbackOnFailure_Interrupted(t *testing.T) { func TestInstallRelease_RollbackOnFailure_Interrupted(t *testing.T) {
is := assert.New(t) is := assert.New(t)
req := require.New(t) req := require.New(t)
@ -751,9 +756,12 @@ func TestInstallRelease_RollbackOnFailure_Interrupted(t *testing.T) {
req.Error(err) req.Error(err)
is.Equal(err, driver.ErrReleaseNotFound) is.Equal(err, driver.ErrReleaseNotFound)
is.Equal(goroutines+1, instAction.getGoroutineCount()) // installation goroutine still is in background is.Equal(goroutines+1, instAction.getGoroutineCount()) // installation goroutine still is in background
time.Sleep(10 * time.Second) // wait for goroutine to finish // Poll until the background installation goroutine has finished.
is.Equal(goroutines, instAction.getGoroutineCount()) is.Eventually(func() bool {
return instAction.getGoroutineCount() == goroutines
}, 30*time.Second, 10*time.Millisecond)
} }
func TestNameTemplate(t *testing.T) { func TestNameTemplate(t *testing.T) {
testCases := []nameTemplateTestCase{ testCases := []nameTemplateTestCase{
// Just a straight up nop please // Just a straight up nop please

3
pkg/action/list.go
Unescape View File

@ -172,7 +172,6 @@ func (l *List) Run() ([]ri.Releaser, error) {
return true return true
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -264,7 +263,7 @@ func filterLatestReleases(releases []*release.Release) []*release.Release {
latestReleases[key] = rls latestReleases[key] = rls
} }
var list = make([]*release.Release, 0, len(latestReleases)) list := make([]*release.Release, 0, len(latestReleases))
for _, rls := range latestReleases { for _, rls := range latestReleases {
list = append(list, rls) list = append(list, rls)
} }

1
pkg/action/release_testing.go
Unescape View File

@ -107,7 +107,6 @@ func (r *ReleaseTesting) Run(name string) (ri.Releaser, ExecuteShutdownFunc, err
serverSideApply := rel.ApplyMethod == string(release.ApplyMethodServerSideApply) serverSideApply := rel.ApplyMethod == string(release.ApplyMethodServerSideApply)
shutdown, err := r.cfg.execHookWithDelayedShutdown(rel, release.HookTest, kube.StatusWatcherStrategy, r.WaitOptions, r.Timeout, serverSideApply) shutdown, err := r.cfg.execHookWithDelayedShutdown(rel, release.HookTest, kube.StatusWatcherStrategy, r.WaitOptions, r.Timeout, serverSideApply)
if err != nil { if err != nil {
rel.Hooks = append(skippedHooks, rel.Hooks...) rel.Hooks = append(skippedHooks, rel.Hooks...)
r.cfg.Releases.Update(reli) r.cfg.Releases.Update(reli)

1
pkg/action/rollback.go
Unescape View File

@ -232,7 +232,6 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
kube.ClientUpdateOptionServerSideApply(serverSideApply, r.ForceConflicts), kube.ClientUpdateOptionServerSideApply(serverSideApply, r.ForceConflicts),
kube.ClientUpdateOptionThreeWayMergeForUnstructured(false), kube.ClientUpdateOptionThreeWayMergeForUnstructured(false),
kube.ClientUpdateOptionUpgradeClientSideFieldManager(true)) kube.ClientUpdateOptionUpgradeClientSideFieldManager(true))
if err != nil { if err != nil {
msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err) msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err)
r.cfg.Logger().Warn(msg) r.cfg.Logger().Warn(msg)

1
pkg/action/uninstall.go
Unescape View File

@ -77,7 +77,6 @@ func (u *Uninstall) Run(name string) (*releasei.UninstallReleaseResponse, error)
if u.DryRun { if u.DryRun {
ri, err := u.cfg.releaseContent(name, 0) ri, err := u.cfg.releaseContent(name, 0)
if err != nil { if err != nil {
if u.IgnoreNotFound && errors.Is(err, driver.ErrReleaseNotFound) { if u.IgnoreNotFound && errors.Is(err, driver.ErrReleaseNotFound) {
return nil, nil return nil, nil

1
pkg/action/uninstall_test.go
Unescape View File

@ -59,6 +59,7 @@ func TestUninstallRelease_ignoreNotFound(t *testing.T) {
is.Nil(res) is.Nil(res)
is.NoError(err) is.NoError(err)
} }
func TestUninstallRelease_deleteRelease(t *testing.T) { func TestUninstallRelease_deleteRelease(t *testing.T) {
is := assert.New(t) is := assert.New(t)
req := require.New(t) req := require.New(t)

8
pkg/chart/common.go
Unescape View File

@ -85,7 +85,7 @@ func (r *v2Accessor) IsLibraryChart() bool {
} }
func (r *v2Accessor) Dependencies() []Charter { func (r *v2Accessor) Dependencies() []Charter {
var deps = make([]Charter, len(r.chrt.Dependencies())) deps := make([]Charter, len(r.chrt.Dependencies()))
for i, c := range r.chrt.Dependencies() { for i, c := range r.chrt.Dependencies() {
deps[i] = c deps[i] = c
} }
@ -93,7 +93,7 @@ func (r *v2Accessor) Dependencies() []Charter {
} }
func (r *v2Accessor) MetaDependencies() []Dependency { func (r *v2Accessor) MetaDependencies() []Dependency {
var deps = make([]Dependency, len(r.chrt.Metadata.Dependencies)) deps := make([]Dependency, len(r.chrt.Metadata.Dependencies))
for i, c := range r.chrt.Metadata.Dependencies { for i, c := range r.chrt.Metadata.Dependencies {
deps[i] = c deps[i] = c
} }
@ -154,7 +154,7 @@ func (r *v3Accessor) IsLibraryChart() bool {
} }
func (r *v3Accessor) Dependencies() []Charter { func (r *v3Accessor) Dependencies() []Charter {
var deps = make([]Charter, len(r.chrt.Dependencies())) deps := make([]Charter, len(r.chrt.Dependencies()))
for i, c := range r.chrt.Dependencies() { for i, c := range r.chrt.Dependencies() {
deps[i] = c deps[i] = c
} }
@ -162,7 +162,7 @@ func (r *v3Accessor) Dependencies() []Charter {
} }
func (r *v3Accessor) MetaDependencies() []Dependency { func (r *v3Accessor) MetaDependencies() []Dependency {
var deps = make([]Dependency, len(r.chrt.Dependencies())) deps := make([]Dependency, len(r.chrt.Dependencies()))
for i, c := range r.chrt.Metadata.Dependencies { for i, c := range r.chrt.Metadata.Dependencies {
deps[i] = c deps[i] = c
} }

1
pkg/chart/common/capabilities.go
Unescape View File

@ -47,7 +47,6 @@ var (
panic(fmt.Sprintf("failed to create default capabilities: %v", err)) panic(fmt.Sprintf("failed to create default capabilities: %v", err))
} }
return caps return caps
}() }()
) )

18
pkg/chart/v2/lint/lint_test.go
Unescape View File

@ -30,14 +30,16 @@ import (
const namespace = "testNamespace" const namespace = "testNamespace"
const badChartDir = "rules/testdata/badchartfile" const (
const badValuesFileDir = "rules/testdata/badvaluesfile" badChartDir = "rules/testdata/badchartfile"
const badYamlFileDir = "rules/testdata/albatross" badValuesFileDir = "rules/testdata/badvaluesfile"
const badCrdFileDir = "rules/testdata/badcrdfile" badYamlFileDir = "rules/testdata/albatross"
const goodChartDir = "rules/testdata/goodone" badCrdFileDir = "rules/testdata/badcrdfile"
const subChartValuesDir = "rules/testdata/withsubchart" goodChartDir = "rules/testdata/goodone"
const malformedTemplate = "rules/testdata/malformed-template" subChartValuesDir = "rules/testdata/withsubchart"
const invalidChartFileDir = "rules/testdata/invalidchartfile" malformedTemplate = "rules/testdata/malformed-template"
invalidChartFileDir = "rules/testdata/invalidchartfile"
)
func TestBadChart(t *testing.T) { func TestBadChart(t *testing.T) {
var values map[string]any var values map[string]any

1
pkg/chart/v2/lint/rules/chartfile.go
Unescape View File

@ -161,7 +161,6 @@ func validateChartVersion(cf *chart.Metadata) error {
func validateChartVersionStrictSemVerV2(cf *chart.Metadata) error { func validateChartVersionStrictSemVerV2(cf *chart.Metadata) error {
_, err := semver.StrictNewVersion(cf.Version) _, err := semver.StrictNewVersion(cf.Version)
if err != nil { if err != nil {
return fmt.Errorf("version '%s' is not a valid SemVerV2", cf.Version) return fmt.Errorf("version '%s' is not a valid SemVerV2", cf.Version)
} }

26
pkg/chart/v2/lint/rules/chartfile_test.go
Unescape View File

@ -42,8 +42,10 @@ var (
nonExistingChartFilePath = filepath.Join(os.TempDir(), "Chart.yaml") nonExistingChartFilePath = filepath.Join(os.TempDir(), "Chart.yaml")
) )
var badChart, _ = chartutil.LoadChartfile(badChartFilePath) var (
var badChartName, _ = chartutil.LoadChartfile(badChartNamePath) badChart, _ = chartutil.LoadChartfile(badChartFilePath)
badChartName, _ = chartutil.LoadChartfile(badChartNamePath)
)
// Validation functions Test // Validation functions Test
func TestValidateChartYamlNotDirectory(t *testing.T) { func TestValidateChartYamlNotDirectory(t *testing.T) {
@ -63,7 +65,7 @@ func TestValidateChartName(t *testing.T) {
} }
func TestValidateChartVersion(t *testing.T) { func TestValidateChartVersion(t *testing.T) {
var failTest = []struct { failTest := []struct {
Version string Version string
ErrorMsg string ErrorMsg string
}{ }{
@ -73,7 +75,7 @@ func TestValidateChartVersion(t *testing.T) {
{"-3", "'-3' is not a valid SemVer"}, {"-3", "'-3' is not a valid SemVer"},
} }
var successTest = []string{"0.0.1", "0.0.1+build", "0.0.1-beta"} successTest := []string{"0.0.1", "0.0.1+build", "0.0.1-beta"}
for _, test := range failTest { for _, test := range failTest {
badChart.Version = test.Version badChart.Version = test.Version
@ -87,7 +89,7 @@ func TestValidateChartVersion(t *testing.T) {
} }
func TestValidateChartVersionStrictSemVerV2(t *testing.T) { func TestValidateChartVersionStrictSemVerV2(t *testing.T) {
var failTest = []struct { failTest := []struct {
Version string Version string
ErrorMsg string ErrorMsg string
}{ }{
@ -96,7 +98,7 @@ func TestValidateChartVersionStrictSemVerV2(t *testing.T) {
{"1.1", "version '1.1' is not a valid SemVerV2"}, {"1.1", "version '1.1' is not a valid SemVerV2"},
} }
var successTest = []string{"1.1.1", "0.0.1+build", "0.0.1-beta"} successTest := []string{"1.1.1", "0.0.1+build", "0.0.1-beta"}
for _, test := range failTest { for _, test := range failTest {
badChart.Version = test.Version badChart.Version = test.Version
@ -110,7 +112,7 @@ func TestValidateChartVersionStrictSemVerV2(t *testing.T) {
} }
func TestValidateChartMaintainer(t *testing.T) { func TestValidateChartMaintainer(t *testing.T) {
var failTest = []struct { failTest := []struct {
Name string Name string
Email string Email string
ErrorMsg string ErrorMsg string
@ -120,7 +122,7 @@ func TestValidateChartMaintainer(t *testing.T) {
{"John Snow", "wrongFormatEmail.com", "invalid email"}, {"John Snow", "wrongFormatEmail.com", "invalid email"},
} }
var successTest = []struct { successTest := []struct {
Name string Name string
Email string Email string
}{ }{
@ -144,8 +146,8 @@ func TestValidateChartMaintainer(t *testing.T) {
} }
func TestValidateChartSources(t *testing.T) { func TestValidateChartSources(t *testing.T) {
var failTest = []string{"", "RiverRun", "john@winterfell", "riverrun.io"} failTest := []string{"", "RiverRun", "john@winterfell", "riverrun.io"}
var successTest = []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish"} successTest := []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish"}
for _, test := range failTest { for _, test := range failTest {
badChart.Sources = []string{test} badChart.Sources = []string{test}
require.ErrorContainsf(t, validateChartSources(badChart), "invalid source URL", "validateChartSources(%s) to return \"invalid source URL\", got no error", test) require.ErrorContainsf(t, validateChartSources(badChart), "invalid source URL", "validateChartSources(%s) to return \"invalid source URL\", got no error", test)
@ -174,8 +176,8 @@ func TestValidateChartIconPresence(t *testing.T) {
} }
func TestValidateChartIconURL(t *testing.T) { func TestValidateChartIconURL(t *testing.T) {
var failTest = []string{"RiverRun", "john@winterfell", "riverrun.io"} failTest := []string{"RiverRun", "john@winterfell", "riverrun.io"}
var successTest = []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish.png"} successTest := []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish.png"}
for _, test := range failTest { for _, test := range failTest {
badChart.Icon = test badChart.Icon = test
require.ErrorContainsf(t, validateChartIconURL(badChart), "invalid icon URL", "validateChartIconURL(%s) to return \"invalid icon URL\", got no error", test) require.ErrorContainsf(t, validateChartIconURL(badChart), "invalid icon URL", "validateChartIconURL(%s) to return \"invalid icon URL\", got no error", test)

11
pkg/chart/v2/lint/rules/template_test.go
Unescape View File

@ -35,11 +35,11 @@ import (
const templateTestBasedir = "./testdata/albatross" const templateTestBasedir = "./testdata/albatross"
func TestValidateAllowedExtension(t *testing.T) { func TestValidateAllowedExtension(t *testing.T) {
var failTest = []string{"/foo", "/test.toml"} failTest := []string{"/foo", "/test.toml"}
for _, test := range failTest { for _, test := range failTest {
require.ErrorContainsf(t, validateAllowedExtension(test), "Valid extensions are .yaml, .yml, .tpl, or .txt", "validateAllowedExtension('%s') to return \"Valid extensions are .yaml, .yml, .tpl, or .txt\", got no error", test) require.ErrorContainsf(t, validateAllowedExtension(test), "Valid extensions are .yaml, .yml, .tpl, or .txt", "validateAllowedExtension('%s') to return \"Valid extensions are .yaml, .yml, .tpl, or .txt\", got no error", test)
} }
var successTest = []string{"/foo.yaml", "foo.yaml", "foo.tpl", "/foo/bar/baz.yaml", "NOTES.txt"} successTest := []string{"/foo.yaml", "foo.yaml", "foo.tpl", "/foo/bar/baz.yaml", "NOTES.txt"}
for _, test := range successTest { for _, test := range successTest {
assert.NoError(t, validateAllowedExtension(test), "validateAllowedExtension('%s') to return no error", test) assert.NoError(t, validateAllowedExtension(test), "validateAllowedExtension('%s') to return no error", test)
} }
@ -62,8 +62,10 @@ func TestTemplateParsing(t *testing.T) {
assert.ErrorContains(t, res[0].Err, "deliberateSyntaxError") assert.ErrorContains(t, res[0].Err, "deliberateSyntaxError")
} }
var wrongTemplatePath = filepath.Join(templateTestBasedir, "templates", "fail.yaml") var (
var ignoredTemplatePath = filepath.Join(templateTestBasedir, "fail.yaml.ignored") wrongTemplatePath = filepath.Join(templateTestBasedir, "templates", "fail.yaml")
ignoredTemplatePath = filepath.Join(templateTestBasedir, "fail.yaml.ignored")
)
// Test a template with all the existing features: // Test a template with all the existing features:
// namespaces, partial templates // namespaces, partial templates
@ -406,6 +408,7 @@ func TestEmptyWithCommentsManifests(t *testing.T) {
} }
require.Empty(t, linter.Messages, "Expected 0 lint errors") require.Empty(t, linter.Messages, "Expected 0 lint errors")
} }
func TestValidateListAnnotations(t *testing.T) { func TestValidateListAnnotations(t *testing.T) {
md := &k8sYamlStruct{ md := &k8sYamlStruct{
APIVersion: "v1", APIVersion: "v1",

2
pkg/chart/v2/lint/support/message_test.go
Unescape View File

@ -27,7 +27,7 @@ import (
var errLint = errors.New("lint failed") var errLint = errors.New("lint failed")
func TestRunLinterRule(t *testing.T) { func TestRunLinterRule(t *testing.T) {
var tests = []struct { tests := []struct {
Severity int Severity int
LintError error LintError error
ExpectedMessages int ExpectedMessages int

3
pkg/chart/v2/loader/load_test.go
Unescape View File

@ -182,7 +182,8 @@ func TestLoadFiles_BadCases(t *testing.T) {
Data: []byte(""), Data: []byte(""),
}, },
}, },
expectError: "validation: chart.metadata.apiVersion is required"}, expectError: "validation: chart.metadata.apiVersion is required",
},
} { } {
_, err := LoadFiles(tt.bufferedFiles) _, err := LoadFiles(tt.bufferedFiles)
require.Error(t, err, "expected error when load illegal files") require.Error(t, err, "expected error when load illegal files")

1
pkg/cmd/completion.go
Unescape View File

@ -29,6 +29,7 @@ import (
const completionDesc = ` const completionDesc = `
Generate autocompletion scripts for Helm for the specified shell. Generate autocompletion scripts for Helm for the specified shell.
` `
const bashCompDesc = ` const bashCompDesc = `
Generate the autocompletion script for Helm for the bash shell. Generate the autocompletion script for Helm for the bash shell.

3
pkg/cmd/dependency_build_test.go
Unescape View File

@ -59,7 +59,6 @@ func TestDependencyBuildCmd(t *testing.T) {
cmd := fmt.Sprintf("dependency build '%s' --repository-config %s --repository-cache %s --plain-http", filepath.Join(rootDir, chartname), repoFile, rootDir) cmd := fmt.Sprintf("dependency build '%s' --repository-config %s --repository-cache %s --plain-http", filepath.Join(rootDir, chartname), repoFile, rootDir)
_, out, err := executeActionCommand(cmd) _, out, err := executeActionCommand(cmd)
// In the first pass, we basically want the same results as an update. // In the first pass, we basically want the same results as an update.
if err != nil { if err != nil {
t.Logf("Output: %s", out) t.Logf("Output: %s", out)
@ -105,7 +104,6 @@ func TestDependencyBuildCmd(t *testing.T) {
skipRefreshCmd := fmt.Sprintf("dependency build '%s' --skip-refresh --repository-config %s --repository-cache %s --plain-http", filepath.Join(rootDir, chartname), repoFile, rootDir) skipRefreshCmd := fmt.Sprintf("dependency build '%s' --skip-refresh --repository-config %s --repository-cache %s --plain-http", filepath.Join(rootDir, chartname), repoFile, rootDir)
_, out, err = executeActionCommand(skipRefreshCmd) _, out, err = executeActionCommand(skipRefreshCmd)
// In this pass, we check --skip-refresh option becomes effective. // In this pass, we check --skip-refresh option becomes effective.
if err != nil { if err != nil {
t.Logf("Output: %s", out) t.Logf("Output: %s", out)
@ -136,7 +134,6 @@ func TestDependencyBuildCmdWithHelmV2Hash(t *testing.T) {
cmd := fmt.Sprintf("dependency build '%s'", chartName) cmd := fmt.Sprintf("dependency build '%s'", chartName)
_, out, err := executeActionCommand(cmd) _, out, err := executeActionCommand(cmd)
// Want to make sure the build can verify Helm v2 hash // Want to make sure the build can verify Helm v2 hash
if err != nil { if err != nil {
t.Logf("Output: %s", out) t.Logf("Output: %s", out)

12
pkg/cmd/dependency_test.go
Unescape View File

@ -39,16 +39,20 @@ func TestDependencyListCmd(t *testing.T) {
noDependencies.golden = "output/dependency-list-no-requirements-windows.txt" noDependencies.golden = "output/dependency-list-no-requirements-windows.txt"
} }
tests := []cmdTestCase{noSuchChart, tests := []cmdTestCase{
noDependencies, { noSuchChart,
noDependencies,
{
name: "Dependencies in chart dir", name: "Dependencies in chart dir",
cmd: "dependency list testdata/testcharts/reqtest", cmd: "dependency list testdata/testcharts/reqtest",
golden: "output/dependency-list.txt", golden: "output/dependency-list.txt",
}, { },
{
name: "Dependencies in chart archive", name: "Dependencies in chart archive",
cmd: "dependency list testdata/testcharts/reqtest-0.1.0.tgz", cmd: "dependency list testdata/testcharts/reqtest-0.1.0.tgz",
golden: "output/dependency-list-archive.txt", golden: "output/dependency-list-archive.txt",
}} },
}
runTestCmd(t, tests) runTestCmd(t, tests)
} }

1
pkg/cmd/dependency_update_test.go
Unescape View File

@ -209,7 +209,6 @@ func TestDependencyUpdateCmd_WithRepoThatWasNotAdded(t *testing.T) {
fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --content-cache %s", dir(chartname), fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --content-cache %s", dir(chartname),
dir("repositories.yaml"), dir(), contentCache), dir("repositories.yaml"), dir(), contentCache),
) )
if err != nil { if err != nil {
t.Logf("Output: %s", out) t.Logf("Output: %s", out)
t.Fatal(err) t.Fatal(err)

1
pkg/cmd/flags.go
Unescape View File

@ -152,7 +152,6 @@ func bindOutputFlag(cmd *cobra.Command, varRef *output.Format) {
sort.Strings(formatNames) sort.Strings(formatNames)
return formatNames, cobra.ShellCompDirectiveNoFileComp return formatNames, cobra.ShellCompDirectiveNoFileComp
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

1
pkg/cmd/get_hooks.go
Unescape View File

@ -75,7 +75,6 @@ func newGetHooksCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
} }
return nil, cobra.ShellCompDirectiveNoFileComp return nil, cobra.ShellCompDirectiveNoFileComp
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

1
pkg/cmd/get_manifest.go
Unescape View File

@ -71,7 +71,6 @@ func newGetManifestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
} }
return nil, cobra.ShellCompDirectiveNoFileComp return nil, cobra.ShellCompDirectiveNoFileComp
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

1
pkg/cmd/get_metadata.go
Unescape View File

@ -66,7 +66,6 @@ func newGetMetadataCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
} }
return nil, cobra.ShellCompDirectiveNoFileComp return nil, cobra.ShellCompDirectiveNoFileComp
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

1
pkg/cmd/get_notes.go
Unescape View File

@ -70,7 +70,6 @@ func newGetNotesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
} }
return nil, cobra.ShellCompDirectiveNoFileComp return nil, cobra.ShellCompDirectiveNoFileComp
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

1
pkg/cmd/get_values.go
Unescape View File

@ -69,7 +69,6 @@ func newGetValuesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
} }
return nil, cobra.ShellCompDirectiveNoFileComp return nil, cobra.ShellCompDirectiveNoFileComp
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

1
pkg/cmd/load_plugins.go
Unescape View File

@ -221,7 +221,6 @@ type pluginCommand struct {
func loadCompletionForPlugin(pluginCmd *cobra.Command, plug plugin.Plugin) { func loadCompletionForPlugin(pluginCmd *cobra.Command, plug plugin.Plugin) {
// Parse the yaml file providing the plugin's sub-commands and flags // Parse the yaml file providing the plugin's sub-commands and flags
cmds, err := loadFile(plug.Dir() + string(filepath.Separator) + pluginStaticCompletionFile) cmds, err := loadFile(plug.Dir() + string(filepath.Separator) + pluginStaticCompletionFile)
if err != nil { if err != nil {
// The file could be missing or invalid. No static completion for this plugin. // The file could be missing or invalid. No static completion for this plugin.
slog.Debug("plugin completion file loading", slog.String("error", err.Error())) slog.Debug("plugin completion file loading", slog.String("error", err.Error()))

1
pkg/cmd/pull.go
Unescape View File

@ -97,7 +97,6 @@ func newPullCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
} }
return compVersionFlag(args[0], toComplete) return compVersionFlag(args[0], toComplete)
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

3
pkg/cmd/pull_test.go
Unescape View File

@ -268,7 +268,8 @@ func runPullTests(t *testing.T, tests []struct {
wantErrorMsg string wantErrorMsg string
expectFile string expectFile string
expectDir bool expectDir bool
}, outdir string, additionalFlags string) { }, outdir string, additionalFlags string,
) {
t.Helper() t.Helper()
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {

1
pkg/cmd/push.go
Unescape View File

@ -73,7 +73,6 @@ func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
registryClient, err := newRegistryClient( registryClient, err := newRegistryClient(
out, o.certFile, o.keyFile, o.caFile, o.insecureSkipTLSVerify, o.plainHTTP, o.username, o.password, out, o.certFile, o.keyFile, o.caFile, o.insecureSkipTLSVerify, o.plainHTTP, o.username, o.password,
) )
if err != nil { if err != nil {
return fmt.Errorf("missing registry client: %w", err) return fmt.Errorf("missing registry client: %w", err)
} }

4
pkg/cmd/repo_remove_test.go
Unescape View File

@ -76,7 +76,7 @@ func TestRepoRemove(t *testing.T) {
assert.Falsef(t, f.Has(testRepoName), "%s was not successfully removed from repositories list", testRepoName) assert.Falsef(t, f.Has(testRepoName), "%s was not successfully removed from repositories list", testRepoName)
// Test removal of multiple repos in one go // Test removal of multiple repos in one go
var testRepoNames = []string{"foo", "bar", "baz"} testRepoNames := []string{"foo", "bar", "baz"}
cacheFiles := make(map[string][]string, len(testRepoNames)) cacheFiles := make(map[string][]string, len(testRepoNames))
// Add test repos // Add test repos
@ -151,7 +151,7 @@ func TestRepoRemoveCompletion(t *testing.T) {
repoFile := filepath.Join(rootDir, "repositories.yaml") repoFile := filepath.Join(rootDir, "repositories.yaml")
repoCache := filepath.Join(rootDir, "cache") repoCache := filepath.Join(rootDir, "cache")
var testRepoNames = []string{"foo", "bar", "baz"} testRepoNames := []string{"foo", "bar", "baz"}
// Add test repos // Add test repos
for _, repoName := range testRepoNames { for _, repoName := range testRepoNames {

2
pkg/cmd/repo_update_test.go
Unescape View File

@ -159,7 +159,7 @@ func TestUpdateChartsFailWithError(t *testing.T) {
) )
defer ts.Stop() defer ts.Stop()
var invalidURL = ts.URL() + "55" invalidURL := ts.URL() + "55"
r1, err := repo.NewChartRepository(&repo.Entry{ r1, err := repo.NewChartRepository(&repo.Entry{
Name: "charts", Name: "charts",
URL: invalidURL, URL: invalidURL,

3
pkg/cmd/root.go
Unescape View File

@ -229,7 +229,6 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
} }
return nil, cobra.ShellCompDirectiveDefault return nil, cobra.ShellCompDirectiveDefault
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -253,7 +252,6 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
} }
return nil, cobra.ShellCompDirectiveNoFileComp return nil, cobra.ShellCompDirectiveNoFileComp
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -446,7 +444,6 @@ func newRegistryClientWithTLS(
tlsutil.WithCertKeyPairFiles(certFile, keyFile), tlsutil.WithCertKeyPairFiles(certFile, keyFile),
tlsutil.WithCAFile(caFile), tlsutil.WithCAFile(caFile),
) )
if err != nil { if err != nil {
return nil, fmt.Errorf("can't create TLS config for client: %w", err) return nil, fmt.Errorf("can't create TLS config for client: %w", err)
} }

10
pkg/cmd/search_hub_test.go
Unescape View File

@ -28,7 +28,7 @@ import (
func TestSearchHubCmd(t *testing.T) { func TestSearchHubCmd(t *testing.T) {
// Setup a mock search service // Setup a mock search service
var searchResult = `{"data":[{"id":"stable/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"stable","url":"https://charts.helm.sh/stable"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/stable/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T17:57:31.38Z","digest":"119c499251bffd4b06ff0cd5ac98c2ce32231f84899fb4825be6c2d90971c742","urls":["https://charts.helm.sh/stable/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/stable/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/stable/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/stable/phpmyadmin/versions/3.0.0"}}}},{"id":"bitnami/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"bitnami","url":"https://charts.bitnami.com"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/bitnami/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T18:34:13.341Z","digest":"66d77cf6d8c2b52c488d0a294cd4996bd5bad8dc41d3829c394498fb401c008a","urls":["https://charts.bitnami.com/bitnami/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/bitnami/phpmyadmin/versions/3.0.0"}}}}]}` searchResult := `{"data":[{"id":"stable/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"stable","url":"https://charts.helm.sh/stable"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/stable/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T17:57:31.38Z","digest":"119c499251bffd4b06ff0cd5ac98c2ce32231f84899fb4825be6c2d90971c742","urls":["https://charts.helm.sh/stable/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/stable/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/stable/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/stable/phpmyadmin/versions/3.0.0"}}}},{"id":"bitnami/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"bitnami","url":"https://charts.bitnami.com"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/bitnami/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T18:34:13.341Z","digest":"66d77cf6d8c2b52c488d0a294cd4996bd5bad8dc41d3829c394498fb401c008a","urls":["https://charts.bitnami.com/bitnami/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/bitnami/phpmyadmin/versions/3.0.0"}}}}]}`
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
fmt.Fprintln(w, searchResult) fmt.Fprintln(w, searchResult)
})) }))
@ -37,7 +37,7 @@ func TestSearchHubCmd(t *testing.T) {
// The expected output has the URL to the mocked search service in it // The expected output has the URL to the mocked search service in it
// Trailing spaces are necessary to preserve in "expected" as the uitable package adds // Trailing spaces are necessary to preserve in "expected" as the uitable package adds
// them during printing. // them during printing.
var expected = fmt.Sprintf(`URL CHART VERSION APP VERSION DESCRIPTION expected := fmt.Sprintf(`URL CHART VERSION APP VERSION DESCRIPTION
%s/charts/stable/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend %s/charts/stable/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend
%s/charts/bitnami/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend %s/charts/bitnami/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend
`, ts.URL, ts.URL) `, ts.URL, ts.URL)
@ -51,7 +51,7 @@ func TestSearchHubCmd(t *testing.T) {
func TestSearchHubListRepoCmd(t *testing.T) { func TestSearchHubListRepoCmd(t *testing.T) {
// Setup a mock search service // Setup a mock search service
var searchResult = `{"data":[{"id":"stable/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"stable","url":"https://charts.helm.sh/stable"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/stable/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T17:57:31.38Z","digest":"119c499251bffd4b06ff0cd5ac98c2ce32231f84899fb4825be6c2d90971c742","urls":["https://charts.helm.sh/stable/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/stable/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/stable/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/stable/phpmyadmin/versions/3.0.0"}}}},{"id":"bitnami/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"bitnami","url":"https://charts.bitnami.com"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/bitnami/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T18:34:13.341Z","digest":"66d77cf6d8c2b52c488d0a294cd4996bd5bad8dc41d3829c394498fb401c008a","urls":["https://charts.bitnami.com/bitnami/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/bitnami/phpmyadmin/versions/3.0.0"}}}}]}` searchResult := `{"data":[{"id":"stable/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"stable","url":"https://charts.helm.sh/stable"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/stable/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T17:57:31.38Z","digest":"119c499251bffd4b06ff0cd5ac98c2ce32231f84899fb4825be6c2d90971c742","urls":["https://charts.helm.sh/stable/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/stable/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/stable/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/stable/phpmyadmin/versions/3.0.0"}}}},{"id":"bitnami/phpmyadmin","type":"chart","attributes":{"name":"phpmyadmin","repo":{"name":"bitnami","url":"https://charts.bitnami.com"},"description":"phpMyAdmin is an mysql administration frontend","home":"https://www.phpmyadmin.net/","keywords":["mariadb","mysql","phpmyadmin"],"maintainers":[{"name":"Bitnami","email":"containers@bitnami.com"}],"sources":["https://github.com/bitnami/bitnami-docker-phpmyadmin"],"icon":""},"links":{"self":"/v1/charts/bitnami/phpmyadmin"},"relationships":{"latestChartVersion":{"data":{"version":"3.0.0","app_version":"4.9.0-1","created":"2019-08-08T18:34:13.341Z","digest":"66d77cf6d8c2b52c488d0a294cd4996bd5bad8dc41d3829c394498fb401c008a","urls":["https://charts.bitnami.com/bitnami/phpmyadmin-3.0.0.tgz"],"readme":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/README.md","values":"/v1/assets/bitnami/phpmyadmin/versions/3.0.0/values.yaml"},"links":{"self":"/v1/charts/bitnami/phpmyadmin/versions/3.0.0"}}}}]}`
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
fmt.Fprintln(w, searchResult) fmt.Fprintln(w, searchResult)
})) }))
@ -60,7 +60,7 @@ func TestSearchHubListRepoCmd(t *testing.T) {
// The expected output has the URL to the mocked search service in it // The expected output has the URL to the mocked search service in it
// Trailing spaces are necessary to preserve in "expected" as the uitable package adds // Trailing spaces are necessary to preserve in "expected" as the uitable package adds
// them during printing. // them during printing.
var expected = fmt.Sprintf(`URL CHART VERSION APP VERSION DESCRIPTION REPO URL expected := fmt.Sprintf(`URL CHART VERSION APP VERSION DESCRIPTION REPO URL
%s/charts/stable/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend https://charts.helm.sh/stable %s/charts/stable/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend https://charts.helm.sh/stable
%s/charts/bitnami/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend https://charts.bitnami.com %s/charts/bitnami/phpmyadmin 3.0.0 4.9.0-1 phpMyAdmin is an mysql administration frontend https://charts.bitnami.com
`, ts.URL, ts.URL) `, ts.URL, ts.URL)
@ -96,7 +96,7 @@ func TestSearchHubCmd_FailOnNoResponseTests(t *testing.T) {
wantErr bool wantErr bool
} }
var tests = []testCase{ tests := []testCase{
{ {
name: "Search hub with no results in response", name: "Search hub with no results in response",
cmd: `search hub maria`, cmd: `search hub maria`,

3
pkg/cmd/search_repo_test.go
Unescape View File

@ -61,7 +61,8 @@ func TestSearchRepositoriesCmd(t *testing.T) {
cmd: "search repo syzygy --fail-on-no-result", cmd: "search repo syzygy --fail-on-no-result",
golden: "output/search-not-found-error.txt", golden: "output/search-not-found-error.txt",
wantError: true, wantError: true,
}, {name: "search for 'syzygy' with json output and --fail-on-no-result, expect failure for no results", }, {
name: "search for 'syzygy' with json output and --fail-on-no-result, expect failure for no results",
cmd: "search repo syzygy --output json --fail-on-no-result", cmd: "search repo syzygy --output json --fail-on-no-result",
golden: "output/search-not-found-error.txt", golden: "output/search-not-found-error.txt",
wantError: true, wantError: true,

1
pkg/cmd/show.go
Unescape View File

@ -205,7 +205,6 @@ func addShowFlags(subCmd *cobra.Command, client *action.Show) {
} }
return compVersionFlag(args[0], toComplete) return compVersionFlag(args[0], toComplete)
}) })
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

3
pkg/cmd/status_test.go
Unescape View File

@ -185,7 +185,8 @@ func TestStatusCompletion(t *testing.T) {
Version: "1.2.3-prerelease", Version: "1.2.3-prerelease",
}, },
}, },
}} },
}
tests := []cmdTestCase{{ tests := []cmdTestCase{{
name: "completion for status", name: "completion for status",

1
pkg/cmd/template.go
Unescape View File

@ -254,7 +254,6 @@ func writeToFile(outputDir string, name string, data string, appendData bool) er
defer f.Close() defer f.Close()
_, err = fmt.Fprintf(f, "---\n# Source: %s\n%s\n", name, data) _, err = fmt.Fprintf(f, "---\n# Source: %s\n%s\n", name, data)
if err != nil { if err != nil {
return err return err
} }

8
pkg/engine/engine.go
Unescape View File

@ -143,9 +143,11 @@ type renderable struct {
basePath string basePath string
} }
const warnStartDelim = "HELM_ERR_START" const (
const warnEndDelim = "HELM_ERR_END" warnStartDelim = "HELM_ERR_START"
const recursionMaxNums = 1000 warnEndDelim = "HELM_ERR_END"
recursionMaxNums = 1000
)
var warnRegex = regexp.MustCompile(warnStartDelim + `((?s).*)` + warnEndDelim) var warnRegex = regexp.MustCompile(warnStartDelim + `((?s).*)` + warnEndDelim)

1
pkg/engine/engine_test.go
Unescape View File

@ -1278,6 +1278,7 @@ func TestTraceableError_SimpleForm(t *testing.T) {
assert.Equal(t, "error calling include", trace.message, "Expected %q, got %q", errString, trace.message) assert.Equal(t, "error calling include", trace.message, "Expected %q, got %q", errString, trace.message)
} }
} }
func TestTraceableError_ExecutingForm(t *testing.T) { func TestTraceableError_ExecutingForm(t *testing.T) {
testStrings := [][]string{ testStrings := [][]string{
{"function_not_found/templates/secret.yaml:6:11: executing \"function_not_found/templates/secret.yaml\" at <include \"name\" .>: ", "function_not_found/templates/secret.yaml:6:11"}, {"function_not_found/templates/secret.yaml:6:11: executing \"function_not_found/templates/secret.yaml\" at <include \"name\" .>: ", "function_not_found/templates/secret.yaml:6:11"},

1
pkg/engine/funcs.go
Unescape View File

@ -130,7 +130,6 @@ func toYAMLPretty(v any) string {
encoder := goYaml.NewEncoder(&data) encoder := goYaml.NewEncoder(&data)
encoder.SetIndent(2) encoder.SetIndent(2)
err := encoder.Encode(v) err := encoder.Encode(v)
if err != nil { if err != nil {
// Swallow errors inside of a template. // Swallow errors inside of a template.
return "" return ""

152
pkg/engine/funcs_test.go
Unescape View File

@ -147,39 +147,40 @@ keyInElement1 = "valueInElement1"`,
tpl string tpl string
expect any expect any
vars any vars any
}{{ }{
tpl: `{{ mustToYaml . }}`, {
vars: loopMap, tpl: `{{ mustToYaml . }}`,
}, { vars: loopMap,
tpl: `{{ mustToJson . }}`, }, {
vars: loopMap, tpl: `{{ mustToJson . }}`,
}, { vars: loopMap,
tpl: `{{ mustToDuration 30 }}`, }, {
expect: `30s`, tpl: `{{ mustToDuration 30 }}`,
vars: nil, expect: `30s`,
}, { vars: nil,
tpl: `{{ mustToDuration "1m30s" }}`, }, {
expect: `1m30s`, tpl: `{{ mustToDuration "1m30s" }}`,
vars: nil, expect: `1m30s`,
}, { vars: nil,
tpl: `{{ mustToDuration "foo" }}`, }, {
vars: nil, tpl: `{{ mustToDuration "foo" }}`,
}, { vars: nil,
tpl: `{{ toYaml . }}`, }, {
expect: "", // should return empty string and swallow error tpl: `{{ toYaml . }}`,
vars: loopMap, expect: "", // should return empty string and swallow error
}, { vars: loopMap,
tpl: `{{ toJson . }}`, }, {
expect: "", // should return empty string and swallow error tpl: `{{ toJson . }}`,
vars: loopMap, expect: "", // should return empty string and swallow error
}, { vars: loopMap,
tpl: `{{ mustToToml . }}`, }, {
vars: map[int]string{1: "one"}, // non-string key is invalid in TOML tpl: `{{ mustToToml . }}`,
}, { vars: map[int]string{1: "one"}, // non-string key is invalid in TOML
tpl: `{{ mustToToml . }}`, }, {
expect: "foo = \"bar\"\n", // should succeed and return TOML string tpl: `{{ mustToToml . }}`,
vars: map[string]string{"foo": "bar"}, expect: "foo = \"bar\"\n", // should succeed and return TOML string
}, vars: map[string]string{"foo": "bar"},
},
} }
for _, tt := range mustFuncsTests { for _, tt := range mustFuncsTests {
@ -368,48 +369,49 @@ func TestDurationHelpers(t *testing.T) {
name string name string
tpl string tpl string
vars any vars any
}{{ }{
name: "mustToDuration invalid string", {
tpl: `{{ mustToDuration "nope" }}`, name: "mustToDuration invalid string",
}, { tpl: `{{ mustToDuration "nope" }}`,
name: "mustToDuration empty string", }, {
tpl: `{{ mustToDuration "" }}`, name: "mustToDuration empty string",
}, { tpl: `{{ mustToDuration "" }}`,
name: "mustToDuration whitespace string", }, {
tpl: `{{ mustToDuration " " }}`, name: "mustToDuration whitespace string",
}, { tpl: `{{ mustToDuration " " }}`,
name: "mustToDuration unsupported type", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration unsupported type",
vars: []int{1, 2, 3}, tpl: `{{ mustToDuration . }}`,
}, { vars: []int{1, 2, 3},
name: "mustToDuration uint overflow", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration uint overflow",
vars: uint64(math.MaxInt64) + 1, tpl: `{{ mustToDuration . }}`,
}, { vars: uint64(math.MaxInt64) + 1,
name: "mustToDuration int overflow", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration int overflow",
vars: maxDurationSeconds + 1, tpl: `{{ mustToDuration . }}`,
}, { vars: maxDurationSeconds + 1,
name: "mustToDuration int underflow", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration int underflow",
vars: minDurationSeconds - 1, tpl: `{{ mustToDuration . }}`,
}, { vars: minDurationSeconds - 1,
name: "mustToDuration float overflow", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration float overflow",
vars: maxDurationSecondsFloat + 0.5, tpl: `{{ mustToDuration . }}`,
}, { vars: maxDurationSecondsFloat + 0.5,
name: "mustToDuration float underflow", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration float underflow",
vars: minDurationSecondsFloat - 0.5, tpl: `{{ mustToDuration . }}`,
}, { vars: minDurationSecondsFloat - 0.5,
name: "mustToDuration NaN", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration NaN",
vars: math.NaN(), tpl: `{{ mustToDuration . }}`,
}, { vars: math.NaN(),
name: "mustToDuration Inf", }, {
tpl: `{{ mustToDuration . }}`, name: "mustToDuration Inf",
vars: math.Inf(-1), tpl: `{{ mustToDuration . }}`,
}, vars: math.Inf(-1),
},
} }
for _, tt := range mustErrTests { for _, tt := range mustErrTests {

1
pkg/getter/ocigetter.go
Unescape View File

@ -165,7 +165,6 @@ func (g *OCIGetter) newRegistryClient() (*registry.Client, error) {
} }
client, err := registry.NewClient(opts...) client, err := registry.NewClient(opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }

1
pkg/getter/plugingetter.go
Unescape View File

@ -19,7 +19,6 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"net/url" "net/url"
"helm.sh/helm/v4/internal/plugin" "helm.sh/helm/v4/internal/plugin"

1
pkg/getter/plugingetter_test.go
Unescape View File

@ -17,7 +17,6 @@ package getter
import ( import (
"context" "context"
"testing" "testing"
"time" "time"

6
pkg/kube/client.go
Unescape View File

@ -127,8 +127,10 @@ const (
FieldValidationDirectiveStrict FieldValidationDirective = "Strict" FieldValidationDirectiveStrict FieldValidationDirective = "Strict"
) )
type CreateApplyFunc func(target *resource.Info) error type (
type UpdateApplyFunc func(original, target *resource.Info) error CreateApplyFunc func(target *resource.Info) error
UpdateApplyFunc func(original, target *resource.Info) error
)
func init() { func init() {
// Add CRDs to the scheme. They are missing by default. // Add CRDs to the scheme. They are missing by default.

3
pkg/kube/client_test.go
Unescape View File

@ -2260,7 +2260,8 @@ metadata:
} }
func createManifest(t *testing.T, manifest string, func createManifest(t *testing.T, manifest string,
fakeMapper meta.RESTMapper, fakeClient *dynamicfake.FakeDynamicClient) { fakeMapper meta.RESTMapper, fakeClient *dynamicfake.FakeDynamicClient,
) {
t.Helper() t.Helper()
m := make(map[string]any) m := make(map[string]any)

8
pkg/kube/converter.go
Unescape View File

@ -28,8 +28,10 @@ import (
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
) )
var k8sNativeScheme *runtime.Scheme var (
var k8sNativeSchemeOnce sync.Once k8sNativeScheme *runtime.Scheme
k8sNativeSchemeOnce sync.Once
)
// AsVersioned converts the given info into a runtime.Object with the correct // AsVersioned converts the given info into a runtime.Object with the correct
// group and version set // group and version set
@ -41,7 +43,7 @@ func AsVersioned(info *resource.Info) runtime.Object {
// RESTMapping. If no mapping is provided, the default schema versioner is used // RESTMapping. If no mapping is provided, the default schema versioner is used
func convertWithMapper(obj runtime.Object, mapping *meta.RESTMapping) runtime.Object { func convertWithMapper(obj runtime.Object, mapping *meta.RESTMapping) runtime.Object {
s := kubernetesNativeScheme() s := kubernetesNativeScheme()
var gv = runtime.GroupVersioner(schema.GroupVersions(s.PrioritizedVersionsAllGroups())) gv := runtime.GroupVersioner(schema.GroupVersions(s.PrioritizedVersionsAllGroups()))
if mapping != nil { if mapping != nil {
gv = mapping.GroupVersionKind.GroupVersion() gv = mapping.GroupVersionKind.GroupVersion()
} }

1
pkg/provenance/sign.go
Unescape View File

@ -218,7 +218,6 @@ func (s *Signatory) ClearSign(archiveData []byte, filename string, metadataBytes
} }
_, err = io.Copy(w, b) _, err = io.Copy(w, b)
if err != nil { if err != nil {
// NB: We intentionally don't call `w.Close()` here! `w.Close()` is the method which // NB: We intentionally don't call `w.Close()` here! `w.Close()` is the method which
// actually does the PGP signing, and therefore is the part which uses the private key. // actually does the PGP signing, and therefore is the part which uses the private key.

4
pkg/registry/client.go
Unescape View File

@ -329,7 +329,6 @@ func ensureTLSConfig(client *auth.Client, setConfig *tls.Config) (*tls.Config, e
func LoginOptInsecure(insecure bool) LoginOption { func LoginOptInsecure(insecure bool) LoginOption {
return func(o *loginOperation) { return func(o *loginOperation) {
tlsConfig, err := ensureTLSConfig(o.client.authorizer, nil) tlsConfig, err := ensureTLSConfig(o.client.authorizer, nil)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -909,7 +908,8 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (string, *ur
// tagManifest prepares and tags a manifest in memory storage // tagManifest prepares and tags a manifest in memory storage
func (c *Client) tagManifest(ctx context.Context, memoryStore *memory.Store, func (c *Client) tagManifest(ctx context.Context, memoryStore *memory.Store,
configDescriptor ocispec.Descriptor, layers []ocispec.Descriptor, configDescriptor ocispec.Descriptor, layers []ocispec.Descriptor,
ociAnnotations map[string]string, parsedRef reference) (ocispec.Descriptor, error) { ociAnnotations map[string]string, parsedRef reference,
) (ocispec.Descriptor, error) {
manifest := ocispec.Manifest{ manifest := ocispec.Manifest{
Versioned: specs.Versioned{SchemaVersion: 2}, Versioned: specs.Versioned{SchemaVersion: 2},
Config: configDescriptor, Config: configDescriptor,

1
pkg/registry/client_scope_test.go
Unescape View File

@ -40,6 +40,7 @@ func (suite *RegistryScopeTestSuite) SetupSuite() {
// when the registry itself was reached over https. // when the registry itself was reached over https.
setup(&suite.TestRegistry, false, false, "token") setup(&suite.TestRegistry, false, false, "token")
} }
func (suite *RegistryScopeTestSuite) TearDownSuite() { func (suite *RegistryScopeTestSuite) TearDownSuite() {
teardown(&suite.TestRegistry) teardown(&suite.TestRegistry)
os.RemoveAll(suite.WorkspaceDir) os.RemoveAll(suite.WorkspaceDir)

4
pkg/release/common.go
Unescape View File

@ -77,7 +77,7 @@ func (a *v1Accessor) Version() int {
} }
func (a *v1Accessor) Hooks() []Hook { func (a *v1Accessor) Hooks() []Hook {
var hooks = make([]Hook, len(a.rel.Hooks)) hooks := make([]Hook, len(a.rel.Hooks))
for i, h := range a.rel.Hooks { for i, h := range a.rel.Hooks {
hooks[i] = h hooks[i] = h
} }
@ -141,7 +141,7 @@ func (a *v2Accessor) Version() int {
} }
func (a *v2Accessor) Hooks() []Hook { func (a *v2Accessor) Hooks() []Hook {
var hooks = make([]Hook, len(a.rel.Hooks)) hooks := make([]Hook, len(a.rel.Hooks))
for i, h := range a.rel.Hooks { for i, h := range a.rel.Hooks {
hooks[i] = h hooks[i] = h
} }

6
pkg/release/v1/release.go
Unescape View File

@ -22,8 +22,10 @@ import (
type ApplyMethod string type ApplyMethod string
const ApplyMethodClientSideApply ApplyMethod = "csa" const (
const ApplyMethodServerSideApply ApplyMethod = "ssa" ApplyMethodClientSideApply ApplyMethod = "csa"
ApplyMethodServerSideApply ApplyMethod = "ssa"
)
// Release describes a deployment of a chart, together with the chart // Release describes a deployment of a chart, together with the chart
// and the variables used to deploy that chart. // and the variables used to deploy that chart.

15
pkg/release/v1/util/manifest_sorter_test.go
Unescape View File

@ -61,7 +61,8 @@ metadata:
annotations: annotations:
"helm.sh/hook": post-install "helm.sh/hook": post-install
`, `,
}, { },
{
name: []string{"third"}, name: []string{"third"},
path: "three", path: "three",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
@ -73,7 +74,8 @@ metadata:
annotations: annotations:
"helm.sh/hook": no-such-hook "helm.sh/hook": no-such-hook
`, `,
}, { },
{
name: []string{"fourth"}, name: []string{"fourth"},
path: "four", path: "four",
kind: []string{"Pod"}, kind: []string{"Pod"},
@ -84,7 +86,8 @@ metadata:
name: fourth name: fourth
annotations: annotations:
nothing: here`, nothing: here`,
}, { },
{
name: []string{"fifth"}, name: []string{"fifth"},
path: "five", path: "five",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
@ -96,14 +99,16 @@ metadata:
annotations: annotations:
"helm.sh/hook": post-delete, post-install "helm.sh/hook": post-delete, post-install
`, `,
}, { },
{
// Regression test: files with an underscore in the base name should be skipped. // Regression test: files with an underscore in the base name should be skipped.
name: []string{"sixth"}, name: []string{"sixth"},
path: "six/_six", path: "six/_six",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
hooks: map[string][]release.HookEvent{"sixth": nil}, hooks: map[string][]release.HookEvent{"sixth": nil},
manifest: `invalid manifest`, // This will fail if partial is not skipped. manifest: `invalid manifest`, // This will fail if partial is not skipped.
}, { },
{
// Regression test: files with no content should be skipped. // Regression test: files with no content should be skipped.
name: []string{"seventh"}, name: []string{"seventh"},
path: "seven", path: "seven",

2
pkg/repo/v1/index_test.go
Unescape View File

@ -424,7 +424,6 @@ func TestIndexAdd(t *testing.T) {
baseURL string baseURL string
digest string digest string
}{ }{
{&chart.Metadata{APIVersion: "v2", Name: "clipper", Version: "0.1.0"}, "clipper-0.1.0.tgz", "http://example.com/charts", "sha256:1234567890"}, {&chart.Metadata{APIVersion: "v2", Name: "clipper", Version: "0.1.0"}, "clipper-0.1.0.tgz", "http://example.com/charts", "sha256:1234567890"},
{&chart.Metadata{APIVersion: "v2", Name: "alpine", Version: "0.1.0"}, "/home/charts/alpine-0.1.0.tgz", "http://example.com/charts", "sha256:1234567890"}, {&chart.Metadata{APIVersion: "v2", Name: "alpine", Version: "0.1.0"}, "/home/charts/alpine-0.1.0.tgz", "http://example.com/charts", "sha256:1234567890"},
{&chart.Metadata{APIVersion: "v2", Name: "deis", Version: "0.1.0"}, "/home/charts/deis-0.1.0.tgz", "http://example.com/charts/", "sha256:1234567890"}, {&chart.Metadata{APIVersion: "v2", Name: "deis", Version: "0.1.0"}, "/home/charts/deis-0.1.0.tgz", "http://example.com/charts/", "sha256:1234567890"},
@ -536,6 +535,7 @@ entries:
home: https://github.com/something/else home: https://github.com/something/else
digest: "sha256:1234567890abcdef" digest: "sha256:1234567890abcdef"
` `
var indexWithDuplicatesInLastChartDeps = ` var indexWithDuplicatesInLastChartDeps = `
apiVersion: v1 apiVersion: v1
entries: entries:

10
pkg/repo/v1/repo_test.go
Unescape View File

@ -137,15 +137,17 @@ func TestUpdateRepository(t *testing.T) {
}, },
) )
newRepoName := "sample" newRepoName := "sample"
sampleRepository.Update(&Entry{Name: newRepoName, sampleRepository.Update(&Entry{
URL: "https://example.com/sample", Name: newRepoName,
URL: "https://example.com/sample",
}) })
assert.Truef(t, sampleRepository.Has(newRepoName), "expected repository %s not found", newRepoName) assert.Truef(t, sampleRepository.Has(newRepoName), "expected repository %s not found", newRepoName)
repoCount := len(sampleRepository.Repositories) repoCount := len(sampleRepository.Repositories)
sampleRepository.Update(&Entry{Name: newRepoName, sampleRepository.Update(&Entry{
URL: "https://example.com/sample", Name: newRepoName,
URL: "https://example.com/sample",
}) })
assert.Lenf(t, sampleRepository.Repositories, repoCount, "invalid number of repositories found %d, expected number of repositories %d", len(sampleRepository.Repositories), repoCount) assert.Lenf(t, sampleRepository.Repositories, repoCount, "invalid number of repositories found %d, expected number of repositories %d", len(sampleRepository.Repositories), repoCount)

2
pkg/storage/driver/labels_test.go
Unescape View File

@ -23,7 +23,7 @@ import (
) )
func TestLabelsMatch(t *testing.T) { func TestLabelsMatch(t *testing.T) {
var tests = []struct { tests := []struct {
desc string desc string
set1 labels set1 labels
set2 labels set2 labels

10
pkg/storage/driver/memory_test.go
Unescape View File

@ -34,7 +34,7 @@ func TestMemoryName(t *testing.T) {
} }
func TestMemoryCreate(t *testing.T) { func TestMemoryCreate(t *testing.T) {
var tests = []struct { tests := []struct {
desc string desc string
rls *rspb.Release rls *rspb.Release
err bool err bool
@ -76,7 +76,7 @@ func TestMemoryCreate(t *testing.T) {
} }
func TestMemoryGet(t *testing.T) { func TestMemoryGet(t *testing.T) {
var tests = []struct { tests := []struct {
desc string desc string
key string key string
namespace string namespace string
@ -133,7 +133,7 @@ func TestMemoryList(t *testing.T) {
} }
func TestMemoryQuery(t *testing.T) { func TestMemoryQuery(t *testing.T) {
var tests = []struct { tests := []struct {
desc string desc string
xlen int xlen int
namespace string namespace string
@ -164,7 +164,7 @@ func TestMemoryQuery(t *testing.T) {
} }
func TestMemoryUpdate(t *testing.T) { func TestMemoryUpdate(t *testing.T) {
var tests = []struct { tests := []struct {
desc string desc string
key string key string
rls *rspb.Release rls *rspb.Release
@ -215,7 +215,7 @@ func TestMemoryUpdate(t *testing.T) {
} }
func TestMemoryDelete(t *testing.T) { func TestMemoryDelete(t *testing.T) {
var tests = []struct { tests := []struct {
desc string desc string
key string key string
namespace string namespace string

12
pkg/storage/driver/records_test.go
Unescape View File

@ -31,7 +31,7 @@ func TestRecordsAdd(t *testing.T) {
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)),
}) })
var tests = []struct { tests := []struct {
desc string desc string
key string key string
ok bool ok bool
@ -62,7 +62,7 @@ func TestRecordsAdd(t *testing.T) {
} }
func TestRecordsRemove(t *testing.T) { func TestRecordsRemove(t *testing.T) {
var tests = []struct { tests := []struct {
desc string desc string
key string key string
ok bool ok bool
@ -112,7 +112,7 @@ func TestRecordsGet(t *testing.T) {
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)),
}) })
var tests = []struct { tests := []struct {
desc string desc string
key string key string
rec *record rec *record
@ -141,7 +141,7 @@ func TestRecordsIndex(t *testing.T) {
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)),
}) })
var tests = []struct { tests := []struct {
desc string desc string
key string key string
sort int sort int
@ -170,7 +170,7 @@ func TestRecordsExists(t *testing.T) {
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)),
}) })
var tests = []struct { tests := []struct {
desc string desc string
key string key string
ok bool ok bool
@ -199,7 +199,7 @@ func TestRecordsReplace(t *testing.T) {
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", common.StatusDeployed)),
}) })
var tests = []struct { tests := []struct {
desc string desc string
key string key string
rec *record rec *record

21
pkg/storage/driver/sql.go
Unescape View File

@ -53,8 +53,10 @@ const postgreSQLDialect = "postgres"
// SQLDriverName is the string name of this driver. // SQLDriverName is the string name of this driver.
const SQLDriverName = "SQL" const SQLDriverName = "SQL"
const sqlReleaseTableName = "releases_v1" const (
const sqlCustomLabelsTableName = "custom_labels_v1" sqlReleaseTableName = "releases_v1"
sqlCustomLabelsTableName = "custom_labels_v1"
)
const ( const (
sqlReleaseTableKeyColumn = "key" sqlReleaseTableKeyColumn = "key"
@ -359,7 +361,7 @@ func (s *SQL) List(filter func(release.Releaser) bool) ([]release.Releaser, erro
return nil, err return nil, err
} }
var records = []SQLReleaseWrapper{} records := []SQLReleaseWrapper{}
if err := s.db.Select(&records, query, args...); err != nil { if err := s.db.Select(&records, query, args...); err != nil {
s.Logger().Debug("failed to list", slog.Any("error", err)) s.Logger().Debug("failed to list", slog.Any("error", err))
return nil, err return nil, err
@ -424,7 +426,7 @@ func (s *SQL) Query(labels map[string]string) ([]release.Releaser, error) {
return nil, err return nil, err
} }
var records = []SQLReleaseWrapper{} records := []SQLReleaseWrapper{}
if err := s.db.Select(&records, query, args...); err != nil { if err := s.db.Select(&records, query, args...); err != nil {
s.Logger().Debug("failed to query with labels", slog.Any("error", err)) s.Logger().Debug("failed to query with labels", slog.Any("error", err))
return nil, err return nil, err
@ -556,7 +558,6 @@ func (s *SQL) Create(key string, rel release.Releaser) error {
k, k,
v, v,
).ToSql() ).ToSql()
if err != nil { if err != nil {
defer transaction.Rollback() defer transaction.Rollback()
s.Logger().Debug("failed to build insert query", slog.Any("error", err)) s.Logger().Debug("failed to build insert query", slog.Any("error", err))
@ -603,7 +604,6 @@ func (s *SQL) Update(key string, rel release.Releaser) error {
Where(sq.Eq{sqlReleaseTableKeyColumn: key}). Where(sq.Eq{sqlReleaseTableKeyColumn: key}).
Where(sq.Eq{sqlReleaseTableNamespaceColumn: namespace}). Where(sq.Eq{sqlReleaseTableNamespaceColumn: namespace}).
ToSql() ToSql()
if err != nil { if err != nil {
s.Logger().Debug("failed to build update query", slog.Any("error", err)) s.Logger().Debug("failed to build update query", slog.Any("error", err))
return err return err
@ -681,7 +681,6 @@ func (s *SQL) Delete(key string) (release.Releaser, error) {
Where(sq.Eq{sqlCustomLabelsTableReleaseKeyColumn: key}). Where(sq.Eq{sqlCustomLabelsTableReleaseKeyColumn: key}).
Where(sq.Eq{sqlCustomLabelsTableReleaseNamespaceColumn: s.namespace}). Where(sq.Eq{sqlCustomLabelsTableReleaseNamespaceColumn: s.namespace}).
ToSql() ToSql()
if err != nil { if err != nil {
s.Logger().Debug("failed to build delete Labels query", slog.Any("error", err)) s.Logger().Debug("failed to build delete Labels query", slog.Any("error", err))
return nil, err return nil, err
@ -695,14 +694,16 @@ func (s *SQL) getReleaseCustomLabels(key string, _ string) (map[string]string, e
query, args, err := s.statementBuilder. query, args, err := s.statementBuilder.
Select(sqlCustomLabelsTableKeyColumn, sqlCustomLabelsTableValueColumn). Select(sqlCustomLabelsTableKeyColumn, sqlCustomLabelsTableValueColumn).
From(sqlCustomLabelsTableName). From(sqlCustomLabelsTableName).
Where(sq.Eq{sqlCustomLabelsTableReleaseKeyColumn: key, Where(sq.Eq{
sqlCustomLabelsTableReleaseNamespaceColumn: s.namespace}). sqlCustomLabelsTableReleaseKeyColumn: key,
sqlCustomLabelsTableReleaseNamespaceColumn: s.namespace,
}).
ToSql() ToSql()
if err != nil { if err != nil {
return nil, err return nil, err
} }
var labelsList = []SQLReleaseCustomLabelWrapper{} labelsList := []SQLReleaseCustomLabelWrapper{}
if err := s.db.Select(&labelsList, query, args...); err != nil { if err := s.db.Select(&labelsList, query, args...); err != nil {
return nil, err return nil, err
} }

4
pkg/storage/driver/util_test.go
Unescape View File

@ -38,7 +38,7 @@ func TestIsSystemLabel(t *testing.T) {
} }
func TestFilterSystemLabels(t *testing.T) { func TestFilterSystemLabels(t *testing.T) {
var tests = [][2]map[string]string{ tests := [][2]map[string]string{
{nil, map[string]string{}}, {nil, map[string]string{}},
{map[string]string{}, map[string]string{}}, {map[string]string{}, map[string]string{}},
{map[string]string{ {map[string]string{
@ -73,7 +73,7 @@ func TestFilterSystemLabels(t *testing.T) {
} }
func TestContainsSystemLabels(t *testing.T) { func TestContainsSystemLabels(t *testing.T) {
var tests = []struct { tests := []struct {
input map[string]string input map[string]string
output bool output bool
}{ }{

9
pkg/storage/storage_test.go
Unescape View File

@ -137,7 +137,7 @@ func TestStorageList(t *testing.T) {
require.NoError(t, storage.Create(rls6), "Storing release 'rls6'") require.NoError(t, storage.Create(rls6), "Storing release 'rls6'")
} }
var listTests = []struct { listTests := []struct {
Description string Description string
NumExpected int NumExpected int
ListFunc func() ([]release.Releaser, error) ListFunc func() ([]release.Releaser, error)
@ -263,24 +263,31 @@ type MaxHistoryMockDriver struct {
func NewMaxHistoryMockDriver(d driver.Driver) *MaxHistoryMockDriver { func NewMaxHistoryMockDriver(d driver.Driver) *MaxHistoryMockDriver {
return &MaxHistoryMockDriver{Driver: d} return &MaxHistoryMockDriver{Driver: d}
} }
func (d *MaxHistoryMockDriver) Create(key string, rls release.Releaser) error { func (d *MaxHistoryMockDriver) Create(key string, rls release.Releaser) error {
return d.Driver.Create(key, rls) return d.Driver.Create(key, rls)
} }
func (d *MaxHistoryMockDriver) Update(key string, rls release.Releaser) error { func (d *MaxHistoryMockDriver) Update(key string, rls release.Releaser) error {
return d.Driver.Update(key, rls) return d.Driver.Update(key, rls)
} }
func (d *MaxHistoryMockDriver) Delete(_ string) (release.Releaser, error) { func (d *MaxHistoryMockDriver) Delete(_ string) (release.Releaser, error) {
return nil, errMaxHistoryMockDriverSomethingHappened return nil, errMaxHistoryMockDriverSomethingHappened
} }
func (d *MaxHistoryMockDriver) Get(key string) (release.Releaser, error) { func (d *MaxHistoryMockDriver) Get(key string) (release.Releaser, error) {
return d.Driver.Get(key) return d.Driver.Get(key)
} }
func (d *MaxHistoryMockDriver) List(filter func(release.Releaser) bool) ([]release.Releaser, error) { func (d *MaxHistoryMockDriver) List(filter func(release.Releaser) bool) ([]release.Releaser, error) {
return d.Driver.List(filter) return d.Driver.List(filter)
} }
func (d *MaxHistoryMockDriver) Query(labels map[string]string) ([]release.Releaser, error) { func (d *MaxHistoryMockDriver) Query(labels map[string]string) ([]release.Releaser, error) {
return d.Driver.Query(labels) return d.Driver.Query(labels)
} }
func (d *MaxHistoryMockDriver) Name() string { func (d *MaxHistoryMockDriver) Name() string {
return d.Driver.Name() return d.Driver.Name()
} }

3
pkg/strvals/literal_parser_test.go
Unescape View File

@ -316,7 +316,8 @@ func TestParseLiteralInto(t *testing.T) {
"outer": map[string]any{ "outer": map[string]any{
"inner1": "value1,outer.inner3=value3,outer.inner4=4", "inner1": "value1,outer.inner3=value3,outer.inner4=4",
"inner2": "value2", "inner2": "value2",
}}, },
},
err: false, err: false,
}, },
{ {

3
pkg/strvals/parser_test.go
Unescape View File

@ -439,7 +439,8 @@ func TestParseInto(t *testing.T) {
"inner2": "value2", "inner2": "value2",
"inner3": "value3", "inner3": "value3",
"inner4": 4, "inner4": 4,
}}, },
},
err: false, err: false,
}, },
{ {

9
scripts/get-helm-3
Unescape View File

@ -114,12 +114,15 @@ verifySupported() {
checkDesiredVersion() { checkDesiredVersion() {
if [ "x$DESIRED_VERSION" == "x" ]; then if [ "x$DESIRED_VERSION" == "x" ]; then
# Get tag from release URL # Get tag from release URL
local latest_release_url="https://get.helm.sh/helm3-latest-version" # Cache behavior is provider-specific, so this mitigation is best effort.
# The current CDN does not revalidate on the request no-cache directive,
# so use a unique query while retaining no-cache for compliant intermediaries.
local latest_release_url="https://get.helm.sh/helm3-latest-version?ts=$(date +%s)"
local latest_release_response="" local latest_release_response=""
if [ "${HAS_CURL}" == "true" ]; then if [ "${HAS_CURL}" == "true" ]; then
latest_release_response=$( curl -L --silent --show-error --fail "$latest_release_url" 2>&1 || true ) latest_release_response=$( curl -L --silent --show-error --fail --header "Cache-Control: no-cache" "$latest_release_url" 2>&1 || true )
elif [ "${HAS_WGET}" == "true" ]; then elif [ "${HAS_WGET}" == "true" ]; then
latest_release_response=$( wget "$latest_release_url" -q -O - 2>&1 || true ) latest_release_response=$( wget "$latest_release_url" --header="Cache-Control: no-cache" -q -O - 2>&1 || true )
fi fi
TAG=$( echo "$latest_release_response" | grep '^v[0-9]' ) TAG=$( echo "$latest_release_response" | grep '^v[0-9]' )
if [ "x$TAG" == "x" ]; then if [ "x$TAG" == "x" ]; then

9
scripts/get-helm-4
Unescape View File

@ -114,12 +114,15 @@ verifySupported() {
checkDesiredVersion() { checkDesiredVersion() {
if [ "x$DESIRED_VERSION" == "x" ]; then if [ "x$DESIRED_VERSION" == "x" ]; then
# Get tag from release URL # Get tag from release URL
local latest_release_url="https://get.helm.sh/helm4-latest-version" # Cache behavior is provider-specific, so this mitigation is best effort.
# The current CDN does not revalidate on the request no-cache directive,
# so use a unique query while retaining no-cache for compliant intermediaries.
local latest_release_url="https://get.helm.sh/helm4-latest-version?ts=$(date +%s)"
local latest_release_response="" local latest_release_response=""
if [ "${HAS_CURL}" == "true" ]; then if [ "${HAS_CURL}" == "true" ]; then
latest_release_response=$( curl -L --silent --show-error --fail "$latest_release_url" 2>&1 || true ) latest_release_response=$( curl -L --silent --show-error --fail --header "Cache-Control: no-cache" "$latest_release_url" 2>&1 || true )
elif [ "${HAS_WGET}" == "true" ]; then elif [ "${HAS_WGET}" == "true" ]; then
latest_release_response=$( wget "$latest_release_url" -q -O - 2>&1 || true ) latest_release_response=$( wget "$latest_release_url" --header="Cache-Control: no-cache" -q -O - 2>&1 || true )
fi fi
TAG=$( echo "$latest_release_response" | grep '^v[0-9]' ) TAG=$( echo "$latest_release_response" | grep '^v[0-9]' )
if [ "x$TAG" == "x" ]; then if [ "x$TAG" == "x" ]; then

Write Preview
Loading…
Cancel
Save