public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-22 12:05:19 +02:00
Code Issues Projects Releases Wiki Activity

optimize lint logic (#586)

Browse Source 
Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero
2022-12-18 08:39:45 +08:00
committed by GitHub
parent 9cc0cff07f
commit 36c91c5427
11 changed files with 34 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/app/init_test.go
+2 -2
View File
@@ -30,7 +30,7 @@ func TestDownloadfile(t *testing.T) {
{
name: "download 404",
handler: func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(404)
w.WriteHeader(http.StatusNotFound)
fmt.Fprint(w, "not found")
},
wantError: "download .*? error, code: 404",
@@ -38,7 +38,7 @@ func TestDownloadfile(t *testing.T) {
{
name: "download 500",
handler: func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(500)
w.WriteHeader(http.StatusInternalServerError)
fmt.Fprint(w, "server error")
},
wantError: "download .*? error, code: 500",
pkg/helmexec/exec.go
-1
View File
@@ -113,7 +113,6 @@ func redactedURL(chart string) string {
}
// New for running helm commands
// nolint: golint
func New(helmBinary string, enableLiveOutput bool, logger *zap.SugaredLogger, kubeContext string, runner Runner) *execer {
// TODO: proper error handling
version, err := GetHelmVersion(helmBinary, runner)
pkg/helmexec/exec_test.go
-1
View File
@@ -33,7 +33,6 @@ func (mock *mockRunner) Execute(cmd string, args []string, env map[string]string
return mock.output, mock.err
}
// nolint: golint
func MockExecer(logger *zap.SugaredLogger, kubeContext string) *execer {
execer := New("helm", false, logger, kubeContext, &mockRunner{})
return execer
pkg/state/chart_dependency.go
-1
View File
@@ -279,7 +279,6 @@ type chartDependencyManager struct {
writeFile func(string, []byte, os.FileMode) error
}
// nolint: golint
func NewChartDependencyManager(name string, logger *zap.SugaredLogger, lockFilePath string) *chartDependencyManager {
return &chartDependencyManager{
Name: name,
pkg/state/create.go
+2 -1
View File
@@ -22,7 +22,6 @@ const (
DefaultHelmBinary = "helm"
)
// nolint: golint
type StateLoadError struct {
msg string
Cause error
@@ -306,12 +305,14 @@ func (c *StateCreator) scatterGatherEnvSecretFiles(st *HelmState, envSecretFiles
results <- secretResult{secret.id, nil, err, secret.path}
continue
}
// nolint: staticcheck
defer func() {
if err := c.fs.DeleteFile(decFile); err != nil {
c.logger.Warnf("removing decrypted file %s: %w", decFile, err)
}
}()
bytes, err := c.fs.ReadFile(decFile)
if err != nil {
results <- secretResult{secret.id, nil, fmt.Errorf("failed to load environment secrets file \"%s\": %v", secret.path, err), secret.path}
pkg/state/helmx.go
+4 -6
View File
@@ -17,18 +17,16 @@ type Dependency struct {
Alias string `yaml:"alias"`
}
// nolint: unparam
func (st *HelmState) appendHelmXFlags(flags []string, release *ReleaseSpec) ([]string, error) {
func (st *HelmState) appendHelmXFlags(flags []string, release *ReleaseSpec) []string {
for _, adopt := range release.Adopt {
flags = append(flags, "--adopt", adopt)
}
return flags, nil
return flags
}
// append post-renderer flags to helm flags
// nolint: unparam
func (st *HelmState) appendPostRenderFlags(flags []string, release *ReleaseSpec, helm helmexec.Interface) ([]string, error) {
func (st *HelmState) appendPostRenderFlags(flags []string, release *ReleaseSpec, helm helmexec.Interface) []string {
if helm.IsHelm3() {
switch {
// helm.GetPostRenderer() comes from cmd flag.
@@ -40,7 +38,7 @@ func (st *HelmState) appendPostRenderFlags(flags []string, release *ReleaseSpec,
flags = append(flags, "--post-renderer", *st.HelmDefaults.PostRenderer)
}
}
return flags, nil
return flags
}
type Chartify struct {
pkg/state/state.go
+9 -34
View File
@@ -1141,10 +1141,12 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
isLocal := st.fs.DirectoryExistsAt(normalizeChart(st.basePath, chartName))
chartification, clean, err := st.PrepareChartify(helm, release, chartPath, workerIndex)
if !opts.SkipCleanup {
// nolint: staticcheck
defer clean()
}
if err != nil {
results <- &chartPrepareResult{err: err}
return
@@ -1256,7 +1258,6 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
chartPath = filepath.Dir(fullChartPath)
}
}
results <- &chartPrepareResult{
releaseName: release.Name,
chartName: chartName,
@@ -2515,16 +2516,9 @@ func (st *HelmState) flagsForUpgrade(helm helmexec.Interface, release *ReleaseSp
flags = st.appendConnectionFlags(flags, helm, release)
var err error
flags, err = st.appendHelmXFlags(flags, release)
if err != nil {
return nil, nil, err
}
flags = st.appendHelmXFlags(flags, release)
flags, err = st.appendPostRenderFlags(flags, release, helm)
if err != nil {
return nil, nil, err
}
flags = st.appendPostRenderFlags(flags, release, helm)
common, clean, err := st.namespaceAndValuesFlags(helm, release, workerIndex)
if err != nil {
@@ -2545,18 +2539,11 @@ func (st *HelmState) flagsForTemplate(helm helmexec.Interface, release *ReleaseS
flags = st.chartVersionFlags(release)
}
var err error
flags, err = st.appendHelmXFlags(flags, release)
if err != nil {
return nil, nil, err
}
flags = st.appendHelmXFlags(flags, release)
flags = st.appendApiVersionsFlags(flags, release)
flags, err = st.appendPostRenderFlags(flags, release, helm)
if err != nil {
return nil, nil, err
}
flags = st.appendPostRenderFlags(flags, release, helm)
common, files, err := st.namespaceAndValuesFlags(helm, release, workerIndex)
if err != nil {
@@ -2593,16 +2580,9 @@ func (st *HelmState) flagsForDiff(helm helmexec.Interface, release *ReleaseSpec,
flags = st.appendConnectionFlags(flags, helm, release)
var err error
flags, err = st.appendHelmXFlags(flags, release)
if err != nil {
return nil, nil, err
}
flags = st.appendHelmXFlags(flags, release)
flags, err = st.appendPostRenderFlags(flags, release, helm)
if err != nil {
return nil, nil, err
}
flags = st.appendPostRenderFlags(flags, release, helm)
common, files, err := st.namespaceAndValuesFlags(helm, release, workerIndex)
if err != nil {
@@ -2660,12 +2640,7 @@ func (st *HelmState) flagsForLint(helm helmexec.Interface, release *ReleaseSpec,
return nil, files, err
}
flags, err = st.appendHelmXFlags(flags, release)
if err != nil {
return nil, files, err
}
return flags, files, nil
return st.appendHelmXFlags(flags, release), files, nil
}
func (st *HelmState) newReleaseTemplateData(release *ReleaseSpec) releaseTemplateData {
pkg/tmpl/text_renderer.go
-1
View File
@@ -14,7 +14,6 @@ type TextRenderer interface {
RenderTemplateText(text string) (string, error)
}
// nolint: golint
func NewTextRenderer(fs *filesystem.FileSystem, basePath string, data interface{}) *templateTextRenderer {
return &templateTextRenderer{
ReadText: fs.ReadFile,