Skip to content

Commit 38adf62

Browse files
authored
chore: Enable GCI for golangci-lint (kubeflow#2540)
Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
1 parent b1e242b commit 38adf62

File tree

8 files changed

+26
-8
lines changed

8 files changed

+26
-8
lines changed

.golangci.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# golangci-lint configuration file
2+
# see: https://golangci-lint.run/usage/configuration/
3+
4+
# Settings of specific linters
5+
linters-settings:
6+
gci:
7+
sections:
8+
- standard # Standard section: captures all standard packages.
9+
- default # Default section: contains all imports that could not be matched to another section type.
10+
- prefix(github.com/kubeflow/trainer) # Custom section: groups all imports with the specified Prefix.
11+
- blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
12+
- dot # Dot section: contains all dot imports.
13+
skip-generated: true # Skip generated files.
14+
15+
# Settings for enabling and disabling linters
16+
linters:
17+
enable:
18+
- gci

pkg/controller/trainjob_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"fmt"
2323

2424
"github.com/go-logr/logr"
25-
"github.com/kubeflow/trainer/pkg/constants"
2625
"k8s.io/apimachinery/pkg/api/equality"
2726
"k8s.io/apimachinery/pkg/api/meta"
2827
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -38,6 +37,7 @@ import (
3837
"sigs.k8s.io/controller-runtime/pkg/controller"
3938

4039
trainer "github.com/kubeflow/trainer/pkg/apis/trainer/v1alpha1"
40+
"github.com/kubeflow/trainer/pkg/constants"
4141
jobruntimes "github.com/kubeflow/trainer/pkg/runtime"
4242
)
4343

pkg/runtime/framework/plugins/mpi/mpi.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"strconv"
2929

3030
"golang.org/x/crypto/ssh"
31-
3231
corev1 "k8s.io/api/core/v1"
3332
apiruntime "k8s.io/apimachinery/pkg/runtime"
3433
"k8s.io/apimachinery/pkg/util/intstr"

pkg/runtime/framework/plugins/mpi/mpi_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
gocmp "github.com/google/go-cmp/cmp"
2727
"github.com/google/go-cmp/cmp/cmpopts"
28-
"github.com/kubeflow/trainer/pkg/constants"
2928
corev1 "k8s.io/api/core/v1"
3029
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3130
apiruntime "k8s.io/apimachinery/pkg/runtime"
@@ -37,6 +36,7 @@ import (
3736
"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
3837

3938
trainer "github.com/kubeflow/trainer/pkg/apis/trainer/v1alpha1"
39+
"github.com/kubeflow/trainer/pkg/constants"
4040
"github.com/kubeflow/trainer/pkg/runtime"
4141
"github.com/kubeflow/trainer/pkg/runtime/framework"
4242
utiltesting "github.com/kubeflow/trainer/pkg/util/testing"

pkg/runtime/framework/plugins/torch/torch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"fmt"
2222
"strings"
2323

24+
corev1 "k8s.io/api/core/v1"
2425
"k8s.io/apimachinery/pkg/util/intstr"
2526
"k8s.io/apimachinery/pkg/util/sets"
2627
"k8s.io/apimachinery/pkg/util/validation/field"
@@ -34,7 +35,6 @@ import (
3435
"github.com/kubeflow/trainer/pkg/constants"
3536
"github.com/kubeflow/trainer/pkg/runtime"
3637
"github.com/kubeflow/trainer/pkg/runtime/framework"
37-
corev1 "k8s.io/api/core/v1"
3838
)
3939

4040
type Torch struct{}

pkg/runtime/runtime_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
batchv1ac "k8s.io/client-go/applyconfigurations/batch/v1"
2727
corev1ac "k8s.io/client-go/applyconfigurations/core/v1"
2828
"k8s.io/utils/ptr"
29+
jobsetv1alpha2ac "sigs.k8s.io/jobset/client-go/applyconfiguration/jobset/v1alpha2"
2930

3031
"github.com/kubeflow/trainer/pkg/constants"
3132
jobsetplgconsts "github.com/kubeflow/trainer/pkg/runtime/framework/plugins/jobset/constants"
32-
jobsetv1alpha2ac "sigs.k8s.io/jobset/client-go/applyconfiguration/jobset/v1alpha2"
3333
)
3434

3535
func TestNewInfo(t *testing.T) {

pkg/util/testing/compare.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import (
2222

2323
"github.com/google/go-cmp/cmp"
2424
"github.com/google/go-cmp/cmp/cmpopts"
25-
"github.com/kubeflow/trainer/pkg/constants"
2625
corev1 "k8s.io/api/core/v1"
26+
27+
"github.com/kubeflow/trainer/pkg/constants"
2728
)
2829

2930
var (

pkg/util/testing/wrapper.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import (
2626
"k8s.io/apimachinery/pkg/types"
2727
"k8s.io/apimachinery/pkg/util/intstr"
2828
"k8s.io/utils/ptr"
29+
jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2"
30+
schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
2931

3032
trainer "github.com/kubeflow/trainer/pkg/apis/trainer/v1alpha1"
3133
"github.com/kubeflow/trainer/pkg/constants"
3234
jobsetplgconsts "github.com/kubeflow/trainer/pkg/runtime/framework/plugins/jobset/constants"
33-
jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2"
34-
schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
3535
)
3636

3737
type JobSetWrapper struct {

0 commit comments

Comments
 (0)