chore: sort imports (#498)

aiven · Sep 14, 2023 · eaa4892 · eaa4892
1 parent 1f1fd04
commit eaa4892
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -104,7 +104,7 @@ boilerplate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto,
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: generate
-generate: boilerplate userconfigs manifests docs charts
+generate: boilerplate userconfigs imports manifests docs charts
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
@@ -340,3 +340,8 @@ endif
 		--set resources.requests.memory=0 \
 		--set webhooks.enabled=${WEBHOOKS_ENABLED} \
 		aiven-operator charts/aiven-operator
+
+# On MACOS requires gnu-sed. Run `brew info gnu-sed` and follow instructions to replace default sed.
+imports:
+	find . -type f -name '*.go' -exec sed -zi 's/"\n\+\t"/"\n"/g' {} +
+	goimports -local "github.com/aiven/aiven-operator" -w .
diff --git a/api/v1alpha1/userconfig/integration/clickhouse_kafka/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/clickhouse_kafka/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/clickhouse_postgresql/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/clickhouse_postgresql/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/datadog/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/datadog/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/external_aws_cloudwatch_metrics/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/external_aws_cloudwatch_metrics/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/kafka_connect/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/kafka_connect/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/kafka_logs/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/kafka_logs/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/kafka_mirrormaker/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/kafka_mirrormaker/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/logs/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/logs/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/integration/metrics/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integration/metrics/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/cassandra/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/cassandra/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/clickhouse/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/clickhouse/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/grafana/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/grafana/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/kafka/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/kafka/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/kafka_connect/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/kafka_connect/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/mysql/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/mysql/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/pg/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/pg/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/redis/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/redis/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/common.go b/controllers/common.go
@@ -8,15 +8,14 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/aiven/aiven-go-client"
 	"github.com/liip/sheriff"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	"github.com/aiven/aiven-go-client"
-
 	"github.com/aiven/aiven-operator/api/v1alpha1"
 )
 

diff --git a/controllers/secret_finalizer_gc_controller.go b/controllers/secret_finalizer_gc_controller.go
@@ -15,14 +15,13 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-
 	"github.com/aiven/aiven-operator/api/v1alpha1"
 )
 

diff --git a/generators/userconfigs/pg/zz_generated.deepcopy.go b/generators/userconfigs/pg/zz_generated.deepcopy.go