Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove abandoned linters, use unused linter #5661

Merged
merged 1 commit into from May 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions .golangci.yaml
Expand Up @@ -25,11 +25,9 @@ linters:
disable-all: true
enable:
# Default linters.
- deadcode
- ineffassign
- structcheck
- typecheck
- varcheck
- unused

# Extra linters.
- asciicheck
Expand All @@ -42,3 +40,13 @@ linters:
- gocritic
- gofumpt
- misspell
- nolintlint

issues:
# Show all errors.
max-issues-per-linter: 0
max-same-issues: 0

exclude:
# TODO use %w in the future.
- "non-wrapping format verb for fmt.Errorf" # errorlint
2 changes: 1 addition & 1 deletion Taskfile.dist.yaml
Expand Up @@ -509,7 +509,7 @@ tasks:
deps:install:golangci-lint:
desc: "Install golangci-lint binary."
cmds:
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin {{.golangcilintVersion | default "v1.50.0"}}
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin {{.golangcilintVersion | default "v1.52.2"}}

deps:install:prettier:
desc: "Install prettier."
Expand Down
4 changes: 3 additions & 1 deletion pkg/buildah/common.go
Expand Up @@ -256,7 +256,9 @@ func GetDefaultIsolation() (thirdparty.Isolation, error) {
return thirdparty.IsolationChroot, nil
}

//nolint:deadcode,unused
// TODO used for linux only, hide under the build flag
//
//nolint:nolintlint,unused
func debug() bool {
return os.Getenv("WERF_BUILDAH_DEBUG") == "1"
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/buildah/thirdparty/docker.go
Expand Up @@ -164,7 +164,7 @@ type V1Image struct {
// V2Image stores the image configuration
type V2Image struct {
V1Image
Parent ID `json:"parent,omitempty"` // nolint:govet
Parent ID `json:"parent,omitempty"` //nolint:govet
RootFS *V2S2RootFS `json:"rootfs,omitempty"`
History []V2S2History `json:"history,omitempty"`
OSVersion string `json:"os.version,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/cleaning/stage_manager/manager.go
Expand Up @@ -27,7 +27,7 @@ func NewManager() Manager {

type stage struct {
stageID string
isMultiplatform bool
isMultiplatform bool //nolint:unused
description *image.StageDescription
isProtected bool
protectionReason string
Expand Down
2 changes: 2 additions & 0 deletions pkg/config/raw_stapel_image.go
Expand Up @@ -158,6 +158,7 @@ func (c *rawStapelImage) validateStapelImageDirective(image *StapelImage) (err e
return nil
}

//nolint:unused
func (c *rawStapelImage) toShellDirectiveByCommandAndStage(command, stage string) (shell *Shell) {
shell = &Shell{}
switch stage {
Expand All @@ -176,6 +177,7 @@ func (c *rawStapelImage) toShellDirectiveByCommandAndStage(command, stage string
return
}

//nolint:unused
func (c *rawStapelImage) toAnsibleWithTaskByStage(task *AnsibleTask, stage string) (ansible *Ansible) {
ansible = &Ansible{}
switch stage {
Expand Down
6 changes: 6 additions & 0 deletions pkg/docker_registry/docker_hub.go
Expand Up @@ -93,6 +93,8 @@ func (r *dockerHub) DeleteRepoImage(ctx context.Context, repoImage *image.Info)
return err
}

//nolint:bodyclose
// TODO: close response body
resp, err := r.dockerHubApi.deleteTag(ctx, account, project, repoImage.Tag, token)
if err != nil {
return r.handleFailedApiResponse(resp, err)
Expand All @@ -112,6 +114,8 @@ func (r *dockerHub) deleteRepo(ctx context.Context, reference string) error {
return err
}

//nolint:bodyclose
// TODO: close response body
resp, err := r.dockerHubApi.deleteRepository(ctx, account, project, token)
if err != nil {
return r.handleFailedApiResponse(resp, err)
Expand All @@ -125,6 +129,8 @@ func (r *dockerHub) getToken(ctx context.Context) (string, error) {
return r.dockerHubCredentials.token, nil
}

//nolint:bodyclose
// TODO: close response body
token, resp, err := r.dockerHubApi.getToken(ctx, r.dockerHubCredentials.username, r.dockerHubCredentials.password)
if err != nil {
return "", r.handleFailedApiResponse(resp, err)
Expand Down
14 changes: 14 additions & 0 deletions pkg/docker_registry/github_packages.go
Expand Up @@ -102,13 +102,17 @@ func (r *gitHubPackages) DeleteRepoImage(ctx context.Context, repoImage *image.I
}

if isUser {
//nolint:bodyclose
// TODO: close response body
if resp, err := r.gitHubApi.deleteUserContainerPackageVersion(ctx, packageName, packageVersionId, r.token); err != nil {
return r.handleFailedApiResponse(resp, err)
}

return nil
}

//nolint:bodyclose
// TODO: close response body
if resp, err := r.gitHubApi.deleteOrgContainerPackageVersion(ctx, orgOrUserName, packageName, packageVersionId, r.token); err != nil {
return r.handleFailedApiResponse(resp, err)
}
Expand All @@ -128,13 +132,17 @@ func (r *gitHubPackages) DeleteRepo(ctx context.Context, reference string) error
}

if isUser {
//nolint:bodyclose
// TODO: close response body
if resp, err := r.gitHubApi.deleteUserContainerPackage(ctx, packageName, r.token); err != nil {
return r.handleFailedApiResponse(resp, err)
}

return nil
}

//nolint:bodyclose
// TODO: close response body
if resp, err := r.gitHubApi.deleteOrgContainerPackage(ctx, orgOrUserName, packageName, r.token); err != nil {
return r.handleFailedApiResponse(resp, err)
}
Expand Down Expand Up @@ -178,13 +186,17 @@ func (r *gitHubPackages) populateTagIDPackageVersionIDCache(ctx context.Context,
}

if isUser {
//nolint:bodyclose
// TODO: close response body
if resp, err := r.gitHubApi.getUserContainerPackageVersionsInBatches(ctx, packageName, r.token, handleFunc); err != nil {
return r.handleFailedApiResponse(resp, err)
}

return nil
}

//nolint:bodyclose
// TODO: close response body
if resp, err := r.gitHubApi.getOrgContainerPackageVersionsInBatches(ctx, orgOrUserName, packageName, r.token, handleFunc); err != nil {
return r.handleFailedApiResponse(resp, err)
}
Expand All @@ -202,6 +214,8 @@ func (r *gitHubPackages) isUser(ctx context.Context, orgOrUserName string) (bool
return isUser.(bool), nil
}

//nolint:bodyclose
// TODO: close response body
user, resp, err := r.gitHubApi.getUser(ctx, orgOrUserName, r.token)
if err != nil {
return false, r.handleFailedApiResponse(resp, err)
Expand Down
8 changes: 8 additions & 0 deletions pkg/docker_registry/selectel.go
Expand Up @@ -110,6 +110,8 @@ func (r *selectel) deleteRepoImage(ctx context.Context, repoImage *image.Info) e
return err
}

//nolint:bodyclose
// TODO: close response body
resp, err := r.selectelApi.deleteReference(ctx, hostname, registryID, repository, repoImage.RepoDigest, token)
if err != nil {
return r.handleFailedApiResponse(resp, err)
Expand All @@ -129,6 +131,8 @@ func (r *selectel) deleteRepo(ctx context.Context, reference string) error {
return err
}

//nolint:bodyclose
// TODO: close response body
resp, err := r.selectelApi.deleteRepository(ctx, hostname, registryID, repository, token)
if err != nil {
return r.handleFailedApiResponse(resp, err)
Expand All @@ -148,6 +152,8 @@ func (r *selectel) tags(ctx context.Context, reference string) ([]string, error)
return nil, err
}

//nolint:bodyclose
// TODO: close response body
tags, resp, err := r.selectelApi.getTags(ctx, hostname, registryID, repository, token)
if err != nil {
return nil, r.handleFailedApiResponse(resp, err)
Expand Down Expand Up @@ -195,6 +201,8 @@ func (r *selectel) getRegistryId(ctx context.Context, token, reference string) (
return "", err
}

//nolint:bodyclose
// TODO: close response body
registryId, resp, err := r.selectelApi.getRegistryId(ctx, hostname, registry, token)
if err != nil {
return "", r.handleFailedApiResponse(resp, err)
Expand Down
1 change: 1 addition & 0 deletions pkg/storage/kubernetes_stages_storage_cache.go
Expand Up @@ -73,6 +73,7 @@ func (cache *KubernetesStagesStorageCache) setCacheData(obj *v1.ConfigMap, cache
}
}

//nolint:unused
func (cache *KubernetesStagesStorageCache) getConfigMapName(projectName string) string {
if cache.GetConfigMapNameFunc != nil {
return cache.GetConfigMapNameFunc(projectName)
Expand Down