make lint issues

codefresh-io · Sep 23, 2024 · 2e4fc8c · 2e4fc8c
1 parent e1fbbba
commit 2e4fc8c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/acr_controller/controller/broadcaster.go b/acr_controller/controller/broadcaster.go
@@ -1,12 +1,11 @@
 package application_change_revision_controller
 
 import (
-	"sync"
-
-	"sync"
-
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/watch"
+	"sync"
+
+	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 type subscriber struct {

diff --git a/acr_controller/controller/controller.go b/acr_controller/controller/controller.go
@@ -4,6 +4,10 @@ import (
 	"context"
 	"time"
 
+	log "github.com/sirupsen/logrus"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/tools/cache"
+
 	appclient "github.com/argoproj/argo-cd/v2/acr_controller/application"
 	"github.com/argoproj/argo-cd/v2/acr_controller/service"
 	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"

diff --git a/acr_controller/service/acr_service.go b/acr_controller/service/acr_service.go
@@ -3,14 +3,15 @@ package service
 import (
 	"context"
 	"encoding/json"
-	"sync"
-
-	"sync"
-
+	argoclient "github.com/argoproj/argo-cd/v2/acr_controller/application"
+	appclient "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
+	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
 	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/pointer"
+	"sync"
 )
 
 type ACRService interface {

diff --git a/acr_controller/service/acr_service_test.go b/acr_controller/service/acr_service_test.go
@@ -4,7 +4,11 @@ import (
 	"context"
 	"testing"
 
-	"testing"
+	"github.com/argoproj/argo-cd/v2/acr_controller/application/mocks"
+	appclient "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
+	appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	apps "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
+	"github.com/argoproj/argo-cd/v2/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"