CR-6176-list-with-version-and-cluster (#79)

* added label, error instead of panic

* typo

* retries at beginning of interval func

* fix runtime list command

* updated version to 0.0.84

Co-authored-by: Noam Gal <[email protected]>

Author: elad-codefresh

Makefile

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

cmd/commands/runtime.go

@@ -296,7 +296,10 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	var wg sync.WaitGroup
 
 	wg.Add(1)
-	go intervalCheckIsRuntimePersisted(15000, ctx, opts.RuntimeName, &wg)
+	err = intervalCheckIsRuntimePersisted(15000, ctx, opts.RuntimeName, &wg)
+	if err != nil {
+		return fmt.Errorf("failed to complete installation. Error: %w", err)
+	}
 	wg.Wait()
 
 	log.G(ctx).Infof("done installing runtime '%s'", opts.RuntimeName)
@@ -372,12 +375,13 @@ func checkExistingRuntimes(ctx context.Context, runtime string) error {
 	return nil
 }
 
-func intervalCheckIsRuntimePersisted(milliseconds int, ctx context.Context, runtimeName string, wg *sync.WaitGroup) {
+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
 
 	for retries := 20; retries > 0; <-ticker.C {
+		retries--
 		fmt.Println("waiting for the runtime installation to complete...")
 		var runtimes []model.Runtime
 		runtimes, err = cfConfig.NewClient().V2().Runtime().List(ctx)
@@ -389,14 +393,13 @@ func intervalCheckIsRuntimePersisted(milliseconds int, ctx context.Context, runt
 			if rt.Metadata.Name == runtimeName {
 				wg.Done()
 				ticker.Stop()
-				return
+				return nil
 			}
 		}
 
-		retries--
 	}
 
-	panic(fmt.Errorf("failed to complete the runtime installation due to error: %w", err))
+	return fmt.Errorf("failed to complete the runtime installation due to timeout. Error: %w", err)
 }
 
 func NewRuntimeListCommand() *cobra.Command {
@@ -432,7 +435,7 @@ func RunRuntimeList(ctx context.Context) error {
 		status := "N/A"
 		namespace := "N/A"
 		cluster := "N/A"
-		name := "N/A"
+		name := rt.Metadata.Name
 		version := "N/A"
 
 		if rt.Self.HealthMessage != nil {
@@ -447,10 +450,6 @@ func RunRuntimeList(ctx context.Context) error {
 			cluster = *rt.Cluster
 		}
 
-		if rt.Metadata.Name != "" {
-			name = rt.Metadata.Name
-		}
-
 		if rt.RuntimeVersion != nil {
 			version = *rt.RuntimeVersion
 		}

docs/releases/release_notes.md

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

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.83
+  version: 0.0.84
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/runtime/runtime.go

@@ -153,7 +153,7 @@ func (r *Runtime) Save(fs fs.FS, filename string, config *CommonConfig) error {
 			Name:      store.Get().CodefreshCM,
 			Namespace: r.Namespace,
 			Labels: map[string]string{
-				apstore.Default.LabelKeyAppManagedBy: store.Get().BinaryName,
+				apstore.Default.LabelKeyAppManagedBy: store.Get().Codefresh,
 				store.Get().LabelKeyCFType:           store.Get().CFRuntimeDefType,
 			},
 		},

pkg/store/store.go

@@ -49,6 +49,7 @@ type Store struct {
 	ArgoWFServiceName      string
 	ArgoWFServicePort      int32
 	BinaryName             string
+	Codefresh              string
 	CFComponentType        string
 	CFGitSourceType        string
 	CFRuntimeDefType       string
@@ -91,6 +92,7 @@ func init() {
 	s.ArgoWFServiceName = "argo-server"
 	s.ArgoWFServicePort = 2746
 	s.BinaryName = binaryName
+	s.Codefresh = "codefresh"
 	s.CFComponentType = "component"
 	s.CFGitSourceType = "git-source"
 	s.CFRuntimeDefType = "runtimeDef"