Skip to content

Commit

Permalink
count instead of jobs list and expose filter by pipeline and tag (#1513)
Browse files Browse the repository at this point in the history 
* count instead of jobs list and expose filter by pipeline and tag

* CR

* Include the job of the jobid used in query

* update swagger with firstJobId lastJobId

* toJob -lastJobId

* fix lastJobId

* nfs

* toJob -> lastJobId

Co-authored-by: yehiyam <[email protected]>
  • Loading branch information
@yehiyam
Golan Hallel and yehiyam authored Feb 8, 2022
1 parent 6c3ba41 commit a4a17bf
Show file tree
Hide file tree
Showing 14 changed files with 396 additions and 164 deletions.
42 changes: 37 additions & 5 deletions core/api-server/api/rest-api/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "HKube API",
"description": "HKube RESTful API",
"version": "2.2.7",
"version": "2.2.9",
"contact": {
"email": "[email protected]"
},
Expand Down Expand Up @@ -12464,15 +12464,15 @@
"description": "Get preferred",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -12487,6 +12487,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down Expand Up @@ -13143,15 +13159,15 @@
"description": "Get managed",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -13166,6 +13182,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down
42 changes: 37 additions & 5 deletions core/datasources-service/api/rest-api/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "HKube API",
"description": "HKube RESTful API",
"version": "2.2.7",
"version": "2.2.9",
"contact": {
"email": "[email protected]"
},
Expand Down Expand Up @@ -12464,15 +12464,15 @@
"description": "Get preferred",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -12487,6 +12487,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down Expand Up @@ -13143,15 +13159,15 @@
"description": "Get managed",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -13166,6 +13182,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down
42 changes: 37 additions & 5 deletions core/gc-service/api/rest-api/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "HKube API",
"description": "HKube RESTful API",
"version": "2.2.7",
"version": "2.2.9",
"contact": {
"email": "[email protected]"
},
Expand Down Expand Up @@ -12464,15 +12464,15 @@
"description": "Get preferred",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -12487,6 +12487,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down Expand Up @@ -13143,15 +13159,15 @@
"description": "Get managed",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -13166,6 +13182,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down
42 changes: 37 additions & 5 deletions core/openapi-spec/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "HKube API",
"description": "HKube RESTful API",
"version": "2.2.7",
"version": "2.2.9",
"contact": {
"email": "[email protected]"
},
Expand Down Expand Up @@ -12464,15 +12464,15 @@
"description": "Get preferred",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -12487,6 +12487,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down Expand Up @@ -13143,15 +13159,15 @@
"description": "Get managed",
"parameters": [
{
"name": "fromJob",
"name": "firstJobId",
"in": "query",
"description": "from this job and on",
"schema": {
"type": "string"
}
},
{
"name": "toJob",
"name": "lastJobId",
"in": "query",
"description": "up to this job",
"schema": {
Expand All @@ -13166,6 +13182,22 @@
"schema": {
"type": "string"
}
},
{
"name": "pipelineName",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by pipeline"
},
{
"name": "tag",
"in": "query",
"schema": {
"type": "string"
},
"description": "filter by tag"
}
],
"responses": {
Expand Down
14 changes: 12 additions & 2 deletions core/openapi-spec/swagger/paths/managed/list.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ get:
summary: Get Managed
description: Get managed
parameters:
- name: fromJob
- name: firstJobId
in: query
description: from this job and on
schema:
type: string
- name: toJob
- name: lastJobId
in: query
description: up to this job
schema:
Expand All @@ -20,6 +20,16 @@ get:
required: true
schema:
type: string
- name: pipelineName
in: query
schema:
type: string
description: filter by pipeline
- name: tag
in: query
schema:
type: string
description: filter by tag

responses:
"200":
Expand Down
Loading

0 comments on commit a4a17bf

Please sign in to comment.