chore: enable gci and ineffassign linters (argoproj#6839)

Signed-off-by: Alex Collins <[email protected]>

.github/workflows/ci-build.yaml

@@ -179,7 +179,7 @@ jobs:
  - run: cp server/static/files.go.stub server/static/files.go
  - uses: golangci/golangci-lint-action@v2
  with:
- version: v1.40.1
+ version: v1.42.0
 
  ui:
  name: UI

.golangci.yml

@@ -17,13 +17,24 @@ run:
  - functional
 linters:
  enable:
+ # TODO https://github.com/argoproj/argo-workflows/issues/6837
+ # - bodyclose
  - deadcode
  - errcheck
  - goimports
+ # only minor issues
+ # - errorlint
+ # TODO https://github.com/argoproj/argo-workflows/issues/6840
+ # - exportloopref
+ - gci
  - gosec
  - gosimple
  - govet
+ - ineffassign
  - misspell
+ # TODO https://github.com/argoproj/argo-workflows/issues/6838
+ # - rowserrcheck
+ # - sqlclosecheck
  - staticcheck
  - structcheck
  - typecheck

cmd/argo/commands/cron/get_test.go

@@ -4,9 +4,9 @@ import (
  "testing"
  "time"
 
- "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-
  "github.com/stretchr/testify/assert"
+
+ "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
 )
 
 var invalidCwf = `

cmd/argo/commands/resubmit.go

@@ -3,11 +3,10 @@ package commands
 import (
  "context"
 
+ "github.com/argoproj/pkg/errors"
  "github.com/spf13/cobra"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
- "github.com/argoproj/pkg/errors"
-
  "github.com/argoproj/argo-workflows/v3/cmd/argo/commands/client"
  workflowpkg "github.com/argoproj/argo-workflows/v3/pkg/apiclient/workflow"
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"

cmd/argo/commands/retry.go

@@ -5,12 +5,11 @@ import (
  "fmt"
  "os"
 
+ "github.com/argoproj/pkg/errors"
  "github.com/spf13/cobra"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/fields"
 
- "github.com/argoproj/pkg/errors"
-
  "github.com/argoproj/argo-workflows/v3/cmd/argo/commands/client"
  workflowpkg "github.com/argoproj/argo-workflows/v3/pkg/apiclient/workflow"
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"

cmd/argoexec/commands/agent.go

@@ -6,6 +6,7 @@ import (
  "os"
 
  log "github.com/sirupsen/logrus"
+ "github.com/spf13/cobra"
  "k8s.io/client-go/kubernetes"
  restclient "k8s.io/client-go/rest"
 
@@ -14,8 +15,6 @@ import (
  "github.com/argoproj/argo-workflows/v3/util/logs"
  "github.com/argoproj/argo-workflows/v3/workflow/common"
  "github.com/argoproj/argo-workflows/v3/workflow/executor"
-
- "github.com/spf13/cobra"
 )
 
 func NewAgentCommand() *cobra.Command {

cmd/argoexec/commands/root.go

@@ -6,8 +6,6 @@ import (
  "os"
  "time"
 
- wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-
  "github.com/argoproj/pkg/cli"
  kubecli "github.com/argoproj/pkg/kube/cli"
  log "github.com/sirupsen/logrus"
@@ -17,6 +15,7 @@ import (
  "k8s.io/client-go/tools/clientcmd"
 
  "github.com/argoproj/argo-workflows/v3"
+ wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo-workflows/v3/util"
  "github.com/argoproj/argo-workflows/v3/util/cmd"
  "github.com/argoproj/argo-workflows/v3/util/logs"

pkg/apiclient/watch-intermediary.go

@@ -4,7 +4,6 @@ import (
  "context"
 
  "google.golang.org/grpc/metadata"
-
  v1 "k8s.io/api/core/v1"
 
  workflowpkg "github.com/argoproj/argo-workflows/v3/pkg/apiclient/workflow"

server/apiserver/argoserver.go

@@ -8,8 +8,6 @@ import (
  "os"
  "time"
 
- "google.golang.org/grpc/metadata"
-
  "github.com/gorilla/handlers"
  grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
  grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
@@ -21,6 +19,7 @@ import (
  "golang.org/x/net/context"
  "google.golang.org/grpc"
  "google.golang.org/grpc/credentials"
+ "google.golang.org/grpc/metadata"
  "k8s.io/apimachinery/pkg/util/wait"
  "k8s.io/client-go/rest"
  "k8s.io/utils/env"

test/e2e/cli_test.go

@@ -12,12 +12,11 @@ import (
  "testing"
  "time"
 
- "sigs.k8s.io/yaml"
-
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/suite"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/types"
+ "sigs.k8s.io/yaml"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo-workflows/v3/test/e2e/fixtures"

test/e2e/functional_test.go

@@ -11,7 +11,6 @@ import (
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/suite"
  apiv1 "k8s.io/api/core/v1"
- corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/types"
 
@@ -231,7 +230,7 @@ func (s *FunctionalSuite) TestEventOnNodeFailSentAsPod() {
  return (event.InvolvedObject.Kind == workflow.WorkflowKind && event.InvolvedObject.UID == uid) || (event.InvolvedObject.Kind == "Pod" && event.InvolvedObject.UID == nodeId && strings.HasPrefix(event.Reason, "Workflow"))
  },
  4,
- func(t *testing.T, es []corev1.Event) {
+ func(t *testing.T, es []apiv1.Event) {
  for _, e := range es {
  switch e.Reason {
  case "WorkflowNodeRunning":
@@ -278,7 +277,7 @@ func (s *FunctionalSuite) TestEventOnNodeFail() {
  ExpectAuditEvents(
  fixtures.HasInvolvedObject(workflow.WorkflowKind, uid),
  4,
- func(t *testing.T, es []corev1.Event) {
+ func(t *testing.T, es []apiv1.Event) {
  for _, e := range es {
  switch e.Reason {
  case "WorkflowNodeRunning":
@@ -313,7 +312,7 @@ func (s *FunctionalSuite) TestEventOnWorkflowSuccess() {
  ExpectAuditEvents(
  fixtures.HasInvolvedObject(workflow.WorkflowKind, uid),
  4,
- func(t *testing.T, es []corev1.Event) {
+ func(t *testing.T, es []apiv1.Event) {
  for _, e := range es {
  println(e.Reason, e.Message)
  switch e.Reason {
@@ -349,7 +348,7 @@ func (s *FunctionalSuite) TestEventOnPVCFail() {
  ExpectAuditEvents(
  fixtures.HasInvolvedObject(workflow.WorkflowKind, uid),
  2,
- func(t *testing.T, e []corev1.Event) {
+ func(t *testing.T, e []apiv1.Event) {
  assert.Equal(t, "WorkflowRunning", e[0].Reason)
 
  assert.Equal(t, "WorkflowFailed", e[1].Reason)
@@ -754,7 +753,7 @@ spec:
  SubmitWorkflow().
  WaitForWorkflow().
  Then().
- ExpectWorkflowNode(wfv1.SucceededPodNode, func(t *testing.T, n *wfv1.NodeStatus, p *corev1.Pod) {
+ ExpectWorkflowNode(wfv1.SucceededPodNode, func(t *testing.T, n *wfv1.NodeStatus, p *apiv1.Pod) {
  assert.Equal(t, *p.Spec.TerminationGracePeriodSeconds, int64(5))
  for _, c := range p.Spec.Containers {
  if c.Name == "main" {

util/kubeconfig/kubeconfig.go

@@ -11,7 +11,6 @@ import (
  "time"
 
  "github.com/pkg/errors"
- "k8s.io/client-go/pkg/apis/clientauthentication"
  clientauthenticationapi "k8s.io/client-go/pkg/apis/clientauthentication"
  "k8s.io/client-go/plugin/pkg/client/auth/exec"
  restclient "k8s.io/client-go/rest"
@@ -149,7 +148,7 @@ func GetBearerToken(in *restclient.Config, explicitKubeConfigPath string) (strin
  return "", err
  }
 
- var cluster *clientauthentication.Cluster
+ var cluster *clientauthenticationapi.Cluster
  if in.ExecProvider.ProvideClusterInfo {
  var err error
  cluster, err = ConfigToExecCluster(in)
@@ -216,7 +215,7 @@ func ConfigToExecCluster(config *restclient.Config) (*clientauthenticationapi.Cl
  }
  }
 
- return &clientauthentication.Cluster{
+ return &clientauthenticationapi.Cluster{
  Server: config.Host,
  TLSServerName: config.ServerName,
  InsecureSkipTLSVerify: config.Insecure,

workflow/common/util.go

@@ -12,8 +12,6 @@ import (
  "strings"
  "time"
 
- "k8s.io/client-go/tools/cache"
-
  "github.com/gorilla/websocket"
  log "github.com/sirupsen/logrus"
  apiv1 "k8s.io/api/core/v1"
@@ -23,6 +21,7 @@ import (
  "k8s.io/apimachinery/pkg/util/wait"
  "k8s.io/client-go/kubernetes"
  "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/cache"
  "k8s.io/client-go/tools/remotecommand"
 
  "github.com/argoproj/argo-workflows/v3/errors"

workflow/controller/agent_test.go

@@ -5,14 +5,12 @@ import (
  "strings"
  "testing"
 
- apiv1 "k8s.io/api/core/v1"
-
- "github.com/argoproj/argo-workflows/v3/workflow/common"
-
  "github.com/stretchr/testify/assert"
+ apiv1 "k8s.io/api/core/v1"
  v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo-workflows/v3/workflow/common"
 )
 
 func TestExecuteTaskSet(t *testing.T) {

workflow/controller/controller.go

@@ -9,8 +9,6 @@ import (
  "syscall"
  "time"
 
- v1 "k8s.io/client-go/informers/core/v1"
-
  "github.com/argoproj/pkg/errors"
  syncpkg "github.com/argoproj/pkg/sync"
  log "github.com/sirupsen/logrus"
@@ -27,6 +25,7 @@ import (
  "k8s.io/apimachinery/pkg/util/wait"
  "k8s.io/apimachinery/pkg/watch"
  "k8s.io/client-go/dynamic"
+ v1 "k8s.io/client-go/informers/core/v1"
  "k8s.io/client-go/kubernetes"
  "k8s.io/client-go/rest"
  "k8s.io/client-go/tools/cache"

workflow/controller/dag_test.go

@@ -11,7 +11,6 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-
  "github.com/argoproj/argo-workflows/v3/workflow/common"
 )
 

workflow/controller/indexes/configmap_index_test.go

@@ -3,10 +3,9 @@ package indexes
 import (
  "testing"
 
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
  "github.com/stretchr/testify/assert"
  corev1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestConfigMapIndexFunc(t *testing.T) {

workflow/controller/operator_workflow_template_ref_test.go

@@ -4,10 +4,9 @@ import (
  "context"
  "testing"
 
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
  "github.com/stretchr/testify/assert"
  apiv1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/utils/pointer"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"

workflow/controller/steps_test.go

@@ -8,7 +8,6 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-
  "github.com/argoproj/argo-workflows/v3/workflow/common"
 )
 

workflow/controller/taskset_test.go

@@ -5,12 +5,11 @@ import (
  "strings"
  "testing"
 
- "github.com/argoproj/argo-workflows/v3/workflow/common"
-
  "github.com/stretchr/testify/assert"
  v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo-workflows/v3/workflow/common"
 )
 
 func TestCreateTaskSet(t *testing.T) {

workflow/controller/workflowpod.go

@@ -9,8 +9,6 @@ import (
  "strconv"
  "time"
 
- "github.com/argoproj/argo-workflows/v3/workflow/controller/indexes"
-
  log "github.com/sirupsen/logrus"
  apiv1 "k8s.io/api/core/v1"
  apierr "k8s.io/apimachinery/pkg/api/errors"
@@ -26,6 +24,7 @@ import (
  "github.com/argoproj/argo-workflows/v3/util/intstr"
  "github.com/argoproj/argo-workflows/v3/util/template"
  "github.com/argoproj/argo-workflows/v3/workflow/common"
+ "github.com/argoproj/argo-workflows/v3/workflow/controller/indexes"
  "github.com/argoproj/argo-workflows/v3/workflow/util"
 )
 

workflow/cron/controller.go

@@ -6,12 +6,6 @@ import (
  "reflect"
  "time"
 
- "k8s.io/apimachinery/pkg/selection"
-
- "github.com/argoproj/argo-workflows/v3/workflow/common"
-
- "github.com/argoproj/argo-workflows/v3/util/env"
-
  "github.com/argoproj/pkg/sync"
  log "github.com/sirupsen/logrus"
  apiv1 "k8s.io/api/core/v1"
@@ -20,6 +14,7 @@ import (
  "k8s.io/apimachinery/pkg/fields"
  "k8s.io/apimachinery/pkg/labels"
  "k8s.io/apimachinery/pkg/runtime/schema"
+ "k8s.io/apimachinery/pkg/selection"
  "k8s.io/apimachinery/pkg/types"
  runtimeutil "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/apimachinery/pkg/util/wait"
@@ -32,6 +27,8 @@ import (
  "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow"
  "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo-workflows/v3/pkg/client/clientset/versioned"
+ "github.com/argoproj/argo-workflows/v3/util/env"
+ "github.com/argoproj/argo-workflows/v3/workflow/common"
  "github.com/argoproj/argo-workflows/v3/workflow/events"
  "github.com/argoproj/argo-workflows/v3/workflow/metrics"
  "github.com/argoproj/argo-workflows/v3/workflow/util"

workflow/executor/common/common.go

@@ -11,11 +11,10 @@ import (
  "syscall"
  "time"
 
- envutil "github.com/argoproj/argo-workflows/v3/util/env"
-
  log "github.com/sirupsen/logrus"
  v1 "k8s.io/api/core/v1"
 
+ envutil "github.com/argoproj/argo-workflows/v3/util/env"
  "github.com/argoproj/argo-workflows/v3/util/slice"
 )
 

workflow/executor/emissary/emissary.go

@@ -15,7 +15,6 @@ import (
  log "github.com/sirupsen/logrus"
 
  "github.com/argoproj/argo-workflows/v3/errors"
-
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo-workflows/v3/workflow/executor"
  osspecific "github.com/argoproj/argo-workflows/v3/workflow/executor/os-specific"