From 1cdcf2ab482deda21d1b5d503d8fb92cb3c22fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E5=85=83?= Date: Tue, 16 Mar 2021 15:00:02 +0800 Subject: [PATCH] upgrade golang ci lint to 1.38.0 and fix lint error --- .github/workflows/go.yml | 2 +- .golangci.yml | 1 - .../common/rollout/workloads/cloneset_controller.go | 1 + pkg/controller/core.oam.dev/v1alpha2/application/apply.go | 2 ++ pkg/controller/utils/capability.go | 2 +- pkg/dsl/model/instance.go | 2 +- references/cli/exec.go | 2 +- references/cli/show.go | 8 ++++---- references/common/application.go | 2 +- references/plugins/references.go | 4 ++-- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1d435e823..642b155ec 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -14,7 +14,7 @@ on: env: # Common versions GO_VERSION: '1.14' - GOLANGCI_VERSION: 'v1.31' + GOLANGCI_VERSION: 'v1.38' DOCKER_BUILDX_VERSION: 'v0.4.2' KIND_VERSION: 'v0.7.0' diff --git a/.golangci.yml b/.golangci.yml index d349d5140..a080ae0d1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -113,7 +113,6 @@ linters: - govet - gocyclo - gocritic - - interfacer - goconst - goimports - gofmt # We enable this as well as goimports for its simplify mode. diff --git a/pkg/controller/common/rollout/workloads/cloneset_controller.go b/pkg/controller/common/rollout/workloads/cloneset_controller.go index 079e06513..bef6201fb 100644 --- a/pkg/controller/common/rollout/workloads/cloneset_controller.go +++ b/pkg/controller/common/rollout/workloads/cloneset_controller.go @@ -59,6 +59,7 @@ func (c *CloneSetController) VerifySpec(ctx context.Context) (bool, error) { if verifyErr != nil { // do not fail the rollout because we can't get the resource c.rolloutStatus.RolloutRetry(verifyErr.Error()) + // nolint: nilerr return false, nil } // record the size diff --git a/pkg/controller/core.oam.dev/v1alpha2/application/apply.go b/pkg/controller/core.oam.dev/v1alpha2/application/apply.go index 9054b5ec5..0a755f3de 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/application/apply.go +++ b/pkg/controller/core.oam.dev/v1alpha2/application/apply.go @@ -226,6 +226,7 @@ func (h *appHandler) createOrUpdateComponent(ctx context.Context, comp *v1alpha2 checkForRevision := func() (bool, error) { if err := h.r.Get(ctx, compKey, &curComp); err != nil { // retry no matter what + // nolint:nilerr return false, nil } if curComp.Status.LatestRevision == nil || curComp.Status.LatestRevision.Name == preRevisionName { @@ -235,6 +236,7 @@ func (h *appHandler) createOrUpdateComponent(ctx context.Context, comp *v1alpha2 compNameSpace, curComp.Status.LatestRevision.Name, &updatedComp.Spec) if err != nil { // retry no matter what + // nolint:nilerr return false, nil } // end the loop if we find the revision diff --git a/pkg/controller/utils/capability.go b/pkg/controller/utils/capability.go index ee488fc0c..4d98b9da0 100644 --- a/pkg/controller/utils/capability.go +++ b/pkg/controller/utils/capability.go @@ -69,7 +69,7 @@ func (def *CapabilityComponentDefinition) GetCapabilityObject(ctx context.Contex } err := k8sClient.Get(ctx, objectKey, &componentDefinition) if err != nil { - return nil, fmt.Errorf("failed to get ComponentDefinition %s: %v", def.Name, err) + return nil, fmt.Errorf("failed to get ComponentDefinition %s: %w", def.Name, err) } def.ComponentDefinition = componentDefinition capability, err = util.ConvertTemplateJSON2Object(name, componentDefinition.Spec.Extension, componentDefinition.Spec.Schematic) diff --git a/pkg/dsl/model/instance.go b/pkg/dsl/model/instance.go index 467b7221e..2e5c1b612 100644 --- a/pkg/dsl/model/instance.go +++ b/pkg/dsl/model/instance.go @@ -100,7 +100,7 @@ func openPrint(v cue.Value) (string, error) { sysopts := []cue.Option{cue.All(), cue.DisallowCycles(true), cue.ResolveReferences(true), cue.Docs(true)} f, err := sets.ToFile(v.Syntax(sysopts...)) if err != nil { - return "", nil + return "", err } for _, decl := range f.Decls { listOpen(decl) diff --git a/references/cli/exec.go b/references/cli/exec.go index 72d14b9d2..a02350dca 100644 --- a/references/cli/exec.go +++ b/references/cli/exec.go @@ -191,7 +191,7 @@ func (o *VelaExecOptions) getPodName(compName string) (string, error) { }).String(), }) if err != nil { - return "", nil + return "", err } if podList != nil && len(podList.Items) == 0 { return "", fmt.Errorf("cannot get pods") diff --git a/references/cli/show.go b/references/cli/show.go index 7cd4e17d4..21e970013 100644 --- a/references/cli/show.go +++ b/references/cli/show.go @@ -190,19 +190,19 @@ func generateSideBar(capabilities []types.Capability, docsPath string) error { return err } if _, err := f.WriteString("- Workload Types\n"); err != nil { - return nil + return err } for _, w := range workloads { if _, err := f.WriteString(fmt.Sprintf(" - [%s](%s/%s.md)\n", w, plugins.WorkloadTypePath, w)); err != nil { - return nil + return err } } if _, err := f.WriteString("- Traits\n"); err != nil { - return nil + return err } for _, t := range traits { if _, err := f.WriteString(fmt.Sprintf(" - [%s](%s/%s.md)\n", t, plugins.TraitPath, t)); err != nil { - return nil + return err } } return nil diff --git a/references/common/application.go b/references/common/application.go index d22a35ee9..8d20c4f99 100644 --- a/references/common/application.go +++ b/references/common/application.go @@ -112,7 +112,7 @@ func ListApplications(ctx context.Context, c client.Reader, opt Option) ([]apis. } applicationMeta, err := RetrieveApplicationStatusByName(ctx, c, a.Name, a.Namespace) if err != nil { - return applicationMetaList, nil + return applicationMetaList, err } applicationMeta.Components = nil applicationMetaList = append(applicationMetaList, applicationMeta) diff --git a/references/plugins/references.go b/references/plugins/references.go index f350bcaac..85acd33f7 100644 --- a/references/plugins/references.go +++ b/references/plugins/references.go @@ -258,7 +258,7 @@ func (ref *MarkdownReference) CreateMarkdown(caps []types.Capability, baseRefPat } refContent = title + description + specification + refContent + conflictWithAndMoreSection if _, err := f.WriteString(refContent); err != nil { - return nil + return err } if err := f.Close(); err != nil { return err @@ -403,7 +403,7 @@ func (ref *MarkdownReference) generateConflictWithAndMore(capabilityName string, } data, err := ioutil.ReadFile(filepath.Clean(conflictWithFile)) if err != nil { - return "", nil + return "", err } return "\n" + string(data), nil }