CR-6312-runtime-install-mutation (#95)

* bump and added params for runtime create mutation

* with ingresshost

* to use updated go-sdk

* without local go-sdk

* without local go-sdk

* with installationStatus

* with INSTALLATION_STATUS header

* removed redundant

* tested with installation status enum

* with Get instead of List as post validation logic

* better component list

* tested: cli blocks until installation is complete

* commented out preInstallationChecks to test validation by runtime token

* tested: added logic to remove token as part of uninstall

* doc flags fix

* back to original pre installation checks - instead of using token

* bump

* bump use of newer sdk

* without comment

* with merged go-sdk

* codegen

* without gocyclo

* reduce cyclomatic

Author: elad-codefresh

cmd/commands/runtime.go

@@ -123,15 +123,15 @@ func NewRuntimeInstallCommand() *cobra.Command {
 # To run this command you need to create a personal access token for your git provider
 # and provide it using:
 
-		export INSTALL_GIT_TOKEN=<token>
+		export GIT_TOKEN=<token>
 
 # or with the flag:
 
-		--install-git-token <token>
+		--git-token <token>
 
 # Adds a new runtime
 
-	<BIN> runtime install runtime-name --install-repo gitops_repo
+	<BIN> runtime install runtime-name --repo gitops_repo
 `),
 		PreRun: func(_ *cobra.Command, _ []string) {
 			if gsCloneOpts.Auth.Password == "" {
@@ -206,6 +206,32 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	return cmd
 }
 
+func getComponents(rt *runtime.Runtime, opts *RuntimeInstallOptions) []string {
+	var componentNames []string
+	for _, component := range rt.Spec.Components {
+		componentNames = append(componentNames, fmt.Sprintf("%s-%s", opts.RuntimeName, component.Name))
+	}
+
+	//  should find a more dynamic way to get these additional components
+	additionalComponents := []string{"events-reporter", "workflow-reporter"}
+	for _, additionalComponentName := range additionalComponents {
+		componentNames = append(componentNames, fmt.Sprintf("%s-%s", opts.RuntimeName, additionalComponentName))
+	}
+	componentNames = append(componentNames, "argo-cd")
+
+	return componentNames
+}
+
+func createRuntimeOnPlatform(ctx context.Context, runtimeName string, server string, runtimeVersion string, ingressHost string, componentNames []string) (string, error) {
+	runtimeCreationResponse, err := cfConfig.NewClient().V2().Runtime().Create(ctx, runtimeVersion, server, runtimeVersion, ingressHost, componentNames)
+
+	if runtimeCreationResponse.ErrorMessage != nil {
+		return runtimeCreationResponse.NewAccessToken, fmt.Errorf("failed to create a new runtime: %s. Error: %w", *runtimeCreationResponse.ErrorMessage, err)
+	}
+
+	return runtimeCreationResponse.NewAccessToken, nil
+}
+
 func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	if err := preInstallationChecks(ctx, opts); err != nil {
 		return fmt.Errorf("pre installation checks failed: %w", err)
@@ -216,17 +242,26 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		return fmt.Errorf("failed to download runtime definition: %w", err)
 	}
 
-	runtimeCreationResponse, err := cfConfig.NewClient().V2().Runtime().Create(ctx, opts.RuntimeName)
-	if err != nil {
-		return fmt.Errorf("failed to create a new runtime: %w", err)
+	runtimeVersion := "v99.99.99"
+	if rt.Spec.Version != nil { // in dev mode
+		runtimeVersion = rt.Spec.Version.String()
 	}
 
-	opts.RuntimeToken = runtimeCreationResponse.NewAccessToken
 	server, err := util.CurrentServer()
 	if err != nil {
 		return fmt.Errorf("failed to get current server address: %w", err)
 	}
 
+	componentNames := getComponents(rt, opts)
+
+	token, err := createRuntimeOnPlatform(ctx, opts.RuntimeName, server, runtimeVersion, opts.IngressHost, componentNames)
+
+	if err != nil {
+		return fmt.Errorf("failed to create a new runtime: %w", err)
+	}
+
+	opts.RuntimeToken = token
+
 	rt.Spec.Cluster = server
 	rt.Spec.IngressHost = opts.IngressHost
 
@@ -388,20 +423,18 @@ func intervalCheckIsRuntimePersisted(milliseconds int, ctx context.Context, runt
 	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)
+		runtime, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)
 		if err != nil {
-			continue
+			return fmt.Errorf("failed to complete the runtime installation. Error: %w", err)
 		}
 
-		for _, rt := range runtimes {
-			if rt.Metadata.Name == runtimeName {
-				wg.Done()
-				ticker.Stop()
-				return nil
-			}
+		if runtime.InstallationStatus != model.InstallationStatusCompleted {
+			continue
 		}
 
+		wg.Done()
+		ticker.Stop()
+		return nil
 	}
 
 	return fmt.Errorf("failed to complete the runtime installation due to timeout. Error: %w", err)
@@ -431,7 +464,7 @@ func RunRuntimeList(ctx context.Context) error {
 	}
 
 	tb := ansiterm.NewTabWriter(os.Stdout, 0, 0, 4, ' ', 0)
-	_, err = fmt.Fprintln(tb, "NAME\tNAMESPACE\tCLUSTER\tVERSION\tSYNC_STATUS\tHEALTH_STATUS\tHEALTH_MESSAGE")
+	_, err = fmt.Fprintln(tb, "NAME\tNAMESPACE\tCLUSTER\tVERSION\tSYNC_STATUS\tHEALTH_STATUS\tHEALTH_MESSAGE\tINSTALLATION_STATUS")
 	if err != nil {
 		return err
 	}
@@ -444,6 +477,7 @@ func RunRuntimeList(ctx context.Context) error {
 		syncStatus := rt.SyncStatus
 		healthStatus := rt.HealthStatus
 		healthMessage := "N/A"
+		installationStatus := rt.InstallationStatus
 
 		if rt.Metadata.Namespace != nil {
 			namespace = *rt.Metadata.Namespace
@@ -461,14 +495,15 @@ func RunRuntimeList(ctx context.Context) error {
 			healthMessage = *rt.HealthMessage
 		}
 
-		_, err = fmt.Fprintf(tb, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
+		_, err = fmt.Fprintf(tb, "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
 			name,
 			namespace,
 			cluster,
 			version,
 			syncStatus,
 			healthStatus,
 			healthMessage,
+			installationStatus,
 		)
 		if err != nil {
 			return err

docs/commands/cli-v2_runtime_install.md

@@ -13,15 +13,15 @@ cli-v2 runtime install [runtime_name] [flags]
 # To run this command you need to create a personal access token for your git provider
 # and provide it using:
 
-        export INSTALL_GIT_TOKEN=<token>
+        export GIT_TOKEN=<token>
 
 # or with the flag:
 
-        --install-git-token <token>
+        --git-token <token>
 
 # Adds a new runtime
 
-    cli-v2 runtime install runtime-name --install-repo gitops_repo
+    cli-v2 runtime install runtime-name --repo gitops_repo
 
 ```
 

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/argoproj/argo-events v1.4.0
 	github.com/argoproj/argo-workflows/v3 v3.1.6
 	github.com/briandowns/spinner v1.16.0
-	github.com/codefresh-io/go-sdk v0.34.2
+	github.com/codefresh-io/go-sdk v0.34.4
 	github.com/fatih/color v1.12.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-git/go-billy/v5 v5.3.1

go.sum

@@ -268,8 +268,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codefresh-io/go-sdk v0.34.2 h1:tdkCTr9622ZE4yeT3E4wQaUDOnaQeftAwQS0DeQPC3s=
-github.com/codefresh-io/go-sdk v0.34.2/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.34.4 h1:qwEQwE7v/43lkQiE/6t28vSaon04t5vWO8in//BxzH4=
+github.com/codefresh-io/go-sdk v0.34.4/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
 github.com/colinmarc/hdfs v1.1.4-0.20180802165501-48eb8d6c34a9/go.mod h1:0DumPviB681UcSuJErAbDIOx6SIaJWj463TymfZG02I=
 github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31/go.mod h1:vSBumefK4HA5uiRSwNP+3ofgrEoScpCS2MMWcWXEuQ4=
 github.com/container-storage-interface/spec v1.3.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=