chore: sync all codefresh code changes into v3.0.2 without event-reporter related changes

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

Author: oleksandr-codefresh

acr_controller/application/client.go

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

acr_controller/controller/controller.go

@@ -13,6 +13,8 @@ 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

acr_controller/server.go

@@ -2,11 +2,14 @@ package acr_controller
 
 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
 	"time"
 
+	applisters "github.com/argoproj/argo-cd/v3/pkg/client/listers/application/v1alpha1"
+	settings_util "github.com/argoproj/argo-cd/v3/util/settings"
 	"github.com/redis/go-redis/v9"
 	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,11 +36,15 @@ 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{}
+	stopCh     chan struct{}
+	serviceSet *ACRServerSet
 }
 
 type ACRServerSet struct{}
@@ -156,6 +163,10 @@ 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)
 
@@ -176,10 +187,13 @@ 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,
 	}
 

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.Empty(t, current)
-		assert.Empty(t, previous)
+		assert.Equal(t, "", current)
+		assert.Equal(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.Empty(t, previous)
+		assert.Equal(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.Empty(t, previous)
+		assert.Equal(t, "", previous)
 	})
 
 	r.Run("application is synced", func(t *testing.T) {

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

@@ -128,9 +128,13 @@ 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

@@ -78,22 +78,22 @@ func (s *Server) getRsOfSpecificRevision(ctx context.Context, config *rest.Confi
 		if err != nil {
 			return nil, fmt.Errorf("error getting resource: %w", err)
 		}
-		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
+		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
 			}
-		case v:
-			return rsliveObj, nil
 		}
 	}
 
@@ -138,7 +138,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.UID == "" {
+	if foundRolloutNode == nil || foundRolloutNode.ResourceRef.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.Name, err.Error())
+		errMsg := fmt.Sprintf("application destination spec for %s is invalid: %s", app.ObjectMeta.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.Name, argo.FormatAppConditions(conditions))
+		errMsg := fmt.Sprintf("application spec for %s is invalid: %s", app.ObjectMeta.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"
-	utilio "github.com/argoproj/argo-cd/v3/util/io"
+	ioutil "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 utilio.Close(closer)
+	defer ioutil.Close(closer)
 
 	response, err := client.GetChangeRevision(ctx, &apiclient.ChangeRevisionRequest{
 		AppName:          in.GetAppName(),

util/kustomize/repospec.go

@@ -34,7 +34,7 @@ func parseGitURL(n string) (
 		index := strings.Index(n, gitSuffix)
 		orgRepo = n[0:index]
 		n = n[index+len(gitSuffix):]
-		if n != "" && n[0] == '/' {
+		if len(n) > 0 && n[0] == '/' {
 			n = n[1:]
 		}
 		path, gitRef = peelQuery(n)

util/kustomize/repospec_test.go

@@ -43,7 +43,7 @@ var hostNamesRawAndNormalized = [][]string{
 }
 
 func makeURL(hostFmt, orgRepo, path, href string) string {
-	if path != "" {
+	if len(path) > 0 {
 		orgRepo = filepath.Join(orgRepo, path)
 	}
 	url := hostFmt + orgRepo