added pipline v2 and workflow v2 api

daniel-codefresh · daniel-codefresh · commit 1e6c0ac37131 · 2021-08-26T21:26:08.000+03:00
diff --git a/pkg/codefresh/pipeline_v2.go b/pkg/codefresh/pipeline_v2.go
@@ -48,9 +48,11 @@ func (p *pipelineV2) Get(ctx context.Context, name, namespace, runtime string) (
 					metadata {
 						name
 						namespace
+						runtime
 					}
 					self {
 						healthStatus
+						syncStatus
 						version
 					}
 					projects
@@ -76,6 +78,10 @@ func (p *pipelineV2) Get(ctx context.Context, name, namespace, runtime string) (
 		return nil, graphqlErrorResponse{errors: res.Errors}
 	}
 
+	if res.Data.Pipeline.Metadata == nil {
+		return nil, err
+	}
+
 	return &res.Data.Pipeline, nil
 }
 
@@ -89,9 +95,11 @@ func (p *pipelineV2) List(ctx context.Context, filterArgs model.PipelinesFilterA
 							metadata {
 								name
 								namespace
+								runtime
 							}
 							self {
 								healthStatus
+								syncStatus
 								version
 							}
 							projects
diff --git a/pkg/codefresh/workflow_v2.go b/pkg/codefresh/workflow_v2.go
@@ -48,6 +48,7 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (
 					metadata {
 						name
 						namespace
+						runtime
 					}
 					projects
 					spec {
@@ -61,9 +62,6 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (
 						}
 					  }
 					status {
-						createdAt
-						startedAt
-						finishedAt
 						phase
 						progress {
 						  total
@@ -73,20 +71,13 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (
 						  type
 						  name
 						}
-						message
-						statuses {
-						  since
-						  phase
-						  message
-						}
 					  }
 					pipeline {
 						metadata {
 						  name
 						  namespace
 						}
 					  }
-					actualManifest
 				}
 			}`,
 		"variables": map[string]interface{}{
@@ -106,6 +97,10 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (
 		return nil, graphqlErrorResponse{errors: res.Errors}
 	}
 
+	if res.Data.Workflow.Metadata == nil {
+		return nil, err
+	}
+
 	return &res.Data.Workflow, nil
 }
 
@@ -119,6 +114,7 @@ func (w *workflowV2) List(ctx context.Context, filterArgs model.WorkflowsFilterA
 							metadata {
 								name
 								namespace
+								runtime
 							}
 							projects
 							spec {
@@ -132,9 +128,6 @@ func (w *workflowV2) List(ctx context.Context, filterArgs model.WorkflowsFilterA
 								}
 							  }
 							status {
-								createdAt
-								startedAt
-								finishedAt
 								phase
 								progress {
 								  total
@@ -144,20 +137,13 @@ func (w *workflowV2) List(ctx context.Context, filterArgs model.WorkflowsFilterA
 								  type
 								  name
 								}
-								message
-								statuses {
-								  since
-								  phase
-								  message
-								}
-							  }
+						 	}
 							pipeline {
 								metadata {
 								  name
 								  namespace
 								}
-							  }
-							actualManifest
+						  	}
 						}
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,11 @@ func (p *pipelineV2) Get(ctx context.Context, name, namespace, runtime string) (`
`48`	`48`	`metadata {`
`49`	`49`	`name`
`50`	`50`	`namespace`
	`51`	`+ runtime`
`51`	`52`	`}`
`52`	`53`	`self {`
`53`	`54`	`healthStatus`
	`55`	`+ syncStatus`
`54`	`56`	`version`
`55`	`57`	`}`
`56`	`58`	`projects`
`@@ -76,6 +78,10 @@ func (p *pipelineV2) Get(ctx context.Context, name, namespace, runtime string) (`
`76`	`78`	`return nil, graphqlErrorResponse{errors: res.Errors}`
`77`	`79`	`}`
`78`	`80`
	`81`	`+ if res.Data.Pipeline.Metadata == nil {`
	`82`	`+ return nil, err`
	`83`	`+ }`
	`84`	`+`
`79`	`85`	`return &res.Data.Pipeline, nil`
`80`	`86`	`}`
`81`	`87`
`@@ -89,9 +95,11 @@ func (p *pipelineV2) List(ctx context.Context, filterArgs model.PipelinesFilterA`
`89`	`95`	`metadata {`
`90`	`96`	`name`
`91`	`97`	`namespace`
	`98`	`+ runtime`
`92`	`99`	`}`
`93`	`100`	`self {`
`94`	`101`	`healthStatus`
	`102`	`+ syncStatus`
`95`	`103`	`version`
`96`	`104`	`}`
`97`	`105`	`projects`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (`
`48`	`48`	`metadata {`
`49`	`49`	`name`
`50`	`50`	`namespace`
	`51`	`+ runtime`
`51`	`52`	`}`
`52`	`53`	`projects`
`53`	`54`	`spec {`
`@@ -61,9 +62,6 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`status {`
`64`		`- createdAt`
`65`		`- startedAt`
`66`		`- finishedAt`
`67`	`65`	`phase`
`68`	`66`	`progress {`
`69`	`67`	`total`
`@@ -73,20 +71,13 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (`
`73`	`71`	`type`
`74`	`72`	`name`
`75`	`73`	`}`
`76`		`- message`
`77`		`- statuses {`
`78`		`- since`
`79`		`- phase`
`80`		`- message`
`81`		`- }`
`82`	`74`	`}`
`83`	`75`	`pipeline {`
`84`	`76`	`metadata {`
`85`	`77`	`name`
`86`	`78`	`namespace`
`87`	`79`	`}`
`88`	`80`	`}`
`89`		`- actualManifest`
`90`	`81`	`}`
`91`	`82`	}`,
`92`	`83`	`"variables": map[string]interface{}{`
`@@ -106,6 +97,10 @@ func (w *workflowV2) Get(ctx context.Context, name, namespace, runtime string) (`
`106`	`97`	`return nil, graphqlErrorResponse{errors: res.Errors}`
`107`	`98`	`}`
`108`	`99`
	`100`	`+ if res.Data.Workflow.Metadata == nil {`
	`101`	`+ return nil, err`
	`102`	`+ }`
	`103`	`+`
`109`	`104`	`return &res.Data.Workflow, nil`
`110`	`105`	`}`
`111`	`106`
`@@ -119,6 +114,7 @@ func (w *workflowV2) List(ctx context.Context, filterArgs model.WorkflowsFilterA`
`119`	`114`	`metadata {`
`120`	`115`	`name`
`121`	`116`	`namespace`
	`117`	`+ runtime`
`122`	`118`	`}`
`123`	`119`	`projects`
`124`	`120`	`spec {`
`@@ -132,9 +128,6 @@ func (w *workflowV2) List(ctx context.Context, filterArgs model.WorkflowsFilterA`
`132`	`128`	`}`
`133`	`129`	`}`
`134`	`130`	`status {`
`135`		`- createdAt`
`136`		`- startedAt`
`137`		`- finishedAt`
`138`	`131`	`phase`
`139`	`132`	`progress {`
`140`	`133`	`total`
`@@ -144,20 +137,13 @@ func (w *workflowV2) List(ctx context.Context, filterArgs model.WorkflowsFilterA`
`144`	`137`	`type`
`145`	`138`	`name`
`146`	`139`	`}`
`147`		`- message`
`148`		`- statuses {`
`149`		`- since`
`150`		`- phase`
`151`		`- message`
`152`		`- }`
`153`		`- }`
	`140`	`+ }`
`154`	`141`	`pipeline {`
`155`	`142`	`metadata {`
`156`	`143`	`name`
`157`	`144`	`namespace`
`158`	`145`	`}`
`159`		`- }`
`160`		`- actualManifest`
	`146`	`+ }`
`161`	`147`	`}`
`162`	`148`	`}`
`163`	`149`	`}`