Merge pull request #61 from codefresh-io/runtime-mutation-using-input-type

runtime-mutation-using-input-type

Author: elad-codefresh

VERSION

@@ -1 +1 @@
-0.34.5
+0.34.6

pkg/codefresh/argo_runtime.go

@@ -9,9 +9,9 @@ import (
 
 type (
 	IRuntimeAPI interface {
+		Create(ctx context.Context, opts *model.RuntimeInstallationArgs) (*model.RuntimeCreationResponse, error)
 		Get(ctx context.Context, name string) (*model.Runtime, error)
 		List(ctx context.Context) ([]model.Runtime, error)
-		Create(ctx context.Context, runtimeName, cluster, runtimeVersion, ingressHost string, componentNames []string) (*model.RuntimeCreationResponse, error)
 		Delete(ctx context.Context, runtimeName string) (int, error)
 	}
 
@@ -52,6 +52,34 @@ func newArgoRuntimeAPI(codefresh *codefresh) IRuntimeAPI {
 	return &argoRuntime{codefresh: codefresh}
 }
 
+func (r *argoRuntime) Create(ctx context.Context, opts *model.RuntimeInstallationArgs) (*model.RuntimeCreationResponse, error) {
+	jsonData := map[string]interface{}{
+		"query": `
+			mutation CreateRuntime($installationArgs: RuntimeInstallationArgs!) {
+				runtime(installationArgs: $installationArgs) {
+					name
+					newAccessToken
+				}
+			}
+		`,
+		"variables": map[string]interface{}{
+			"installationArgs": opts,
+		},
+	}
+
+	res := &graphQlRuntimeCreationResponse{}
+	err := r.codefresh.graphqlAPI(ctx, jsonData, res)
+	if err != nil {
+		return nil, fmt.Errorf("failed making a graphql API call while creating runtime: %w", err)
+	}
+
+	if len(res.Errors) > 0 {
+		return nil, graphqlErrorResponse{errors: res.Errors}
+	}
+
+	return &res.Data.Runtime, nil
+}
+
 func (r *argoRuntime) Get(ctx context.Context, name string) (*model.Runtime, error) {
 	jsonData := map[string]interface{}{
 		"query": `
@@ -146,40 +174,6 @@ func (r *argoRuntime) List(ctx context.Context) ([]model.Runtime, error) {
 	return runtimes, nil
 }
 
-func (r *argoRuntime) Create(ctx context.Context, runtimeName, cluster, runtimeVersion, ingressHost string, componentNames []string) (*model.RuntimeCreationResponse, error) {
-	jsonData := map[string]interface{}{
-		"query": `
-			mutation CreateRuntime(
-				$runtimeName: String!, $cluster: String!, $runtimeVersion: String!, $ingressHost: String, $componentNames: [String]!
-			) {
-				runtime(runtimeName: $runtimeName, cluster: $cluster, runtimeVersion: $runtimeVersion, ingressHost: $ingressHost, componentNames: $componentNames) {
-					name
-					newAccessToken
-				}
-			}
-		`,
-		"variables": map[string]interface{}{
-			"runtimeName":    runtimeName,
-			"cluster":        cluster,
-			"runtimeVersion": runtimeVersion,
-			"ingressHost":    ingressHost,
-			"componentNames": componentNames,
-		},
-	}
-
-	res := &graphQlRuntimeCreationResponse{}
-	err := r.codefresh.graphqlAPI(ctx, jsonData, res)
-	if err != nil {
-		return nil, fmt.Errorf("failed making a graphql API call while creating runtime: %w", err)
-	}
-
-	if len(res.Errors) > 0 {
-		return nil, graphqlErrorResponse{errors: res.Errors}
-	}
-
-	return &res.Data.Runtime, nil
-}
-
 func (r *argoRuntime) Delete(ctx context.Context, runtimeName string) (int, error) {
 	jsonData := map[string]interface{}{
 		"query": `

pkg/codefresh/codefresh.go

@@ -153,7 +153,7 @@ func (c *codefresh) graphqlAPI(ctx context.Context, body map[string]interface{},
 		body:   body,
 	})
 	if err != nil {
-		return fmt.Errorf("The HTTP request failed: %w", err)
+		return fmt.Errorf("the HTTP request failed: %w", err)
 	}
 	defer response.Body.Close()