run linter

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
jaideepr97 · Jan 4, 2024 · 883cb50 · 883cb50
1 parent cca6426
commit 883cb50
Show file tree

Hide file tree

Showing 78 changed files with 208 additions and 138 deletions.
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/controllers/argocd/TOBEREMOVED.go b/controllers/argocd/TOBEREMOVED.go
@@ -13,14 +13,15 @@ import (
 	"text/template"
 	"time"
 
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	configv1 "github.com/openshift/api/config/v1"
 	templatev1 "github.com/openshift/api/template/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
 
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
+
 	routev1 "github.com/openshift/api/route/v1"
 	"github.com/sethvargo/go-password/password"
 	"golang.org/x/mod/semver"

diff --git a/controllers/argocd/TOBEREMOVED_test.go b/controllers/argocd/TOBEREMOVED_test.go
@@ -5,9 +5,6 @@ import (
 	"sort"
 	"testing"
 
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
@@ -20,6 +17,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 )
 
 func setRouteAPIFound(t *testing.T, routeEnabled bool) {

diff --git a/controllers/argocd/appcontroller/appcontroller.go b/controllers/argocd/appcontroller/appcontroller.go
@@ -1,10 +1,11 @@
 package appcontroller
 
 import (
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 )
 
 type AppControllerReconciler struct {

diff --git a/controllers/argocd/applicationset/applicationset.go b/controllers/argocd/applicationset/applicationset.go
@@ -1,13 +1,14 @@
 package applicationset
 
 import (
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 )
 
 type ApplicationSetReconciler struct {

diff --git a/controllers/argocd/applicationset/applicationset_test.go b/controllers/argocd/applicationset/applicationset_test.go
@@ -3,15 +3,16 @@ package applicationset
 import (
 	"testing"
 
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	routev1 "github.com/openshift/api/route/v1"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 var testExpectedLabels = common.DefaultResourceLabels(argocdcommon.TestArgoCDName, argocdcommon.TestNamespace, AppSetControllerComponent)

diff --git a/controllers/argocd/applicationset/deployment_test.go b/controllers/argocd/applicationset/deployment_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
+
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/types"
 )

diff --git a/controllers/argocd/applicationset/role_test.go b/controllers/argocd/applicationset/role_test.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 func TestApplicationSetReconciler_reconcileRole(t *testing.T) {

diff --git a/controllers/argocd/applicationset/rolebinding_test.go b/controllers/argocd/applicationset/rolebinding_test.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 func TestApplicationSetReconciler_reconcileRoleBinding(t *testing.T) {

diff --git a/controllers/argocd/applicationset/service_test.go b/controllers/argocd/applicationset/service_test.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 func TestApplicationSetReconciler_reconcileService(t *testing.T) {

diff --git a/controllers/argocd/applicationset/serviceaccount_test.go b/controllers/argocd/applicationset/serviceaccount_test.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 func TestApplicationSetReconciler_reconcileServiceAccount(t *testing.T) {

diff --git a/controllers/argocd/applicationset/webhookroute_test.go b/controllers/argocd/applicationset/webhookroute_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
+
 	routev1 "github.com/openshift/api/route/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/controllers/argocd/argocdcommon/testing.go b/controllers/argocd/argocdcommon/testing.go
@@ -1,11 +1,12 @@
 package argocdcommon
 
 import (
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	"github.com/argoproj-labs/argocd-operator/common"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/argoproj-labs/argocd-operator/common"
 )
 
 const (

diff --git a/controllers/argocd/configmap/configmap.go b/controllers/argocd/configmap/configmap.go
@@ -1,10 +1,11 @@
 package configmap
 
 import (
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 )
 
 type ConfigMapReconciler struct {

diff --git a/controllers/argocd/hpa_test.go b/controllers/argocd/hpa_test.go
@@ -4,14 +4,15 @@ import (
 	"context"
 	"testing"
 
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/stretchr/testify/assert"
 	autoscaling "k8s.io/api/autoscaling/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 )
 
 var (

diff --git a/controllers/argocd/keycloak.go b/controllers/argocd/keycloak.go
@@ -22,10 +22,11 @@ import (
 	"fmt"
 	"os"
 
+	oappsv1client "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
+
 	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/argoproj-labs/argocd-operator/common"
 	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
-	oappsv1client "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 
 	appsv1 "github.com/openshift/api/apps/v1"
 	oappsv1 "github.com/openshift/api/apps/v1"

diff --git a/controllers/argocd/notifications/configmap_test.go b/controllers/argocd/notifications/configmap_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/argoproj-labs/argocd-operator/common"
 	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
-	"github.com/stretchr/testify/assert"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/controllers/argocd/notifications/deployment_test.go b/controllers/argocd/notifications/deployment_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
+
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/types"
 )

diff --git a/controllers/argocd/notifications/notifications.go b/controllers/argocd/notifications/notifications.go
@@ -1,13 +1,14 @@
 package notifications
 
 import (
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 )
 
 type NotificationsReconciler struct {

diff --git a/controllers/argocd/notifications/notifications_test.go b/controllers/argocd/notifications/notifications_test.go
@@ -3,14 +3,15 @@ package notifications
 import (
 	"testing"
 
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 var testExpectedLabels = common.DefaultResourceLabels(argocdcommon.TestArgoCDName, argocdcommon.TestNamespace, common.ArgoCDNotificationsControllerComponent)

diff --git a/controllers/argocd/notifications/role_test.go b/controllers/argocd/notifications/role_test.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 func TestNotificationsReconciler_reconcileRole(t *testing.T) {

diff --git a/controllers/argocd/notifications/rolebinding_test.go b/controllers/argocd/notifications/rolebinding_test.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/argoproj-labs/argocd-operator/common"
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 func TestNotificationsReconciler_reconcileRoleBinding(t *testing.T) {

diff --git a/controllers/argocd/notifications/secret_test.go b/controllers/argocd/notifications/secret_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/argoproj-labs/argocd-operator/common"
 	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
-	"github.com/stretchr/testify/assert"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/controllers/argocd/notifications/serviceaccount_test.go b/controllers/argocd/notifications/serviceaccount_test.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"testing"
 
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 )
 
 func TestNotificationsReconciler_reconcileServiceAccount(t *testing.T) {

diff --git a/controllers/argocd/notifications/util.go b/controllers/argocd/notifications/util.go
@@ -1,8 +1,9 @@
 package notifications
 
 import (
-	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 	corev1 "k8s.io/api/core/v1"
+
+	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 )
 
 // GetDefaultNotificationsConfig returns a map that contains default triggers and template configurations for argocd-notifications-cm

diff --git a/controllers/argocd/prometheus_test.go b/controllers/argocd/prometheus_test.go
@@ -5,13 +5,14 @@ import (
 	"fmt"
 	"testing"
 
-	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 )
 
 func TestReconcileWorkloadStatusAlertRule(t *testing.T) {