Skip to content

Commit 972914a

Browse files
authored
fix linter for generated files (#2950)
* make fmt internal/generated * add fmt target to gen-all
1 parent c1022fc commit 972914a

File tree

12 files changed

+69
-54
lines changed

12 files changed

+69
-54
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ run-scaffolder: tools/scaffolder/bin/scaffolder
900900
--indexer-out $(realpath .)/internal/generated/indexers \
901901
--controller-out $(realpath .)/internal/generated/controller
902902

903-
gen-all: gen-crds gen-go-types run-scaffolder
903+
gen-all: gen-crds gen-go-types run-scaffolder fmt
904904

905905
build-autogen: gen-all $(ALL_IN_ONE_AUTOGENERATED_CONFIG)
906906
EXPERIMENTAL=1 VERSION=$(shell $(JQ) -r .next $(VERSION_FILE))-EXPERIMENTAL-${GITCOMMIT} $(MAKE) image

internal/generated/controller/cluster/cluster_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515
package cluster
1616

1717
import (
18-
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
19-
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
20-
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
21-
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
22-
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2318
v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
2419
zap "go.uber.org/zap"
2520
client "sigs.k8s.io/controller-runtime/pkg/client"
2621
cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
2722
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
23+
24+
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
25+
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
26+
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
27+
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
28+
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2829
)
2930

3031
// +kubebuilder:rbac:groups=atlas.generated.mongodb.com,resources=clusters,verbs=get;list;watch;create;update;patch;delete

internal/generated/controller/cluster/handler.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ package cluster
1717
import (
1818
"context"
1919
"fmt"
20+
21+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
22+
controllerruntime "sigs.k8s.io/controller-runtime"
23+
builder "sigs.k8s.io/controller-runtime/pkg/builder"
24+
client "sigs.k8s.io/controller-runtime/pkg/client"
25+
controller "sigs.k8s.io/controller-runtime/pkg/controller"
26+
handler "sigs.k8s.io/controller-runtime/pkg/handler"
27+
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
28+
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
29+
2030
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
2131
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
2232
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
@@ -26,14 +36,6 @@ import (
2636
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2737
result "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/result"
2838
state "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/state"
29-
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
30-
controllerruntime "sigs.k8s.io/controller-runtime"
31-
builder "sigs.k8s.io/controller-runtime/pkg/builder"
32-
client "sigs.k8s.io/controller-runtime/pkg/client"
33-
controller "sigs.k8s.io/controller-runtime/pkg/controller"
34-
handler "sigs.k8s.io/controller-runtime/pkg/handler"
35-
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
36-
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
3739
)
3840

3941
// getHandlerForResource selects the appropriate version-specific handler based on which resource spec version is set

internal/generated/controller/databaseuser/databaseuser_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515
package databaseuser
1616

1717
import (
18-
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
19-
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
20-
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
21-
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
22-
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2318
v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
2419
zap "go.uber.org/zap"
2520
client "sigs.k8s.io/controller-runtime/pkg/client"
2621
cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
2722
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
23+
24+
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
25+
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
26+
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
27+
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
28+
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2829
)
2930

3031
// +kubebuilder:rbac:groups=atlas.generated.mongodb.com,resources=databaseusers,verbs=get;list;watch;create;update;patch;delete

internal/generated/controller/databaseuser/handler.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ package databaseuser
1717
import (
1818
"context"
1919
"fmt"
20+
21+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
22+
controllerruntime "sigs.k8s.io/controller-runtime"
23+
builder "sigs.k8s.io/controller-runtime/pkg/builder"
24+
client "sigs.k8s.io/controller-runtime/pkg/client"
25+
controller "sigs.k8s.io/controller-runtime/pkg/controller"
26+
handler "sigs.k8s.io/controller-runtime/pkg/handler"
27+
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
28+
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
29+
2030
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
2131
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
2232
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
@@ -26,14 +36,6 @@ import (
2636
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2737
result "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/result"
2838
state "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/state"
29-
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
30-
controllerruntime "sigs.k8s.io/controller-runtime"
31-
builder "sigs.k8s.io/controller-runtime/pkg/builder"
32-
client "sigs.k8s.io/controller-runtime/pkg/client"
33-
controller "sigs.k8s.io/controller-runtime/pkg/controller"
34-
handler "sigs.k8s.io/controller-runtime/pkg/handler"
35-
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
36-
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
3739
)
3840

3941
// getHandlerForResource selects the appropriate version-specific handler based on which resource spec version is set

internal/generated/controller/flexcluster/flexcluster_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515
package flexcluster
1616

1717
import (
18-
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
19-
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
20-
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
21-
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
22-
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2318
v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
2419
zap "go.uber.org/zap"
2520
client "sigs.k8s.io/controller-runtime/pkg/client"
2621
cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
2722
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
23+
24+
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
25+
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
26+
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
27+
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
28+
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2829
)
2930

3031
// +kubebuilder:rbac:groups=atlas.generated.mongodb.com,resources=flexclusters,verbs=get;list;watch;create;update;patch;delete

internal/generated/controller/flexcluster/handler.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ package flexcluster
1717
import (
1818
"context"
1919
"fmt"
20+
21+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
22+
controllerruntime "sigs.k8s.io/controller-runtime"
23+
builder "sigs.k8s.io/controller-runtime/pkg/builder"
24+
client "sigs.k8s.io/controller-runtime/pkg/client"
25+
controller "sigs.k8s.io/controller-runtime/pkg/controller"
26+
handler "sigs.k8s.io/controller-runtime/pkg/handler"
27+
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
28+
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
29+
2030
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
2131
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
2232
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
@@ -26,14 +36,6 @@ import (
2636
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2737
result "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/result"
2838
state "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/state"
29-
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
30-
controllerruntime "sigs.k8s.io/controller-runtime"
31-
builder "sigs.k8s.io/controller-runtime/pkg/builder"
32-
client "sigs.k8s.io/controller-runtime/pkg/client"
33-
controller "sigs.k8s.io/controller-runtime/pkg/controller"
34-
handler "sigs.k8s.io/controller-runtime/pkg/handler"
35-
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
36-
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
3739
)
3840

3941
// getHandlerForResource selects the appropriate version-specific handler based on which resource spec version is set

internal/generated/controller/group/group_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515
package group
1616

1717
import (
18-
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
19-
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
20-
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
21-
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
22-
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2318
v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
2419
zap "go.uber.org/zap"
2520
client "sigs.k8s.io/controller-runtime/pkg/client"
2621
cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
2722
predicate "sigs.k8s.io/controller-runtime/pkg/predicate"
23+
24+
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
25+
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
26+
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
27+
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
28+
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2829
)
2930

3031
// +kubebuilder:rbac:groups=atlas.generated.mongodb.com,resources=groups,verbs=get;list;watch;create;update;patch;delete

internal/generated/controller/group/handler.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@ package group
1717
import (
1818
"context"
1919
"fmt"
20+
21+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
22+
controllerruntime "sigs.k8s.io/controller-runtime"
23+
builder "sigs.k8s.io/controller-runtime/pkg/builder"
24+
client "sigs.k8s.io/controller-runtime/pkg/client"
25+
controller "sigs.k8s.io/controller-runtime/pkg/controller"
26+
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
27+
2028
atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
2129
reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
2230
crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
2331
akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
2432
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2533
result "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/result"
2634
state "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/state"
27-
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
28-
controllerruntime "sigs.k8s.io/controller-runtime"
29-
builder "sigs.k8s.io/controller-runtime/pkg/builder"
30-
client "sigs.k8s.io/controller-runtime/pkg/client"
31-
controller "sigs.k8s.io/controller-runtime/pkg/controller"
32-
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
3335
)
3436

3537
// getHandlerForResource selects the appropriate version-specific handler based on which resource spec version is set

internal/generated/indexers/clusterbygroup.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
package indexer
1616

1717
import (
18-
v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
1918
zap "go.uber.org/zap"
2019
types "k8s.io/apimachinery/pkg/types"
2120
client "sigs.k8s.io/controller-runtime/pkg/client"
2221
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
22+
23+
v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
2324
)
2425

2526
// nolint:dupl

0 commit comments

Comments
 (0)