Fix logs (#109)

* wip

* wip

* changed timeout

* bump autopilot

* fixed some info messages

* bump

* codegen

* added debug level

Author: roi-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.103
+VERSION=v0.0.104
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
 

cmd/commands/config.go

@@ -88,7 +88,7 @@ func RunConfigCreateContext(ctx context.Context, context, apiKey, url string) er
 	if err := cfConfig.CreateContext(ctx, context, apiKey, url); err != nil {
 		return err
 	}
-	log.G().Infof("create new context: %s", context)
+	log.G().Infof("New context created: '%s'", context)
 	return RunConfigUseContext(ctx, context)
 }
 
@@ -162,7 +162,7 @@ func RunConfigUseContext(ctx context.Context, context string) error {
 	if err := cfConfig.UseContext(ctx, context); err != nil {
 		return err
 	}
-	log.G().Infof("switched to context: %s", context)
+	log.G().Infof("Switched to context: %s", context)
 	return nil
 }
 
@@ -190,6 +190,6 @@ func RunConfigDeleteContext(ctx context.Context, context string) error {
 		return err
 	}
 
-	log.G(ctx).Infof("delete context: %s", context)
+	log.G(ctx).Infof("Deleted context: %s", context)
 	return nil
 }

cmd/commands/git-source.go

@@ -16,7 +16,6 @@ package commands
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"time"
@@ -35,8 +34,7 @@ import (
 	aputil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
 	wf "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow"
 	wfv1alpha1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-	"github.com/go-git/go-billy/v5/memfs"
-	"github.com/go-git/go-git/v5/plumbing/transport"
+	apu "github.com/codefresh-io/cli-v2/pkg/util/aputil"
 	"github.com/spf13/cobra"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -141,15 +139,13 @@ func NewGitSourceCreateCommand() *cobra.Command {
 		},
 	}
 
-	insCloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
+	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		CreateIfNotExist: true,
-		FS:               memfs.New(),
 	})
-	gsCloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
+	gsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		Prefix:           "git-src",
 		Optional:         true,
 		CreateIfNotExist: true,
-		FS:               memfs.New(),
 	})
 
 	return cmd
@@ -171,23 +167,11 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
 			return fmt.Errorf("failed to create demo workflowTemplate: %w", err)
 		}
 
-		pOpts := &git.PushOptions{
-			CommitMsg: fmt.Sprintf("Created demo workflow template in %s Directory", opts.gsCloneOpts.Path()),
-		}
+		commitMsg := fmt.Sprintf("Created demo workflow template in %s Directory", opts.gsCloneOpts.Path())
 
-		_, err = gsRepo.Persist(ctx, pOpts)
-		if err != nil {
-			if errors.Is(err, transport.ErrRepositoryNotFound) {
-				log.G(ctx).Warn("failed to persist git-source repo, trying again in 3 seconds...")
-				time.Sleep(time.Second * 3)
-
-				_, err = gsRepo.Persist(ctx, pOpts)
-				if err != nil {
-					return fmt.Errorf("failed to push changes. Err: %w", err)
-				}
-			} else {
-				return fmt.Errorf("failed to push changes. Err: %w", err)
-			}
+		log.G(ctx).Info("Pushing a demo workflow-template to the new git-source repo")
+		if err := apu.PushWithMessage(ctx, gsRepo, commitMsg); err != nil {
+			return fmt.Errorf("failed to push demo workflow-template to git-source repo: %w", err)
 		}
 	}
 
@@ -307,9 +291,7 @@ func NewGitSourceDeleteCommand() *cobra.Command {
 		},
 	}
 
-	insCloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
-		FS: memfs.New(),
-	})
+	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
 
 	return cmd
 }
@@ -373,16 +355,14 @@ func NewGitSourceEditCommand() *cobra.Command {
 		},
 	}
 
-	insCloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
+	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		CreateIfNotExist: true,
-		FS:               memfs.New(),
 	})
 
-	gsCloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
+	gsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		Prefix:           "git-src",
 		Optional:         true,
 		CreateIfNotExist: true,
-		FS:               memfs.New(),
 	})
 
 	return cmd
@@ -409,11 +389,8 @@ func RunGitSourceEdit(ctx context.Context, opts *GitSourceEditOptions) error {
 		return fmt.Errorf("failed to write the updated config.json of git-source: %s. Err: %w", opts.GsName, err)
 	}
 
-	_, err = repo.Persist(ctx, &git.PushOptions{
-		CommitMsg: "Persisted an updated git-source",
-	})
-
-	if err != nil {
+	log.G(ctx).Info("Pushing updated GitSource to the installation repo")
+	if err := apu.PushWithMessage(ctx, repo, fmt.Sprintf("Persisted an updated git-source '%s'", opts.GsName)); err != nil {
 		return fmt.Errorf("failed to persist the updated git-source: %s. Err: %w", opts.GsName, err)
 	}
 

cmd/commands/runtime.go

@@ -26,6 +26,7 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/runtime"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
+	apu "github.com/codefresh-io/cli-v2/pkg/util/aputil"
 	argodashboardutil "github.com/codefresh-io/cli-v2/pkg/util/argo-agent"
 	cdutil "github.com/codefresh-io/cli-v2/pkg/util/cd"
 	eventsutil "github.com/codefresh-io/cli-v2/pkg/util/events"
@@ -46,7 +47,6 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ghodss/yaml"
-	"github.com/go-git/go-billy/v5/memfs"
 	billyUtils "github.com/go-git/go-billy/v5/util"
 	"github.com/juju/ansiterm"
 	"github.com/spf13/cobra"
@@ -191,15 +191,13 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	cmd.Flags().StringVar(&versionStr, "version", "", "The runtime version to install, defaults to latest")
 	cmd.Flags().DurationVar(&store.Get().WaitTimeout, "wait-timeout", store.Get().WaitTimeout, "How long to wait for the runtime components to be ready")
 
-	insCloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
+	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		CreateIfNotExist: true,
-		FS:               memfs.New(),
 	})
-	gsCloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
+	gsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		Prefix:           "git-src",
 		Optional:         true,
 		CreateIfNotExist: true,
-		FS:               memfs.New(),
 	})
 	f = kube.AddFlags(cmd.Flags())
 
@@ -265,7 +263,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	rt.Spec.Cluster = server
 	rt.Spec.IngressHost = opts.IngressHost
 
-	log.G(ctx).WithField("version", rt.Spec.Version).Infof("installing runtime '%s'", opts.RuntimeName)
+	log.G(ctx).WithField("version", rt.Spec.Version).Infof("Installing runtime '%s'", opts.RuntimeName)
 	err = apcmd.RunRepoBootstrap(ctx, &apcmd.RepoBootstrapOptions{
 		AppSpecifier: rt.Spec.FullSpecifier(),
 		Namespace:    opts.RuntimeName,
@@ -298,7 +296,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	}
 
 	for _, component := range rt.Spec.Components {
-		log.G(ctx).Infof("creating component '%s'", component.Name)
+		log.G(ctx).Infof("Creating component '%s'", component.Name)
 		if err = component.CreateApp(ctx, opts.KubeFactory, opts.insCloneOpts, opts.RuntimeName, store.Get().CFComponentType); err != nil {
 			return fmt.Errorf("failed to create '%s' application: %w", component.Name, err)
 		}
@@ -338,13 +336,13 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	var wg sync.WaitGroup
 
 	wg.Add(1)
-	err = intervalCheckIsRuntimePersisted(15000, ctx, opts.RuntimeName, &wg)
+	err = intervalCheckIsRuntimePersisted(ctx, opts.RuntimeName, &wg)
 	if err != nil {
-		return fmt.Errorf("failed to complete installation. Error: %w", err)
+		return fmt.Errorf("failed to complete installation: %w", err)
 	}
 	wg.Wait()
 
-	log.G(ctx).Infof("done installing runtime '%s'", opts.RuntimeName)
+	log.G(ctx).Infof("Done installing runtime '%s'", opts.RuntimeName)
 	return nil
 }
 
@@ -415,29 +413,37 @@ func checkExistingRuntimes(ctx context.Context, runtime string) error {
 	return fmt.Errorf("runtime '%s' already exists", runtime)
 }
 
-func intervalCheckIsRuntimePersisted(milliseconds int, ctx context.Context, runtimeName string, wg *sync.WaitGroup) error {
-	interval := time.Duration(milliseconds) * time.Millisecond
-	ticker := time.NewTicker(interval)
-	var err error
+func intervalCheckIsRuntimePersisted(ctx context.Context, runtimeName string, wg *sync.WaitGroup) error {
+	maxRetries := 60           // up to 10 min
+	longerThanUsualCount := 30 // after 5 min
+	waitMsg := "Waiting for the runtime installation to complete"
+	longetThanUsualMsg := waitMsg + " (this is taking longer than usual, you might need to check your cluster for errors)"
+	stop := util.WithSpinner(ctx, waitMsg)
+	ticker := time.NewTicker(time.Second * 10)
 
-	for retries := 20; retries > 0; <-ticker.C {
-		retries--
-		fmt.Println("waiting for the runtime installation to complete...")
+	for triesLeft := maxRetries; triesLeft > 0; triesLeft, _ = triesLeft-1, <-ticker.C {
 		runtime, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)
 		if err != nil {
+			stop()
 			return fmt.Errorf("failed to complete the runtime installation. Error: %w", err)
 		}
 
-		if runtime.InstallationStatus != model.InstallationStatusCompleted {
-			continue
+		if runtime.InstallationStatus == model.InstallationStatusCompleted {
+			stop()
+			wg.Done()
+			ticker.Stop()
+			return nil
 		}
 
-		wg.Done()
-		ticker.Stop()
-		return nil
+		if triesLeft == longerThanUsualCount {
+			stop()
+			stop = util.WithSpinner(ctx, longetThanUsualMsg)
+		}
 	}
 
-	return fmt.Errorf("failed to complete the runtime installation due to timeout. Error: %w", err)
+	stop()
+
+	return fmt.Errorf("timed out while waiting for runtime installation to complete")
 }
 
 func NewRuntimeListCommand() *cobra.Command {
@@ -459,7 +465,7 @@ func RunRuntimeList(ctx context.Context) error {
 	}
 
 	if len(runtimes) == 0 {
-		log.G(ctx).Info("no runtimes were found")
+		log.G(ctx).Info("No runtimes were found")
 		return nil
 	}
 
@@ -559,9 +565,7 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 	cmd.Flags().BoolVar(&skipChecks, "skip-checks", false, "If true, will not verify that runtime exists before uninstalling")
 	cmd.Flags().DurationVar(&store.Get().WaitTimeout, "wait-timeout", store.Get().WaitTimeout, "How long to wait for the runtime components to be deleted")
 
-	cloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
-		FS: memfs.New(),
-	})
+	cloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
 	f = kube.AddFlags(cmd.Flags())
 
 	return cmd
@@ -577,7 +581,7 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		}
 	}
 
-	log.G(ctx).Infof("uninstalling runtime '%s'", opts.RuntimeName)
+	log.G(ctx).Infof("Uninstalling runtime '%s'", opts.RuntimeName)
 
 	if err := apcmd.RunRepoUninstall(ctx, &apcmd.RepoUninstallOptions{
 		Namespace:    opts.RuntimeName,
@@ -588,13 +592,13 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		return fmt.Errorf("failed uninstalling runtime: %w", err)
 	}
 
-	log.G(ctx).Infof("deleting runtime '%s' from the platform", opts.RuntimeName)
+	log.G(ctx).Infof("Deleting runtime '%s' from the platform", opts.RuntimeName)
 
 	if _, err := cfConfig.NewClient().V2().Runtime().Delete(ctx, opts.RuntimeName); err != nil {
 		return fmt.Errorf("failed to delete runtime from the platform: %w", err)
 	}
 
-	log.G(ctx).Infof("done uninstalling runtime '%s'", opts.RuntimeName)
+	log.G(ctx).Infof("Done uninstalling runtime '%s'", opts.RuntimeName)
 	return nil
 }
 
@@ -653,9 +657,7 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&versionStr, "version", "", "The runtime version to upgrade to, defaults to latest")
-	cloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
-		FS: memfs.New(),
-	})
+	cloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
 
 	return cmd
 }
@@ -689,7 +691,8 @@ func RunRuntimeUpgrade(ctx context.Context, opts *RuntimeUpgradeOptions) error {
 		return fmt.Errorf("failed to upgrade runtime: %w", err)
 	}
 
-	if _, err = r.Persist(ctx, &git.PushOptions{CommitMsg: fmt.Sprintf("Upgraded to %s", newRt.Spec.Version)}); err != nil {
+	log.G(ctx).Info("Pushing new runtime definition")
+	if err := apu.PushWithMessage(ctx, r, fmt.Sprintf("Upgraded to %s", newRt.Spec.Version)); err != nil {
 		return err
 	}
 
@@ -717,10 +720,9 @@ func persistRuntime(ctx context.Context, cloneOpts *git.CloneOptions, rt *runtim
 		return err
 	}
 
-	_, err = r.Persist(ctx, &git.PushOptions{
-		CommitMsg: "Persisted runtime data",
-	})
-	return err
+	log.G(ctx).Info("Pushing runtime definition to the installation repo")
+
+	return apu.PushWithMessage(ctx, r, "Persisted runtime data")
 }
 
 func createWorkflowsIngress(ctx context.Context, cloneOpts *git.CloneOptions, rt *runtime.Runtime) error {
@@ -768,10 +770,9 @@ func createWorkflowsIngress(ctx context.Context, cloneOpts *git.CloneOptions, rt
 		return err
 	}
 
-	_, err = r.Persist(ctx, &git.PushOptions{
-		CommitMsg: "Created Workflows Ingress",
-	})
-	return err
+	log.G(ctx).Info("Pushing Argo Workflows ingress manifests")
+
+	return apu.PushWithMessage(ctx, r, "Created Workflows Ingress")
 }
 
 func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *RuntimeInstallOptions, rt *runtime.Runtime) error {
@@ -817,10 +818,9 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 		return err
 	}
 
-	_, err = r.Persist(ctx, &git.PushOptions{
-		CommitMsg: "Created Codefresh Event Reporter",
-	})
-	return err
+	log.G(ctx).Info("Pushing Event Reporter manifests")
+
+	return apu.PushWithMessage(ctx, r, "Created Codefresh Event Reporter")
 }
 
 func createCodefreshArgoAgentReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *RuntimeInstallOptions, rt *runtime.Runtime) error {
@@ -844,10 +844,9 @@ func createCodefreshArgoAgentReporter(ctx context.Context, cloneOpts *git.CloneO
 		return err
 	}
 
-	_, err = r.Persist(ctx, &git.PushOptions{
-		CommitMsg: "Created ArgoCD Agent Reporter",
-	})
-	return err
+	log.G(ctx).Info("Pushing ArgoCD Agent manifests")
+
+	return apu.PushWithMessage(ctx, r, "Created ArgoCD Agent Reporter")
 }
 
 func createWorkflowReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *RuntimeInstallOptions) error {
@@ -878,10 +877,9 @@ func createWorkflowReporter(ctx context.Context, cloneOpts *git.CloneOptions, op
 		return err
 	}
 
-	_, err = r.Persist(ctx, &git.PushOptions{
-		CommitMsg: "Created Codefresh Workflow Reporter",
-	})
-	return err
+	log.G(ctx).Info("Pushing Codefresh Workflow Reporter mainifests")
+
+	return apu.PushWithMessage(ctx, r, "Created Codefresh Workflow Reporter")
 }
 
 func updateProject(repofs fs.FS, rt *runtime.Runtime) error {