From af090bffa2b8773162898c97648c1c0b38dd85fe Mon Sep 17 00:00:00 2001 From: jingzhang36 Date: Wed, 30 Oct 2019 14:54:52 +0800 Subject: [PATCH] Regenerate api since https://github.com/kubeflow/pipelines/pull/2445 changed api proto (#2506) * re-generate api since #2445 changed api proto * Fix integration test for pipeline client * use generated constants --- backend/api/go_client/pipeline.pb.go | 223 +++++++++++------- .../api/go_client/resource_reference.pb.go | 65 ++--- .../job_model/api_resource_type.go | 5 +- .../pipeline_model/api_pipeline.go | 28 +++ .../pipeline_model/api_resource_type.go | 5 +- .../run_model/api_resource_type.go | 5 +- backend/api/swagger/job.swagger.json | 6 +- .../swagger/kfp_api_single_file.swagger.json | 14 +- backend/api/swagger/pipeline.swagger.json | 8 +- backend/api/swagger/run.swagger.json | 6 +- backend/test/integration/pipeline_api_test.go | 13 + 11 files changed, 246 insertions(+), 132 deletions(-) diff --git a/backend/api/go_client/pipeline.pb.go b/backend/api/go_client/pipeline.pb.go index 2dea749a261..7a069f7b3d5 100755 --- a/backend/api/go_client/pipeline.pb.go +++ b/backend/api/go_client/pipeline.pb.go @@ -52,7 +52,7 @@ func (m *Url) Reset() { *m = Url{} } func (m *Url) String() string { return proto.CompactTextString(m) } func (*Url) ProtoMessage() {} func (*Url) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{0} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{0} } func (m *Url) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Url.Unmarshal(m, b) @@ -90,7 +90,7 @@ func (m *CreatePipelineRequest) Reset() { *m = CreatePipelineRequest{} } func (m *CreatePipelineRequest) String() string { return proto.CompactTextString(m) } func (*CreatePipelineRequest) ProtoMessage() {} func (*CreatePipelineRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{1} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{1} } func (m *CreatePipelineRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreatePipelineRequest.Unmarshal(m, b) @@ -128,7 +128,7 @@ func (m *GetPipelineRequest) Reset() { *m = GetPipelineRequest{} } func (m *GetPipelineRequest) String() string { return proto.CompactTextString(m) } func (*GetPipelineRequest) ProtoMessage() {} func (*GetPipelineRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{2} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{2} } func (m *GetPipelineRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetPipelineRequest.Unmarshal(m, b) @@ -169,7 +169,7 @@ func (m *ListPipelinesRequest) Reset() { *m = ListPipelinesRequest{} } func (m *ListPipelinesRequest) String() string { return proto.CompactTextString(m) } func (*ListPipelinesRequest) ProtoMessage() {} func (*ListPipelinesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{3} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{3} } func (m *ListPipelinesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListPipelinesRequest.Unmarshal(m, b) @@ -230,7 +230,7 @@ func (m *ListPipelinesResponse) Reset() { *m = ListPipelinesResponse{} } func (m *ListPipelinesResponse) String() string { return proto.CompactTextString(m) } func (*ListPipelinesResponse) ProtoMessage() {} func (*ListPipelinesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{4} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{4} } func (m *ListPipelinesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListPipelinesResponse.Unmarshal(m, b) @@ -282,7 +282,7 @@ func (m *DeletePipelineRequest) Reset() { *m = DeletePipelineRequest{} } func (m *DeletePipelineRequest) String() string { return proto.CompactTextString(m) } func (*DeletePipelineRequest) ProtoMessage() {} func (*DeletePipelineRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{5} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{5} } func (m *DeletePipelineRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeletePipelineRequest.Unmarshal(m, b) @@ -320,7 +320,7 @@ func (m *GetTemplateRequest) Reset() { *m = GetTemplateRequest{} } func (m *GetTemplateRequest) String() string { return proto.CompactTextString(m) } func (*GetTemplateRequest) ProtoMessage() {} func (*GetTemplateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{6} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{6} } func (m *GetTemplateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTemplateRequest.Unmarshal(m, b) @@ -358,7 +358,7 @@ func (m *GetTemplateResponse) Reset() { *m = GetTemplateResponse{} } func (m *GetTemplateResponse) String() string { return proto.CompactTextString(m) } func (*GetTemplateResponse) ProtoMessage() {} func (*GetTemplateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{7} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{7} } func (m *GetTemplateResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTemplateResponse.Unmarshal(m, b) @@ -396,7 +396,7 @@ func (m *GetPipelineVersionTemplateRequest) Reset() { *m = GetPipelineVe func (m *GetPipelineVersionTemplateRequest) String() string { return proto.CompactTextString(m) } func (*GetPipelineVersionTemplateRequest) ProtoMessage() {} func (*GetPipelineVersionTemplateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{8} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{8} } func (m *GetPipelineVersionTemplateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetPipelineVersionTemplateRequest.Unmarshal(m, b) @@ -434,7 +434,7 @@ func (m *CreatePipelineVersionRequest) Reset() { *m = CreatePipelineVers func (m *CreatePipelineVersionRequest) String() string { return proto.CompactTextString(m) } func (*CreatePipelineVersionRequest) ProtoMessage() {} func (*CreatePipelineVersionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{9} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{9} } func (m *CreatePipelineVersionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreatePipelineVersionRequest.Unmarshal(m, b) @@ -472,7 +472,7 @@ func (m *GetPipelineVersionRequest) Reset() { *m = GetPipelineVersionReq func (m *GetPipelineVersionRequest) String() string { return proto.CompactTextString(m) } func (*GetPipelineVersionRequest) ProtoMessage() {} func (*GetPipelineVersionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{10} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{10} } func (m *GetPipelineVersionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetPipelineVersionRequest.Unmarshal(m, b) @@ -514,7 +514,7 @@ func (m *ListPipelineVersionsRequest) Reset() { *m = ListPipelineVersion func (m *ListPipelineVersionsRequest) String() string { return proto.CompactTextString(m) } func (*ListPipelineVersionsRequest) ProtoMessage() {} func (*ListPipelineVersionsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{11} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{11} } func (m *ListPipelineVersionsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListPipelineVersionsRequest.Unmarshal(m, b) @@ -582,7 +582,7 @@ func (m *ListPipelineVersionsResponse) Reset() { *m = ListPipelineVersio func (m *ListPipelineVersionsResponse) String() string { return proto.CompactTextString(m) } func (*ListPipelineVersionsResponse) ProtoMessage() {} func (*ListPipelineVersionsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{12} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{12} } func (m *ListPipelineVersionsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListPipelineVersionsResponse.Unmarshal(m, b) @@ -634,7 +634,7 @@ func (m *DeletePipelineVersionRequest) Reset() { *m = DeletePipelineVers func (m *DeletePipelineVersionRequest) String() string { return proto.CompactTextString(m) } func (*DeletePipelineVersionRequest) ProtoMessage() {} func (*DeletePipelineVersionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{13} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{13} } func (m *DeletePipelineVersionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeletePipelineVersionRequest.Unmarshal(m, b) @@ -669,6 +669,7 @@ type Pipeline struct { Parameters []*Parameter `protobuf:"bytes,5,rep,name=parameters,proto3" json:"parameters,omitempty"` Url *Url `protobuf:"bytes,7,opt,name=url,proto3" json:"url,omitempty"` Error string `protobuf:"bytes,6,opt,name=error,proto3" json:"error,omitempty"` + DefaultVersion *PipelineVersion `protobuf:"bytes,8,opt,name=default_version,json=defaultVersion,proto3" json:"default_version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -678,7 +679,7 @@ func (m *Pipeline) Reset() { *m = Pipeline{} } func (m *Pipeline) String() string { return proto.CompactTextString(m) } func (*Pipeline) ProtoMessage() {} func (*Pipeline) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{14} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{14} } func (m *Pipeline) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Pipeline.Unmarshal(m, b) @@ -747,6 +748,13 @@ func (m *Pipeline) GetError() string { return "" } +func (m *Pipeline) GetDefaultVersion() *PipelineVersion { + if m != nil { + return m.DefaultVersion + } + return nil +} + type PipelineVersion struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` @@ -764,7 +772,7 @@ func (m *PipelineVersion) Reset() { *m = PipelineVersion{} } func (m *PipelineVersion) String() string { return proto.CompactTextString(m) } func (*PipelineVersion) ProtoMessage() {} func (*PipelineVersion) Descriptor() ([]byte, []int) { - return fileDescriptor_pipeline_8f8139216a076032, []int{15} + return fileDescriptor_pipeline_e46b3924128d1ae3, []int{15} } func (m *PipelineVersion) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PipelineVersion.Unmarshal(m, b) @@ -873,6 +881,7 @@ type PipelineServiceClient interface { GetPipelineVersion(ctx context.Context, in *GetPipelineVersionRequest, opts ...grpc.CallOption) (*PipelineVersion, error) ListPipelineVersions(ctx context.Context, in *ListPipelineVersionsRequest, opts ...grpc.CallOption) (*ListPipelineVersionsResponse, error) DeletePipelineVersion(ctx context.Context, in *DeletePipelineVersionRequest, opts ...grpc.CallOption) (*empty.Empty, error) + GetPipelineVersionTemplate(ctx context.Context, in *GetPipelineVersionTemplateRequest, opts ...grpc.CallOption) (*GetTemplateResponse, error) } type pipelineServiceClient struct { @@ -964,6 +973,15 @@ func (c *pipelineServiceClient) DeletePipelineVersion(ctx context.Context, in *D return out, nil } +func (c *pipelineServiceClient) GetPipelineVersionTemplate(ctx context.Context, in *GetPipelineVersionTemplateRequest, opts ...grpc.CallOption) (*GetTemplateResponse, error) { + out := new(GetTemplateResponse) + err := c.cc.Invoke(ctx, "/api.PipelineService/GetPipelineVersionTemplate", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // PipelineServiceServer is the server API for PipelineService service. type PipelineServiceServer interface { CreatePipeline(context.Context, *CreatePipelineRequest) (*Pipeline, error) @@ -975,6 +993,7 @@ type PipelineServiceServer interface { GetPipelineVersion(context.Context, *GetPipelineVersionRequest) (*PipelineVersion, error) ListPipelineVersions(context.Context, *ListPipelineVersionsRequest) (*ListPipelineVersionsResponse, error) DeletePipelineVersion(context.Context, *DeletePipelineVersionRequest) (*empty.Empty, error) + GetPipelineVersionTemplate(context.Context, *GetPipelineVersionTemplateRequest) (*GetTemplateResponse, error) } func RegisterPipelineServiceServer(s *grpc.Server, srv PipelineServiceServer) { @@ -1143,6 +1162,24 @@ func _PipelineService_DeletePipelineVersion_Handler(srv interface{}, ctx context return interceptor(ctx, in, info, handler) } +func _PipelineService_GetPipelineVersionTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetPipelineVersionTemplateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(PipelineServiceServer).GetPipelineVersionTemplate(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/api.PipelineService/GetPipelineVersionTemplate", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(PipelineServiceServer).GetPipelineVersionTemplate(ctx, req.(*GetPipelineVersionTemplateRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _PipelineService_serviceDesc = grpc.ServiceDesc{ ServiceName: "api.PipelineService", HandlerType: (*PipelineServiceServer)(nil), @@ -1183,84 +1220,90 @@ var _PipelineService_serviceDesc = grpc.ServiceDesc{ MethodName: "DeletePipelineVersion", Handler: _PipelineService_DeletePipelineVersion_Handler, }, + { + MethodName: "GetPipelineVersionTemplate", + Handler: _PipelineService_GetPipelineVersionTemplate_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "backend/api/pipeline.proto", } func init() { - proto.RegisterFile("backend/api/pipeline.proto", fileDescriptor_pipeline_8f8139216a076032) -} - -var fileDescriptor_pipeline_8f8139216a076032 = []byte{ - // 1095 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0x8e, 0xed, 0xc4, 0xb1, 0xcb, 0x71, 0x02, 0x9d, 0x3f, 0x67, 0xe2, 0x6c, 0x9c, 0x21, 0x0a, - 0x09, 0xb0, 0x36, 0x49, 0x4e, 0xac, 0xc4, 0x61, 0x03, 0x68, 0x85, 0x58, 0xd0, 0x6a, 0x92, 0x70, - 0x58, 0x84, 0xac, 0xf6, 0xb8, 0xec, 0x6d, 0x32, 0x9e, 0x19, 0xba, 0xdb, 0x59, 0x12, 0xc4, 0x05, - 0xc4, 0x89, 0x1b, 0x1c, 0x78, 0x19, 0x24, 0x1e, 0x82, 0x57, 0xe0, 0xca, 0x8d, 0x07, 0x58, 0x4d, - 0x4f, 0xf7, 0x64, 0x66, 0xec, 0x64, 0xb3, 0x27, 0xbb, 0xab, 0xbe, 0xee, 0xaa, 0xfa, 0xfa, 0x9b, - 0xaa, 0x06, 0xab, 0x47, 0xdd, 0x0b, 0xf4, 0xfb, 0x1d, 0x1a, 0xb2, 0x4e, 0xc8, 0x42, 0xf4, 0x98, - 0x8f, 0xed, 0x90, 0x07, 0x32, 0x20, 0x25, 0x1a, 0x32, 0xab, 0x39, 0x0c, 0x82, 0xa1, 0x87, 0xca, - 0x4f, 0x7d, 0x3f, 0x90, 0x54, 0xb2, 0xc0, 0x17, 0x31, 0xc4, 0xda, 0xd6, 0x5e, 0xb5, 0xea, 0x8d, - 0x07, 0x1d, 0xc9, 0x46, 0x28, 0x24, 0x1d, 0x85, 0x1a, 0xb0, 0x99, 0x07, 0xe0, 0x28, 0x94, 0x57, - 0xda, 0xb9, 0x9e, 0x0e, 0x8e, 0x9c, 0x07, 0xdc, 0xec, 0xca, 0x64, 0x45, 0x39, 0x1d, 0xa1, 0x44, - 0xe3, 0xdc, 0x9e, 0x96, 0x72, 0x57, 0x84, 0xe8, 0x6a, 0xc0, 0x6e, 0x1a, 0xc0, 0x51, 0x04, 0x63, - 0xee, 0x62, 0x97, 0xe3, 0x00, 0x39, 0xfa, 0xae, 0xae, 0xce, 0xfa, 0x40, 0xfd, 0xb8, 0x0f, 0x87, - 0xe8, 0x3f, 0x14, 0x2f, 0xe9, 0x70, 0x88, 0xbc, 0x13, 0x84, 0xaa, 0xb8, 0xc9, 0x42, 0xed, 0x7d, - 0x28, 0x9d, 0x73, 0x8f, 0xec, 0xc0, 0x42, 0x12, 0x71, 0xcc, 0xbd, 0x46, 0xa1, 0x55, 0xd8, 0xaf, - 0x3a, 0x35, 0x63, 0x3b, 0xe7, 0x9e, 0x7d, 0x02, 0xab, 0x9f, 0x70, 0xa4, 0x12, 0x9f, 0x69, 0xa3, - 0x83, 0xdf, 0x8f, 0x51, 0x48, 0x72, 0x00, 0x15, 0x83, 0x53, 0xfb, 0x6a, 0x47, 0xf5, 0x36, 0x0d, - 0x59, 0x3b, 0xc1, 0x25, 0x6e, 0x7b, 0x17, 0xc8, 0x13, 0x94, 0xf9, 0x03, 0x16, 0xa1, 0xc8, 0xfa, - 0x3a, 0x64, 0x91, 0xf5, 0xed, 0x5f, 0x0a, 0xb0, 0xf2, 0x94, 0x89, 0x04, 0x27, 0x0c, 0x70, 0x0b, - 0x20, 0xa4, 0x43, 0xec, 0xca, 0xe0, 0x02, 0x7d, 0xbd, 0xa1, 0x1a, 0x59, 0xce, 0x22, 0x03, 0xd9, - 0x04, 0xb5, 0xe8, 0x0a, 0x76, 0x8d, 0x8d, 0x62, 0xab, 0xb0, 0x3f, 0xe7, 0x54, 0x22, 0xc3, 0x29, - 0xbb, 0x46, 0xb2, 0x0e, 0xf3, 0x22, 0xe0, 0xb2, 0xdb, 0xbb, 0x6a, 0x94, 0xd4, 0xc6, 0x72, 0xb4, - 0x3c, 0xb9, 0x22, 0x6b, 0x50, 0x1e, 0x30, 0x4f, 0x22, 0x6f, 0xcc, 0xc6, 0xf6, 0x78, 0x65, 0xff, - 0x56, 0x80, 0xd5, 0x5c, 0x16, 0x22, 0x0c, 0x7c, 0x81, 0xe4, 0x7d, 0xa8, 0x9a, 0x8a, 0x44, 0xa3, - 0xd0, 0x2a, 0x4d, 0x56, 0x7c, 0xe3, 0x8f, 0x72, 0x96, 0x81, 0xa4, 0x5e, 0x9c, 0x55, 0x49, 0x65, - 0x55, 0x55, 0x16, 0x95, 0xd6, 0x1e, 0x2c, 0xf9, 0xf8, 0x83, 0xec, 0xa6, 0xea, 0x2a, 0xaa, 0x34, - 0xea, 0x91, 0xf9, 0x99, 0xa9, 0xcd, 0x7e, 0x17, 0x56, 0x3f, 0x45, 0x0f, 0x27, 0xd9, 0xcf, 0x93, - 0x17, 0x53, 0x7c, 0x86, 0xa3, 0xd0, 0xa3, 0xf2, 0x56, 0xd4, 0x21, 0x2c, 0x67, 0x50, 0xba, 0x32, - 0x0b, 0x2a, 0x52, 0xdb, 0x34, 0x38, 0x59, 0xdb, 0x27, 0xb0, 0x93, 0xba, 0xbb, 0xaf, 0x91, 0x0b, - 0x16, 0xf8, 0xf9, 0x38, 0x5b, 0x00, 0x97, 0xb1, 0xa7, 0x9b, 0xc4, 0xab, 0x6a, 0xcb, 0xe7, 0x7d, - 0xfb, 0x2b, 0x68, 0x66, 0x35, 0xa4, 0x8f, 0x31, 0xdb, 0xdb, 0x30, 0xaf, 0xc1, 0x5a, 0x49, 0x2b, - 0x19, 0x5e, 0x0d, 0xda, 0x80, 0xec, 0x47, 0xb0, 0x31, 0x99, 0xd3, 0x3d, 0x73, 0xf9, 0xbb, 0x00, - 0x9b, 0xe9, 0xfb, 0xd5, 0xbb, 0x13, 0xb1, 0x1d, 0xc3, 0x42, 0xf2, 0x8d, 0x5d, 0xe0, 0x95, 0x4e, - 0xe8, 0x2d, 0x95, 0x90, 0xa3, 0x1d, 0x5f, 0xe0, 0x95, 0x53, 0xe3, 0x37, 0x8b, 0xbb, 0x25, 0x98, - 0x95, 0x6f, 0x29, 0x2f, 0xdf, 0x94, 0x42, 0x67, 0x6f, 0x51, 0xe8, 0x5c, 0x46, 0xa1, 0x7f, 0x16, - 0xa0, 0x39, 0xbd, 0x02, 0x7d, 0x9d, 0x1f, 0x42, 0x45, 0xd7, 0x6b, 0x74, 0x3a, 0x9d, 0xcf, 0x04, - 0x75, 0x5f, 0x39, 0xbe, 0x46, 0xd5, 0xf6, 0xc7, 0xd0, 0xcc, 0xaa, 0xf5, 0xcd, 0xae, 0xe6, 0xbf, - 0x02, 0x54, 0xcc, 0xce, 0xbc, 0x74, 0xc9, 0x47, 0x00, 0xae, 0xd2, 0x50, 0xbf, 0x4b, 0xa5, 0xca, - 0xae, 0x76, 0x64, 0xb5, 0xe3, 0x76, 0xdc, 0x36, 0xed, 0xb8, 0x7d, 0x66, 0xfa, 0xb5, 0x53, 0xd5, - 0xe8, 0xc7, 0x92, 0x10, 0x98, 0xf5, 0xe9, 0x08, 0x35, 0xf5, 0xea, 0x3f, 0x69, 0x41, 0xad, 0x8f, - 0xc2, 0xe5, 0x4c, 0xb5, 0x48, 0xcd, 0x7c, 0xda, 0x44, 0xda, 0xd1, 0xb5, 0xe9, 0x56, 0x2d, 0x1a, - 0x73, 0x8a, 0xc7, 0xc5, 0x98, 0x47, 0x63, 0x76, 0x52, 0x08, 0x62, 0x41, 0x29, 0x6a, 0xa1, 0xf3, - 0x2a, 0xb3, 0x8a, 0x02, 0x9e, 0x73, 0xcf, 0x89, 0x8c, 0x64, 0x05, 0xe6, 0xd4, 0x3c, 0x68, 0x94, - 0x55, 0x9c, 0x78, 0x61, 0xff, 0x55, 0x84, 0xa5, 0x1c, 0x53, 0x13, 0x65, 0x9b, 0xdc, 0x8b, 0xa9, - 0xdc, 0xb3, 0x54, 0x94, 0xde, 0x84, 0x8a, 0x6c, 0x51, 0xb3, 0xaf, 0x2d, 0x6a, 0x0f, 0x96, 0xdc, - 0xa0, 0x8f, 0x5d, 0xfd, 0x41, 0x44, 0x05, 0xc6, 0x62, 0xac, 0x47, 0xe6, 0x53, 0x65, 0x8d, 0x06, - 0xc9, 0x01, 0xd4, 0x42, 0xea, 0x5e, 0x44, 0xf2, 0x89, 0x30, 0xe5, 0x1c, 0x09, 0xa0, 0x9d, 0x11, - 0xf4, 0x09, 0x2c, 0x4f, 0x0e, 0x31, 0xd1, 0x98, 0x57, 0xb9, 0xac, 0x65, 0xbe, 0x33, 0xc7, 0xb8, - 0x1d, 0xc2, 0xf3, 0x26, 0x71, 0xf4, 0x7f, 0xf9, 0x86, 0xbe, 0x53, 0xe4, 0x97, 0xcc, 0x45, 0x32, - 0x80, 0xc5, 0x6c, 0xa7, 0x21, 0x96, 0x3a, 0x71, 0xea, 0x08, 0xb3, 0xb2, 0xed, 0xdb, 0x3e, 0xf8, - 0xf9, 0x9f, 0x7f, 0xff, 0x28, 0xbe, 0x63, 0xaf, 0x47, 0x93, 0x56, 0x74, 0x2e, 0x0f, 0x7b, 0x28, - 0xe9, 0x61, 0x32, 0x93, 0xc5, 0xa3, 0x64, 0xa2, 0x91, 0x6f, 0xa0, 0x96, 0xea, 0x40, 0x64, 0x5d, - 0x1d, 0x34, 0x39, 0xe3, 0xf2, 0x11, 0x76, 0x55, 0x84, 0x07, 0xa4, 0x79, 0x4b, 0x84, 0xce, 0x8f, - 0xac, 0xff, 0x13, 0x19, 0x42, 0x3d, 0x33, 0x81, 0xc8, 0x86, 0x3a, 0x65, 0xda, 0x6c, 0xb4, 0xac, - 0x69, 0xae, 0xb8, 0x0f, 0xd8, 0xdb, 0x2a, 0xda, 0x06, 0xb9, 0xad, 0x1e, 0xf2, 0x1d, 0x2c, 0x66, - 0xbf, 0x57, 0xcd, 0xd6, 0xd4, 0x91, 0x63, 0xad, 0x4d, 0x48, 0xec, 0xb3, 0xe8, 0xf1, 0x63, 0x8a, - 0x7a, 0xef, 0xee, 0xa2, 0x42, 0xc5, 0x98, 0x19, 0x1c, 0x37, 0x8c, 0xe5, 0x46, 0x89, 0xd5, 0x98, - 0x74, 0xe8, 0x72, 0xda, 0x2a, 0xce, 0x3e, 0xd9, 0xbb, 0x2b, 0x4e, 0xc7, 0x0c, 0x2e, 0x41, 0x9c, - 0xfc, 0xcb, 0xc5, 0x7c, 0x63, 0x3b, 0x53, 0x24, 0x91, 0xed, 0x54, 0xd6, 0xd4, 0x86, 0x69, 0xcf, - 0x90, 0xa7, 0x99, 0x97, 0x8c, 0x39, 0xf0, 0x41, 0xfe, 0xfa, 0xef, 0x79, 0xda, 0xb7, 0xd9, 0x07, - 0x8f, 0x69, 0xe4, 0xa4, 0x35, 0x71, 0xa9, 0xb9, 0x29, 0x65, 0xed, 0xdc, 0x81, 0xd0, 0x74, 0xcd, - 0x90, 0xb3, 0xfc, 0xe3, 0x21, 0x4b, 0xc0, 0x5d, 0xad, 0xfa, 0xd6, 0xcb, 0x9e, 0x39, 0xf9, 0xb5, - 0xf0, 0xfb, 0xe3, 0x2f, 0x9d, 0x26, 0xcc, 0xf7, 0x71, 0x40, 0xc7, 0x9e, 0x24, 0x6f, 0x93, 0x25, - 0xa8, 0x5b, 0x35, 0x75, 0xe6, 0xa9, 0xa4, 0x72, 0x2c, 0x9e, 0x6f, 0xc3, 0x16, 0x94, 0x4f, 0x90, - 0x72, 0xe4, 0x64, 0xb9, 0x52, 0xb4, 0xea, 0x74, 0x2c, 0x5f, 0x04, 0x9c, 0x5d, 0xab, 0x47, 0x68, - 0xab, 0xd8, 0x5b, 0x00, 0x48, 0x00, 0x33, 0xcf, 0x8f, 0x87, 0x4c, 0xbe, 0x18, 0xf7, 0xda, 0x6e, - 0x30, 0xea, 0x5c, 0x8c, 0x7b, 0x38, 0xf0, 0x82, 0x97, 0xa9, 0x7b, 0x4d, 0xbf, 0x7f, 0x87, 0x41, - 0xd7, 0xf5, 0x18, 0xfa, 0xb2, 0x57, 0x56, 0x99, 0x1d, 0xbf, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x74, - 0x2b, 0x8c, 0xa2, 0xf3, 0x0b, 0x00, 0x00, + proto.RegisterFile("backend/api/pipeline.proto", fileDescriptor_pipeline_e46b3924128d1ae3) +} + +var fileDescriptor_pipeline_e46b3924128d1ae3 = []byte{ + // 1127 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdd, 0x6e, 0xe3, 0xc4, + 0x17, 0x6f, 0x92, 0x36, 0x1f, 0x27, 0x9b, 0xf6, 0xff, 0x9f, 0xed, 0x47, 0xea, 0xa6, 0xdb, 0xd4, + 0x54, 0xa5, 0x05, 0x36, 0xa1, 0xed, 0x15, 0x2b, 0xed, 0xc5, 0x16, 0xd0, 0x0a, 0xb1, 0xa0, 0x95, + 0xdb, 0x72, 0xb1, 0x08, 0x99, 0x89, 0x73, 0x92, 0x35, 0x75, 0x6c, 0x33, 0x33, 0xe9, 0xd2, 0x22, + 0x6e, 0x40, 0x5c, 0x71, 0x07, 0x17, 0xbc, 0x04, 0x8f, 0x80, 0xc4, 0x43, 0x20, 0xf1, 0x04, 0x3c, + 0x08, 0xf2, 0x78, 0xc6, 0xb5, 0x9d, 0x8f, 0xed, 0x5e, 0x25, 0x73, 0xce, 0x6f, 0xe6, 0x9c, 0xf3, + 0x9b, 0x9f, 0xcf, 0x19, 0x30, 0x7a, 0xd4, 0xb9, 0x44, 0xbf, 0xdf, 0xa5, 0xa1, 0xdb, 0x0d, 0xdd, + 0x10, 0x3d, 0xd7, 0xc7, 0x4e, 0xc8, 0x02, 0x11, 0x90, 0x12, 0x0d, 0x5d, 0xa3, 0x35, 0x0c, 0x82, + 0xa1, 0x87, 0xd2, 0x4f, 0x7d, 0x3f, 0x10, 0x54, 0xb8, 0x81, 0xcf, 0x63, 0x88, 0xb1, 0xa3, 0xbc, + 0x72, 0xd5, 0x1b, 0x0f, 0xba, 0xc2, 0x1d, 0x21, 0x17, 0x74, 0x14, 0x2a, 0xc0, 0x56, 0x1e, 0x80, + 0xa3, 0x50, 0x5c, 0x2b, 0xe7, 0x46, 0x3a, 0x38, 0x32, 0x16, 0x30, 0xbd, 0x2b, 0x93, 0x15, 0x65, + 0x74, 0x84, 0x02, 0xb5, 0x73, 0x67, 0x5a, 0xca, 0x36, 0x0f, 0xd1, 0x51, 0x80, 0xbd, 0x34, 0x80, + 0x21, 0x0f, 0xc6, 0xcc, 0x41, 0x9b, 0xe1, 0x00, 0x19, 0xfa, 0x8e, 0xaa, 0xce, 0x78, 0x4f, 0xfe, + 0x38, 0x0f, 0x87, 0xe8, 0x3f, 0xe4, 0xaf, 0xe8, 0x70, 0x88, 0xac, 0x1b, 0x84, 0xb2, 0xb8, 0xc9, + 0x42, 0xcd, 0x03, 0x28, 0x5d, 0x30, 0x8f, 0xec, 0xc2, 0xbd, 0x24, 0xe2, 0x98, 0x79, 0xcd, 0x42, + 0xbb, 0x70, 0x50, 0xb3, 0xea, 0xda, 0x76, 0xc1, 0x3c, 0xf3, 0x14, 0xd6, 0x3e, 0x64, 0x48, 0x05, + 0x3e, 0x57, 0x46, 0x0b, 0xbf, 0x1d, 0x23, 0x17, 0xe4, 0x10, 0xaa, 0x1a, 0x27, 0xf7, 0xd5, 0x8f, + 0x1b, 0x1d, 0x1a, 0xba, 0x9d, 0x04, 0x97, 0xb8, 0xcd, 0x3d, 0x20, 0x4f, 0x51, 0xe4, 0x0f, 0x58, + 0x86, 0xa2, 0xdb, 0x57, 0x21, 0x8b, 0x6e, 0xdf, 0xfc, 0xa9, 0x00, 0xab, 0xcf, 0x5c, 0x9e, 0xe0, + 0xb8, 0x06, 0x6e, 0x03, 0x84, 0x74, 0x88, 0xb6, 0x08, 0x2e, 0xd1, 0x57, 0x1b, 0x6a, 0x91, 0xe5, + 0x3c, 0x32, 0x90, 0x2d, 0x90, 0x0b, 0x9b, 0xbb, 0x37, 0xd8, 0x2c, 0xb6, 0x0b, 0x07, 0x4b, 0x56, + 0x35, 0x32, 0x9c, 0xb9, 0x37, 0x48, 0x36, 0xa0, 0xc2, 0x03, 0x26, 0xec, 0xde, 0x75, 0xb3, 0x24, + 0x37, 0x96, 0xa3, 0xe5, 0xe9, 0x35, 0x59, 0x87, 0xf2, 0xc0, 0xf5, 0x04, 0xb2, 0xe6, 0x62, 0x6c, + 0x8f, 0x57, 0xe6, 0x2f, 0x05, 0x58, 0xcb, 0x65, 0xc1, 0xc3, 0xc0, 0xe7, 0x48, 0xde, 0x85, 0x9a, + 0xae, 0x88, 0x37, 0x0b, 0xed, 0xd2, 0x64, 0xc5, 0xb7, 0xfe, 0x28, 0x67, 0x11, 0x08, 0xea, 0xc5, + 0x59, 0x95, 0x64, 0x56, 0x35, 0x69, 0x91, 0x69, 0xed, 0xc3, 0x8a, 0x8f, 0xdf, 0x09, 0x3b, 0x55, + 0x57, 0x51, 0xa6, 0xd1, 0x88, 0xcc, 0xcf, 0x75, 0x6d, 0xe6, 0xdb, 0xb0, 0xf6, 0x11, 0x7a, 0x38, + 0xc9, 0x7e, 0x9e, 0xbc, 0x98, 0xe2, 0x73, 0x1c, 0x85, 0x1e, 0x15, 0x33, 0x51, 0x47, 0x70, 0x3f, + 0x83, 0x52, 0x95, 0x19, 0x50, 0x15, 0xca, 0xa6, 0xc0, 0xc9, 0xda, 0x3c, 0x85, 0xdd, 0xd4, 0xdd, + 0x7d, 0x81, 0x8c, 0xbb, 0x81, 0x9f, 0x8f, 0xb3, 0x0d, 0x70, 0x15, 0x7b, 0xec, 0x24, 0x5e, 0x4d, + 0x59, 0x3e, 0xe9, 0x9b, 0x9f, 0x43, 0x2b, 0xab, 0x21, 0x75, 0x8c, 0xde, 0xde, 0x81, 0x8a, 0x02, + 0x2b, 0x25, 0xad, 0x66, 0x78, 0xd5, 0x68, 0x0d, 0x32, 0x1f, 0xc1, 0xe6, 0x64, 0x4e, 0x77, 0xcc, + 0xe5, 0xaf, 0x02, 0x6c, 0xa5, 0xef, 0x57, 0xed, 0x4e, 0xc4, 0x76, 0x02, 0xf7, 0x92, 0x6f, 0xec, + 0x12, 0xaf, 0x55, 0x42, 0xff, 0x93, 0x09, 0x59, 0xca, 0xf1, 0x29, 0x5e, 0x5b, 0x75, 0x76, 0xbb, + 0x98, 0x2f, 0xc1, 0xac, 0x7c, 0x4b, 0x79, 0xf9, 0xa6, 0x14, 0xba, 0x38, 0x43, 0xa1, 0x4b, 0x19, + 0x85, 0xfe, 0x5e, 0x80, 0xd6, 0xf4, 0x0a, 0xd4, 0x75, 0xbe, 0x0f, 0x55, 0x55, 0xaf, 0xd6, 0xe9, + 0x74, 0x3e, 0x13, 0xd4, 0x5d, 0xe5, 0xf8, 0x1a, 0x55, 0x9b, 0x8f, 0xa1, 0x95, 0x55, 0xeb, 0x9b, + 0x5d, 0xcd, 0x1f, 0x45, 0xa8, 0xea, 0x9d, 0x79, 0xe9, 0x92, 0x0f, 0x00, 0x1c, 0xa9, 0xa1, 0xbe, + 0x4d, 0x85, 0xcc, 0xae, 0x7e, 0x6c, 0x74, 0xe2, 0x76, 0xdc, 0xd1, 0xed, 0xb8, 0x73, 0xae, 0xfb, + 0xb5, 0x55, 0x53, 0xe8, 0x27, 0x82, 0x10, 0x58, 0xf4, 0xe9, 0x08, 0x15, 0xf5, 0xf2, 0x3f, 0x69, + 0x43, 0xbd, 0x8f, 0xdc, 0x61, 0xae, 0x6c, 0x91, 0x8a, 0xf9, 0xb4, 0x89, 0x74, 0xa2, 0x6b, 0x53, + 0xad, 0x9a, 0x37, 0x97, 0x24, 0x8f, 0xcb, 0x31, 0x8f, 0xda, 0x6c, 0xa5, 0x10, 0xc4, 0x80, 0x52, + 0xd4, 0x42, 0x2b, 0x32, 0xb3, 0xaa, 0x04, 0x5e, 0x30, 0xcf, 0x8a, 0x8c, 0x64, 0x15, 0x96, 0xe4, + 0x3c, 0x68, 0x96, 0x65, 0x9c, 0x78, 0x41, 0x1e, 0xc3, 0x4a, 0x1f, 0x07, 0x74, 0xec, 0x09, 0x5b, + 0xcb, 0xbf, 0x3a, 0x47, 0xfe, 0xcb, 0x0a, 0xac, 0xd6, 0xe6, 0x9f, 0x45, 0x58, 0xc9, 0x61, 0x26, + 0x58, 0xd3, 0xa5, 0x17, 0x53, 0xa5, 0x67, 0x99, 0x2c, 0xbd, 0x09, 0x93, 0x59, 0x4e, 0x16, 0x5f, + 0xcb, 0xc9, 0x3e, 0xac, 0x38, 0x41, 0x1f, 0x6d, 0xf5, 0x3d, 0x45, 0xfc, 0xc4, 0x5a, 0x6e, 0x44, + 0xe6, 0x33, 0x69, 0x8d, 0xe6, 0xd0, 0x21, 0xd4, 0x43, 0xea, 0x5c, 0x46, 0xea, 0x8b, 0x30, 0xe5, + 0x1c, 0x87, 0xa0, 0x9c, 0x11, 0xf4, 0x29, 0xdc, 0x9f, 0x9c, 0x81, 0xbc, 0x59, 0x91, 0xb9, 0xac, + 0x67, 0x3e, 0x53, 0x4b, 0xbb, 0x2d, 0xc2, 0xf2, 0x26, 0x7e, 0xfc, 0x4f, 0xe5, 0x96, 0xbe, 0x33, + 0x64, 0x57, 0xae, 0x83, 0x64, 0x00, 0xcb, 0xd9, 0x46, 0x45, 0x0c, 0x79, 0xe2, 0xd4, 0x09, 0x68, + 0x64, 0xbb, 0xbf, 0x79, 0xf8, 0xe3, 0xdf, 0xff, 0xfe, 0x56, 0x7c, 0xcb, 0xdc, 0x88, 0x06, 0x35, + 0xef, 0x5e, 0x1d, 0xf5, 0x50, 0xd0, 0xa3, 0x64, 0xa4, 0xf3, 0x47, 0xc9, 0x40, 0x24, 0x5f, 0x42, + 0x3d, 0xd5, 0xc0, 0xc8, 0x86, 0x3c, 0x68, 0x72, 0x44, 0xe6, 0x23, 0xec, 0xc9, 0x08, 0x0f, 0x48, + 0x6b, 0x46, 0x84, 0xee, 0xf7, 0x6e, 0xff, 0x07, 0x32, 0x84, 0x46, 0x66, 0x80, 0x91, 0x4d, 0x79, + 0xca, 0xb4, 0xd1, 0x6a, 0x18, 0xd3, 0x5c, 0x71, 0x1b, 0x31, 0x77, 0x64, 0xb4, 0x4d, 0x32, 0xab, + 0x1e, 0xf2, 0x0d, 0x2c, 0x67, 0x3f, 0x77, 0xc5, 0xd6, 0xd4, 0x89, 0x65, 0xac, 0x4f, 0x48, 0xec, + 0xe3, 0xe8, 0xed, 0xa4, 0x8b, 0x7a, 0x67, 0x7e, 0x51, 0xa1, 0x64, 0x4c, 0xcf, 0x9d, 0x5b, 0xc6, + 0x72, 0x93, 0xc8, 0x68, 0x4e, 0x3a, 0x54, 0x39, 0x1d, 0x19, 0xe7, 0x80, 0xec, 0xcf, 0x8b, 0xd3, + 0xd5, 0x73, 0x8f, 0x13, 0x2b, 0xff, 0xf0, 0xd1, 0xdf, 0xd8, 0xee, 0x14, 0x49, 0x64, 0x1b, 0x9d, + 0x31, 0xf5, 0x03, 0x36, 0x17, 0xc8, 0xb3, 0xcc, 0x43, 0x48, 0x1f, 0xf8, 0x20, 0x7f, 0xfd, 0x77, + 0x3c, 0xed, 0xab, 0xec, 0x7b, 0x49, 0xcf, 0x01, 0xd2, 0x9e, 0xb8, 0xd4, 0xdc, 0x90, 0x33, 0x76, + 0xe7, 0x20, 0x14, 0x5d, 0x0b, 0xe4, 0x3c, 0xff, 0xf6, 0xc8, 0x12, 0x30, 0xaf, 0xd3, 0xcf, 0xbc, + 0xec, 0x05, 0xf2, 0x35, 0x18, 0xb3, 0xdf, 0x13, 0x64, 0x7f, 0x06, 0x15, 0x77, 0xbf, 0xe6, 0x85, + 0xd3, 0x9f, 0x0b, 0xbf, 0x3e, 0xf9, 0xcc, 0x6a, 0x41, 0x45, 0xf5, 0x4b, 0xf2, 0x7f, 0xb2, 0x02, + 0x0d, 0xa3, 0x2e, 0xb7, 0x9c, 0x09, 0x2a, 0xc6, 0xfc, 0xc5, 0x0e, 0x6c, 0x43, 0xf9, 0x14, 0x29, + 0x43, 0x46, 0xee, 0x57, 0x8b, 0x46, 0x83, 0x8e, 0xc5, 0xcb, 0x80, 0xb9, 0x37, 0xf2, 0x95, 0xdc, + 0x2e, 0xf6, 0xee, 0x01, 0x24, 0x80, 0x85, 0x17, 0x27, 0x43, 0x57, 0xbc, 0x1c, 0xf7, 0x3a, 0x4e, + 0x30, 0xea, 0x5e, 0x8e, 0x7b, 0x38, 0xf0, 0x82, 0x57, 0x29, 0xe5, 0xa4, 0x1f, 0xe8, 0xc3, 0xc0, + 0x76, 0x3c, 0x17, 0x7d, 0xd1, 0x2b, 0xcb, 0xda, 0x4f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xca, + 0x2f, 0xa0, 0x4e, 0x94, 0x0c, 0x00, 0x00, } diff --git a/backend/api/go_client/resource_reference.pb.go b/backend/api/go_client/resource_reference.pb.go index b9db5a60978..2c3b693a600 100755 --- a/backend/api/go_client/resource_reference.pb.go +++ b/backend/api/go_client/resource_reference.pb.go @@ -39,6 +39,7 @@ const ( ResourceType_EXPERIMENT ResourceType = 1 ResourceType_JOB ResourceType = 2 ResourceType_PIPELINE ResourceType = 3 + ResourceType_PIPELINE_VERSION ResourceType = 4 ) var ResourceType_name = map[int32]string{ @@ -46,19 +47,21 @@ var ResourceType_name = map[int32]string{ 1: "EXPERIMENT", 2: "JOB", 3: "PIPELINE", + 4: "PIPELINE_VERSION", } var ResourceType_value = map[string]int32{ "UNKNOWN_RESOURCE_TYPE": 0, "EXPERIMENT": 1, "JOB": 2, "PIPELINE": 3, + "PIPELINE_VERSION": 4, } func (x ResourceType) String() string { return proto.EnumName(ResourceType_name, int32(x)) } func (ResourceType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_resource_reference_476d21426b041cec, []int{0} + return fileDescriptor_resource_reference_81a9849386131b93, []int{0} } type Relationship int32 @@ -84,7 +87,7 @@ func (x Relationship) String() string { return proto.EnumName(Relationship_name, int32(x)) } func (Relationship) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_resource_reference_476d21426b041cec, []int{1} + return fileDescriptor_resource_reference_81a9849386131b93, []int{1} } type ResourceKey struct { @@ -99,7 +102,7 @@ func (m *ResourceKey) Reset() { *m = ResourceKey{} } func (m *ResourceKey) String() string { return proto.CompactTextString(m) } func (*ResourceKey) ProtoMessage() {} func (*ResourceKey) Descriptor() ([]byte, []int) { - return fileDescriptor_resource_reference_476d21426b041cec, []int{0} + return fileDescriptor_resource_reference_81a9849386131b93, []int{0} } func (m *ResourceKey) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResourceKey.Unmarshal(m, b) @@ -146,7 +149,7 @@ func (m *ResourceReference) Reset() { *m = ResourceReference{} } func (m *ResourceReference) String() string { return proto.CompactTextString(m) } func (*ResourceReference) ProtoMessage() {} func (*ResourceReference) Descriptor() ([]byte, []int) { - return fileDescriptor_resource_reference_476d21426b041cec, []int{1} + return fileDescriptor_resource_reference_81a9849386131b93, []int{1} } func (m *ResourceReference) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResourceReference.Unmarshal(m, b) @@ -195,31 +198,31 @@ func init() { } func init() { - proto.RegisterFile("backend/api/resource_reference.proto", fileDescriptor_resource_reference_476d21426b041cec) -} - -var fileDescriptor_resource_reference_476d21426b041cec = []byte{ - // 339 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x8b, 0xda, 0x40, - 0x14, 0xc6, 0x4d, 0x62, 0x6b, 0x7d, 0x8a, 0x8c, 0x43, 0x0b, 0xe9, 0x4d, 0xa4, 0x05, 0xf1, 0x90, - 0x80, 0xe2, 0xbd, 0x6a, 0x07, 0x9a, 0xea, 0x26, 0x61, 0x8c, 0xb8, 0xbb, 0x97, 0x90, 0xc4, 0xa7, - 0x0e, 0xc6, 0x64, 0x88, 0x91, 0x25, 0xd7, 0xfd, 0xcb, 0x17, 0xc3, 0x4a, 0xf4, 0xf6, 0xe0, 0xf7, - 0xf1, 0xfb, 0x1e, 0x7c, 0xf0, 0x2b, 0x0c, 0xa2, 0x23, 0x26, 0x5b, 0x33, 0x90, 0xc2, 0xcc, 0xf0, - 0x9c, 0x5e, 0xb2, 0x08, 0xfd, 0x0c, 0x77, 0x98, 0x61, 0x12, 0xa1, 0x21, 0xb3, 0x34, 0x4f, 0xa9, - 0x16, 0x48, 0xd1, 0xff, 0x0b, 0x2d, 0xfe, 0x19, 0x58, 0x60, 0x41, 0x7f, 0x43, 0x3d, 0x2f, 0x24, - 0xea, 0x4a, 0x4f, 0x19, 0x74, 0x46, 0x5d, 0x23, 0x90, 0xc2, 0xb8, 0x71, 0xaf, 0x90, 0xc8, 0x4b, - 0x4c, 0x3b, 0xa0, 0x8a, 0xad, 0xae, 0xf6, 0x94, 0x41, 0x93, 0xab, 0x62, 0xdb, 0x7f, 0x57, 0xa0, - 0x7b, 0x8b, 0xf1, 0x5b, 0x0d, 0xed, 0x83, 0x76, 0xc4, 0xa2, 0x74, 0xb5, 0x46, 0xe4, 0xc1, 0xb5, - 0xc0, 0x82, 0x5f, 0x21, 0xa5, 0x50, 0x4f, 0x82, 0x13, 0xea, 0x5a, 0xe9, 0x2a, 0x6f, 0x3a, 0x81, - 0x76, 0x86, 0x71, 0x90, 0x8b, 0x34, 0x39, 0x1f, 0x84, 0x2c, 0x7b, 0xaa, 0x67, 0x2a, 0xc0, 0x1f, - 0x62, 0x43, 0x17, 0xda, 0xf7, 0xaf, 0xd2, 0x9f, 0xf0, 0x63, 0x6d, 0x2f, 0x6c, 0x67, 0x63, 0xfb, - 0x9c, 0xad, 0x9c, 0x35, 0x9f, 0x33, 0xdf, 0x7b, 0x71, 0x19, 0xa9, 0xd1, 0x0e, 0x00, 0x7b, 0x76, - 0x19, 0xb7, 0x9e, 0x98, 0xed, 0x11, 0x85, 0x36, 0x40, 0xfb, 0xef, 0xcc, 0x88, 0x4a, 0xdb, 0xf0, - 0xcd, 0xb5, 0x5c, 0xb6, 0xb4, 0x6c, 0x46, 0xb4, 0xe1, 0x9f, 0xab, 0xb1, 0x6a, 0xa0, 0x3a, 0x7c, - 0xaf, 0x8c, 0xcb, 0xa9, 0x67, 0x39, 0xf6, 0xea, 0x9f, 0xe5, 0x92, 0x1a, 0x6d, 0xc2, 0x17, 0x67, - 0x63, 0x33, 0x4e, 0x14, 0xda, 0x82, 0xc6, 0x9c, 0xb3, 0xa9, 0xe7, 0x70, 0xa2, 0xce, 0x26, 0xaf, - 0xe3, 0xbd, 0xc8, 0x0f, 0x97, 0xd0, 0x88, 0xd2, 0x93, 0x79, 0xbc, 0x84, 0xb8, 0x8b, 0xd3, 0x37, - 0x53, 0x0a, 0x89, 0xb1, 0x48, 0xf0, 0x6c, 0xde, 0x2f, 0xb5, 0x4f, 0xfd, 0x28, 0x16, 0x98, 0xe4, - 0xe1, 0xd7, 0x72, 0xa1, 0xf1, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x16, 0x9c, 0xfe, 0xc9, - 0x01, 0x00, 0x00, + proto.RegisterFile("backend/api/resource_reference.proto", fileDescriptor_resource_reference_81a9849386131b93) +} + +var fileDescriptor_resource_reference_81a9849386131b93 = []byte{ + // 351 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0x41, 0xab, 0xda, 0x40, + 0x14, 0x85, 0x5f, 0x12, 0xdb, 0xd7, 0x77, 0x15, 0x99, 0x37, 0x58, 0x48, 0x77, 0x22, 0x2d, 0x88, + 0x8b, 0x04, 0x14, 0xf7, 0x55, 0x3b, 0xd0, 0x54, 0x3b, 0x09, 0x63, 0xac, 0x6d, 0x37, 0x21, 0x89, + 0x57, 0x1d, 0x8c, 0xc9, 0x10, 0x23, 0x25, 0xdb, 0xfe, 0xf2, 0x62, 0x68, 0x88, 0xee, 0x66, 0xf8, + 0x0e, 0xe7, 0xbb, 0x70, 0xe0, 0x63, 0x14, 0xc6, 0x27, 0x4c, 0x77, 0x76, 0xa8, 0xa4, 0x9d, 0xe3, + 0x25, 0xbb, 0xe6, 0x31, 0x06, 0x39, 0xee, 0x31, 0xc7, 0x34, 0x46, 0x4b, 0xe5, 0x59, 0x91, 0x51, + 0x23, 0x54, 0x72, 0xf0, 0x05, 0xda, 0xe2, 0x7f, 0x60, 0x89, 0x25, 0xfd, 0x04, 0xad, 0xa2, 0x54, + 0x68, 0x6a, 0x7d, 0x6d, 0xd8, 0x1d, 0xbf, 0x5a, 0xa1, 0x92, 0x56, 0xcd, 0xfd, 0x52, 0xa1, 0xa8, + 0x30, 0xed, 0x82, 0x2e, 0x77, 0xa6, 0xde, 0xd7, 0x86, 0x2f, 0x42, 0x97, 0xbb, 0xc1, 0x5f, 0x0d, + 0x5e, 0xeb, 0x98, 0xa8, 0x35, 0x74, 0x00, 0xc6, 0x09, 0xcb, 0xaa, 0xab, 0x3d, 0x26, 0x0f, 0x5d, + 0x4b, 0x2c, 0xc5, 0x0d, 0x52, 0x0a, 0xad, 0x34, 0x3c, 0xa3, 0x69, 0x54, 0x5d, 0xd5, 0x9b, 0x4e, + 0xa1, 0x93, 0x63, 0x12, 0x16, 0x32, 0x4b, 0x2f, 0x47, 0xa9, 0x2a, 0x4f, 0x73, 0x4c, 0x03, 0xc4, + 0x43, 0x6c, 0xb4, 0x87, 0xce, 0xfd, 0xa9, 0xf4, 0x03, 0xbc, 0xdf, 0xf0, 0x25, 0x77, 0xb7, 0x3c, + 0x10, 0x6c, 0xed, 0x6e, 0xc4, 0x82, 0x05, 0xfe, 0x2f, 0x8f, 0x91, 0x27, 0xda, 0x05, 0x60, 0x3f, + 0x3d, 0x26, 0x9c, 0xef, 0x8c, 0xfb, 0x44, 0xa3, 0xcf, 0x60, 0x7c, 0x73, 0xe7, 0x44, 0xa7, 0x1d, + 0x78, 0xe7, 0x39, 0x1e, 0x5b, 0x39, 0x9c, 0x11, 0x83, 0xf6, 0x80, 0xd4, 0xbf, 0xe0, 0x07, 0x13, + 0x6b, 0xc7, 0xe5, 0xa4, 0x35, 0xfa, 0x7c, 0xf3, 0x34, 0x5e, 0x6a, 0x42, 0xaf, 0xf1, 0xac, 0x66, + 0xbe, 0xe3, 0xf2, 0xf5, 0x57, 0xc7, 0x23, 0x4f, 0xf4, 0x05, 0xde, 0xb8, 0x5b, 0xce, 0x04, 0xd1, + 0x68, 0x1b, 0x9e, 0x17, 0x82, 0xcd, 0x7c, 0x57, 0x10, 0x7d, 0x3e, 0xfd, 0x3d, 0x39, 0xc8, 0xe2, + 0x78, 0x8d, 0xac, 0x38, 0x3b, 0xdb, 0xa7, 0x6b, 0x84, 0xfb, 0x24, 0xfb, 0x63, 0x2b, 0xa9, 0x30, + 0x91, 0x29, 0x5e, 0xec, 0xfb, 0xfd, 0x0e, 0x59, 0x10, 0x27, 0x12, 0xd3, 0x22, 0x7a, 0x5b, 0xed, + 0x36, 0xf9, 0x17, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x32, 0x3a, 0x06, 0xdf, 0x01, 0x00, 0x00, } diff --git a/backend/api/go_http_client/job_model/api_resource_type.go b/backend/api/go_http_client/job_model/api_resource_type.go index e33daf12abc..cc2493d0627 100644 --- a/backend/api/go_http_client/job_model/api_resource_type.go +++ b/backend/api/go_http_client/job_model/api_resource_type.go @@ -45,6 +45,9 @@ const ( // APIResourceTypePIPELINE captures enum value "PIPELINE" APIResourceTypePIPELINE APIResourceType = "PIPELINE" + + // APIResourceTypePIPELINEVERSION captures enum value "PIPELINE_VERSION" + APIResourceTypePIPELINEVERSION APIResourceType = "PIPELINE_VERSION" ) // for schema @@ -52,7 +55,7 @@ var apiResourceTypeEnum []interface{} func init() { var res []APIResourceType - if err := json.Unmarshal([]byte(`["UNKNOWN_RESOURCE_TYPE","EXPERIMENT","JOB","PIPELINE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["UNKNOWN_RESOURCE_TYPE","EXPERIMENT","JOB","PIPELINE","PIPELINE_VERSION"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/backend/api/go_http_client/pipeline_model/api_pipeline.go b/backend/api/go_http_client/pipeline_model/api_pipeline.go index e9bdfb10e1f..4b40d15542b 100644 --- a/backend/api/go_http_client/pipeline_model/api_pipeline.go +++ b/backend/api/go_http_client/pipeline_model/api_pipeline.go @@ -37,6 +37,12 @@ type APIPipeline struct { // Format: date-time CreatedAt strfmt.DateTime `json:"created_at,omitempty"` + // Output only. The default version of the pipeline. As of now, the latest + // version is used as default. (In the future, if desired by customers, we + // can allow them to set default version.) + // Read Only: true + DefaultVersion *APIPipelineVersion `json:"default_version,omitempty"` + // Optional input field. Describing the purpose of the job. Description string `json:"description,omitempty"` @@ -74,6 +80,10 @@ func (m *APIPipeline) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateDefaultVersion(formats); err != nil { + res = append(res, err) + } + if err := m.validateParameters(formats); err != nil { res = append(res, err) } @@ -101,6 +111,24 @@ func (m *APIPipeline) validateCreatedAt(formats strfmt.Registry) error { return nil } +func (m *APIPipeline) validateDefaultVersion(formats strfmt.Registry) error { + + if swag.IsZero(m.DefaultVersion) { // not required + return nil + } + + if m.DefaultVersion != nil { + if err := m.DefaultVersion.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("default_version") + } + return err + } + } + + return nil +} + func (m *APIPipeline) validateParameters(formats strfmt.Registry) error { if swag.IsZero(m.Parameters) { // not required diff --git a/backend/api/go_http_client/pipeline_model/api_resource_type.go b/backend/api/go_http_client/pipeline_model/api_resource_type.go index 8e8a8cb7a16..363e3e9b21d 100644 --- a/backend/api/go_http_client/pipeline_model/api_resource_type.go +++ b/backend/api/go_http_client/pipeline_model/api_resource_type.go @@ -45,6 +45,9 @@ const ( // APIResourceTypePIPELINE captures enum value "PIPELINE" APIResourceTypePIPELINE APIResourceType = "PIPELINE" + + // APIResourceTypePIPELINEVERSION captures enum value "PIPELINE_VERSION" + APIResourceTypePIPELINEVERSION APIResourceType = "PIPELINE_VERSION" ) // for schema @@ -52,7 +55,7 @@ var apiResourceTypeEnum []interface{} func init() { var res []APIResourceType - if err := json.Unmarshal([]byte(`["UNKNOWN_RESOURCE_TYPE","EXPERIMENT","JOB","PIPELINE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["UNKNOWN_RESOURCE_TYPE","EXPERIMENT","JOB","PIPELINE","PIPELINE_VERSION"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/backend/api/go_http_client/run_model/api_resource_type.go b/backend/api/go_http_client/run_model/api_resource_type.go index 4ae667835d6..7e9c02d7db7 100644 --- a/backend/api/go_http_client/run_model/api_resource_type.go +++ b/backend/api/go_http_client/run_model/api_resource_type.go @@ -45,6 +45,9 @@ const ( // APIResourceTypePIPELINE captures enum value "PIPELINE" APIResourceTypePIPELINE APIResourceType = "PIPELINE" + + // APIResourceTypePIPELINEVERSION captures enum value "PIPELINE_VERSION" + APIResourceTypePIPELINEVERSION APIResourceType = "PIPELINE_VERSION" ) // for schema @@ -52,7 +55,7 @@ var apiResourceTypeEnum []interface{} func init() { var res []APIResourceType - if err := json.Unmarshal([]byte(`["UNKNOWN_RESOURCE_TYPE","EXPERIMENT","JOB","PIPELINE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["UNKNOWN_RESOURCE_TYPE","EXPERIMENT","JOB","PIPELINE","PIPELINE_VERSION"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/backend/api/swagger/job.swagger.json b/backend/api/swagger/job.swagger.json index 35ae6b62752..adfd13f0f2f 100644 --- a/backend/api/swagger/job.swagger.json +++ b/backend/api/swagger/job.swagger.json @@ -63,7 +63,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, @@ -458,7 +459,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, diff --git a/backend/api/swagger/kfp_api_single_file.swagger.json b/backend/api/swagger/kfp_api_single_file.swagger.json index 6cb0efcaa43..124fee5c6ae 100644 --- a/backend/api/swagger/kfp_api_single_file.swagger.json +++ b/backend/api/swagger/kfp_api_single_file.swagger.json @@ -64,7 +64,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, @@ -431,7 +432,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, @@ -1166,7 +1168,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, @@ -1520,6 +1523,11 @@ "error": { "type": "string", "description": "In case any error happens retrieving a pipeline field, only pipeline ID\nand the error message is returned. Client has the flexibility of choosing\nhow to handle error. This is especially useful during listing call." + }, + "default_version": { + "$ref": "#/definitions/apiPipelineVersion", + "title": "Output only. The default version of the pipeline. As of now, the latest\nversion is used as default. (In the future, if desired by customers, we\ncan allow them to set default version.)", + "readOnly": true } } }, diff --git a/backend/api/swagger/pipeline.swagger.json b/backend/api/swagger/pipeline.swagger.json index 1c56366383d..4b075c05602 100644 --- a/backend/api/swagger/pipeline.swagger.json +++ b/backend/api/swagger/pipeline.swagger.json @@ -275,6 +275,11 @@ "error": { "type": "string", "description": "In case any error happens retrieving a pipeline field, only pipeline ID\nand the error message is returned. Client has the flexibility of choosing\nhow to handle error. This is especially useful during listing call." + }, + "default_version": { + "$ref": "#/definitions/apiPipelineVersion", + "title": "Output only. The default version of the pipeline. As of now, the latest\nversion is used as default. (In the future, if desired by customers, we\ncan allow them to set default version.)", + "readOnly": true } } }, @@ -362,7 +367,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, diff --git a/backend/api/swagger/run.swagger.json b/backend/api/swagger/run.swagger.json index 5e7a88affc9..863278a88a8 100644 --- a/backend/api/swagger/run.swagger.json +++ b/backend/api/swagger/run.swagger.json @@ -63,7 +63,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, @@ -586,7 +587,8 @@ "UNKNOWN_RESOURCE_TYPE", "EXPERIMENT", "JOB", - "PIPELINE" + "PIPELINE", + "PIPELINE_VERSION" ], "default": "UNKNOWN_RESOURCE_TYPE" }, diff --git a/backend/test/integration/pipeline_api_test.go b/backend/test/integration/pipeline_api_test.go index 4ad99ca07d1..f0f427413d6 100644 --- a/backend/test/integration/pipeline_api_test.go +++ b/backend/test/integration/pipeline_api_test.go @@ -195,6 +195,19 @@ func verifyPipeline(t *testing.T, pipeline *model.APIPipeline) { {Name: "param1", Value: "hello"}, // Default value in the pipeline template {Name: "param2"}, // No default value in the pipeline }, + // TODO(jingzhang36): after version API launch, remove the following field. + // This is because after the version API launch, we won't have defautl + // version produced automatically when creating pipeline. + DefaultVersion: &model.APIPipelineVersion{ + CreatedAt: pipeline.CreatedAt, + ID: pipeline.ID, + Name: "arguments-parameters.yaml", + Parameters: []*model.APIParameter{ + {Name: "param1", Value: "hello"}, + {Name: "param2"}}, + ResourceReferences: []*model.APIResourceReference{{ + Key: &model.APIResourceKey{ID: pipeline.ID, Type: model.APIResourceTypePIPELINE}, + Relationship: model.APIRelationshipOWNER}}}, } assert.Equal(t, expected, *pipeline) }