update IsAutomatedSyncEnabled func to return bool

anandrkskd · anandrkskd · commit 5974e09ef35d · 2025-03-11T15:51:59.000+05:30
Signed-off-by: Anand Kumar Singh &lt;anandrkskd@gmail.com&gt;
diff --git a/applicationset/controllers/applicationset_controller.go b/applicationset/controllers/applicationset_controller.go
@@ -1398,7 +1398,7 @@ func (r *ApplicationSetReconciler) syncValidApplications(logCtx *log.Entry, appl
 		pruneEnabled := false
 
 		// ensure that Applications generated with RollingSync do not have an automated sync policy, since the AppSet controller will handle triggering the sync operation instead
-		if validApps[i].Spec.SyncPolicy != nil && *validApps[i].Spec.SyncPolicy.IsAutomatedSyncEnabled() {
+		if validApps[i].Spec.SyncPolicy != nil && validApps[i].Spec.SyncPolicy.IsAutomatedSyncEnabled() {
 			pruneEnabled = validApps[i].Spec.SyncPolicy.Automated.Prune
 			validApps[i].Spec.SyncPolicy.Automated = nil
 		}
diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go
@@ -664,7 +664,7 @@ func printAppSummaryTable(app *argoappv1.Application, appURL string, windows *ar
 	}
 
 	var syncPolicy string
-	if app.Spec.SyncPolicy != nil && *app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
+	if app.Spec.SyncPolicy != nil && app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
 		syncPolicy = "Automated"
 		if app.Spec.SyncPolicy.Automated.Prune {
 			syncPolicy += " (Prune)"
@@ -1726,7 +1726,7 @@ func NewApplicationListCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 }
 
 func formatSyncPolicy(app argoappv1.Application) string {
-	if app.Spec.SyncPolicy == nil || !*app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
+	if app.Spec.SyncPolicy == nil || !app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
 		return "Manual"
 	}
 	policy := "Auto"
@@ -2158,7 +2158,7 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 				}
 
 				if local != "" {
-					if app.Spec.SyncPolicy != nil && *app.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !dryRun {
+					if app.Spec.SyncPolicy != nil && app.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !dryRun {
 						log.Fatal("Cannot use local sync when Automatic Sync Policy is enabled except with --dry-run")
 					}
 
diff --git a/cmd/argocd/commands/applicationset.go b/cmd/argocd/commands/applicationset.go
@@ -460,7 +460,7 @@ func printAppSetSummaryTable(appSet *arogappsetv1.ApplicationSet) {
 		syncPolicyStr string
 		syncPolicy    = appSet.Spec.Template.Spec.SyncPolicy
 	)
-	if syncPolicy != nil && *syncPolicy.IsAutomatedSyncEnabled() {
+	if syncPolicy != nil && syncPolicy.IsAutomatedSyncEnabled() {
 		syncPolicyStr = "Automated"
 		if syncPolicy.Automated.Prune {
 			syncPolicyStr += " (Prune)"
diff --git a/cmd/util/app.go b/cmd/util/app.go
@@ -289,19 +289,19 @@ func SetAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, ap
 		}
 	})
 	if flags.Changed("auto-prune") {
-		if spec.SyncPolicy == nil || !*spec.SyncPolicy.IsAutomatedSyncEnabled() {
+		if spec.SyncPolicy == nil || !spec.SyncPolicy.IsAutomatedSyncEnabled() {
 			log.Fatal("Cannot set --auto-prune: application not configured with automatic sync")
 		}
 		spec.SyncPolicy.Automated.Prune = appOpts.autoPrune
 	}
 	if flags.Changed("self-heal") {
-		if spec.SyncPolicy == nil || !*spec.SyncPolicy.IsAutomatedSyncEnabled() {
+		if spec.SyncPolicy == nil || !spec.SyncPolicy.IsAutomatedSyncEnabled() {
 			log.Fatal("Cannot set --self-heal: application not configured with automatic sync")
 		}
 		spec.SyncPolicy.Automated.SelfHeal = appOpts.selfHeal
 	}
 	if flags.Changed("allow-empty") {
-		if spec.SyncPolicy == nil || !*spec.SyncPolicy.IsAutomatedSyncEnabled() {
+		if spec.SyncPolicy == nil || !spec.SyncPolicy.IsAutomatedSyncEnabled() {
 			log.Fatal("Cannot set --allow-empty: application not configured with automatic sync")
 		}
 		spec.SyncPolicy.Automated.AllowEmpty = appOpts.allowEmpty
diff --git a/controller/appcontroller.go b/controller/appcontroller.go
@@ -2060,7 +2060,7 @@ func (ctrl *ApplicationController) autoSync(app *appv1.Application, syncStatus *
 		logCtx = logCtx.WithField("time_ms", time.Since(ts.StartTime).Milliseconds())
 		logCtx.Debug("Finished auto sync")
 	}()
-	if app.Spec.SyncPolicy == nil || !*app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
+	if app.Spec.SyncPolicy == nil || !app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
 		return nil, 0
 	}
 
@@ -2486,14 +2486,14 @@ func isOperationInProgress(app *appv1.Application) bool {
 func automatedSyncEnabled(oldApp *appv1.Application, newApp *appv1.Application) bool {
 	oldEnabled := false
 	oldSelfHealEnabled := false
-	if oldApp.Spec.SyncPolicy != nil && *oldApp.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
+	if oldApp.Spec.SyncPolicy != nil && oldApp.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
 		oldEnabled = true
 		oldSelfHealEnabled = oldApp.Spec.SyncPolicy.Automated.SelfHeal
 	}
 
 	newEnabled := false
 	newSelfHealEnabled := false
-	if newApp.Spec.SyncPolicy != nil && *newApp.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
+	if newApp.Spec.SyncPolicy != nil && newApp.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
 		newEnabled = true
 		newSelfHealEnabled = newApp.Spec.SyncPolicy.Automated.SelfHeal
 	}
diff --git a/controller/metrics/metrics.go b/controller/metrics/metrics.go
@@ -412,7 +412,7 @@ func (c *appCollector) collectApps(ch chan<- prometheus.Metric, app *argoappv1.A
 		healthStatus = health.HealthStatusUnknown
 	}
 
-	autoSyncEnabled := app.Spec.SyncPolicy != nil && *app.Spec.SyncPolicy.IsAutomatedSyncEnabled()
+	autoSyncEnabled := app.Spec.SyncPolicy != nil && app.Spec.SyncPolicy.IsAutomatedSyncEnabled()
 
 	addGauge(descAppInfo, 1, strconv.FormatBool(autoSyncEnabled), git.NormalizeGitURL(app.Spec.GetSource().RepoURL), app.Spec.Destination.Server, app.Spec.Destination.Namespace, string(syncStatus), string(healthStatus), operation)
 
diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go
@@ -22,7 +22,6 @@ import (
 	"github.com/argoproj/gitops-engine/pkg/health"
 	synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
 	"github.com/argoproj/gitops-engine/pkg/utils/kube"
-	"github.com/robfig/cron/v3"
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -1433,13 +1432,13 @@ type SyncPolicy struct {
 }
 
 // IsAutomatedSyncEnabled checks if the automated sync is enabled or disabled
-func (p *SyncPolicy) IsAutomatedSyncEnabled() *bool {
+func (p *SyncPolicy) IsAutomatedSyncEnabled() bool {
 	var isEnabled bool
 
 	if p.Automated != nil && (p.Automated.Enable == nil || *p.Automated.Enable) {
 		isEnabled = true
 	}
-	return &isEnabled
+	return isEnabled
 }
 
 // IsZero returns true if the sync policy is empty
diff --git a/server/application/application.go b/server/application/application.go
@@ -1948,7 +1948,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR
 		if err := s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplications, rbac.ActionOverride, a.RBACName(s.ns)); err != nil {
 			return nil, err
 		}
-		if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {
+		if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {
 			return nil, status.Error(codes.FailedPrecondition, "cannot use local sync when Automatic Sync Policy is enabled unless for dry run")
 		}
 	}
@@ -2048,7 +2048,7 @@ func (s *Server) resolveSourceRevisions(ctx context.Context, a *v1alpha1.Applica
 			sources[pos-1].TargetRevision = syncReq.Revisions[i]
 		}
 		for index, source := range sources {
-			if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {
+			if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {
 				if text.FirstNonEmpty(a.Spec.GetSources()[index].TargetRevision, "HEAD") != text.FirstNonEmpty(source.TargetRevision, "HEAD") {
 					return "", "", nil, nil, status.Errorf(codes.FailedPrecondition, "Cannot sync source %s to %s: auto-sync currently set to %s", source.RepoURL, source.TargetRevision, a.Spec.Sources[index].TargetRevision)
 				}
@@ -2063,7 +2063,7 @@ func (s *Server) resolveSourceRevisions(ctx context.Context, a *v1alpha1.Applica
 		return "", "", sourceRevisions, displayRevisions, nil
 	}
 	source := a.Spec.GetSource()
-	if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {
+	if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {
 		if syncReq.GetRevision() != "" && syncReq.GetRevision() != text.FirstNonEmpty(source.TargetRevision, "HEAD") {
 			return "", "", nil, nil, status.Errorf(codes.FailedPrecondition, "Cannot sync to %s: auto-sync currently set to %s", syncReq.GetRevision(), source.TargetRevision)
 		}
@@ -2086,7 +2086,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat
 	if a.DeletionTimestamp != nil {
 		return nil, status.Errorf(codes.FailedPrecondition, "application is deleting")
 	}
-	if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
+	if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() {
 		return nil, status.Errorf(codes.FailedPrecondition, "rollback cannot be initiated when auto-sync is enabled")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,7 @@ func (r ApplicationSetReconciler) syncValidApplications(logCtx log.Entry, appl`
`1398`	`1398`	`pruneEnabled := false`
`1399`	`1399`
`1400`	`1400`	`// ensure that Applications generated with RollingSync do not have an automated sync policy, since the AppSet controller will handle triggering the sync operation instead`
`1401`		`- if validApps[i].Spec.SyncPolicy != nil && *validApps[i].Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
	`1401`	`+ if validApps[i].Spec.SyncPolicy != nil && validApps[i].Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
`1402`	`1402`	`pruneEnabled = validApps[i].Spec.SyncPolicy.Automated.Prune`
`1403`	`1403`	`validApps[i].Spec.SyncPolicy.Automated = nil`
`1404`	`1404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ func printAppSummaryTable(app argoappv1.Application, appURL string, windows ar`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`var syncPolicy string`
`667`		`- if app.Spec.SyncPolicy != nil && *app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
	`667`	`+ if app.Spec.SyncPolicy != nil && app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
`668`	`668`	`syncPolicy = "Automated"`
`669`	`669`	`if app.Spec.SyncPolicy.Automated.Prune {`
`670`	`670`	`syncPolicy += " (Prune)"`
`@@ -1726,7 +1726,7 @@ func NewApplicationListCommand(clientOpts argocdclient.ClientOptions) cobra.Co`
`1726`	`1726`	`}`
`1727`	`1727`
`1728`	`1728`	`func formatSyncPolicy(app argoappv1.Application) string {`
`1729`		`- if app.Spec.SyncPolicy == nil \|\| !*app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
	`1729`	`+ if app.Spec.SyncPolicy == nil \|\| !app.Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
`1730`	`1730`	`return "Manual"`
`1731`	`1731`	`}`
`1732`	`1732`	`policy := "Auto"`
`@@ -2158,7 +2158,7 @@ func NewApplicationSyncCommand(clientOpts argocdclient.ClientOptions) cobra.Co`
`2158`	`2158`	`}`
`2159`	`2159`
`2160`	`2160`	`if local != "" {`
`2161`		`- if app.Spec.SyncPolicy != nil && *app.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !dryRun {`
	`2161`	`+ if app.Spec.SyncPolicy != nil && app.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !dryRun {`
`2162`	`2162`	`log.Fatal("Cannot use local sync when Automatic Sync Policy is enabled except with --dry-run")`
`2163`	`2163`	`}`
`2164`	`2164`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ func printAppSetSummaryTable(appSet *arogappsetv1.ApplicationSet) {`
`460`	`460`	`syncPolicyStr string`
`461`	`461`	`syncPolicy = appSet.Spec.Template.Spec.SyncPolicy`
`462`	`462`	`)`
`463`		`- if syncPolicy != nil && *syncPolicy.IsAutomatedSyncEnabled() {`
	`463`	`+ if syncPolicy != nil && syncPolicy.IsAutomatedSyncEnabled() {`
`464`	`464`	`syncPolicyStr = "Automated"`
`465`	`465`	`if syncPolicy.Automated.Prune {`
`466`	`466`	`syncPolicyStr += " (Prune)"`
Original file line number	Diff line number	Diff line change
`@@ -289,19 +289,19 @@ func SetAppSpecOptions(flags pflag.FlagSet, spec argoappv1.ApplicationSpec, ap`
`289`	`289`	`}`
`290`	`290`	`})`
`291`	`291`	`if flags.Changed("auto-prune") {`
`292`		`- if spec.SyncPolicy == nil \|\| !*spec.SyncPolicy.IsAutomatedSyncEnabled() {`
	`292`	`+ if spec.SyncPolicy == nil \|\| !spec.SyncPolicy.IsAutomatedSyncEnabled() {`
`293`	`293`	`log.Fatal("Cannot set --auto-prune: application not configured with automatic sync")`
`294`	`294`	`}`
`295`	`295`	`spec.SyncPolicy.Automated.Prune = appOpts.autoPrune`
`296`	`296`	`}`
`297`	`297`	`if flags.Changed("self-heal") {`
`298`		`- if spec.SyncPolicy == nil \|\| !*spec.SyncPolicy.IsAutomatedSyncEnabled() {`
	`298`	`+ if spec.SyncPolicy == nil \|\| !spec.SyncPolicy.IsAutomatedSyncEnabled() {`
`299`	`299`	`log.Fatal("Cannot set --self-heal: application not configured with automatic sync")`
`300`	`300`	`}`
`301`	`301`	`spec.SyncPolicy.Automated.SelfHeal = appOpts.selfHeal`
`302`	`302`	`}`
`303`	`303`	`if flags.Changed("allow-empty") {`
`304`		`- if spec.SyncPolicy == nil \|\| !*spec.SyncPolicy.IsAutomatedSyncEnabled() {`
	`304`	`+ if spec.SyncPolicy == nil \|\| !spec.SyncPolicy.IsAutomatedSyncEnabled() {`
`305`	`305`	`log.Fatal("Cannot set --allow-empty: application not configured with automatic sync")`
`306`	`306`	`}`
`307`	`307`	`spec.SyncPolicy.Automated.AllowEmpty = appOpts.allowEmpty`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ func (c appCollector) collectApps(ch chan<- prometheus.Metric, app argoappv1.A`
`412`	`412`	`healthStatus = health.HealthStatusUnknown`
`413`	`413`	`}`
`414`	`414`
`415`		`- autoSyncEnabled := app.Spec.SyncPolicy != nil && *app.Spec.SyncPolicy.IsAutomatedSyncEnabled()`
	`415`	`+ autoSyncEnabled := app.Spec.SyncPolicy != nil && app.Spec.SyncPolicy.IsAutomatedSyncEnabled()`
`416`	`416`
`417`	`417`	`addGauge(descAppInfo, 1, strconv.FormatBool(autoSyncEnabled), git.NormalizeGitURL(app.Spec.GetSource().RepoURL), app.Spec.Destination.Server, app.Spec.Destination.Namespace, string(syncStatus), string(healthStatus), operation)`
`418`	`418`
Original file line number	Diff line number	Diff line change
`@@ -1948,7 +1948,7 @@ func (s Server) Sync(ctx context.Context, syncReq application.ApplicationSyncR`
`1948`	`1948`	`if err := s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceApplications, rbac.ActionOverride, a.RBACName(s.ns)); err != nil {`
`1949`	`1949`	`return nil, err`
`1950`	`1950`	`}`
`1951`		`- if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {`
	`1951`	`+ if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {`
`1952`	`1952`	`return nil, status.Error(codes.FailedPrecondition, "cannot use local sync when Automatic Sync Policy is enabled unless for dry run")`
`1953`	`1953`	`}`
`1954`	`1954`	`}`
`@@ -2048,7 +2048,7 @@ func (s Server) resolveSourceRevisions(ctx context.Context, a v1alpha1.Applica`
`2048`	`2048`	`sources[pos-1].TargetRevision = syncReq.Revisions[i]`
`2049`	`2049`	`}`
`2050`	`2050`	`for index, source := range sources {`
`2051`		`- if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {`
	`2051`	`+ if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {`
`2052`	`2052`	`if text.FirstNonEmpty(a.Spec.GetSources()[index].TargetRevision, "HEAD") != text.FirstNonEmpty(source.TargetRevision, "HEAD") {`
`2053`	`2053`	`return "", "", nil, nil, status.Errorf(codes.FailedPrecondition, "Cannot sync source %s to %s: auto-sync currently set to %s", source.RepoURL, source.TargetRevision, a.Spec.Sources[index].TargetRevision)`
`2054`	`2054`	`}`
`@@ -2063,7 +2063,7 @@ func (s Server) resolveSourceRevisions(ctx context.Context, a v1alpha1.Applica`
`2063`	`2063`	`return "", "", sourceRevisions, displayRevisions, nil`
`2064`	`2064`	`}`
`2065`	`2065`	`source := a.Spec.GetSource()`
`2066`		`- if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {`
	`2066`	`+ if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() && !syncReq.GetDryRun() {`
`2067`	`2067`	`if syncReq.GetRevision() != "" && syncReq.GetRevision() != text.FirstNonEmpty(source.TargetRevision, "HEAD") {`
`2068`	`2068`	`return "", "", nil, nil, status.Errorf(codes.FailedPrecondition, "Cannot sync to %s: auto-sync currently set to %s", syncReq.GetRevision(), source.TargetRevision)`
`2069`	`2069`	`}`
`@@ -2086,7 +2086,7 @@ func (s Server) Rollback(ctx context.Context, rollbackReq application.Applicat`
`2086`	`2086`	`if a.DeletionTimestamp != nil {`
`2087`	`2087`	`return nil, status.Errorf(codes.FailedPrecondition, "application is deleting")`
`2088`	`2088`	`}`
`2089`		`- if a.Spec.SyncPolicy != nil && *a.Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
	`2089`	`+ if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.IsAutomatedSyncEnabled() {`
`2090`	`2090`	`return nil, status.Errorf(codes.FailedPrecondition, "rollback cannot be initiated when auto-sync is enabled")`
`2091`	`2091`	`}`
`2092`	`2092`