Skip to content

Commit 9aa649d

Browse files
kim-codefreshkim-codefresh
committed
fix: support artifact files
Signed-off-by: kim-codefresh <[email protected]>
1 parent 44d9818 commit 9aa649d

File tree

11 files changed

+55093
-66
lines changed

11 files changed

+55093
-66
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ E2E_WAIT_TIMEOUT ?= 1m
3535
E2E_PARALLEL ?= 20
3636
E2E_SUITE_TIMEOUT ?= 15m
3737

38-
VERSION := CR-15902-test-2
39-
DOCKER_PUSH := true
38+
VERSION := latest
39+
DOCKER_PUSH := false
4040

4141
# VERSION is the version to be used for files in manifests and should always be latest unless we are releasing
4242
# we assume HEAD means you are on a tag

‎api/jsonschema/schema.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3576,6 +3576,17 @@
35763576
],
35773577
"type": "object"
35783578
},
3579+
"io.argoproj.workflow.v1alpha1.ArtifactByManifestRequest": {
3580+
"properties": {
3581+
"workflow": {
3582+
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.Workflow"
3583+
}
3584+
},
3585+
"required": [
3586+
"workflow"
3587+
],
3588+
"type": "object"
3589+
},
35793590
"io.argoproj.workflow.v1alpha1.ArtifactGC": {
35803591
"description": "ArtifactGC describes how to delete artifacts from completed Workflows",
35813592
"properties": {

‎api/openapi-spec/swagger.json‎

Lines changed: 71 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3733,23 +3733,25 @@
37333733
}
37343734
}
37353735
},
3736-
"/artifacts-by-uid/{uid}/{nodeId}/{artifactName}": {
3737-
"get": {
3736+
"/artifacts-by-manifest/{podName}/{artifactName}": {
3737+
"post": {
37383738
"tags": [
37393739
"ArtifactService"
37403740
],
3741-
"summary": "Get an output artifact by UID.",
3742-
"operationId": "ArtifactService_GetOutputArtifactByUID",
3741+
"summary": "Get an output artifact by a full workflow manifest.",
3742+
"operationId": "ArtifactService_GetOutputArtifactByManifest",
37433743
"parameters": [
37443744
{
3745-
"type": "string",
3746-
"name": "uid",
3747-
"in": "path",
3748-
"required": true
3745+
"name": "body",
3746+
"in": "body",
3747+
"required": true,
3748+
"schema": {
3749+
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.ArtifactByManifestRequest"
3750+
}
37493751
},
37503752
{
37513753
"type": "string",
3752-
"name": "nodeId",
3754+
"name": "podName",
37533755
"in": "path",
37543756
"required": true
37553757
},
@@ -3762,11 +3764,7 @@
37623764
],
37633765
"responses": {
37643766
"200": {
3765-
"description": "An artifact file.",
3766-
"schema": {
3767-
"type": "string",
3768-
"format": "binary"
3769-
}
3767+
"description": "An artifact file."
37703768
},
37713769
"default": {
37723770
"description": "An unexpected error response.",
@@ -3777,23 +3775,17 @@
37773775
}
37783776
}
37793777
},
3780-
"/artifacts/{namespace}/{name}/{nodeId}/{artifactName}": {
3778+
"/artifacts-by-uid/{uid}/{nodeId}/{artifactName}": {
37813779
"get": {
37823780
"tags": [
37833781
"ArtifactService"
37843782
],
3785-
"summary": "Get an output artifact.",
3786-
"operationId": "ArtifactService_GetOutputArtifact",
3783+
"summary": "Get an output artifact by UID.",
3784+
"operationId": "ArtifactService_GetOutputArtifactByUID",
37873785
"parameters": [
37883786
{
37893787
"type": "string",
3790-
"name": "namespace",
3791-
"in": "path",
3792-
"required": true
3793-
},
3794-
{
3795-
"type": "string",
3796-
"name": "name",
3788+
"name": "uid",
37973789
"in": "path",
37983790
"required": true
37993791
},
@@ -3827,17 +3819,23 @@
38273819
}
38283820
}
38293821
},
3830-
"/input-artifacts-by-uid/{uid}/{nodeId}/{artifactName}": {
3822+
"/artifacts/{namespace}/{name}/{nodeId}/{artifactName}": {
38313823
"get": {
38323824
"tags": [
38333825
"ArtifactService"
38343826
],
3835-
"summary": "Get an input artifact by UID.",
3836-
"operationId": "ArtifactService_GetInputArtifactByUID",
3827+
"summary": "Get an output artifact.",
3828+
"operationId": "ArtifactService_GetOutputArtifact",
38373829
"parameters": [
38383830
{
38393831
"type": "string",
3840-
"name": "uid",
3832+
"name": "namespace",
3833+
"in": "path",
3834+
"required": true
3835+
},
3836+
{
3837+
"type": "string",
3838+
"name": "name",
38413839
"in": "path",
38423840
"required": true
38433841
},
@@ -3871,29 +3869,25 @@
38713869
}
38723870
}
38733871
},
3874-
"/input-artifacts/{namespace}/{name}/{nodeId}/{artifactName}": {
3875-
"get": {
3872+
"/input-artifacts-by-manifest/{podName}/{artifactName}": {
3873+
"post": {
38763874
"tags": [
38773875
"ArtifactService"
38783876
],
3879-
"summary": "Get an input artifact.",
3880-
"operationId": "ArtifactService_GetInputArtifact",
3877+
"summary": "Get an output artifact by a full workflow manifest.",
3878+
"operationId": "ArtifactService_GetInputArtifactByManifest",
38813879
"parameters": [
38823880
{
3883-
"type": "string",
3884-
"name": "namespace",
3885-
"in": "path",
3886-
"required": true
3887-
},
3888-
{
3889-
"type": "string",
3890-
"name": "name",
3891-
"in": "path",
3892-
"required": true
3881+
"name": "body",
3882+
"in": "body",
3883+
"required": true,
3884+
"schema": {
3885+
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.ArtifactByManifestRequest"
3886+
}
38933887
},
38943888
{
38953889
"type": "string",
3896-
"name": "nodeId",
3890+
"name": "podName",
38973891
"in": "path",
38983892
"required": true
38993893
},
@@ -3906,11 +3900,7 @@
39063900
],
39073901
"responses": {
39083902
"200": {
3909-
"description": "An artifact file.",
3910-
"schema": {
3911-
"type": "string",
3912-
"format": "binary"
3913-
}
3903+
"description": "An artifact file."
39143904
},
39153905
"default": {
39163906
"description": "An unexpected error response.",
@@ -3921,30 +3911,30 @@
39213911
}
39223912
}
39233913
},
3924-
"/artifacts-by-manifest/{podId}/{artifactName}": {
3925-
"post": {
3914+
"/input-artifacts-by-uid/{uid}/{nodeId}/{artifactName}": {
3915+
"get": {
39263916
"tags": [
39273917
"ArtifactService"
39283918
],
3929-
"summary": "Get outputs artifacts by manifest",
3930-
"operationId": "ArtifactService_GetOutputArtifactByManifest",
3919+
"summary": "Get an input artifact by UID.",
3920+
"operationId": "ArtifactService_GetInputArtifactByUID",
39313921
"parameters": [
39323922
{
39333923
"type": "string",
3934-
"name": "podId",
3924+
"name": "uid",
39353925
"in": "path",
39363926
"required": true
39373927
},
39383928
{
39393929
"type": "string",
3940-
"name": "artifactName",
3930+
"name": "nodeId",
39413931
"in": "path",
39423932
"required": true
39433933
},
39443934
{
39453935
"type": "string",
3946-
"name": "workflow",
3947-
"in": "body",
3936+
"name": "artifactName",
3937+
"in": "path",
39483938
"required": true
39493939
}
39503940
],
@@ -3965,30 +3955,36 @@
39653955
}
39663956
}
39673957
},
3968-
"/input-artifacts-by-manifest/{podId}/{artifactName}": {
3969-
"post": {
3958+
"/input-artifacts/{namespace}/{name}/{nodeId}/{artifactName}": {
3959+
"get": {
39703960
"tags": [
39713961
"ArtifactService"
39723962
],
3973-
"summary": "Get inputs artifacts by manifest",
3974-
"operationId": "ArtifactService_GetInputArtifactByManifest",
3963+
"summary": "Get an input artifact.",
3964+
"operationId": "ArtifactService_GetInputArtifact",
39753965
"parameters": [
39763966
{
39773967
"type": "string",
3978-
"name": "podId",
3968+
"name": "namespace",
39793969
"in": "path",
39803970
"required": true
39813971
},
39823972
{
39833973
"type": "string",
3984-
"name": "artifactName",
3974+
"name": "name",
39853975
"in": "path",
39863976
"required": true
39873977
},
39883978
{
39893979
"type": "string",
3990-
"name": "workflow",
3991-
"in": "body",
3980+
"name": "nodeId",
3981+
"in": "path",
3982+
"required": true
3983+
},
3984+
{
3985+
"type": "string",
3986+
"name": "artifactName",
3987+
"in": "path",
39923988
"required": true
39933989
}
39943990
],
@@ -7585,6 +7581,17 @@
75857581
}
75867582
}
75877583
},
7584+
"io.argoproj.workflow.v1alpha1.ArtifactByManifestRequest": {
7585+
"type": "object",
7586+
"required": [
7587+
"workflow"
7588+
],
7589+
"properties": {
7590+
"workflow": {
7591+
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.Workflow"
7592+
}
7593+
}
7594+
},
75887595
"io.argoproj.workflow.v1alpha1.ArtifactGC": {
75897596
"description": "ArtifactGC describes how to delete artifacts from completed Workflows",
75907597
"type": "object",

‎pkg/apiclient/_.primary.swagger.json‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,90 @@
3030
}
3131
],
3232
"paths": {
33+
"/artifacts-by-manifest/{podName}/{artifactName}": {
34+
"post": {
35+
"tags": [
36+
"ArtifactService"
37+
],
38+
"summary": "Get an output artifact by a full workflow manifest.",
39+
"operationId": "ArtifactService_GetOutputArtifactByManifest",
40+
"parameters": [
41+
{
42+
"name": "body",
43+
"in": "body",
44+
"required": true,
45+
"schema": {
46+
"$ref": "#/definitions/github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.ArtifactByManifestRequest"
47+
}
48+
},
49+
{
50+
"type": "string",
51+
"name": "podName",
52+
"in": "path",
53+
"required": true
54+
},
55+
{
56+
"type": "string",
57+
"name": "artifactName",
58+
"in": "path",
59+
"required": true
60+
}
61+
],
62+
"responses": {
63+
"200": {
64+
"description": "An artifact file."
65+
},
66+
"default": {
67+
"description": "An unexpected error response.",
68+
"schema": {
69+
"$ref": "#/definitions/grpc.gateway.runtime.Error"
70+
}
71+
}
72+
}
73+
}
74+
},
75+
"/input-artifacts-by-manifest/{podName}/{artifactName}": {
76+
"post": {
77+
"tags": [
78+
"ArtifactService"
79+
],
80+
"summary": "Get an output artifact by a full workflow manifest.",
81+
"operationId": "ArtifactService_GetInputArtifactByManifest",
82+
"parameters": [
83+
{
84+
"name": "body",
85+
"in": "body",
86+
"required": true,
87+
"schema": {
88+
"$ref": "#/definitions/github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.ArtifactByManifestRequest"
89+
}
90+
},
91+
{
92+
"type": "string",
93+
"name": "podName",
94+
"in": "path",
95+
"required": true
96+
},
97+
{
98+
"type": "string",
99+
"name": "artifactName",
100+
"in": "path",
101+
"required": true
102+
}
103+
],
104+
"responses": {
105+
"200": {
106+
"description": "An artifact file."
107+
},
108+
"default": {
109+
"description": "An unexpected error response.",
110+
"schema": {
111+
"$ref": "#/definitions/grpc.gateway.runtime.Error"
112+
}
113+
}
114+
}
115+
}
116+
},
33117
"/artifact-files/{namespace}/{idDiscriminator}/{id}/{nodeId}/{artifactDiscriminator}/{artifactName}": {
34118
"get": {
35119
"tags": [
@@ -289,6 +373,17 @@
289373
}
290374
},
291375
"definitions": {
376+
"github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.ArtifactByManifestRequest": {
377+
"type": "object",
378+
"required": [
379+
"workflow"
380+
],
381+
"properties": {
382+
"workflow": {
383+
"$ref": "#/definitions/github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.Workflow"
384+
}
385+
}
386+
},
292387
"io.k8s.apimachinery.pkg.runtime.Object": {
293388
"title": "This is a hack do deal with this problem: https://github.com/kubernetes/kube-openapi/issues/174"
294389
},

0 commit comments

Comments
 (0)