address new linter issues

Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>

Author: ppapapetrou76

acr_controller/application/client.go

@@ -23,7 +23,6 @@ type httpApplicationClient struct {
 	httpClient *http.Client
 	baseURL    string
 	token      string
-	rootpath   string
 }
 
 func NewHTTPApplicationClient(token string, address string, rootpath string) ApplicationClient {
@@ -47,14 +46,13 @@ func NewHTTPApplicationClient(token string, address string, rootpath string) App
 				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 			},
 		},
-		baseURL:  address,
-		token:    token,
-		rootpath: rootpath,
+		baseURL: address,
+		token:   token,
 	}
 }
 
 func (c *httpApplicationClient) execute(ctx context.Context, url string, result any) error {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, http.NoBody)
 	if err != nil {
 		return err
 	}

acr_controller/controller/broadcaster.go

@@ -57,9 +57,7 @@ func (b *broadcasterHandler) notify(event *appv1.ApplicationWatchEvent) {
 		if s.matches(event) {
 			select {
 			case s.ch <- event:
-				{
-					// log.Infof("adding application '%s' to channel", event.Application.Name)
-				}
+				log.Infof("adding application '%s' to channel", event.Application.Name)
 			default:
 				// drop event if cannot send right away
 				log.WithField("application", event.Application.Name).Warn("unable to send event notification")

acr_controller/controller/controller.go

@@ -13,8 +13,6 @@ import (
 	appclientset "github.com/argoproj/argo-cd/v3/pkg/client/clientset/versioned"
 
 	appv1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
-	applisters "github.com/argoproj/argo-cd/v3/pkg/client/listers/application/v1alpha1"
-	servercache "github.com/argoproj/argo-cd/v3/server/cache"
 )
 
 var watchAPIBufferSize = 1000
@@ -24,27 +22,19 @@ type ACRController interface {
 }
 
 type applicationChangeRevisionController struct {
-	appBroadcaster           Broadcaster
-	cache                    *servercache.Cache
-	appLister                applisters.ApplicationLister
-	applicationServiceClient appclient.ApplicationClient
-	acrService               service.ACRService
-	applicationClientset     appclientset.Interface
+	appBroadcaster Broadcaster
+	acrService     service.ACRService
 }
 
-func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInformer, cache *servercache.Cache, applicationServiceClient appclient.ApplicationClient, appLister applisters.ApplicationLister, applicationClientset appclientset.Interface) ACRController {
+func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInformer, applicationServiceClient appclient.ApplicationClient, applicationClientset appclientset.Interface) ACRController {
 	appBroadcaster := NewBroadcaster()
 	_, err := appInformer.AddEventHandler(appBroadcaster)
 	if err != nil {
 		log.Error(err)
 	}
 	return &applicationChangeRevisionController{
-		appBroadcaster:           appBroadcaster,
-		cache:                    cache,
-		applicationServiceClient: applicationServiceClient,
-		appLister:                appLister,
-		applicationClientset:     applicationClientset,
-		acrService:               service.NewACRService(applicationClientset, applicationServiceClient),
+		appBroadcaster: appBroadcaster,
+		acrService:     service.NewACRService(applicationClientset, applicationServiceClient),
 	}
 }
 

acr_controller/server.go

@@ -2,7 +2,6 @@ package acr_controller
 
 import (
 	"context"
-	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
@@ -20,10 +19,8 @@ import (
 
 	appclientset "github.com/argoproj/argo-cd/v3/pkg/client/clientset/versioned"
 	appinformer "github.com/argoproj/argo-cd/v3/pkg/client/informers/externalversions"
-	applisters "github.com/argoproj/argo-cd/v3/pkg/client/listers/application/v1alpha1"
 	servercache "github.com/argoproj/argo-cd/v3/server/cache"
 	"github.com/argoproj/argo-cd/v3/util/healthz"
-	settings_util "github.com/argoproj/argo-cd/v3/util/settings"
 )
 
 var backoff = wait.Backoff{
@@ -36,15 +33,11 @@ var backoff = wait.Backoff{
 type ACRServer struct {
 	ACRServerOpts
 
-	settings             *settings_util.ArgoCDSettings
-	log                  *log.Entry
 	appInformer          cache.SharedIndexInformer
-	appLister            applisters.ApplicationLister
 	applicationClientset appclientset.Interface
 
 	// stopCh is the channel which when closed, will shutdown the Event Reporter server
-	stopCh     chan struct{}
-	serviceSet *ACRServerSet
+	stopCh chan struct{}
 }
 
 type ACRServerSet struct{}
@@ -100,12 +93,10 @@ func (a *ACRServer) healthCheck(_ *http.Request) error {
 // Init starts informers used by the API server
 func (a *ACRServer) Init(ctx context.Context) {
 	go a.appInformer.Run(ctx.Done())
-	svcSet := newApplicationChangeRevisionServiceSet()
-	a.serviceSet = svcSet
 }
 
 func (a *ACRServer) RunController(ctx context.Context) {
-	controller := acr_controller.NewApplicationChangeRevisionController(a.appInformer, a.Cache, a.ApplicationServiceClient, a.appLister, a.applicationClientset)
+	controller := acr_controller.NewApplicationChangeRevisionController(a.appInformer, a.ApplicationServiceClient, a.applicationClientset)
 	go controller.Run(ctx)
 }
 
@@ -164,10 +155,6 @@ func (a *ACRServer) Listen() (*Listeners, error) {
 // golang/protobuf).
 func (a *ACRServer) Run(ctx context.Context, lns *Listeners) {
 	httpS := a.newHTTPServer(ctx, a.ListenPort)
-	tlsConfig := tls.Config{}
-	tlsConfig.GetCertificate = func(_ *tls.ClientHelloInfo) (*tls.Certificate, error) {
-		return a.settings.Certificate, nil
-	}
 	go func() { a.checkServeErr("httpS", httpS.Serve(lns.Main)) }()
 	go a.RunController(ctx)
 
@@ -179,7 +166,7 @@ func (a *ACRServer) Run(ctx context.Context, lns *Listeners) {
 	<-a.stopCh
 }
 
-// NewServer returns a new instance of the Event Reporter server
+// NewApplicationChangeRevisionServer returns a new instance of the Event Reporter server
 func NewApplicationChangeRevisionServer(_ context.Context, opts ACRServerOpts) *ACRServer {
 	appInformerNs := opts.Namespace
 	if len(opts.ApplicationNamespaces) > 0 {
@@ -188,19 +175,12 @@ func NewApplicationChangeRevisionServer(_ context.Context, opts ACRServerOpts) *
 	appFactory := appinformer.NewSharedInformerFactoryWithOptions(opts.AppClientset, 0, appinformer.WithNamespace(appInformerNs), appinformer.WithTweakListOptions(func(_ *metav1.ListOptions) {}))
 
 	appInformer := appFactory.Argoproj().V1alpha1().Applications().Informer()
-	appLister := appFactory.Argoproj().V1alpha1().Applications().Lister()
 
 	server := &ACRServer{
 		ACRServerOpts:        opts,
-		log:                  log.NewEntry(log.StandardLogger()),
 		appInformer:          appInformer,
-		appLister:            appLister,
 		applicationClientset: opts.AppClientset,
 	}
 
 	return server
 }
-
-func newApplicationChangeRevisionServiceSet() *ACRServerSet {
-	return &ACRServerSet{}
-}

acr_controller/service/acr_service_test.go

@@ -229,22 +229,22 @@ func Test_getRevisions(r *testing.T) {
 	r.Run("history list is empty", func(t *testing.T) {
 		acrService := newTestACRService(&mocks.ApplicationClient{})
 		current, previous := acrService.getRevisions(r.Context(), createTestApp(fakeApp))
-		assert.Equal(t, "", current)
-		assert.Equal(t, "", previous)
+		assert.Empty(t, current)
+		assert.Empty(t, previous)
 	})
 
 	r.Run("history list is empty, but operation happens right now", func(t *testing.T) {
 		acrService := newTestACRService(&mocks.ApplicationClient{})
 		current, previous := acrService.getRevisions(r.Context(), createTestApp(fakeAppWithOperation))
 		assert.Equal(t, "c732f4d2ef24c7eeb900e9211ff98f90bb646505", current)
-		assert.Equal(t, "", previous)
+		assert.Empty(t, previous)
 	})
 
 	r.Run("history list contains only one element, also sync result is here", func(t *testing.T) {
 		acrService := newTestACRService(&mocks.ApplicationClient{})
 		current, previous := acrService.getRevisions(r.Context(), createTestApp(syncedAppWithSingleHistory))
 		assert.Equal(t, "c732f4d2ef24c7eeb900e9211ff98f90bb646505", current)
-		assert.Equal(t, "", previous)
+		assert.Empty(t, previous)
 	})
 
 	r.Run("application is synced", func(t *testing.T) {

cmd/application-change-revision-controller/commands/application_change_revision_controller.go

@@ -126,13 +126,9 @@ func NewCommand() *cobra.Command {
 			lns, err := changeRevisionServer.Listen()
 			errors.CheckError(err)
 			for {
-				var closer func()
 				ctx, cancel := context.WithCancel(ctx)
 				changeRevisionServer.Run(ctx, lns)
 				cancel()
-				if closer != nil {
-					closer()
-				}
 			}
 		},
 	}

server/application/application_rollout_rollback.go

@@ -79,22 +79,22 @@ func (s *Server) getRsOfSpecificRevision(ctx context.Context, config *rest.Confi
 			return nil, fmt.Errorf("error getting resource: %w", err)
 		}
 
-		if v := resource.GetRevision(rsliveObj); err == nil {
-			if toRevision == 0 {
-				if latestRevision < v {
-					// newest one we've seen so far
-					previousRevision = latestRevision
-					previousReplicaSet = latestReplicaSet
-					latestRevision = v
-					latestReplicaSet = rsliveObj
-				} else if previousRevision < v {
-					// second newest one we've seen so far
-					previousRevision = v
-					previousReplicaSet = rsliveObj
-				}
-			} else if toRevision == v {
-				return rsliveObj, nil
+		v := resource.GetRevision(rsliveObj)
+		switch toRevision {
+		case 0:
+			if latestRevision < v {
+				// newest one we've seen so far
+				previousRevision = latestRevision
+				previousReplicaSet = latestReplicaSet
+				latestRevision = v
+				latestReplicaSet = rsliveObj
+			} else if previousRevision < v {
+				// second newest one we've seen so far
+				previousRevision = v
+				previousReplicaSet = rsliveObj
 			}
+		case v:
+			return rsliveObj, nil
 		}
 	}
 
@@ -139,7 +139,7 @@ func (s *Server) getReplicaSetForRolloutRollack(ctx context.Context, config *res
 	rolloutGVK := getRolloutGVK()
 
 	foundRolloutNode := tree.FindNode(rolloutGVK.Group, rolloutGVK.Kind, q.GetRolloutNamespace(), q.GetRolloutName())
-	if foundRolloutNode == nil || foundRolloutNode.ResourceRef.UID == "" {
+	if foundRolloutNode == nil || foundRolloutNode.UID == "" {
 		return nil, status.Errorf(codes.InvalidArgument, "%s %s %s not found as part of application %s", rolloutGVK.Kind, rolloutGVK.Group, q.GetRolloutName(), q.GetName())
 	}
 

server/application/application_validate_src_and_dest.go

@@ -35,7 +35,7 @@ func (s *Server) ValidateSrcAndDst(ctx context.Context, requset *application.App
 
 	if err := validateDestination(ctx, &app.Spec.Destination, s.db); err != nil {
 		entity := destinationEntity
-		errMsg := fmt.Sprintf("application destination spec for %s is invalid: %s", app.ObjectMeta.Name, err.Error())
+		errMsg := fmt.Sprintf("application destination spec for %s is invalid: %s", app.Name, err.Error())
 		return &application.ApplicationValidateResponse{
 			Error:  &errMsg,
 			Entity: &entity,
@@ -53,7 +53,7 @@ func (s *Server) ValidateSrcAndDst(ctx context.Context, requset *application.App
 	}
 	if len(conditions) > 0 {
 		entity := sourceEntity
-		errMsg := fmt.Sprintf("application spec for %s is invalid: %s", app.ObjectMeta.Name, argo.FormatAppConditions(conditions))
+		errMsg := fmt.Sprintf("application spec for %s is invalid: %s", app.Name, argo.FormatAppConditions(conditions))
 		return &application.ApplicationValidateResponse{
 			Error:  &errMsg,
 			Entity: &entity,

server/application/cf_application.go

@@ -12,7 +12,7 @@ import (
 	appv1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v3/reposerver/apiclient"
 	"github.com/argoproj/argo-cd/v3/util/app/path"
-	ioutil "github.com/argoproj/argo-cd/v3/util/io"
+	utilio "github.com/argoproj/argo-cd/v3/util/io"
 )
 
 const (
@@ -41,7 +41,7 @@ func (s *Server) GetChangeRevision(ctx context.Context, in *application.ChangeRe
 	if err != nil {
 		return nil, fmt.Errorf("error creating repo server client: %w", err)
 	}
-	defer ioutil.Close(closer)
+	defer utilio.Close(closer)
 
 	response, err := client.GetChangeRevision(ctx, &apiclient.ChangeRevisionRequest{
 		AppName:          in.GetAppName(),

util/exec/exec_test.go

@@ -203,9 +203,9 @@ func TestRunInDir(t *testing.T) {
 }
 
 func TestRedact(t *testing.T) {
-	assert.Equal(t, "", Redact(nil)(""))
-	assert.Equal(t, "", Redact([]string{})(""))
-	assert.Equal(t, "", Redact([]string{"foo"})(""))
+	assert.Empty(t, Redact(nil)(""))
+	assert.Empty(t, Redact([]string{})(""))
+	assert.Empty(t, Redact([]string{"foo"})(""))
 	assert.Equal(t, "foo", Redact([]string{})("foo"))
 	assert.Equal(t, "******", Redact([]string{"foo"})("foo"))
 	assert.Equal(t, "****** ******", Redact([]string{"foo", "bar"})("foo bar"))