diff --git a/.golangci.yml b/.golangci.yml index db9861d77be..feb3c57774e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -41,7 +41,6 @@ linters: - usestdlibvars - whitespace disable: - - ineffassign - staticcheck # Enabling presets means that new linters that we automatically adopt new # linters that augment a preset. This also opts us in for replacement linters @@ -70,6 +69,7 @@ issues: - dogsled - errcheck - gosec + - ineffassign - path: test/pipelinerun_test\.go linters: - unused diff --git a/pkg/pipelinerunmetrics/metrics.go b/pkg/pipelinerunmetrics/metrics.go index 93c3671f294..a83546a541c 100644 --- a/pkg/pipelinerunmetrics/metrics.go +++ b/pkg/pipelinerunmetrics/metrics.go @@ -112,7 +112,7 @@ func viewRegister(cfg *config.Metrics) error { r.mutex.Lock() defer r.mutex.Unlock() - prunTag := []tag.Key{} + var prunTag []tag.Key switch cfg.PipelinerunLevel { case config.PipelinerunLevelAtPipelinerun: diff --git a/pkg/pod/status.go b/pkg/pod/status.go index 71f8f81ce95..47ab62cdcf7 100644 --- a/pkg/pod/status.go +++ b/pkg/pod/status.go @@ -266,7 +266,7 @@ func filterResultsAndResources(results []v1beta1.PipelineResourceResult, specRes for _, r := range results { switch r.ResultType { case v1beta1.TaskRunResultType: - taskRunResult := v1beta1.TaskRunResult{} + var taskRunResult v1beta1.TaskRunResult if neededTypes[r.Key] == v1beta1.ResultsTypeString { taskRunResult = v1beta1.TaskRunResult{ Name: r.Key, diff --git a/pkg/resolution/resolver/bundle/bundle.go b/pkg/resolution/resolver/bundle/bundle.go index 961b5201dda..ea23787587a 100644 --- a/pkg/resolution/resolver/bundle/bundle.go +++ b/pkg/resolution/resolver/bundle/bundle.go @@ -113,7 +113,7 @@ func GetEntry(ctx context.Context, keychain authn.Keychain, opts RequestOptions) obj, err := readTarLayer(layerMap[l.Digest.String()]) if err != nil { // This could still be a raw layer so try to read it as that instead. - obj, err = readRawLayer(layers[idx]) + obj, _ = readRawLayer(layers[idx]) } return &ResolvedResource{ data: obj, diff --git a/pkg/resolution/resolver/bundle/resolver.go b/pkg/resolution/resolver/bundle/resolver.go index fa86fd97b2b..5a9ae84f3a5 100644 --- a/pkg/resolution/resolver/bundle/resolver.go +++ b/pkg/resolution/resolver/bundle/resolver.go @@ -94,7 +94,7 @@ func (r *Resolver) Resolve(ctx context.Context, params []pipelinev1beta1.Param) return nil, err } namespace := common.RequestNamespace(ctx) - kc, err := k8schain.New(ctx, r.kubeClientSet, k8schain.Options{ + kc, _ := k8schain.New(ctx, r.kubeClientSet, k8schain.Options{ Namespace: namespace, ServiceAccountName: opts.ServiceAccount, }) diff --git a/pkg/taskrunmetrics/metrics.go b/pkg/taskrunmetrics/metrics.go index 8536287f902..fa1f5432233 100644 --- a/pkg/taskrunmetrics/metrics.go +++ b/pkg/taskrunmetrics/metrics.go @@ -135,8 +135,7 @@ func viewRegister(cfg *config.Metrics) error { r.mutex.Lock() defer r.mutex.Unlock() - prunTag := []tag.Key{} - trunTag := []tag.Key{} + var prunTag []tag.Key switch cfg.PipelinerunLevel { case config.PipelinerunLevelAtPipelinerun: prunTag = []tag.Key{pipelineTag, pipelinerunTag} @@ -151,6 +150,7 @@ func viewRegister(cfg *config.Metrics) error { return errors.New("invalid config for PipelinerunLevel: " + cfg.PipelinerunLevel) } + var trunTag []tag.Key switch cfg.TaskrunLevel { case config.TaskrunLevelAtTaskrun: trunTag = []tag.Key{taskTag, taskrunTag}