Skip to content

Commit 5818634

Browse files
committed
fix: correct typo in linter settings key name
The linter settings key was incorrectly named "linter-settings" instead of "linters-settings", preventing proper parsing of goimports configuration. This fixes the local-prefixes setting for import organization. All affected files have been automatically reformatted to comply with the now-active goimports rules for import ordering and grouping. Signed-off-by: Ville Vesilehto <[email protected]>
1 parent c0ca530 commit 5818634

File tree

94 files changed

+247
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+247
-152
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ issues:
66
- pkg/client
77
exclude-files:
88
- ".*\\.pb\\.go"
9-
linter-settings:
9+
linters-settings:
1010
goimports:
1111
local-prefixes: github.com/argoproj/argo-rollouts
1212
linters:

analysis/controller.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import (
55
"sync"
66
"time"
77

8-
"github.com/argoproj/argo-rollouts/metric"
9-
jobProvider "github.com/argoproj/argo-rollouts/metricproviders/job"
108
"github.com/aws/smithy-go/ptr"
119
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1210
"k8s.io/apimachinery/pkg/types"
1311

12+
"github.com/argoproj/argo-rollouts/metric"
13+
jobProvider "github.com/argoproj/argo-rollouts/metricproviders/job"
14+
1415
unstructuredutil "github.com/argoproj/argo-rollouts/utils/unstructured"
1516

1617
log "github.com/sirupsen/logrus"

cmd/kubectl-argo-rollouts/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package main
33
import (
44
"os"
55

6-
logutil "github.com/argoproj/argo-rollouts/utils/log"
76
log "github.com/sirupsen/logrus"
87
"k8s.io/cli-runtime/pkg/genericclioptions"
98
_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
109
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
1110
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
1211
"k8s.io/klog/v2"
1312

13+
logutil "github.com/argoproj/argo-rollouts/utils/log"
14+
1415
"github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/cmd"
1516
"github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options"
1617
)

cmd/rollouts-controller/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/argoproj/argo-rollouts/metricproviders"
11-
"github.com/argoproj/argo-rollouts/utils/record"
1210
"github.com/argoproj/pkg/kubeclientmetrics"
1311
smiclientset "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/split/clientset/versioned"
1412
log "github.com/sirupsen/logrus"
@@ -24,6 +22,9 @@ import (
2422
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
2523
"k8s.io/client-go/tools/clientcmd"
2624

25+
"github.com/argoproj/argo-rollouts/metricproviders"
26+
"github.com/argoproj/argo-rollouts/utils/record"
27+
2728
"github.com/argoproj/argo-rollouts/controller"
2829
"github.com/argoproj/argo-rollouts/controller/metrics"
2930
jobprovider "github.com/argoproj/argo-rollouts/metricproviders/job"

controller/controller.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ import (
1313

1414
istioutil "github.com/argoproj/argo-rollouts/utils/istio"
1515

16-
rolloutsConfig "github.com/argoproj/argo-rollouts/utils/config"
1716
goPlugin "github.com/hashicorp/go-plugin"
1817

18+
rolloutsConfig "github.com/argoproj/argo-rollouts/utils/config"
19+
1920
"k8s.io/apimachinery/pkg/util/wait"
2021

2122
"k8s.io/client-go/dynamic/dynamicinformer"

controller/metrics/experiment_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import (
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"sigs.k8s.io/yaml"
1212

13-
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
1413
"github.com/prometheus/client_golang/prometheus"
1514
"github.com/prometheus/client_golang/prometheus/promhttp"
15+
16+
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
1617
)
1718

1819
const (

controller/metrics/metrics_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/argoproj/argo-rollouts/utils/defaults"
1312
"github.com/stretchr/testify/assert"
1413
"k8s.io/apimachinery/pkg/runtime"
1514
"k8s.io/client-go/tools/cache"
1615

16+
"github.com/argoproj/argo-rollouts/utils/defaults"
17+
1718
"github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake"
1819
informerfactory "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions"
1920
logutil "github.com/argoproj/argo-rollouts/utils/log"

controller/metrics/prommetrics.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package metrics
22

33
import (
4-
"github.com/argoproj/argo-rollouts/utils/version"
54
"github.com/prometheus/client_golang/prometheus"
5+
6+
"github.com/argoproj/argo-rollouts/utils/version"
67
)
78

89
// Follow Prometheus naming practices

controller/metrics/rollout_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import (
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"sigs.k8s.io/yaml"
1212

13-
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
14-
"github.com/argoproj/argo-rollouts/utils/conditions"
1513
"github.com/prometheus/client_golang/prometheus"
1614
"github.com/prometheus/client_golang/prometheus/promhttp"
15+
16+
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
17+
"github.com/argoproj/argo-rollouts/utils/conditions"
1718
)
1819

1920
const (

experiments/service.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import (
66

77
"k8s.io/apimachinery/pkg/api/errors"
88

9-
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
10-
logutil "github.com/argoproj/argo-rollouts/utils/log"
119
log "github.com/sirupsen/logrus"
1210
corev1 "k8s.io/api/core/v1"
1311
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1412
"k8s.io/apimachinery/pkg/labels"
13+
14+
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
15+
logutil "github.com/argoproj/argo-rollouts/utils/log"
1516
)
1617

1718
var experimentKind = v1alpha1.SchemeGroupVersion.WithKind("Experiment")

0 commit comments

Comments
 (0)