[golangci] Remove superfluous notlint and checks

geropl · geropl · commit 2c8bce8a9a22 · 2025-01-16T15:54:05.000Z
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
@@ -44,4 +44,4 @@ defaultVariant:
       - "**/node_modules/**"
   config:
     go:
-      lintCommand: ["sh", "-c", "golangci-lint run --disable govet,errcheck,typecheck,staticcheck,structcheck -e '.*declared but not used.*' --allow-parallel-runners --timeout 15m"]
+      lintCommand: ["sh", "-c", "golangci-lint run --disable govet,errcheck,staticcheck --allow-parallel-runners --timeout 15m"]
diff --git a/gitpod-ws.code-workspace b/gitpod-ws.code-workspace
@@ -160,6 +160,7 @@
             "**/.git": true
         },
         "go.lintTool": "golangci-lint",
+        "go.lintFlags": ["-disable", "govet,errcheck,staticcheck", "--allow-parallel-runners", "--timeout", "15m"],
         "gopls": {
             "allowModfileModifications": true
         },
diff --git a/install/installer/pkg/components/agent-smith/daemonset.go b/install/installer/pkg/components/agent-smith/daemonset.go
@@ -20,7 +20,6 @@ import (
 func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 	labels := common.CustomizeLabel(ctx, Component, common.TypeMetaDaemonset)
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/blobserve/deployment.go b/install/installer/pkg/components/blobserve/deployment.go
@@ -47,7 +47,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		hashObj = append(hashObj, objs...)
 	}
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(hashObj, nil)
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/content-service/deployment.go b/install/installer/pkg/components/content-service/deployment.go
@@ -20,7 +20,6 @@ import (
 func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 	labels := common.CustomizeLabel(ctx, Component, common.TypeMetaDeployment)
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/docker-registry/secret.go b/install/installer/pkg/components/docker-registry/secret.go
@@ -5,7 +5,6 @@
 package dockerregistry
 
 import (
-	//nolint:typecheck
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
diff --git a/install/installer/pkg/components/ide-metrics/deployment.go b/install/installer/pkg/components/ide-metrics/deployment.go
@@ -20,7 +20,6 @@ import (
 func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 	labels := common.CustomizeLabel(ctx, Component, common.TypeMetaDeployment)
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/ide-service/deployment.go b/install/installer/pkg/components/ide-service/deployment.go
@@ -36,7 +36,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil, fmt.Errorf("%s: invalid container registry config", Component)
 	}
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/image-builder-mk3/deployment.go b/install/installer/pkg/components/image-builder-mk3/deployment.go
@@ -55,7 +55,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		hashObj = append(hashObj, objs...)
 	}
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(hashObj, nil)
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/openvsx-proxy/statefulset.go b/install/installer/pkg/components/openvsx-proxy/statefulset.go
@@ -25,7 +25,6 @@ func statefulset(ctx *common.RenderContext) ([]runtime.Object, error) {
 	labels := common.CustomizeLabel(ctx, Component, common.TypeMetaStatefulSet)
 	// todo(sje): add redis
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/proxy/deployment.go b/install/installer/pkg/components/proxy/deployment.go
@@ -96,7 +96,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		}
 	}
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(hashObj, nil)
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/public-api-server/deployment.go b/install/installer/pkg/components/public-api-server/deployment.go
@@ -30,7 +30,6 @@ const (
 )
 
 func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/registry-facade/daemonset.go b/install/installer/pkg/components/registry-facade/daemonset.go
@@ -72,7 +72,6 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 		hashObj = append(hashObj, objs...)
 	}
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(hashObj, nil)
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/server/deployment.go b/install/installer/pkg/components/server/deployment.go
@@ -66,7 +66,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		},
 	})
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(hashObj, nil)
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/spicedb/deployment.go b/install/installer/pkg/components/spicedb/deployment.go
@@ -35,7 +35,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil, errors.New("missing configuration for spicedb.secretRef")
 	}
 
-	//nolint:typecheck//nolint:typecheck
 	bootstrapVolume, bootstrapVolumeMount, bootstrapFiles, contentHash, err := getBootstrapConfig(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get bootstrap config: %w", err)
diff --git a/install/installer/pkg/components/usage/deployment.go b/install/installer/pkg/components/usage/deployment.go
@@ -64,7 +64,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil
 	})
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/ws-daemon/daemonset.go b/install/installer/pkg/components/ws-daemon/daemonset.go
@@ -23,7 +23,6 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 	cfg := ctx.Config
 	labels := common.CustomizeLabel(ctx, Component, common.TypeMetaDaemonset)
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/ws-manager-bridge/deployment.go b/install/installer/pkg/components/ws-manager-bridge/deployment.go
@@ -76,7 +76,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		},
 	})
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(hashObj, nil)
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/ws-manager-mk2/deployment.go b/install/installer/pkg/components/ws-manager-mk2/deployment.go
@@ -22,7 +22,6 @@ import (
 func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 	labels := common.DefaultLabels(Component)
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err
diff --git a/install/installer/pkg/components/ws-proxy/deployment.go b/install/installer/pkg/components/ws-proxy/deployment.go
@@ -23,7 +23,6 @@ import (
 func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 	labels := common.CustomizeLabel(ctx, Component, common.TypeMetaDeployment)
 
-	//nolint:typecheck
 	configHash, err := common.ObjectHash(configmap(ctx))
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {`
`47`	`47`	`hashObj = append(hashObj, objs...)`
`48`	`48`	`}`
`49`	`49`
`50`		`- //nolint:typecheck`
`51`	`50`	`configHash, err := common.ObjectHash(hashObj, nil)`
`52`	`51`	`if err != nil {`
`53`	`52`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {`
`36`	`36`	`return nil, fmt.Errorf("%s: invalid container registry config", Component)`
`37`	`37`	`}`
`38`	`38`
`39`		`- //nolint:typecheck`
`40`	`39`	`configHash, err := common.ObjectHash(configmap(ctx))`
`41`	`40`	`if err != nil {`
`42`	`41`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {`
`55`	`55`	`hashObj = append(hashObj, objs...)`
`56`	`56`	`}`
`57`	`57`
`58`		`- //nolint:typecheck`
`59`	`58`	`configHash, err := common.ObjectHash(hashObj, nil)`
`60`	`59`	`if err != nil {`
`61`	`60`	`return nil, err`