Cr 9208 - added cf context to summary lines (#242)

* added cf context to final params

* wip

* bump

Author: roi-codefresh

Makefile

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

cmd/commands/common.go

@@ -29,10 +29,10 @@ import (
 
 	"github.com/argoproj-labs/argocd-autopilot/pkg/git"
 	"github.com/codefresh-io/cli-v2/pkg/config"
+	cfgit "github.com/codefresh-io/cli-v2/pkg/git"
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
-	cfgit "github.com/codefresh-io/cli-v2/pkg/git"
 
 	"github.com/manifoldco/promptui"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -262,17 +262,19 @@ func inferProviderFromRepo(opts *git.CloneOptions) {
 	}
 }
 
-func ensureGitToken(cmd *cobra.Command, cloneOpts *git.CloneOptions) error {
+func ensureGitToken(cmd *cobra.Command, cloneOpts *git.CloneOptions, verify bool) error {
 	if cloneOpts.Auth.Password == "" && !store.Get().Silent {
 		err := getGitTokenFromUserInput(cmd)
 		if err != nil {
 			return err
 		}
 	}
 
-	err := cfgit.VerifyToken(cmd.Context(), cloneOpts.Provider, cloneOpts.Auth.Password)
-	if err != nil {
-		return fmt.Errorf("failed to verify git token: %w", err)
+	if verify {
+		err := cfgit.VerifyToken(cmd.Context(), cloneOpts.Provider, cloneOpts.Auth.Password)
+		if err != nil {
+			return fmt.Errorf("failed to verify git token: %w", err)
+		}
 	}
 
 	return nil
@@ -290,7 +292,7 @@ func ensureGitPAT(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
 
 func getGitPATFromUserInput(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
 	gitPATPrompt := promptui.Prompt{
-		Label: "Enter your Personal Git Access Token (leave blank to use system token. Can be changed later)",
+		Label: "Enter your Personal Git Access Token (leave blank to use runtime token. Can be changed later)",
 		Mask:  '*',
 	}
 

cmd/commands/runtime.go

@@ -191,6 +191,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 			}
 
 			finalParameters = map[string]string{
+				"Codefresh context":         cfConfig.CurrentContext,
 				"Kube context":              installationOpts.kubeContext,
 				"Runtime name":              installationOpts.RuntimeName,
 				"Repository URL":            installationOpts.InsCloneOpts.Repo,
@@ -289,7 +290,7 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 
 	inferProviderFromRepo(opts.InsCloneOpts)
 
-	err = ensureGitToken(cmd, opts.InsCloneOpts)
+	err = ensureGitToken(cmd, opts.InsCloneOpts, true)
 	handleCliStep(reporter.InstallStepPreCheckEnsureGitToken, "Getting git token", err, false)
 	if err != nil {
 		return err
@@ -358,7 +359,7 @@ func runtimeUninstallCommandPreRunHandler(cmd *cobra.Command, args []string, opt
 		return fmt.Errorf("%w", err)
 	}
 
-	err = ensureGitToken(cmd, opts.CloneOpts)
+	err = ensureGitToken(cmd, opts.CloneOpts, false)
 	handleCliStep(reporter.UninstallStepPreCheckEnsureGitToken, "Getting git token", err, false)
 	if err != nil {
 		return fmt.Errorf("%w", err)
@@ -382,7 +383,7 @@ func runtimeUpgradeCommandPreRunHandler(cmd *cobra.Command, args []string, opts
 		return fmt.Errorf("%w", err)
 	}
 
-	err = ensureGitToken(cmd, opts.CloneOpts)
+	err = ensureGitToken(cmd, opts.CloneOpts, false)
 	handleCliStep(reporter.UpgradeStepPreCheckEnsureGitToken, "Getting git token", err, false)
 	if err != nil {
 		return fmt.Errorf("%w", err)
@@ -999,9 +1000,10 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 			}
 
 			finalParameters = map[string]string{
-				"Kube context":   uninstallationOpts.kubeContext,
-				"Runtime name":   uninstallationOpts.RuntimeName,
-				"Repository URL": uninstallationOpts.CloneOpts.Repo,
+				"Codefresh context": cfConfig.CurrentContext,
+				"Kube context":      uninstallationOpts.kubeContext,
+				"Runtime name":      uninstallationOpts.RuntimeName,
+				"Repository URL":    uninstallationOpts.CloneOpts.Repo,
 			}
 
 			err = getApprovalFromUser(ctx, finalParameters, "runtime uninstall")
@@ -1136,8 +1138,9 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 			}
 
 			finalParameters = map[string]string{
-				"Runtime name":   opts.RuntimeName,
-				"Repository URL": opts.CloneOpts.Repo,
+				"Codefresh context": cfConfig.CurrentContext,
+				"Runtime name":      opts.RuntimeName,
+				"Repository URL":    opts.CloneOpts.Repo,
 			}
 
 			if versionStr != "" {

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.221/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.222/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.221/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.222/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -1,26 +1,26 @@
 apiVersion: codefresh.io/v1alpha1
 kind: Runtime
 metadata:
-    name: '{{ name }}'
-    namespace: '{{ namespace }}'
+  name: "{{ name }}"
+  namespace: "{{ namespace }}"
 spec:
-    defVersion: 1.0.0
-    version: 0.0.221
-    bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
-    components:
-        - name: events
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-events
-          wait: true
-        - name: rollouts
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
-        - name: workflows
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
-        - name: argocd-agent
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-agent
-        - name: app-proxy
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/app-proxy
+  defVersion: 1.0.0
+  version: 0.0.222
+  bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
+  components:
+    - name: events
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-events
+      wait: true
+    - name: rollouts
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
+    - name: workflows
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
+    - name: argocd-agent
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-agent
+    - name: app-proxy
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/app-proxy