From 43d9eebb479242ef23e84135bbe4b9dd252dea46 Mon Sep 17 00:00:00 2001 From: Saravanan Balasubramanian <33908564+sarabala1979@users.noreply.github.com> Date: Wed, 22 Apr 2020 08:31:24 -0700 Subject: [PATCH] fix: Rename Submittable API endpoint to `submit` (#2778) --- api/openapi-spec/swagger.json | 8 +- cmd/argo/commands/submit.go | 2 +- .../argo-kube-workflow-service-client.go | 4 +- pkg/apiclient/workflow/workflow.pb.go | 242 +++++++++--------- pkg/apiclient/workflow/workflow.pb.gw.go | 28 +- pkg/apiclient/workflow/workflow.proto | 6 +- pkg/apiclient/workflow/workflow.swagger.json | 8 +- server/workflow/workflow_server.go | 2 +- server/workflow/workflow_server_test.go | 6 +- test/e2e/argo_server_test.go | 6 +- 10 files changed, 156 insertions(+), 156 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 52ac4dfd0142..d986afbe88a1 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -1172,12 +1172,12 @@ } } }, - "/api/v1/workflows/{namespace}/submit-from": { + "/api/v1/workflows/{namespace}/submit": { "post": { "tags": [ "WorkflowService" ], - "operationId": "SubmitFrom", + "operationId": "SubmitWorkflow", "parameters": [ { "type": "string", @@ -1190,7 +1190,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/io.argoproj.workflow.v1alpha1.WorkflowSubmitFromRequest" + "$ref": "#/definitions/io.argoproj.workflow.v1alpha1.WorkflowSubmitRequest" } } ], @@ -6272,7 +6272,7 @@ } } }, - "io.argoproj.workflow.v1alpha1.WorkflowSubmitFromRequest": { + "io.argoproj.workflow.v1alpha1.WorkflowSubmitRequest": { "type": "object", "properties": { "createOptions": { diff --git a/cmd/argo/commands/submit.go b/cmd/argo/commands/submit.go index 7652be346ba9..883ec672f2bc 100644 --- a/cmd/argo/commands/submit.go +++ b/cmd/argo/commands/submit.go @@ -154,7 +154,7 @@ func submitWorkflowFromResource(resourceIdentifier string, submitOpts *wfv1.Subm validateOptions([]wfv1.Workflow{tempwf}, submitOpts, cliOpts) - created, err := apiClient.NewWorkflowServiceClient().SubmitFrom(ctx, &workflowpkg.WorkflowSubmitFromRequest{ + created, err := apiClient.NewWorkflowServiceClient().SubmitWorkflow(ctx, &workflowpkg.WorkflowSubmitRequest{ Namespace: namespace, ResourceKind: kind, ResourceName: name, diff --git a/pkg/apiclient/argo-kube-workflow-service-client.go b/pkg/apiclient/argo-kube-workflow-service-client.go index e25fe5905c14..c9ecb2f536d6 100644 --- a/pkg/apiclient/argo-kube-workflow-service-client.go +++ b/pkg/apiclient/argo-kube-workflow-service-client.go @@ -86,6 +86,6 @@ func (c argoKubeWorkflowServiceClient) PodLogs(ctx context.Context, req *workflo return intermediary, nil } -func (c argoKubeWorkflowServiceClient) SubmitFrom(ctx context.Context, req *workflowpkg.WorkflowSubmitFromRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) { - return c.delegate.SubmitFrom(ctx, req) +func (c argoKubeWorkflowServiceClient) SubmitWorkflow(ctx context.Context, req *workflowpkg.WorkflowSubmitRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) { + return c.delegate.SubmitWorkflow(ctx, req) } diff --git a/pkg/apiclient/workflow/workflow.pb.go b/pkg/apiclient/workflow/workflow.pb.go index c1c73ed8e50f..a0e30b8d9428 100644 --- a/pkg/apiclient/workflow/workflow.pb.go +++ b/pkg/apiclient/workflow/workflow.pb.go @@ -1023,7 +1023,7 @@ func (m *WorkflowLintRequest) GetWorkflow() *v1alpha1.Workflow { return nil } -type WorkflowSubmitFromRequest struct { +type WorkflowSubmitRequest struct { Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` ResourceKind string `protobuf:"bytes,2,opt,name=resourceKind,proto3" json:"resourceKind,omitempty"` ResourceName string `protobuf:"bytes,3,opt,name=resourceName,proto3" json:"resourceName,omitempty"` @@ -1034,18 +1034,18 @@ type WorkflowSubmitFromRequest struct { XXX_sizecache int32 `json:"-"` } -func (m *WorkflowSubmitFromRequest) Reset() { *m = WorkflowSubmitFromRequest{} } -func (m *WorkflowSubmitFromRequest) String() string { return proto.CompactTextString(m) } -func (*WorkflowSubmitFromRequest) ProtoMessage() {} -func (*WorkflowSubmitFromRequest) Descriptor() ([]byte, []int) { +func (m *WorkflowSubmitRequest) Reset() { *m = WorkflowSubmitRequest{} } +func (m *WorkflowSubmitRequest) String() string { return proto.CompactTextString(m) } +func (*WorkflowSubmitRequest) ProtoMessage() {} +func (*WorkflowSubmitRequest) Descriptor() ([]byte, []int) { return fileDescriptor_1f6bb75f9e833cb6, []int{16} } -func (m *WorkflowSubmitFromRequest) XXX_Unmarshal(b []byte) error { +func (m *WorkflowSubmitRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *WorkflowSubmitFromRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *WorkflowSubmitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_WorkflowSubmitFromRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_WorkflowSubmitRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1055,47 +1055,47 @@ func (m *WorkflowSubmitFromRequest) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } -func (m *WorkflowSubmitFromRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_WorkflowSubmitFromRequest.Merge(m, src) +func (m *WorkflowSubmitRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_WorkflowSubmitRequest.Merge(m, src) } -func (m *WorkflowSubmitFromRequest) XXX_Size() int { +func (m *WorkflowSubmitRequest) XXX_Size() int { return m.Size() } -func (m *WorkflowSubmitFromRequest) XXX_DiscardUnknown() { - xxx_messageInfo_WorkflowSubmitFromRequest.DiscardUnknown(m) +func (m *WorkflowSubmitRequest) XXX_DiscardUnknown() { + xxx_messageInfo_WorkflowSubmitRequest.DiscardUnknown(m) } -var xxx_messageInfo_WorkflowSubmitFromRequest proto.InternalMessageInfo +var xxx_messageInfo_WorkflowSubmitRequest proto.InternalMessageInfo -func (m *WorkflowSubmitFromRequest) GetNamespace() string { +func (m *WorkflowSubmitRequest) GetNamespace() string { if m != nil { return m.Namespace } return "" } -func (m *WorkflowSubmitFromRequest) GetResourceKind() string { +func (m *WorkflowSubmitRequest) GetResourceKind() string { if m != nil { return m.ResourceKind } return "" } -func (m *WorkflowSubmitFromRequest) GetResourceName() string { +func (m *WorkflowSubmitRequest) GetResourceName() string { if m != nil { return m.ResourceName } return "" } -func (m *WorkflowSubmitFromRequest) GetSubmitOptions() *v1alpha1.SubmitOpts { +func (m *WorkflowSubmitRequest) GetSubmitOptions() *v1alpha1.SubmitOpts { if m != nil { return m.SubmitOptions } return nil } -func (m *WorkflowSubmitFromRequest) GetCreateOptions() *v1.CreateOptions { +func (m *WorkflowSubmitRequest) GetCreateOptions() *v1.CreateOptions { if m != nil { return m.CreateOptions } @@ -1119,7 +1119,7 @@ func init() { proto.RegisterType((*WorkflowWatchEvent)(nil), "workflow.WorkflowWatchEvent") proto.RegisterType((*LogEntry)(nil), "workflow.LogEntry") proto.RegisterType((*WorkflowLintRequest)(nil), "workflow.WorkflowLintRequest") - proto.RegisterType((*WorkflowSubmitFromRequest)(nil), "workflow.WorkflowSubmitFromRequest") + proto.RegisterType((*WorkflowSubmitRequest)(nil), "workflow.WorkflowSubmitRequest") } func init() { @@ -1127,87 +1127,87 @@ func init() { } var fileDescriptor_1f6bb75f9e833cb6 = []byte{ - // 1278 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0x4f, 0x6f, 0xdc, 0xc4, - 0x1b, 0xc7, 0x35, 0x9b, 0xfe, 0xda, 0x74, 0x9a, 0xa4, 0xed, 0xfc, 0xa0, 0x2c, 0x56, 0x9b, 0xa6, - 0x53, 0x0a, 0x21, 0x6d, 0xec, 0x6c, 0x1a, 0xa0, 0x44, 0x2a, 0xa8, 0x24, 0x6d, 0x04, 0xac, 0xa0, - 0x72, 0x40, 0xa8, 0xdc, 0x1c, 0xef, 0x13, 0xc7, 0x8d, 0xed, 0x31, 0x9e, 0xd9, 0x8d, 0x96, 0x2a, - 0x20, 0x38, 0x72, 0x80, 0x03, 0x17, 0x04, 0x17, 0x54, 0xfe, 0x08, 0x09, 0x89, 0x3f, 0x07, 0x5e, - 0x01, 0x17, 0x8e, 0x48, 0xbc, 0x01, 0x14, 0xf1, 0x42, 0xd0, 0x8c, 0xff, 0x67, 0xb7, 0x5b, 0x13, - 0x17, 0x7a, 0x9b, 0xf1, 0x78, 0xe6, 0xfb, 0x99, 0xe7, 0x99, 0x79, 0xfc, 0xdd, 0xc5, 0x17, 0xc2, - 0x6d, 0xc7, 0xb0, 0x42, 0xd7, 0xf6, 0x5c, 0x08, 0x84, 0xb1, 0xc3, 0xa2, 0xed, 0x4d, 0x8f, 0xed, - 0x64, 0x0d, 0x3d, 0x8c, 0x98, 0x60, 0x64, 0x3c, 0xed, 0x6b, 0xf3, 0x8e, 0x2b, 0xb6, 0xba, 0x1b, - 0xba, 0xcd, 0x7c, 0xc3, 0x61, 0x0e, 0x33, 0xd4, 0x0b, 0x1b, 0xdd, 0x4d, 0xd5, 0x53, 0x1d, 0xd5, - 0x8a, 0x27, 0x6a, 0xa7, 0x1d, 0xc6, 0x1c, 0x0f, 0xa4, 0x84, 0x61, 0x05, 0x01, 0x13, 0x96, 0x70, - 0x59, 0xc0, 0x93, 0xd1, 0xa5, 0xed, 0x2b, 0x5c, 0x77, 0x99, 0x1c, 0xf5, 0x2d, 0x7b, 0xcb, 0x0d, - 0x20, 0xea, 0x1b, 0x09, 0x11, 0x37, 0x7c, 0x10, 0x96, 0xd1, 0x6b, 0x19, 0x0e, 0x04, 0x10, 0x59, - 0x02, 0x3a, 0xc9, 0xac, 0x95, 0x02, 0x82, 0x15, 0x29, 0xd1, 0xdb, 0xaa, 0x91, 0x4f, 0xcd, 0xf6, - 0xd1, 0x6b, 0x59, 0x5e, 0xb8, 0x65, 0x0d, 0x2e, 0x42, 0x73, 0x69, 0xc3, 0x66, 0x11, 0x0c, 0x11, - 0xa2, 0x3f, 0x36, 0xf0, 0xa3, 0x6f, 0x25, 0x2b, 0xad, 0x44, 0x60, 0x09, 0x30, 0xe1, 0x9d, 0x2e, - 0x70, 0x41, 0x4e, 0xe3, 0xa3, 0x81, 0xe5, 0x03, 0x0f, 0x2d, 0x1b, 0x9a, 0x68, 0x06, 0xcd, 0x1e, - 0x35, 0xf3, 0x07, 0xe4, 0x16, 0xce, 0xe2, 0xd5, 0x6c, 0xcc, 0xa0, 0xd9, 0x63, 0x8b, 0x57, 0xf5, - 0x9c, 0x59, 0x4f, 0x99, 0x55, 0x43, 0x0f, 0xb7, 0x1d, 0x5d, 0x32, 0xeb, 0x59, 0xc8, 0x53, 0x66, - 0x3d, 0xd5, 0x36, 0xb3, 0xe5, 0xc8, 0x34, 0xc6, 0x6e, 0xc0, 0x85, 0x15, 0xd8, 0xf0, 0xf2, 0x6a, - 0x73, 0x4c, 0x29, 0x17, 0x9e, 0x10, 0x8a, 0x27, 0x38, 0x44, 0x3d, 0x88, 0x56, 0xa3, 0xbe, 0xd9, - 0x0d, 0x9a, 0x87, 0x66, 0xd0, 0xec, 0xb8, 0x59, 0x7a, 0x46, 0x6e, 0xe1, 0x49, 0x5b, 0xed, 0xe6, - 0xf5, 0x50, 0x25, 0xa3, 0xf9, 0x3f, 0xc5, 0x78, 0x59, 0x8f, 0x43, 0xa2, 0x17, 0xb3, 0x91, 0xe3, - 0xc9, 0x6c, 0xe8, 0xbd, 0x96, 0xbe, 0x52, 0x9c, 0x6a, 0x96, 0x57, 0xa2, 0x3f, 0x21, 0x4c, 0x52, - 0xea, 0x35, 0x10, 0x69, 0xb8, 0x08, 0x3e, 0x24, 0xa3, 0x93, 0x44, 0x4a, 0xb5, 0xcb, 0x21, 0x6c, - 0xec, 0x0f, 0xe1, 0x4d, 0x8c, 0x1d, 0x10, 0x29, 0xe0, 0x98, 0x02, 0x5c, 0xa8, 0x06, 0xb8, 0x96, - 0xcd, 0x33, 0x0b, 0x6b, 0x90, 0x53, 0xf8, 0xf0, 0xa6, 0x0b, 0x5e, 0x87, 0xab, 0x98, 0x1c, 0x35, - 0x93, 0x1e, 0xfd, 0x12, 0xe1, 0xff, 0xa7, 0xc8, 0x6d, 0x97, 0x8b, 0x6a, 0x29, 0x5e, 0xc7, 0xc7, - 0x3c, 0x97, 0x67, 0x80, 0x71, 0x96, 0x5b, 0xd5, 0x00, 0xdb, 0xf9, 0x44, 0xb3, 0xb8, 0x4a, 0x01, - 0x71, 0xac, 0x84, 0xe8, 0xe0, 0xc7, 0xb2, 0xa3, 0x00, 0xbc, 0xbb, 0xe1, 0xbb, 0x35, 0x22, 0xab, - 0xe1, 0x71, 0x1f, 0x7c, 0xe6, 0xbe, 0x0b, 0x1d, 0x25, 0x33, 0x6e, 0x66, 0x7d, 0x7a, 0x17, 0xe1, - 0x47, 0x72, 0x25, 0x11, 0xf5, 0x0f, 0x2e, 0x33, 0x87, 0x4f, 0x44, 0xc0, 0x85, 0x15, 0x89, 0xf5, - 0xae, 0x6d, 0x03, 0xdf, 0xec, 0x7a, 0x89, 0xdc, 0xc0, 0x73, 0x72, 0x09, 0x9f, 0x0c, 0x58, 0x07, - 0x6e, 0xc8, 0xdd, 0xae, 0x83, 0x07, 0xb6, 0x60, 0x51, 0x92, 0xa5, 0xc1, 0x01, 0xba, 0x93, 0x5f, - 0x4a, 0x19, 0x0d, 0x1f, 0x0e, 0x0e, 0x39, 0x54, 0x78, 0xec, 0x5e, 0xc2, 0x6d, 0xdc, 0x4c, 0x85, - 0xdf, 0x80, 0xc8, 0x77, 0x83, 0x42, 0x41, 0xf8, 0xc7, 0xda, 0xf4, 0x93, 0xc2, 0xb9, 0x5b, 0x17, - 0x2c, 0xfc, 0x8f, 0x76, 0x41, 0x9a, 0xf8, 0x88, 0x0f, 0x9c, 0x5b, 0x0e, 0x24, 0x21, 0x4e, 0xbb, - 0xf4, 0x15, 0x7c, 0x2a, 0x03, 0xea, 0xf2, 0x10, 0x82, 0xce, 0xc1, 0x77, 0xf7, 0x55, 0xa1, 0x10, - 0xb4, 0x99, 0x73, 0xf0, 0xcd, 0x35, 0xf1, 0x91, 0x90, 0x75, 0x5e, 0x93, 0x93, 0xe2, 0x2d, 0xa5, - 0x5d, 0x72, 0x0d, 0x63, 0x8f, 0x39, 0xe9, 0x0d, 0x3c, 0xa4, 0x6e, 0xe0, 0xb9, 0xc2, 0x0d, 0xd4, - 0x65, 0x59, 0x97, 0xf7, 0xed, 0x26, 0xeb, 0xb4, 0xb3, 0x17, 0xcd, 0xc2, 0x24, 0xfa, 0x35, 0xca, - 0xcf, 0xd2, 0x2a, 0x78, 0x50, 0x23, 0x9f, 0xb2, 0xaa, 0x76, 0xd4, 0x12, 0xe5, 0xa2, 0x55, 0xb1, - 0xaa, 0xae, 0x16, 0xa7, 0x9a, 0xe5, 0x95, 0x68, 0x33, 0x4f, 0x4c, 0x4a, 0xc9, 0x43, 0x16, 0x70, - 0xa0, 0x1f, 0xc9, 0x0d, 0x58, 0xc2, 0xde, 0x4a, 0xc7, 0xf9, 0xc3, 0x2b, 0x5f, 0xf4, 0xfd, 0x3c, - 0xe5, 0x8a, 0xe9, 0x7a, 0x0f, 0x02, 0x15, 0x49, 0xd1, 0x0f, 0xb3, 0x48, 0xca, 0x36, 0x79, 0x13, - 0x1f, 0x66, 0x1b, 0xb7, 0xc1, 0x16, 0x0f, 0xe6, 0xf3, 0x98, 0x2c, 0x46, 0x5f, 0xc0, 0xe3, 0x6d, - 0xe6, 0x5c, 0x0f, 0x44, 0xd4, 0x97, 0xe7, 0xc6, 0x66, 0x81, 0x80, 0x40, 0x24, 0xca, 0x69, 0xb7, - 0x78, 0xa2, 0x1a, 0xa5, 0x13, 0x45, 0x3f, 0x2e, 0x7d, 0x0a, 0x02, 0xf1, 0xb0, 0xbf, 0xf6, 0xf4, - 0xd7, 0x06, 0x7e, 0x3c, 0xbf, 0x92, 0xb2, 0xee, 0xdf, 0x88, 0x98, 0x5f, 0x0d, 0x8b, 0xe2, 0x89, - 0x08, 0x38, 0xeb, 0x46, 0x36, 0xbc, 0xea, 0x06, 0x9d, 0x64, 0xaf, 0xa5, 0x67, 0xc5, 0x77, 0x0a, - 0x37, 0xac, 0xf4, 0x8c, 0x00, 0x9e, 0x8c, 0x3f, 0x39, 0xe5, 0x9b, 0xf6, 0xe2, 0x81, 0xf6, 0xb8, - 0x9e, 0xae, 0xc4, 0xcd, 0xf2, 0xaa, 0xff, 0xa2, 0x29, 0x59, 0xfc, 0xe5, 0x24, 0x3e, 0x9e, 0x45, - 0x11, 0xa2, 0x9e, 0x6b, 0x03, 0xf9, 0x1c, 0xe1, 0xa9, 0x78, 0x52, 0x3a, 0x42, 0xce, 0xe6, 0xbc, - 0x43, 0x4d, 0x9f, 0x56, 0x2f, 0xad, 0x74, 0xf6, 0xc3, 0x3f, 0xfe, 0xfa, 0xb4, 0x41, 0xe9, 0x19, - 0xe5, 0x39, 0x7b, 0xad, 0xcc, 0xa4, 0x72, 0xe3, 0x4e, 0x96, 0xb6, 0xdd, 0x65, 0x34, 0x47, 0x3e, - 0x43, 0xf8, 0xd8, 0x1a, 0x88, 0x8c, 0xec, 0xf4, 0x20, 0x59, 0x6e, 0xae, 0xea, 0x62, 0x5d, 0x52, - 0x58, 0x4f, 0x92, 0x27, 0x46, 0x62, 0xc5, 0xed, 0x5d, 0x89, 0x36, 0x29, 0x0b, 0x40, 0x56, 0x6f, - 0xc8, 0x99, 0x41, 0xb8, 0x82, 0x8d, 0xd2, 0xae, 0xd5, 0xa2, 0x93, 0x2b, 0xd1, 0x0b, 0x8a, 0xf0, - 0x2c, 0x19, 0x1d, 0x38, 0xf2, 0x1e, 0x9e, 0x2a, 0x97, 0xc2, 0x52, 0x46, 0x87, 0x15, 0x49, 0x6d, - 0x48, 0x60, 0xf3, 0xca, 0x45, 0x2f, 0x2a, 0xdd, 0x0b, 0xe4, 0xfc, 0x7e, 0xdd, 0x79, 0x90, 0xe3, - 0x25, 0xf5, 0x05, 0x44, 0x3e, 0x40, 0x78, 0x2a, 0x2e, 0xcf, 0xa3, 0x8e, 0x54, 0xe9, 0x33, 0xa3, - 0xcd, 0xdc, 0xfb, 0x85, 0xa4, 0xc2, 0x27, 0xe9, 0x99, 0xab, 0x96, 0x9e, 0x6f, 0x10, 0x9e, 0x54, - 0xc6, 0x2d, 0x43, 0x98, 0x1e, 0x54, 0x28, 0x3a, 0xbb, 0xba, 0xa7, 0xe7, 0x19, 0x85, 0x67, 0x68, - 0x73, 0x55, 0xf0, 0x8c, 0x48, 0x2a, 0xcb, 0x13, 0xfe, 0x03, 0xc2, 0x27, 0x52, 0x2b, 0x9b, 0xa1, - 0x9e, 0x1b, 0x86, 0x5a, 0xb2, 0xbb, 0x75, 0x69, 0xaf, 0x28, 0xda, 0x45, 0x6d, 0xbe, 0x22, 0x6d, - 0x2c, 0x2e, 0x81, 0xbf, 0x43, 0x78, 0x2a, 0x76, 0x9b, 0xa3, 0x92, 0x5b, 0xf2, 0xa3, 0x75, 0x61, - 0x9f, 0x55, 0xb0, 0x0b, 0xda, 0xc5, 0xca, 0xb0, 0x3e, 0x48, 0xd4, 0xef, 0x11, 0x3e, 0x9e, 0xf8, - 0xb7, 0x8c, 0x75, 0xc8, 0x39, 0x2b, 0x5b, 0xbc, 0xba, 0xb0, 0xcf, 0x29, 0xd8, 0x96, 0x76, 0xa9, - 0x12, 0x2c, 0x8f, 0xb5, 0x25, 0xed, 0xcf, 0x08, 0x9f, 0xcc, 0xdc, 0x74, 0xc6, 0x4b, 0x07, 0x79, - 0xf7, 0x5b, 0xee, 0xba, 0xc4, 0xcf, 0x2b, 0xe2, 0xcb, 0x9a, 0x5e, 0x89, 0x58, 0xa4, 0xea, 0x92, - 0xf9, 0x2e, 0xc2, 0x13, 0xd2, 0xb2, 0x67, 0xb8, 0x43, 0x6a, 0x60, 0xc1, 0xd2, 0xd7, 0x25, 0x5d, - 0x52, 0xa4, 0xba, 0xf6, 0x74, 0xb5, 0xd8, 0x0a, 0x16, 0x4a, 0xc8, 0x2f, 0x10, 0x9e, 0x90, 0x26, - 0x66, 0x14, 0x64, 0xc1, 0xe4, 0xd4, 0x85, 0x9c, 0x57, 0x90, 0x4f, 0x51, 0x3a, 0x1a, 0xd2, 0x73, - 0x03, 0x75, 0x9f, 0xfa, 0xf8, 0x48, 0x6c, 0xcb, 0xf9, 0xb0, 0xaf, 0x5b, 0xfe, 0x8b, 0x41, 0x23, - 0xf9, 0x68, 0xea, 0xed, 0xe8, 0xb2, 0xd2, 0x5a, 0x22, 0x8b, 0x95, 0x02, 0x72, 0x27, 0xb1, 0x77, - 0xbb, 0x86, 0xc7, 0x9c, 0x05, 0x44, 0xbe, 0x45, 0x18, 0xe7, 0x66, 0x8a, 0x9c, 0x1f, 0x76, 0x35, - 0xf6, 0x59, 0xad, 0x07, 0x94, 0x41, 0x7a, 0x9f, 0x0c, 0xc6, 0xe5, 0x66, 0x7e, 0x33, 0x62, 0xfe, - 0x32, 0x9a, 0x7b, 0xe9, 0xea, 0x6f, 0x7b, 0xd3, 0xe8, 0xf7, 0xbd, 0x69, 0xf4, 0xe7, 0xde, 0x34, - 0x7a, 0xdb, 0xb8, 0xdf, 0xbf, 0x5e, 0xfb, 0xfe, 0xc2, 0xdb, 0x38, 0xac, 0xfe, 0xc4, 0xba, 0xfc, - 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x09, 0xb7, 0x28, 0xd2, 0xe3, 0x13, 0x00, 0x00, + // 1267 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0x41, 0x6f, 0xdc, 0x44, + 0x1b, 0xc7, 0x35, 0x49, 0xdf, 0x36, 0x9d, 0x26, 0x69, 0x3b, 0x2f, 0x94, 0x95, 0xd5, 0xa6, 0xe9, + 0x40, 0x21, 0x4d, 0x1b, 0x3b, 0x9b, 0x16, 0x28, 0x95, 0x0a, 0x2a, 0x4d, 0x89, 0x80, 0x15, 0x54, + 0x5e, 0x10, 0x2a, 0x37, 0xc7, 0xfb, 0xc4, 0x71, 0xe3, 0xf5, 0x18, 0xcf, 0xec, 0x46, 0x4b, 0x15, + 0x10, 0x1c, 0x39, 0xc0, 0x81, 0x0b, 0x82, 0x0b, 0x14, 0x90, 0x90, 0x90, 0xa0, 0x7c, 0x02, 0xae, + 0x1c, 0x91, 0xf8, 0x02, 0x28, 0xe2, 0x83, 0xa0, 0x19, 0xdb, 0x63, 0x3b, 0xbb, 0xdd, 0x9a, 0xb8, + 0xd0, 0xdb, 0x8c, 0xc7, 0x33, 0xff, 0xdf, 0x3c, 0xcf, 0xcc, 0xe3, 0xff, 0x2e, 0x3e, 0x1b, 0x6d, + 0x79, 0x96, 0x13, 0xf9, 0x6e, 0xe0, 0x43, 0x28, 0xac, 0x6d, 0x16, 0x6f, 0x6d, 0x04, 0x6c, 0x5b, + 0x37, 0xcc, 0x28, 0x66, 0x82, 0x91, 0xa9, 0xac, 0x6f, 0x2c, 0x79, 0xbe, 0xd8, 0xec, 0xad, 0x9b, + 0x2e, 0xeb, 0x5a, 0x1e, 0xf3, 0x98, 0xa5, 0x5e, 0x58, 0xef, 0x6d, 0xa8, 0x9e, 0xea, 0xa8, 0x56, + 0x32, 0xd1, 0x38, 0xe9, 0x31, 0xe6, 0x05, 0x20, 0x25, 0x2c, 0x27, 0x0c, 0x99, 0x70, 0x84, 0xcf, + 0x42, 0x9e, 0x8e, 0x5e, 0xda, 0xba, 0xcc, 0x4d, 0x9f, 0xc9, 0xd1, 0xae, 0xe3, 0x6e, 0xfa, 0x21, + 0xc4, 0x03, 0x2b, 0x25, 0xe2, 0x56, 0x17, 0x84, 0x63, 0xf5, 0x9b, 0x96, 0x07, 0x21, 0xc4, 0x8e, + 0x80, 0x4e, 0x3a, 0xeb, 0x7a, 0x01, 0xc1, 0x89, 0x95, 0xe8, 0x6d, 0xd5, 0xc8, 0xa7, 0xea, 0x7d, + 0xf4, 0x9b, 0x4e, 0x10, 0x6d, 0x3a, 0xc3, 0x8b, 0xd0, 0x5c, 0xda, 0x72, 0x59, 0x0c, 0x23, 0x84, + 0xe8, 0xcf, 0x13, 0xf8, 0xf1, 0x77, 0xd2, 0x95, 0xae, 0xc7, 0xe0, 0x08, 0xb0, 0xe1, 0xbd, 0x1e, + 0x70, 0x41, 0x4e, 0xe2, 0xc3, 0xa1, 0xd3, 0x05, 0x1e, 0x39, 0x2e, 0x34, 0xd0, 0x3c, 0x5a, 0x38, + 0x6c, 0xe7, 0x0f, 0xc8, 0x2d, 0xac, 0xe3, 0xd5, 0x98, 0x98, 0x47, 0x0b, 0x47, 0x56, 0xae, 0x9a, + 0x39, 0xb3, 0x99, 0x31, 0xab, 0x86, 0x19, 0x6d, 0x79, 0xa6, 0x64, 0x36, 0x75, 0xc8, 0x33, 0x66, + 0x33, 0xd3, 0xb6, 0xf5, 0x72, 0x64, 0x0e, 0x63, 0x3f, 0xe4, 0xc2, 0x09, 0x5d, 0x78, 0x75, 0xb5, + 0x31, 0xa9, 0x94, 0x0b, 0x4f, 0x08, 0xc5, 0xd3, 0x1c, 0xe2, 0x3e, 0xc4, 0xab, 0xf1, 0xc0, 0xee, + 0x85, 0x8d, 0x03, 0xf3, 0x68, 0x61, 0xca, 0x2e, 0x3d, 0x23, 0xb7, 0xf0, 0x8c, 0xab, 0x76, 0xf3, + 0x66, 0xa4, 0x92, 0xd1, 0xf8, 0x9f, 0x62, 0xbc, 0x68, 0x26, 0x21, 0x31, 0x8b, 0xd9, 0xc8, 0xf1, + 0x64, 0x36, 0xcc, 0x7e, 0xd3, 0xbc, 0x5e, 0x9c, 0x6a, 0x97, 0x57, 0xa2, 0xf7, 0x10, 0x26, 0x19, + 0xf5, 0x1a, 0x88, 0x2c, 0x5c, 0x04, 0x1f, 0x90, 0xd1, 0x49, 0x23, 0xa5, 0xda, 0xe5, 0x10, 0x4e, + 0xec, 0x0d, 0xe1, 0x4d, 0x8c, 0x3d, 0x10, 0x19, 0xe0, 0xa4, 0x02, 0x5c, 0xae, 0x06, 0xb8, 0xa6, + 0xe7, 0xd9, 0x85, 0x35, 0xc8, 0x09, 0x7c, 0x70, 0xc3, 0x87, 0xa0, 0xc3, 0x55, 0x4c, 0x0e, 0xdb, + 0x69, 0x8f, 0x7e, 0x8d, 0xf0, 0xff, 0x33, 0xe4, 0x96, 0xcf, 0x45, 0xb5, 0x14, 0xb7, 0xf1, 0x91, + 0xc0, 0xe7, 0x1a, 0x30, 0xc9, 0x72, 0xb3, 0x1a, 0x60, 0x2b, 0x9f, 0x68, 0x17, 0x57, 0x29, 0x20, + 0x4e, 0x96, 0x10, 0x3d, 0xfc, 0x84, 0x3e, 0x0a, 0xc0, 0x7b, 0xeb, 0x5d, 0xbf, 0x46, 0x64, 0x0d, + 0x3c, 0xd5, 0x85, 0x2e, 0xf3, 0xdf, 0x87, 0x8e, 0x92, 0x99, 0xb2, 0x75, 0x9f, 0xde, 0x45, 0xf8, + 0xb1, 0x5c, 0x49, 0xc4, 0x83, 0xfd, 0xcb, 0x2c, 0xe2, 0x63, 0x31, 0x70, 0xe1, 0xc4, 0xa2, 0xdd, + 0x73, 0x5d, 0xe0, 0x1b, 0xbd, 0x20, 0x95, 0x1b, 0x7a, 0x4e, 0x2e, 0xe0, 0xe3, 0x21, 0xeb, 0xc0, + 0x2b, 0x72, 0xb7, 0x6d, 0x08, 0xc0, 0x15, 0x2c, 0x4e, 0xb3, 0x34, 0x3c, 0x40, 0xb7, 0xf3, 0x4b, + 0x29, 0xa3, 0xd1, 0x85, 0xfd, 0x43, 0x8e, 0x14, 0x9e, 0xbc, 0x9f, 0x70, 0x0b, 0x37, 0x32, 0xe1, + 0xb7, 0x20, 0xee, 0xfa, 0x61, 0xa1, 0x20, 0xfc, 0x63, 0x6d, 0xfa, 0x59, 0xe1, 0xdc, 0xb5, 0x05, + 0x8b, 0xfe, 0xa3, 0x5d, 0x90, 0x06, 0x3e, 0xd4, 0x05, 0xce, 0x1d, 0x0f, 0xd2, 0x10, 0x67, 0x5d, + 0xfa, 0x1a, 0x3e, 0xa1, 0x81, 0x7a, 0x3c, 0x82, 0xb0, 0xb3, 0xff, 0xdd, 0x7d, 0x5b, 0x28, 0x04, + 0x2d, 0xe6, 0xed, 0x7f, 0x73, 0x0d, 0x7c, 0x28, 0x62, 0x9d, 0x37, 0xe4, 0xa4, 0x64, 0x4b, 0x59, + 0x97, 0x5c, 0xc3, 0x38, 0x60, 0x5e, 0x76, 0x03, 0x0f, 0xa8, 0x1b, 0x78, 0xa6, 0x70, 0x03, 0x4d, + 0x59, 0xd6, 0xe5, 0x7d, 0xbb, 0xc9, 0x3a, 0x2d, 0xfd, 0xa2, 0x5d, 0x98, 0x44, 0xbf, 0x43, 0xf9, + 0x59, 0x5a, 0x85, 0x00, 0x6a, 0xe4, 0x53, 0x56, 0xd5, 0x8e, 0x5a, 0xa2, 0x5c, 0xb4, 0x2a, 0x56, + 0xd5, 0xd5, 0xe2, 0x54, 0xbb, 0xbc, 0x12, 0x6d, 0xe4, 0x89, 0xc9, 0x28, 0x79, 0xc4, 0x42, 0x0e, + 0xf4, 0x13, 0xb9, 0x01, 0x47, 0xb8, 0x9b, 0xd9, 0x38, 0x7f, 0x74, 0xe5, 0x8b, 0x7e, 0x98, 0xa7, + 0x5c, 0x31, 0xdd, 0xe8, 0x43, 0xa8, 0x22, 0x29, 0x06, 0x91, 0x8e, 0xa4, 0x6c, 0x93, 0xb7, 0xf1, + 0x41, 0xb6, 0x7e, 0x1b, 0x5c, 0xf1, 0x70, 0x3e, 0x8f, 0xe9, 0x62, 0xf4, 0x45, 0x3c, 0xd5, 0x62, + 0xde, 0x8d, 0x50, 0xc4, 0x03, 0x79, 0x6e, 0x5c, 0x16, 0x0a, 0x08, 0x45, 0xaa, 0x9c, 0x75, 0x8b, + 0x27, 0x6a, 0xa2, 0x74, 0xa2, 0xe8, 0xa7, 0xa5, 0x4f, 0x41, 0x28, 0x1e, 0xf5, 0xd7, 0x9e, 0xfe, + 0x5a, 0x30, 0x20, 0xed, 0x52, 0xdd, 0x1f, 0x8f, 0x44, 0xf1, 0x74, 0x0c, 0x9c, 0xf5, 0x62, 0x17, + 0x5e, 0xf7, 0xc3, 0x4e, 0xba, 0xcf, 0xd2, 0xb3, 0xe2, 0x3b, 0x85, 0xdb, 0x55, 0x7a, 0x46, 0x00, + 0xcf, 0x24, 0x9f, 0x9b, 0xf2, 0x2d, 0x7b, 0x69, 0x5f, 0xfb, 0x6b, 0x67, 0x2b, 0x71, 0xbb, 0xbc, + 0xea, 0xbf, 0x68, 0x48, 0x56, 0xee, 0x1d, 0xc7, 0x47, 0x75, 0x04, 0x21, 0xee, 0xfb, 0x2e, 0x90, + 0x2f, 0x11, 0x9e, 0x4d, 0x26, 0x65, 0x23, 0xe4, 0x74, 0xce, 0x3b, 0xd2, 0xf0, 0x19, 0xf5, 0x52, + 0x4a, 0x17, 0x3e, 0xfe, 0xe3, 0xaf, 0xcf, 0x27, 0x28, 0x3d, 0xa5, 0xfc, 0x66, 0xbf, 0xa9, 0x0d, + 0x2a, 0xb7, 0xee, 0xe8, 0xb4, 0xed, 0x5c, 0x41, 0x8b, 0xe4, 0x0b, 0x84, 0x8f, 0xac, 0x81, 0xd0, + 0x64, 0x27, 0x87, 0xc9, 0x72, 0x63, 0x55, 0x17, 0xeb, 0x82, 0xc2, 0x7a, 0x9a, 0x3c, 0x35, 0x16, + 0x2b, 0x69, 0xef, 0x48, 0xb4, 0x19, 0x79, 0xf9, 0x75, 0xad, 0x21, 0xa7, 0x86, 0xe1, 0x0a, 0x16, + 0xca, 0xb8, 0x56, 0x8b, 0x4e, 0xae, 0x44, 0xcf, 0x2a, 0xc2, 0xd3, 0x64, 0x7c, 0xe0, 0xc8, 0x07, + 0x78, 0xb6, 0x5c, 0x06, 0x4b, 0x19, 0x1d, 0x55, 0x20, 0x8d, 0x11, 0x81, 0xcd, 0xab, 0x16, 0x3d, + 0xaf, 0x74, 0xcf, 0x92, 0x27, 0xf7, 0xea, 0x2e, 0x81, 0x1c, 0x2f, 0xa9, 0x2f, 0x23, 0xf2, 0x11, + 0xc2, 0xb3, 0x49, 0x69, 0x1e, 0x77, 0xa4, 0x4a, 0x9f, 0x18, 0x63, 0xfe, 0xfe, 0x2f, 0xa4, 0xd5, + 0x3d, 0x4d, 0xcf, 0x62, 0xb5, 0xf4, 0x7c, 0x8f, 0xf0, 0x8c, 0x32, 0x6d, 0x1a, 0x61, 0x6e, 0x58, + 0xa1, 0xe8, 0xea, 0xea, 0x9e, 0x9e, 0x67, 0x15, 0x9e, 0x65, 0x2c, 0x56, 0xc1, 0xb3, 0x62, 0xa9, + 0x2c, 0x4f, 0xf8, 0x4f, 0x08, 0x1f, 0xcb, 0x6c, 0xac, 0x46, 0x3d, 0x33, 0x0a, 0xb5, 0x64, 0x75, + 0xeb, 0xd2, 0x5e, 0x56, 0xb4, 0x2b, 0xc6, 0x52, 0x45, 0xda, 0x44, 0x5c, 0x02, 0xff, 0x80, 0xf0, + 0x6c, 0xe2, 0x34, 0xc7, 0x25, 0xb7, 0xe4, 0x45, 0xeb, 0xc2, 0x3e, 0xa7, 0x60, 0x97, 0x8d, 0xf3, + 0x95, 0x61, 0xbb, 0x20, 0x51, 0x7f, 0x44, 0xf8, 0x68, 0xea, 0xdd, 0x34, 0xeb, 0x88, 0x73, 0x56, + 0xb6, 0x77, 0x75, 0x61, 0x9f, 0x57, 0xb0, 0x4d, 0xe3, 0x42, 0x25, 0x58, 0x9e, 0x68, 0x4b, 0xda, + 0x5f, 0x10, 0x3e, 0xae, 0x9d, 0xb4, 0xe6, 0xa5, 0xc3, 0xbc, 0x7b, 0xed, 0x76, 0x5d, 0xe2, 0x17, + 0x14, 0xf1, 0x45, 0xc3, 0xac, 0x44, 0x2c, 0x32, 0x75, 0xc9, 0x7c, 0x17, 0xe1, 0x69, 0x69, 0xd7, + 0x35, 0xee, 0x88, 0x1a, 0x58, 0xb0, 0xf3, 0x75, 0x49, 0x2f, 0x29, 0x52, 0xd3, 0x38, 0x57, 0x2d, + 0xb6, 0x82, 0x45, 0x12, 0xf2, 0x2b, 0x84, 0xa7, 0xa5, 0x81, 0x19, 0x07, 0x59, 0x30, 0x38, 0x75, + 0x21, 0x97, 0x14, 0xe4, 0x33, 0x94, 0x8e, 0x87, 0x0c, 0xfc, 0x50, 0xdd, 0xa7, 0x01, 0x3e, 0x94, + 0x58, 0x72, 0x3e, 0xea, 0xeb, 0x96, 0xff, 0x5a, 0x30, 0x48, 0x3e, 0x9a, 0xf9, 0x3a, 0x7a, 0x45, + 0x69, 0x5d, 0x22, 0x2b, 0x95, 0x02, 0x72, 0x27, 0xb5, 0x76, 0x3b, 0x56, 0xc0, 0xbc, 0x65, 0x44, + 0xbe, 0x41, 0x78, 0xb6, 0x5d, 0xae, 0x3c, 0xa7, 0x47, 0x5d, 0x8f, 0x87, 0x58, 0x77, 0x2c, 0x05, + 0x7c, 0x8e, 0x3e, 0xa0, 0x88, 0xeb, 0x72, 0xf3, 0xf2, 0xd5, 0xdf, 0x76, 0xe7, 0xd0, 0xef, 0xbb, + 0x73, 0xe8, 0xcf, 0xdd, 0x39, 0xf4, 0xae, 0xf5, 0xa0, 0x3f, 0xbb, 0xf6, 0xfc, 0x73, 0xb7, 0x7e, + 0x50, 0xfd, 0x77, 0x75, 0xf1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x3f, 0x7b, 0xe3, 0xda, + 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1235,7 +1235,7 @@ type WorkflowServiceClient interface { StopWorkflow(ctx context.Context, in *WorkflowStopRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) LintWorkflow(ctx context.Context, in *WorkflowLintRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) PodLogs(ctx context.Context, in *WorkflowLogRequest, opts ...grpc.CallOption) (WorkflowService_PodLogsClient, error) - SubmitFrom(ctx context.Context, in *WorkflowSubmitFromRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) + SubmitWorkflow(ctx context.Context, in *WorkflowSubmitRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) } type workflowServiceClient struct { @@ -1409,9 +1409,9 @@ func (x *workflowServicePodLogsClient) Recv() (*LogEntry, error) { return m, nil } -func (c *workflowServiceClient) SubmitFrom(ctx context.Context, in *WorkflowSubmitFromRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) { +func (c *workflowServiceClient) SubmitWorkflow(ctx context.Context, in *WorkflowSubmitRequest, opts ...grpc.CallOption) (*v1alpha1.Workflow, error) { out := new(v1alpha1.Workflow) - err := c.cc.Invoke(ctx, "/workflow.WorkflowService/SubmitFrom", in, out, opts...) + err := c.cc.Invoke(ctx, "/workflow.WorkflowService/SubmitWorkflow", in, out, opts...) if err != nil { return nil, err } @@ -1433,7 +1433,7 @@ type WorkflowServiceServer interface { StopWorkflow(context.Context, *WorkflowStopRequest) (*v1alpha1.Workflow, error) LintWorkflow(context.Context, *WorkflowLintRequest) (*v1alpha1.Workflow, error) PodLogs(*WorkflowLogRequest, WorkflowService_PodLogsServer) error - SubmitFrom(context.Context, *WorkflowSubmitFromRequest) (*v1alpha1.Workflow, error) + SubmitWorkflow(context.Context, *WorkflowSubmitRequest) (*v1alpha1.Workflow, error) } // UnimplementedWorkflowServiceServer can be embedded to have forward compatible implementations. @@ -1479,8 +1479,8 @@ func (*UnimplementedWorkflowServiceServer) LintWorkflow(ctx context.Context, req func (*UnimplementedWorkflowServiceServer) PodLogs(req *WorkflowLogRequest, srv WorkflowService_PodLogsServer) error { return status.Errorf(codes.Unimplemented, "method PodLogs not implemented") } -func (*UnimplementedWorkflowServiceServer) SubmitFrom(ctx context.Context, req *WorkflowSubmitFromRequest) (*v1alpha1.Workflow, error) { - return nil, status.Errorf(codes.Unimplemented, "method SubmitFrom not implemented") +func (*UnimplementedWorkflowServiceServer) SubmitWorkflow(ctx context.Context, req *WorkflowSubmitRequest) (*v1alpha1.Workflow, error) { + return nil, status.Errorf(codes.Unimplemented, "method SubmitWorkflow not implemented") } func RegisterWorkflowServiceServer(s *grpc.Server, srv WorkflowServiceServer) { @@ -1727,20 +1727,20 @@ func (x *workflowServicePodLogsServer) Send(m *LogEntry) error { return x.ServerStream.SendMsg(m) } -func _WorkflowService_SubmitFrom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(WorkflowSubmitFromRequest) +func _WorkflowService_SubmitWorkflow_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WorkflowSubmitRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(WorkflowServiceServer).SubmitFrom(ctx, in) + return srv.(WorkflowServiceServer).SubmitWorkflow(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/workflow.WorkflowService/SubmitFrom", + FullMethod: "/workflow.WorkflowService/SubmitWorkflow", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(WorkflowServiceServer).SubmitFrom(ctx, req.(*WorkflowSubmitFromRequest)) + return srv.(WorkflowServiceServer).SubmitWorkflow(ctx, req.(*WorkflowSubmitRequest)) } return interceptor(ctx, in, info, handler) } @@ -1794,8 +1794,8 @@ var _WorkflowService_serviceDesc = grpc.ServiceDesc{ Handler: _WorkflowService_LintWorkflow_Handler, }, { - MethodName: "SubmitFrom", - Handler: _WorkflowService_SubmitFrom_Handler, + MethodName: "SubmitWorkflow", + Handler: _WorkflowService_SubmitWorkflow_Handler, }, }, Streams: []grpc.StreamDesc{ @@ -2614,7 +2614,7 @@ func (m *WorkflowLintRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *WorkflowSubmitFromRequest) Marshal() (dAtA []byte, err error) { +func (m *WorkflowSubmitRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2624,12 +2624,12 @@ func (m *WorkflowSubmitFromRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *WorkflowSubmitFromRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *WorkflowSubmitRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *WorkflowSubmitFromRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *WorkflowSubmitRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3066,7 +3066,7 @@ func (m *WorkflowLintRequest) Size() (n int) { return n } -func (m *WorkflowSubmitFromRequest) Size() (n int) { +func (m *WorkflowSubmitRequest) Size() (n int) { if m == nil { return 0 } @@ -5408,7 +5408,7 @@ func (m *WorkflowLintRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *WorkflowSubmitFromRequest) Unmarshal(dAtA []byte) error { +func (m *WorkflowSubmitRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5431,10 +5431,10 @@ func (m *WorkflowSubmitFromRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: WorkflowSubmitFromRequest: wiretype end group for non-group") + return fmt.Errorf("proto: WorkflowSubmitRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: WorkflowSubmitFromRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: WorkflowSubmitRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/pkg/apiclient/workflow/workflow.pb.gw.go b/pkg/apiclient/workflow/workflow.pb.gw.go index 769e6473f862..1c9502e7c491 100644 --- a/pkg/apiclient/workflow/workflow.pb.gw.go +++ b/pkg/apiclient/workflow/workflow.pb.gw.go @@ -1088,8 +1088,8 @@ func request_WorkflowService_PodLogs_0(ctx context.Context, marshaler runtime.Ma } -func request_WorkflowService_SubmitFrom_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq WorkflowSubmitFromRequest +func request_WorkflowService_SubmitWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq WorkflowSubmitRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -1118,13 +1118,13 @@ func request_WorkflowService_SubmitFrom_0(ctx context.Context, marshaler runtime return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "namespace", err) } - msg, err := client.SubmitFrom(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.SubmitWorkflow(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_WorkflowService_SubmitFrom_0(ctx context.Context, marshaler runtime.Marshaler, server WorkflowServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq WorkflowSubmitFromRequest +func local_request_WorkflowService_SubmitWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, server WorkflowServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq WorkflowSubmitRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -1153,7 +1153,7 @@ func local_request_WorkflowService_SubmitFrom_0(ctx context.Context, marshaler r return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "namespace", err) } - msg, err := server.SubmitFrom(ctx, &protoReq) + msg, err := server.SubmitWorkflow(ctx, &protoReq) return msg, metadata, err } @@ -1397,7 +1397,7 @@ func RegisterWorkflowServiceHandlerServer(ctx context.Context, mux *runtime.Serv return }) - mux.Handle("POST", pattern_WorkflowService_SubmitFrom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_WorkflowService_SubmitWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1406,14 +1406,14 @@ func RegisterWorkflowServiceHandlerServer(ctx context.Context, mux *runtime.Serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_WorkflowService_SubmitFrom_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_WorkflowService_SubmitWorkflow_0(rctx, inboundMarshaler, server, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_WorkflowService_SubmitFrom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_WorkflowService_SubmitWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1718,7 +1718,7 @@ func RegisterWorkflowServiceHandlerClient(ctx context.Context, mux *runtime.Serv }) - mux.Handle("POST", pattern_WorkflowService_SubmitFrom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_WorkflowService_SubmitWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1727,14 +1727,14 @@ func RegisterWorkflowServiceHandlerClient(ctx context.Context, mux *runtime.Serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_WorkflowService_SubmitFrom_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_WorkflowService_SubmitWorkflow_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_WorkflowService_SubmitFrom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_WorkflowService_SubmitWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1768,7 +1768,7 @@ var ( pattern_WorkflowService_PodLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "workflows", "namespace", "name", "podName", "log"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_WorkflowService_SubmitFrom_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "workflows", "namespace", "submit-from"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_WorkflowService_SubmitWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "workflows", "namespace", "submit"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( @@ -1798,5 +1798,5 @@ var ( forward_WorkflowService_PodLogs_0 = runtime.ForwardResponseStream - forward_WorkflowService_SubmitFrom_0 = runtime.ForwardResponseMessage + forward_WorkflowService_SubmitWorkflow_0 = runtime.ForwardResponseMessage ) diff --git a/pkg/apiclient/workflow/workflow.proto b/pkg/apiclient/workflow/workflow.proto index 547ce23c906e..8d28582dd332 100644 --- a/pkg/apiclient/workflow/workflow.proto +++ b/pkg/apiclient/workflow/workflow.proto @@ -108,7 +108,7 @@ message WorkflowLintRequest { } -message WorkflowSubmitFromRequest{ +message WorkflowSubmitRequest{ string namespace = 1; string resourceKind = 2; string resourceName = 3; @@ -194,9 +194,9 @@ service WorkflowService { option (google.api.http).get = "/api/v1/workflows/{namespace}/{name}/{podName}/log"; } - rpc SubmitFrom (WorkflowSubmitFromRequest) returns (github.com.argoproj.argo.pkg.apis.workflow.v1alpha1.Workflow) { + rpc SubmitWorkflow (WorkflowSubmitRequest) returns (github.com.argoproj.argo.pkg.apis.workflow.v1alpha1.Workflow) { option (google.api.http) = { - post: "/api/v1/workflows/{namespace}/submit-from" + post: "/api/v1/workflows/{namespace}/submit" body: "*" }; } diff --git a/pkg/apiclient/workflow/workflow.swagger.json b/pkg/apiclient/workflow/workflow.swagger.json index a7ecdff0cc87..1fe00c67ab31 100644 --- a/pkg/apiclient/workflow/workflow.swagger.json +++ b/pkg/apiclient/workflow/workflow.swagger.json @@ -249,9 +249,9 @@ ] } }, - "/api/v1/workflows/{namespace}/submit-from": { + "/api/v1/workflows/{namespace}/submit": { "post": { - "operationId": "SubmitFrom", + "operationId": "SubmitWorkflow", "responses": { "200": { "description": "A successful response.", @@ -272,7 +272,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/workflow.WorkflowSubmitFromRequest" + "$ref": "#/definitions/workflow.WorkflowSubmitRequest" } } ], @@ -5068,7 +5068,7 @@ } } }, - "workflow.WorkflowSubmitFromRequest": { + "workflow.WorkflowSubmitRequest": { "type": "object", "properties": { "namespace": { diff --git a/server/workflow/workflow_server.go b/server/workflow/workflow_server.go index 57356eb1b1a3..e641030941eb 100644 --- a/server/workflow/workflow_server.go +++ b/server/workflow/workflow_server.go @@ -394,7 +394,7 @@ func (s *workflowServer) validateInstanceID(wf *v1alpha1.Workflow) bool { return false } -func (s *workflowServer) SubmitFrom(ctx context.Context, req *workflowpkg.WorkflowSubmitFromRequest) (*v1alpha1.Workflow, error) { +func (s *workflowServer) SubmitWorkflow(ctx context.Context, req *workflowpkg.WorkflowSubmitRequest) (*v1alpha1.Workflow, error) { wfClient := auth.GetWfClient(ctx) var wf *v1alpha1.Workflow switch req.ResourceKind { diff --git a/server/workflow/workflow_server_test.go b/server/workflow/workflow_server_test.go index ceb90d5786b3..c592ec65eb2f 100644 --- a/server/workflow/workflow_server_test.go +++ b/server/workflow/workflow_server_test.go @@ -696,7 +696,7 @@ func TestSubmitWorkflowFromResource(t *testing.T) { server, ctx := getWorkflowServer() t.Run("SubmitFromWorkflowTemplate", func(t *testing.T) { - wf, err := server.SubmitFrom(ctx, &workflowpkg.WorkflowSubmitFromRequest{ + wf, err := server.SubmitWorkflow(ctx, &workflowpkg.WorkflowSubmitRequest{ Namespace: "workflows", ResourceKind: "workflowtemplate", ResourceName: "workflow-template-whalesay-template", @@ -706,7 +706,7 @@ func TestSubmitWorkflowFromResource(t *testing.T) { } }) t.Run("SubmitFromCronWorkflow", func(t *testing.T) { - wf, err := server.SubmitFrom(ctx, &workflowpkg.WorkflowSubmitFromRequest{ + wf, err := server.SubmitWorkflow(ctx, &workflowpkg.WorkflowSubmitRequest{ Namespace: "workflows", ResourceKind: "cronworkflow", ResourceName: "hello-world", @@ -716,7 +716,7 @@ func TestSubmitWorkflowFromResource(t *testing.T) { } }) t.Run("SubmitFromClusterWorkflowTemplate", func(t *testing.T) { - wf, err := server.SubmitFrom(ctx, &workflowpkg.WorkflowSubmitFromRequest{ + wf, err := server.SubmitWorkflow(ctx, &workflowpkg.WorkflowSubmitRequest{ Namespace: "workflows", ResourceKind: "ClusterWorkflowTemplate", ResourceName: "cluster-workflow-template-whalesay-template", diff --git a/test/e2e/argo_server_test.go b/test/e2e/argo_server_test.go index b11fb3345830..00fb32b58fdc 100644 --- a/test/e2e/argo_server_test.go +++ b/test/e2e/argo_server_test.go @@ -1136,7 +1136,7 @@ func (s *ArgoServerSuite) TestSumbitWorkflowFromResource() { }) s.Run("SubmitWFT", func() { - s.e(s.T()).POST("/api/v1/workflows/argo/submit-from"). + s.e(s.T()).POST("/api/v1/workflows/argo/submit"). WithBytes([]byte(`{ "resourceKind": "WorkflowTemplate", "resourceName": "test" @@ -1176,7 +1176,7 @@ func (s *ArgoServerSuite) TestSumbitWorkflowFromResource() { Status(200) }) s.Run("SubmitWFT", func() { - s.e(s.T()).POST("/api/v1/workflows/argo/submit-from"). + s.e(s.T()).POST("/api/v1/workflows/argo/submit"). WithBytes([]byte(`{ "resourceKind": "cronworkflow", "resourceName": "test" @@ -1213,7 +1213,7 @@ func (s *ArgoServerSuite) TestSumbitWorkflowFromResource() { }) s.Run("SubmitCWFT", func() { - s.e(s.T()).POST("/api/v1/workflows/argo/submit-from"). + s.e(s.T()).POST("/api/v1/workflows/argo/submit"). WithBytes([]byte(`{ "resourceKind": "ClusterWorkflowTemplate", "resourceName": "test"