From 19d573a8590506a29d1cdf24ad9f1fd30ecf50ca Mon Sep 17 00:00:00 2001 From: krrrr38 Date: Tue, 14 Dec 2021 10:12:37 +0900 Subject: [PATCH] feat: change nav bar color by config.navColor Signed-off-by: krrrr38 --- api/jsonschema/schema.json | 14 +- api/openapi-spec/swagger.json | 14 +- config/config.go | 3 + pkg/apiclient/info/info.pb.go | 112 +++-- pkg/apiclient/info/info.proto | 2 +- pkg/apis/workflow/v1alpha1/generated.pb.go | 419 ++++++------------ pkg/apis/workflow/v1alpha1/generated.proto | 6 - pkg/apis/workflow/v1alpha1/info.go | 6 - .../workflow/v1alpha1/openapi_generated.go | 21 - .../v1alpha1/zz_generated.deepcopy.go | 16 - .../IoArgoprojWorkflowV1alpha1InfoResponse.md | 2 +- .../docs/IoArgoprojWorkflowV1alpha1Ui.md | 14 - ...rgoproj_workflow_v1alpha1_info_response.py | 10 +- .../model/io_argoproj_workflow_v1alpha1_ui.py | 255 ----------- .../client/argo_workflows/models/__init__.py | 1 - .../IoArgoprojWorkflowV1alpha1InfoResponse.md | 2 +- .../docs/IoArgoprojWorkflowV1alpha1Ui.md | 13 - server/apiserver/argoserver.go | 6 +- server/info/info_server.go | 8 +- server/info/info_server_test.go | 29 ++ ui/package.json | 2 +- ui/src/app/app-router.tsx | 2 +- ui/src/models/info.ts | 6 +- 23 files changed, 233 insertions(+), 730 deletions(-) delete mode 100644 sdks/java/client/docs/IoArgoprojWorkflowV1alpha1Ui.md delete mode 100644 sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_ui.py delete mode 100644 sdks/python/client/docs/IoArgoprojWorkflowV1alpha1Ui.md diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json index 36de99ec15fa..54f6a1a75e96 100644 --- a/api/jsonschema/schema.json +++ b/api/jsonschema/schema.json @@ -5448,8 +5448,8 @@ "managedNamespace": { "type": "string" }, - "ui": { - "$ref": "#/definitions/io.argoproj.workflow.v1alpha1.UI" + "navColor": { + "type": "string" } }, "type": "object" @@ -6865,16 +6865,6 @@ ], "type": "object" }, - "io.argoproj.workflow.v1alpha1.UI": { - "description": "UI defines a config for UI", - "properties": { - "navColor": { - "description": "NavColor is an ui navigation bar theme which switch the design", - "type": "string" - } - }, - "type": "object" - }, "io.argoproj.workflow.v1alpha1.UpdateCronWorkflowRequest": { "properties": { "cronWorkflow": { diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index f5830772879f..75055bef4334 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -9711,8 +9711,8 @@ "managedNamespace": { "type": "string" }, - "ui": { - "$ref": "#/definitions/io.argoproj.workflow.v1alpha1.UI" + "navColor": { + "type": "string" } } }, @@ -11127,16 +11127,6 @@ } } }, - "io.argoproj.workflow.v1alpha1.UI": { - "description": "UI defines a config for UI", - "type": "object", - "properties": { - "navColor": { - "description": "NavColor is an ui navigation bar theme which switch the design", - "type": "string" - } - } - }, "io.argoproj.workflow.v1alpha1.UpdateCronWorkflowRequest": { "type": "object", "properties": { diff --git a/config/config.go b/config/config.go index 14764ef34b5b..b0b774324fd8 100644 --- a/config/config.go +++ b/config/config.go @@ -126,6 +126,9 @@ type Config struct { Images map[string]Image `json:"images,omitempty"` RetentionPolicy *RetentionPolicy `json:"retentionPolicy,omitempty"` + + // NavColor is an ui navigation bar background color + NavColor string `json:"navColor,omitempty"` } func (c Config) GetContainerRuntimeExecutor(labels labels.Labels) (string, error) { diff --git a/pkg/apiclient/info/info.pb.go b/pkg/apiclient/info/info.pb.go index b331dd7987db..bc8be7a084e0 100644 --- a/pkg/apiclient/info/info.pb.go +++ b/pkg/apiclient/info/info.pb.go @@ -70,7 +70,7 @@ var xxx_messageInfo_GetInfoRequest proto.InternalMessageInfo type InfoResponse struct { ManagedNamespace string `protobuf:"bytes,1,opt,name=managedNamespace,proto3" json:"managedNamespace,omitempty"` Links []*v1alpha1.Link `protobuf:"bytes,2,rep,name=links,proto3" json:"links,omitempty"` - Ui *v1alpha1.UI `protobuf:"bytes,3,opt,name=ui,proto3" json:"ui,omitempty"` + NavColor string `protobuf:"bytes,3,opt,name=navColor,proto3" json:"navColor,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -123,11 +123,11 @@ func (m *InfoResponse) GetLinks() []*v1alpha1.Link { return nil } -func (m *InfoResponse) GetUi() *v1alpha1.UI { +func (m *InfoResponse) GetNavColor() string { if m != nil { - return m.Ui + return m.NavColor } - return nil + return "" } type GetVersionRequest struct { @@ -306,41 +306,40 @@ func init() { func init() { proto.RegisterFile("pkg/apiclient/info/info.proto", fileDescriptor_96940c93018255fa) } var fileDescriptor_96940c93018255fa = []byte{ - // 531 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0x13, 0x41, - 0x14, 0x67, 0x37, 0x6d, 0xaa, 0x93, 0x5a, 0xd3, 0xd7, 0x60, 0xc7, 0xa0, 0x21, 0x04, 0x0f, 0x41, - 0x70, 0x96, 0xa4, 0xf8, 0x01, 0xfc, 0x83, 0x21, 0xa0, 0x1e, 0xa2, 0xed, 0x41, 0x0a, 0x32, 0xd9, - 0xbc, 0x6c, 0xa7, 0xd9, 0xcc, 0xac, 0x33, 0xb3, 0xe9, 0xdd, 0x9b, 0x67, 0xbf, 0x91, 0x27, 0xc1, - 0x8b, 0xe0, 0x17, 0x90, 0xe0, 0xd9, 0xcf, 0x20, 0x3b, 0xbb, 0x9b, 0x26, 0xda, 0x83, 0xd0, 0xcb, - 0xf2, 0xfe, 0xcd, 0x6f, 0x7e, 0xef, 0xf7, 0xde, 0x2c, 0xb9, 0x9f, 0xcc, 0xa2, 0x80, 0x27, 0x22, - 0x8c, 0x05, 0x4a, 0x1b, 0x08, 0x39, 0x55, 0xee, 0xc3, 0x12, 0xad, 0xac, 0x82, 0xad, 0xcc, 0x6e, - 0xde, 0x8b, 0x94, 0x8a, 0x62, 0xcc, 0xea, 0x02, 0x2e, 0xa5, 0xb2, 0xdc, 0x0a, 0x25, 0x4d, 0x5e, - 0xd3, 0x7c, 0x15, 0x09, 0x7b, 0x96, 0x8e, 0x59, 0xa8, 0xe6, 0x01, 0xd7, 0x91, 0x4a, 0xb4, 0x3a, - 0x77, 0xc6, 0xa3, 0x0b, 0xa5, 0x67, 0xd3, 0x58, 0x5d, 0x98, 0xa0, 0xb8, 0xc5, 0x04, 0x65, 0x28, - 0x58, 0xf4, 0x78, 0x9c, 0x9c, 0xf1, 0x5e, 0x10, 0xa1, 0x44, 0xcd, 0x2d, 0x4e, 0x72, 0xb8, 0x4e, - 0x9d, 0xec, 0x0d, 0xd0, 0x0e, 0xe5, 0x54, 0x8d, 0xf0, 0x43, 0x8a, 0xc6, 0x76, 0x7e, 0x7b, 0x64, - 0x37, 0xf7, 0x4d, 0xa2, 0xa4, 0x41, 0x78, 0x48, 0xea, 0x73, 0x2e, 0x79, 0x84, 0x93, 0xd7, 0x7c, - 0x8e, 0x26, 0xe1, 0x21, 0x52, 0xaf, 0xed, 0x75, 0x6f, 0x8e, 0xfe, 0x89, 0xc3, 0x29, 0xd9, 0x8e, - 0x85, 0x9c, 0x19, 0xea, 0xb7, 0x2b, 0xdd, 0x5a, 0xff, 0x05, 0xbb, 0x64, 0xcb, 0x4a, 0xb6, 0xce, - 0x78, 0xbf, 0x62, 0xcb, 0x16, 0x47, 0x2c, 0x99, 0x45, 0x2c, 0x23, 0xcc, 0xca, 0x28, 0x2b, 0x09, - 0xb3, 0x97, 0x42, 0xce, 0x46, 0x39, 0x28, 0xbc, 0x25, 0x7e, 0x2a, 0x68, 0xa5, 0xed, 0x75, 0x6b, - 0xfd, 0xe7, 0xd7, 0x87, 0x3e, 0x1e, 0x8e, 0xfc, 0x54, 0x74, 0x0e, 0xc8, 0xfe, 0x00, 0xed, 0x09, - 0x6a, 0x23, 0x94, 0x2c, 0x55, 0x68, 0x10, 0x18, 0xa0, 0x3d, 0x36, 0xa8, 0xd7, 0xb5, 0xf9, 0xe6, - 0x91, 0x83, 0x8d, 0x70, 0x21, 0xd1, 0x1d, 0x52, 0x15, 0xc6, 0xa4, 0xa8, 0x0b, 0x61, 0x0a, 0x0f, - 0x28, 0xd9, 0x31, 0xe9, 0xf8, 0x1c, 0x43, 0x4b, 0x7d, 0x97, 0x28, 0xdd, 0xec, 0x44, 0xa4, 0x55, - 0x9a, 0x18, 0x5a, 0x69, 0x57, 0xb2, 0x13, 0xb9, 0x07, 0x0d, 0xb2, 0x8d, 0x73, 0x2e, 0x62, 0xba, - 0xe5, 0xea, 0x73, 0x07, 0x1e, 0x90, 0x5b, 0xce, 0x38, 0x41, 0x2d, 0xa6, 0x02, 0x27, 0x74, 0xbb, - 0xed, 0x75, 0x6f, 0x8c, 0x36, 0x83, 0xc0, 0x08, 0x18, 0xd4, 0x0b, 0x11, 0xe2, 0x93, 0x30, 0x54, - 0xa9, 0xb4, 0xd9, 0x5c, 0x68, 0xd5, 0x01, 0x5d, 0x91, 0xe9, 0x7f, 0xf1, 0x49, 0x2d, 0x6b, 0xe3, - 0x4d, 0x9e, 0x82, 0x21, 0xd9, 0x29, 0x76, 0x01, 0x1a, 0xcc, 0xad, 0xe5, 0xe6, 0x6a, 0x34, 0x21, - 0x8f, 0xae, 0xb7, 0xde, 0x69, 0x7c, 0xfc, 0xf1, 0xeb, 0xb3, 0xbf, 0x07, 0xbb, 0x6e, 0x5f, 0x17, - 0x3d, 0xb7, 0xcf, 0xf0, 0xc9, 0x23, 0xe4, 0x52, 0x54, 0x38, 0x5c, 0xc1, 0x6d, 0xca, 0xdc, 0x1c, - 0x5e, 0x7f, 0x8a, 0x05, 0x62, 0xe7, 0xd0, 0x11, 0xd9, 0x87, 0xdb, 0x25, 0x91, 0x45, 0x71, 0xf9, - 0x29, 0xa9, 0xad, 0xcd, 0x0c, 0xe8, 0x8a, 0xcb, 0x5f, 0xd3, 0x6d, 0xde, 0xbd, 0x22, 0x53, 0x74, - 0x49, 0x1d, 0x38, 0x40, 0xbd, 0x04, 0x4f, 0x0d, 0xea, 0xac, 0xfa, 0xe9, 0xb3, 0xaf, 0xcb, 0x96, - 0xf7, 0x7d, 0xd9, 0xf2, 0x7e, 0x2e, 0x5b, 0xde, 0xbb, 0xc7, 0xff, 0xff, 0x3a, 0xd7, 0xfe, 0x01, - 0xe3, 0xaa, 0x7b, 0x8c, 0x47, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x42, 0xd5, 0xdd, 0x61, 0x20, - 0x04, 0x00, 0x00, + // 525 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0x95, 0x93, 0x36, 0x2d, 0x9b, 0x52, 0xd2, 0x69, 0x44, 0x17, 0x0b, 0xa2, 0x28, 0xe2, 0x10, + 0x21, 0xb1, 0x56, 0x5a, 0xf1, 0x01, 0x50, 0x89, 0x28, 0x12, 0x70, 0x08, 0xa2, 0x07, 0x54, 0x09, + 0x6d, 0x9c, 0x89, 0xbb, 0x8d, 0xb3, 0x6b, 0x76, 0xd7, 0xee, 0x9d, 0x1b, 0x67, 0x7e, 0x85, 0x2f, + 0xe0, 0x84, 0xc4, 0x05, 0x89, 0x1f, 0x40, 0x11, 0x1f, 0x82, 0xbc, 0xb6, 0xd3, 0x04, 0x7a, 0x40, + 0xe2, 0x62, 0xcd, 0xbc, 0x19, 0xbf, 0x7d, 0x6f, 0x67, 0x87, 0x3c, 0x48, 0xe6, 0x51, 0xc0, 0x13, + 0x11, 0xc6, 0x02, 0xa5, 0x0d, 0x84, 0x9c, 0x29, 0xf7, 0x61, 0x89, 0x56, 0x56, 0xc1, 0x56, 0x1e, + 0xfb, 0xf7, 0x23, 0xa5, 0xa2, 0x18, 0xf3, 0xbe, 0x80, 0x4b, 0xa9, 0x2c, 0xb7, 0x42, 0x49, 0x53, + 0xf4, 0xf8, 0x2f, 0x23, 0x61, 0x2f, 0xd2, 0x09, 0x0b, 0xd5, 0x22, 0xe0, 0x3a, 0x52, 0x89, 0x56, + 0x97, 0x2e, 0x78, 0x7c, 0xa5, 0xf4, 0x7c, 0x16, 0xab, 0x2b, 0x13, 0x94, 0xa7, 0x98, 0xa0, 0x82, + 0x82, 0x6c, 0xc0, 0xe3, 0xe4, 0x82, 0x0f, 0x82, 0x08, 0x25, 0x6a, 0x6e, 0x71, 0x5a, 0xd0, 0xf5, + 0x5a, 0x64, 0x7f, 0x88, 0x76, 0x24, 0x67, 0x6a, 0x8c, 0xef, 0x53, 0x34, 0xb6, 0xf7, 0xd9, 0x23, + 0x7b, 0x45, 0x6e, 0x12, 0x25, 0x0d, 0xc2, 0x23, 0xd2, 0x5a, 0x70, 0xc9, 0x23, 0x9c, 0xbe, 0xe2, + 0x0b, 0x34, 0x09, 0x0f, 0x91, 0x7a, 0x5d, 0xaf, 0x7f, 0x6b, 0xfc, 0x17, 0x0e, 0xe7, 0x64, 0x3b, + 0x16, 0x72, 0x6e, 0x68, 0xad, 0x5b, 0xef, 0x37, 0x8f, 0x9f, 0xb3, 0x6b, 0xb5, 0xac, 0x52, 0xeb, + 0x82, 0x77, 0x2b, 0xb5, 0x2c, 0x3b, 0x61, 0xc9, 0x3c, 0x62, 0xb9, 0x60, 0x56, 0xa1, 0xac, 0x12, + 0xcc, 0x5e, 0x08, 0x39, 0x1f, 0x17, 0xa4, 0xe0, 0x93, 0x5d, 0xc9, 0xb3, 0x53, 0x15, 0x2b, 0x4d, + 0xeb, 0x4e, 0xc1, 0x2a, 0xef, 0x1d, 0x92, 0x83, 0x21, 0xda, 0x33, 0xd4, 0x46, 0x28, 0x59, 0x79, + 0x69, 0x13, 0x18, 0xa2, 0x7d, 0x63, 0x50, 0xaf, 0x3b, 0xfc, 0xe6, 0x91, 0xc3, 0x0d, 0xb8, 0x34, + 0x7a, 0x97, 0x34, 0x84, 0x31, 0x29, 0xea, 0xd2, 0x5e, 0x99, 0x01, 0x25, 0x3b, 0x26, 0x9d, 0x5c, + 0x62, 0x68, 0x69, 0xcd, 0x15, 0xaa, 0x34, 0xff, 0x23, 0xd2, 0x2a, 0x4d, 0x0c, 0xad, 0x77, 0xeb, + 0xf9, 0x1f, 0x45, 0x06, 0x6d, 0xb2, 0x8d, 0x0b, 0x2e, 0x62, 0xba, 0xe5, 0xfa, 0x8b, 0x04, 0x1e, + 0x92, 0xdb, 0x2e, 0x38, 0x43, 0x2d, 0x66, 0x02, 0xa7, 0x74, 0xbb, 0xeb, 0xf5, 0x77, 0xc7, 0x9b, + 0x20, 0x30, 0x02, 0x06, 0x75, 0x26, 0x42, 0x7c, 0x1a, 0x86, 0x2a, 0x95, 0x36, 0xbf, 0x5d, 0xda, + 0x70, 0x44, 0x37, 0x54, 0x8e, 0xbf, 0xd4, 0x48, 0x33, 0xb7, 0xf1, 0xba, 0x28, 0xc1, 0x88, 0xec, + 0x94, 0x13, 0x85, 0x36, 0x73, 0x8f, 0x6b, 0x73, 0xc0, 0x3e, 0x14, 0xe8, 0xba, 0xf5, 0x5e, 0xfb, + 0xc3, 0x8f, 0x5f, 0x9f, 0x6a, 0xfb, 0xb0, 0xe7, 0x5e, 0x5d, 0x36, 0x70, 0xaf, 0x12, 0x3e, 0x7a, + 0x84, 0x5c, 0x5f, 0x2a, 0x1c, 0xad, 0xe8, 0x36, 0xaf, 0xd9, 0x1f, 0xfd, 0xff, 0x98, 0x4b, 0xc6, + 0xde, 0x91, 0x13, 0x72, 0x00, 0x77, 0x2a, 0x21, 0x59, 0x79, 0xf8, 0x39, 0x69, 0xae, 0xcd, 0x0c, + 0xe8, 0x4a, 0xcb, 0x1f, 0xd3, 0xf5, 0xef, 0xdd, 0x50, 0x29, 0x5d, 0x52, 0x47, 0x0e, 0xd0, 0xaa, + 0xc8, 0x53, 0x83, 0x3a, 0xef, 0x7e, 0x76, 0xfa, 0x75, 0xd9, 0xf1, 0xbe, 0x2f, 0x3b, 0xde, 0xcf, + 0x65, 0xc7, 0x7b, 0xfb, 0xe4, 0xdf, 0x77, 0x6c, 0x6d, 0x93, 0x27, 0x0d, 0xb7, 0x52, 0x27, 0xbf, + 0x03, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xf9, 0x19, 0x4c, 0xe6, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -546,15 +545,10 @@ func (m *InfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Ui != nil { - { - size, err := m.Ui.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintInfo(dAtA, i, uint64(size)) - } + if len(m.NavColor) > 0 { + i -= len(m.NavColor) + copy(dAtA[i:], m.NavColor) + i = encodeVarintInfo(dAtA, i, uint64(len(m.NavColor))) i-- dAtA[i] = 0x1a } @@ -749,8 +743,8 @@ func (m *InfoResponse) Size() (n int) { n += 1 + l + sovInfo(uint64(l)) } } - if m.Ui != nil { - l = m.Ui.Size() + l = len(m.NavColor) + if l > 0 { n += 1 + l + sovInfo(uint64(l)) } if m.XXX_unrecognized != nil { @@ -974,9 +968,9 @@ func (m *InfoResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ui", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field NavColor", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowInfo @@ -986,27 +980,23 @@ func (m *InfoResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthInfo } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthInfo } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Ui == nil { - m.Ui = &v1alpha1.UI{} - } - if err := m.Ui.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.NavColor = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/pkg/apiclient/info/info.proto b/pkg/apiclient/info/info.proto index fb6168f844fb..cb607c252d02 100644 --- a/pkg/apiclient/info/info.proto +++ b/pkg/apiclient/info/info.proto @@ -12,7 +12,7 @@ message GetInfoRequest { message InfoResponse { string managedNamespace = 1; repeated github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.Link links = 2; - github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.UI ui = 3; + string navColor = 3; } message GetVersionRequest { diff --git a/pkg/apis/workflow/v1alpha1/generated.pb.go b/pkg/apis/workflow/v1alpha1/generated.pb.go index b735be440016..34918b196566 100644 --- a/pkg/apis/workflow/v1alpha1/generated.pb.go +++ b/pkg/apis/workflow/v1alpha1/generated.pb.go @@ -2808,38 +2808,10 @@ func (m *TransformationStep) XXX_DiscardUnknown() { var xxx_messageInfo_TransformationStep proto.InternalMessageInfo -func (m *UI) Reset() { *m = UI{} } -func (*UI) ProtoMessage() {} -func (*UI) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{99} -} -func (m *UI) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UI) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil -} -func (m *UI) XXX_Merge(src proto.Message) { - xxx_messageInfo_UI.Merge(m, src) -} -func (m *UI) XXX_Size() int { - return m.Size() -} -func (m *UI) XXX_DiscardUnknown() { - xxx_messageInfo_UI.DiscardUnknown(m) -} - -var xxx_messageInfo_UI proto.InternalMessageInfo - func (m *UserContainer) Reset() { *m = UserContainer{} } func (*UserContainer) ProtoMessage() {} func (*UserContainer) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{100} + return fileDescriptor_724696e352c3df5f, []int{99} } func (m *UserContainer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2867,7 +2839,7 @@ var xxx_messageInfo_UserContainer proto.InternalMessageInfo func (m *ValueFrom) Reset() { *m = ValueFrom{} } func (*ValueFrom) ProtoMessage() {} func (*ValueFrom) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{101} + return fileDescriptor_724696e352c3df5f, []int{100} } func (m *ValueFrom) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2895,7 +2867,7 @@ var xxx_messageInfo_ValueFrom proto.InternalMessageInfo func (m *Version) Reset() { *m = Version{} } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{102} + return fileDescriptor_724696e352c3df5f, []int{101} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2923,7 +2895,7 @@ var xxx_messageInfo_Version proto.InternalMessageInfo func (m *VolumeClaimGC) Reset() { *m = VolumeClaimGC{} } func (*VolumeClaimGC) ProtoMessage() {} func (*VolumeClaimGC) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{103} + return fileDescriptor_724696e352c3df5f, []int{102} } func (m *VolumeClaimGC) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2951,7 +2923,7 @@ var xxx_messageInfo_VolumeClaimGC proto.InternalMessageInfo func (m *Workflow) Reset() { *m = Workflow{} } func (*Workflow) ProtoMessage() {} func (*Workflow) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{104} + return fileDescriptor_724696e352c3df5f, []int{103} } func (m *Workflow) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2979,7 +2951,7 @@ var xxx_messageInfo_Workflow proto.InternalMessageInfo func (m *WorkflowEventBinding) Reset() { *m = WorkflowEventBinding{} } func (*WorkflowEventBinding) ProtoMessage() {} func (*WorkflowEventBinding) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{105} + return fileDescriptor_724696e352c3df5f, []int{104} } func (m *WorkflowEventBinding) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3007,7 +2979,7 @@ var xxx_messageInfo_WorkflowEventBinding proto.InternalMessageInfo func (m *WorkflowEventBindingList) Reset() { *m = WorkflowEventBindingList{} } func (*WorkflowEventBindingList) ProtoMessage() {} func (*WorkflowEventBindingList) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{106} + return fileDescriptor_724696e352c3df5f, []int{105} } func (m *WorkflowEventBindingList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3035,7 +3007,7 @@ var xxx_messageInfo_WorkflowEventBindingList proto.InternalMessageInfo func (m *WorkflowEventBindingSpec) Reset() { *m = WorkflowEventBindingSpec{} } func (*WorkflowEventBindingSpec) ProtoMessage() {} func (*WorkflowEventBindingSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{107} + return fileDescriptor_724696e352c3df5f, []int{106} } func (m *WorkflowEventBindingSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3063,7 +3035,7 @@ var xxx_messageInfo_WorkflowEventBindingSpec proto.InternalMessageInfo func (m *WorkflowList) Reset() { *m = WorkflowList{} } func (*WorkflowList) ProtoMessage() {} func (*WorkflowList) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{108} + return fileDescriptor_724696e352c3df5f, []int{107} } func (m *WorkflowList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3091,7 +3063,7 @@ var xxx_messageInfo_WorkflowList proto.InternalMessageInfo func (m *WorkflowSpec) Reset() { *m = WorkflowSpec{} } func (*WorkflowSpec) ProtoMessage() {} func (*WorkflowSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{109} + return fileDescriptor_724696e352c3df5f, []int{108} } func (m *WorkflowSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3119,7 +3091,7 @@ var xxx_messageInfo_WorkflowSpec proto.InternalMessageInfo func (m *WorkflowStatus) Reset() { *m = WorkflowStatus{} } func (*WorkflowStatus) ProtoMessage() {} func (*WorkflowStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{110} + return fileDescriptor_724696e352c3df5f, []int{109} } func (m *WorkflowStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3147,7 +3119,7 @@ var xxx_messageInfo_WorkflowStatus proto.InternalMessageInfo func (m *WorkflowStep) Reset() { *m = WorkflowStep{} } func (*WorkflowStep) ProtoMessage() {} func (*WorkflowStep) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{111} + return fileDescriptor_724696e352c3df5f, []int{110} } func (m *WorkflowStep) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3175,7 +3147,7 @@ var xxx_messageInfo_WorkflowStep proto.InternalMessageInfo func (m *WorkflowTaskSet) Reset() { *m = WorkflowTaskSet{} } func (*WorkflowTaskSet) ProtoMessage() {} func (*WorkflowTaskSet) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{112} + return fileDescriptor_724696e352c3df5f, []int{111} } func (m *WorkflowTaskSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3203,7 +3175,7 @@ var xxx_messageInfo_WorkflowTaskSet proto.InternalMessageInfo func (m *WorkflowTaskSetList) Reset() { *m = WorkflowTaskSetList{} } func (*WorkflowTaskSetList) ProtoMessage() {} func (*WorkflowTaskSetList) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{113} + return fileDescriptor_724696e352c3df5f, []int{112} } func (m *WorkflowTaskSetList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3231,7 +3203,7 @@ var xxx_messageInfo_WorkflowTaskSetList proto.InternalMessageInfo func (m *WorkflowTaskSetSpec) Reset() { *m = WorkflowTaskSetSpec{} } func (*WorkflowTaskSetSpec) ProtoMessage() {} func (*WorkflowTaskSetSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{114} + return fileDescriptor_724696e352c3df5f, []int{113} } func (m *WorkflowTaskSetSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3259,7 +3231,7 @@ var xxx_messageInfo_WorkflowTaskSetSpec proto.InternalMessageInfo func (m *WorkflowTaskSetStatus) Reset() { *m = WorkflowTaskSetStatus{} } func (*WorkflowTaskSetStatus) ProtoMessage() {} func (*WorkflowTaskSetStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{115} + return fileDescriptor_724696e352c3df5f, []int{114} } func (m *WorkflowTaskSetStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3287,7 +3259,7 @@ var xxx_messageInfo_WorkflowTaskSetStatus proto.InternalMessageInfo func (m *WorkflowTemplate) Reset() { *m = WorkflowTemplate{} } func (*WorkflowTemplate) ProtoMessage() {} func (*WorkflowTemplate) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{116} + return fileDescriptor_724696e352c3df5f, []int{115} } func (m *WorkflowTemplate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3315,7 +3287,7 @@ var xxx_messageInfo_WorkflowTemplate proto.InternalMessageInfo func (m *WorkflowTemplateList) Reset() { *m = WorkflowTemplateList{} } func (*WorkflowTemplateList) ProtoMessage() {} func (*WorkflowTemplateList) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{117} + return fileDescriptor_724696e352c3df5f, []int{116} } func (m *WorkflowTemplateList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3343,7 +3315,7 @@ var xxx_messageInfo_WorkflowTemplateList proto.InternalMessageInfo func (m *WorkflowTemplateRef) Reset() { *m = WorkflowTemplateRef{} } func (*WorkflowTemplateRef) ProtoMessage() {} func (*WorkflowTemplateRef) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{118} + return fileDescriptor_724696e352c3df5f, []int{117} } func (m *WorkflowTemplateRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3371,7 +3343,7 @@ var xxx_messageInfo_WorkflowTemplateRef proto.InternalMessageInfo func (m *WorkflowTemplateSpec) Reset() { *m = WorkflowTemplateSpec{} } func (*WorkflowTemplateSpec) ProtoMessage() {} func (*WorkflowTemplateSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{119} + return fileDescriptor_724696e352c3df5f, []int{118} } func (m *WorkflowTemplateSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3399,7 +3371,7 @@ var xxx_messageInfo_WorkflowTemplateSpec proto.InternalMessageInfo func (m *ZipStrategy) Reset() { *m = ZipStrategy{} } func (*ZipStrategy) ProtoMessage() {} func (*ZipStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_724696e352c3df5f, []int{120} + return fileDescriptor_724696e352c3df5f, []int{119} } func (m *ZipStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3529,7 +3501,6 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.Template.NodeSelectorEntry") proto.RegisterType((*TemplateRef)(nil), "github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.TemplateRef") proto.RegisterType((*TransformationStep)(nil), "github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.TransformationStep") - proto.RegisterType((*UI)(nil), "github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.UI") proto.RegisterType((*UserContainer)(nil), "github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.UserContainer") proto.RegisterType((*ValueFrom)(nil), "github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.ValueFrom") proto.RegisterType((*Version)(nil), "github.com.argoproj.argo_workflows.v3.pkg.apis.workflow.v1alpha1.Version") @@ -3565,7 +3536,7 @@ func init() { } var fileDescriptor_724696e352c3df5f = []byte{ - // 8955 bytes of a gzipped FileDescriptorProto + // 8935 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x5b, 0x70, 0x24, 0xc9, 0x71, 0xd8, 0xf5, 0x00, 0x03, 0xcc, 0x24, 0xde, 0xb5, 0xaf, 0x39, 0xdc, 0xdd, 0xe2, 0xd4, 0xa7, 0x3b, 0xdf, 0xca, 0x47, 0x40, 0xb7, 0xcb, 0xb3, 0xcf, 0x64, 0x98, 0x22, 0x06, 0x58, 0x3c, 0x0e, @@ -4018,114 +3989,113 @@ var fileDescriptor_724696e352c3df5f = []byte{ 0x25, 0xa5, 0x17, 0x4c, 0x1f, 0xab, 0xc8, 0x72, 0x82, 0x65, 0xf9, 0xe4, 0x4f, 0xc0, 0x44, 0xd7, 0x61, 0xea, 0x4c, 0x37, 0x81, 0x7f, 0xd9, 0x02, 0xfd, 0xba, 0x5d, 0xe6, 0xc9, 0x85, 0x5f, 0x85, 0xe1, 0x2a, 0x7f, 0xd9, 0x82, 0x5f, 0xd8, 0xeb, 0x37, 0xed, 0x8c, 0x73, 0x5a, 0x19, 0x36, 0x30, - 0xed, 0x25, 0x40, 0xdd, 0x99, 0x1f, 0x13, 0x11, 0x1d, 0xd6, 0xa9, 0x22, 0x3a, 0x6e, 0x42, 0xee, - 0xce, 0x32, 0x6d, 0xb7, 0xe7, 0xec, 0xcd, 0xf9, 0xcd, 0xee, 0x44, 0x8b, 0xeb, 0x02, 0x8e, 0x15, - 0x86, 0xfd, 0x9b, 0x16, 0x8c, 0x18, 0x7a, 0x46, 0xe6, 0xae, 0xbc, 0x05, 0x40, 0x2d, 0x37, 0x08, - 0xfc, 0x40, 0x7f, 0x88, 0x41, 0xa4, 0xc7, 0x63, 0xa9, 0x83, 0xd6, 0xba, 0x4a, 0x71, 0x4a, 0x0d, - 0xfb, 0x9f, 0xf4, 0x43, 0x1c, 0xc9, 0xaa, 0x92, 0x86, 0x59, 0x3d, 0x93, 0x86, 0xbd, 0x04, 0x85, - 0x77, 0x42, 0xdf, 0xdb, 0x8c, 0x53, 0x8b, 0xa9, 0x71, 0x78, 0xad, 0xb2, 0xb1, 0xce, 0x30, 0x15, - 0x06, 0xc3, 0x7e, 0x77, 0xc1, 0x6d, 0x46, 0xdd, 0xb9, 0xa7, 0x5e, 0x7b, 0x9d, 0xc3, 0xb1, 0xc2, - 0x60, 0x4f, 0x45, 0xec, 0x11, 0x65, 0xb4, 0x8e, 0x9f, 0x8a, 0xe0, 0x89, 0x60, 0x59, 0x19, 0x9a, - 0x81, 0xa2, 0xb2, 0x79, 0x0b, 0x13, 0xbc, 0x1a, 0x29, 0x65, 0x1b, 0xc7, 0x31, 0x0e, 0x53, 0x22, - 0x85, 0x39, 0x55, 0x18, 0x42, 0x2a, 0x59, 0x1c, 0x32, 0x12, 0x06, 0x5a, 0xbe, 0x1f, 0x48, 0x30, - 0x56, 0x2c, 0xd3, 0xfc, 0x99, 0xc5, 0xf3, 0xf0, 0x67, 0xea, 0x61, 0xd5, 0xf9, 0xd3, 0x86, 0x55, - 0x9b, 0xeb, 0xa1, 0x70, 0xaa, 0xf5, 0xf0, 0x33, 0x7d, 0x30, 0x78, 0x97, 0x04, 0x2c, 0x21, 0xe2, - 0x0d, 0x18, 0xdc, 0xe3, 0x3f, 0x93, 0x57, 0x97, 0x04, 0x06, 0x96, 0xe5, 0xf4, 0xbb, 0x6d, 0x77, - 0xdc, 0x66, 0x6d, 0x3e, 0x5e, 0xf9, 0xea, 0xbb, 0x95, 0x65, 0x01, 0x8e, 0x71, 0x68, 0x85, 0x3a, - 0x3d, 0x0d, 0xb4, 0x5a, 0x6e, 0x94, 0x8c, 0xee, 0x59, 0x94, 0x05, 0x38, 0xc6, 0x41, 0x2f, 0xc0, - 0x40, 0xdd, 0x8d, 0xb6, 0x9c, 0x7a, 0xd2, 0x7d, 0xb7, 0xc8, 0xa0, 0x58, 0x94, 0x32, 0xff, 0x8f, - 0x1b, 0x6d, 0x05, 0x84, 0xd9, 0x67, 0xbb, 0xee, 0x30, 0x2f, 0x6a, 0x65, 0xd8, 0xc0, 0x64, 0x4d, - 0xf2, 0x45, 0xcf, 0x84, 0x5f, 0x26, 0x6e, 0x92, 0x2c, 0xc0, 0x31, 0x0e, 0x9d, 0xff, 0x55, 0xbf, - 0xd5, 0x76, 0x9b, 0x22, 0xda, 0x55, 0x9b, 0xff, 0x73, 0x02, 0x8e, 0x15, 0x06, 0xc5, 0xa6, 0x62, - 0x8f, 0x8a, 0xac, 0x64, 0x5a, 0xfe, 0x4d, 0x01, 0xc7, 0x0a, 0xc3, 0xbe, 0x0b, 0x23, 0x7c, 0x25, - 0xcf, 0x35, 0x1d, 0xb7, 0xb5, 0x38, 0x87, 0x6e, 0x77, 0x85, 0x74, 0xdf, 0x48, 0x09, 0xe9, 0xbe, - 0x62, 0x54, 0xea, 0x0e, 0xed, 0xb6, 0xbf, 0x9d, 0x83, 0xc2, 0x05, 0xbe, 0x6c, 0xd2, 0x36, 0x5e, - 0x36, 0xc9, 0xfa, 0x7d, 0x8b, 0xb4, 0x57, 0x4d, 0x0e, 0x12, 0xaf, 0x9a, 0x6c, 0x66, 0x79, 0x4b, - 0xe2, 0xc4, 0x17, 0x4d, 0xbe, 0x6f, 0xc1, 0x65, 0x89, 0xca, 0x84, 0x5a, 0xd9, 0xf5, 0x98, 0xe3, - 0xff, 0xfc, 0x87, 0xf9, 0x7d, 0x63, 0x98, 0xdf, 0xcc, 0xae, 0xcb, 0x7a, 0x3f, 0x7a, 0x3e, 0xb7, - 0xf5, 0x3d, 0x0b, 0x4a, 0x69, 0x15, 0x2e, 0xe0, 0x49, 0x97, 0xf7, 0xcc, 0x27, 0x5d, 0xee, 0x9e, - 0x4f, 0xcf, 0x7b, 0x3c, 0xed, 0xf2, 0xfd, 0x1e, 0xfd, 0x66, 0xef, 0xa8, 0x34, 0xe5, 0x76, 0x67, - 0x65, 0xe5, 0x00, 0xe3, 0x2c, 0xd2, 0xf7, 0xcd, 0x26, 0x0c, 0x84, 0xcc, 0x4b, 0x2e, 0xa6, 0xc0, - 0x52, 0x16, 0x9b, 0x20, 0xa5, 0x27, 0x0c, 0x98, 0xec, 0x37, 0x16, 0x3c, 0xec, 0xff, 0x64, 0xc1, - 0xf0, 0x05, 0xbe, 0xdb, 0xe3, 0x9b, 0x1f, 0xf9, 0xb5, 0xec, 0x3e, 0x72, 0x8f, 0x0f, 0xfb, 0xab, - 0xd7, 0xc1, 0x78, 0x22, 0x07, 0xbd, 0x07, 0x45, 0xa9, 0xb5, 0xca, 0xdb, 0x57, 0x59, 0xbe, 0x84, - 0xa1, 0xb6, 0x19, 0x09, 0x09, 0x71, 0xcc, 0x2f, 0x11, 0x97, 0x90, 0x3b, 0x55, 0x5c, 0xc2, 0xe3, - 0x7d, 0x47, 0x23, 0xdd, 0xa6, 0xd0, 0x7f, 0x2e, 0x36, 0x85, 0xa7, 0x33, 0xb7, 0x29, 0x3c, 0x73, - 0xc1, 0x36, 0x05, 0xcd, 0xc0, 0x9b, 0x7f, 0x04, 0x03, 0xef, 0x7b, 0x70, 0x79, 0x2f, 0xde, 0xfc, - 0xd5, 0x4c, 0x12, 0xcf, 0x81, 0xdc, 0x48, 0xb5, 0x24, 0x50, 0x45, 0x26, 0x8c, 0x88, 0x17, 0x69, - 0x6a, 0x43, 0x1c, 0xd5, 0x70, 0x37, 0x85, 0x1c, 0x4e, 0x65, 0x92, 0xb4, 0xd4, 0x0d, 0x9e, 0xc2, - 0x52, 0xf7, 0x5b, 0x3d, 0xdf, 0x00, 0x2e, 0x9c, 0xef, 0x1b, 0xc0, 0x4f, 0x9e, 0xf9, 0xfd, 0xdf, - 0xe7, 0x63, 0x47, 0x06, 0x8f, 0x85, 0x49, 0xf7, 0x3a, 0x7c, 0x2d, 0xe9, 0x1d, 0x05, 0x36, 0xf4, - 0x9f, 0xcd, 0x56, 0xeb, 0xc9, 0xc0, 0x43, 0x3a, 0xf4, 0x08, 0x1e, 0xd2, 0x84, 0xd9, 0x74, 0x38, - 0x23, 0xb3, 0xa9, 0x07, 0xe3, 0x6e, 0xcb, 0xa9, 0x93, 0xcd, 0x4e, 0xb3, 0xc9, 0x43, 0x66, 0xe5, - 0x5b, 0x25, 0xa9, 0x27, 0xa9, 0x55, 0xbf, 0xea, 0x34, 0x93, 0x4f, 0x42, 0xa9, 0xd0, 0xe0, 0xe5, - 0x04, 0x25, 0xdc, 0x45, 0x9b, 0x4e, 0x58, 0x96, 0x53, 0x83, 0x44, 0x74, 0xb4, 0x99, 0x1b, 0x4e, - 0x3c, 0xd6, 0xbe, 0x14, 0x83, 0xb1, 0x8e, 0x83, 0x56, 0xa0, 0x58, 0xf3, 0x42, 0x71, 0xd9, 0x66, - 0x8c, 0x09, 0xb3, 0x8f, 0x51, 0x11, 0x38, 0xbf, 0x5e, 0x51, 0xd7, 0x6c, 0x9e, 0x4e, 0x49, 0xd7, - 0xa2, 0xca, 0x71, 0x5c, 0x1f, 0xad, 0x31, 0x62, 0x22, 0xdd, 0x34, 0xf7, 0x8e, 0x3d, 0xdb, 0xc3, - 0xd8, 0x37, 0xbf, 0x2e, 0x13, 0x66, 0x8f, 0x08, 0x76, 0x22, 0x6f, 0x74, 0x4c, 0x41, 0x7b, 0x33, - 0x66, 0xe2, 0xc4, 0x37, 0x63, 0x58, 0x9e, 0xa6, 0xa8, 0xa9, 0x4c, 0xfb, 0xd7, 0x33, 0xcb, 0xd3, - 0x14, 0xc7, 0x9d, 0x88, 0x3c, 0x4d, 0x31, 0x00, 0xeb, 0x2c, 0xd1, 0x46, 0x2f, 0x17, 0xc7, 0x25, - 0x26, 0x34, 0xce, 0xee, 0xb0, 0xd0, 0x6d, 0xdd, 0x97, 0x4f, 0xb4, 0x75, 0x77, 0xd9, 0xe6, 0xaf, - 0x9c, 0xc1, 0x36, 0xdf, 0x60, 0x19, 0x74, 0x16, 0xe7, 0x84, 0x3b, 0x24, 0x03, 0x85, 0x8e, 0x5d, - 0xbf, 0xe5, 0x71, 0x3c, 0xec, 0x27, 0xe6, 0x0c, 0x7a, 0x06, 0x9d, 0x5d, 0x7b, 0xd8, 0xa0, 0x33, - 0x26, 0x9e, 0x63, 0x38, 0x4b, 0xc5, 0x94, 0x17, 0xe2, 0x39, 0x06, 0x63, 0x1d, 0x27, 0x69, 0xe9, - 0x7e, 0xf2, 0xdc, 0x2c, 0xdd, 0x93, 0x17, 0x60, 0xe9, 0x7e, 0xea, 0xd4, 0x96, 0xee, 0x0f, 0xe0, - 0x52, 0xdb, 0xaf, 0xcd, 0xbb, 0x61, 0xd0, 0x61, 0x77, 0x08, 0xca, 0x9d, 0x5a, 0x9d, 0x44, 0xcc, - 0x54, 0x3e, 0x74, 0xf3, 0xa6, 0xde, 0xc8, 0x36, 0x5b, 0xc8, 0xd3, 0x7b, 0x2f, 0x6f, 0x93, 0x88, - 0x7f, 0xcc, 0x64, 0x2d, 0x76, 0x60, 0x62, 0x81, 0x4c, 0x29, 0x85, 0x38, 0x8d, 0x8f, 0x6e, 0x68, - 0x7f, 0xf6, 0x62, 0x0c, 0xed, 0x9f, 0x86, 0x42, 0xd8, 0xe8, 0x44, 0x35, 0x7f, 0xdf, 0x63, 0xde, - 0x94, 0xa2, 0x7a, 0x35, 0xb2, 0x50, 0x11, 0xf0, 0xfb, 0x47, 0x53, 0xe3, 0xf2, 0xb7, 0x66, 0x52, - 0x10, 0x10, 0xf4, 0x6b, 0x3d, 0xa2, 0xa4, 0xed, 0xf3, 0x8c, 0x92, 0xbe, 0x76, 0xa6, 0x08, 0xe9, - 0x34, 0x6f, 0xc2, 0x73, 0x3f, 0x70, 0xde, 0x84, 0x5f, 0xb1, 0x60, 0x64, 0x4f, 0xb7, 0xdf, 0x08, - 0x8f, 0x47, 0x06, 0x9e, 0x57, 0xc3, 0x2c, 0x54, 0xb6, 0xa9, 0xb0, 0x33, 0x40, 0xf7, 0x93, 0x00, - 0x6c, 0xb6, 0x24, 0xc5, 0x2b, 0xfc, 0xfc, 0xe3, 0xf2, 0x0a, 0x7f, 0xc0, 0x84, 0x99, 0x0c, 0xa1, - 0x62, 0x6e, 0x90, 0x6c, 0xc3, 0xb4, 0xa4, 0x60, 0x54, 0x51, 0x5a, 0x3a, 0x3f, 0xf4, 0x15, 0x0b, - 0xc6, 0xe5, 0xe1, 0x4c, 0xd8, 0x5f, 0x43, 0x11, 0x68, 0x92, 0xe5, 0x99, 0x90, 0x45, 0x2a, 0x6e, - 0x25, 0xf8, 0xe0, 0x2e, 0xce, 0x54, 0xb4, 0xab, 0x28, 0x82, 0x7a, 0xc8, 0xe2, 0xa9, 0x84, 0x22, - 0x33, 0x1b, 0x83, 0xb1, 0x8e, 0xf3, 0xe8, 0x8e, 0xa1, 0x3f, 0x44, 0x30, 0x9a, 0x78, 0xc3, 0xf3, - 0xe3, 0x66, 0xee, 0xce, 0xeb, 0xc9, 0x04, 0x8a, 0x23, 0x12, 0xdf, 0x48, 0xa2, 0x68, 0x64, 0x39, - 0xcc, 0x9d, 0x6b, 0x96, 0xc3, 0xbe, 0x8b, 0xc9, 0x72, 0x38, 0x7e, 0x1e, 0x59, 0x0e, 0x27, 0xce, - 0x94, 0xe5, 0x50, 0xcb, 0x32, 0xd9, 0xff, 0x80, 0x2c, 0x93, 0xb3, 0x30, 0x26, 0x43, 0x5f, 0x89, - 0x48, 0x5f, 0xc7, 0xed, 0xe5, 0xd7, 0x44, 0x95, 0xb1, 0x39, 0xb3, 0x18, 0x27, 0xf1, 0xd1, 0x47, - 0x16, 0xe4, 0x3d, 0x56, 0x73, 0x20, 0xab, 0xc4, 0xcd, 0xe6, 0xd4, 0x62, 0xe7, 0x1d, 0x91, 0x2e, - 0x59, 0x86, 0x16, 0xe5, 0x19, 0xec, 0xbe, 0xfc, 0x81, 0x79, 0x0b, 0xd0, 0xdb, 0x50, 0xf2, 0x77, - 0x76, 0x9a, 0xbe, 0x53, 0x8b, 0x53, 0x31, 0x4a, 0x83, 0x3e, 0xbf, 0x90, 0xa0, 0x52, 0x51, 0x6d, - 0xf4, 0xc0, 0xc3, 0x3d, 0x29, 0xd0, 0x03, 0xeb, 0x58, 0x18, 0xf9, 0x01, 0xa9, 0xc5, 0x87, 0xeb, - 0x22, 0xeb, 0x33, 0xc9, 0xbc, 0xcf, 0x15, 0x93, 0x0f, 0xef, 0xbd, 0xfa, 0x28, 0x89, 0x52, 0x9c, - 0x6c, 0x16, 0x0a, 0xe0, 0x6a, 0x3b, 0xed, 0x6c, 0x1f, 0x8a, 0x80, 0xdd, 0x93, 0x2c, 0x0c, 0x72, - 0xe9, 0x5e, 0x4d, 0xb5, 0x0e, 0x84, 0xb8, 0x07, 0x65, 0x3d, 0x49, 0x63, 0xe1, 0x62, 0x92, 0x34, - 0x9a, 0x2f, 0xef, 0x8e, 0x5c, 0xf8, 0xcb, 0xbb, 0xe8, 0xff, 0xa6, 0xe6, 0x13, 0xe5, 0x47, 0xe2, - 0x7a, 0xe6, 0x73, 0xe2, 0x07, 0x2e, 0xa7, 0xe8, 0x3f, 0xb4, 0x60, 0x92, 0xcf, 0xbc, 0xa4, 0x22, - 0xc6, 0xde, 0x34, 0x1f, 0x3d, 0x17, 0x9f, 0x0f, 0x73, 0x7f, 0x57, 0x0c, 0xae, 0xcc, 0x15, 0x71, - 0x42, 0x4b, 0xd0, 0x2f, 0xa5, 0xa8, 0x7f, 0x63, 0x59, 0x19, 0x99, 0xd2, 0x73, 0x51, 0x5e, 0x3a, - 0x3e, 0x8d, 0xc6, 0xf7, 0x8f, 0x7b, 0xda, 0xc0, 0x10, 0x6b, 0xde, 0x5f, 0x3d, 0x27, 0x1b, 0x98, - 0x9e, 0x30, 0xf3, 0x2c, 0x96, 0xb0, 0xc9, 0x9f, 0x15, 0x19, 0xbb, 0x7b, 0xe6, 0x95, 0xdf, 0x36, - 0x1f, 0x6a, 0x5d, 0xcd, 0x32, 0xab, 0xae, 0x9e, 0xe0, 0xfe, 0x6f, 0x58, 0x70, 0x39, 0x4d, 0x48, - 0xa6, 0x34, 0xe9, 0xb3, 0x66, 0x93, 0x32, 0x54, 0xd2, 0xf4, 0x06, 0x65, 0x93, 0x4a, 0xf4, 0x7b, - 0x45, 0xcd, 0xf3, 0x10, 0x91, 0xf6, 0x39, 0x3e, 0xe8, 0x3d, 0xf2, 0x67, 0x0f, 0x7a, 0x5f, 0x44, - 0x5a, 0x72, 0xe3, 0x69, 0xee, 0xfc, 0xe3, 0x7a, 0x9a, 0x7b, 0xe0, 0x61, 0x9e, 0xe6, 0x1e, 0x7c, - 0x6c, 0x4f, 0x73, 0x17, 0x4e, 0xf9, 0x34, 0x77, 0xf1, 0x07, 0xf4, 0x69, 0xee, 0x5f, 0x57, 0xef, - 0x6d, 0x73, 0x65, 0xe0, 0x8d, 0x6c, 0x53, 0x35, 0xfe, 0xff, 0xf7, 0xe8, 0xf6, 0x1f, 0xe7, 0x60, - 0x4c, 0x6d, 0xdd, 0x4e, 0xb8, 0x5b, 0x21, 0xd1, 0x05, 0x84, 0x4d, 0xec, 0x1b, 0x61, 0x13, 0x59, - 0x5a, 0xaa, 0x78, 0x17, 0x7a, 0x06, 0xa9, 0x7c, 0x21, 0x11, 0xa4, 0x72, 0x2f, 0x7b, 0xd6, 0x27, - 0xc7, 0xaa, 0xfc, 0x0f, 0x0b, 0x2e, 0x25, 0x6a, 0x5c, 0x80, 0x23, 0x7f, 0xcf, 0x74, 0xe4, 0xbf, - 0x9e, 0x79, 0xaf, 0x7b, 0xf8, 0xf3, 0x7f, 0x23, 0xd7, 0xd5, 0x5b, 0xa6, 0x17, 0xfe, 0x8c, 0x25, - 0xdf, 0x6c, 0xb7, 0xb2, 0xf6, 0xd4, 0x69, 0x6c, 0xa6, 0xd9, 0xb3, 0xed, 0x7c, 0xb5, 0xa6, 0x3e, - 0xe5, 0x3e, 0xf9, 0xd3, 0x16, 0x40, 0x8c, 0xf4, 0xb8, 0x54, 0x18, 0xfb, 0xb7, 0x73, 0x70, 0x25, - 0x75, 0x1a, 0xa1, 0x2f, 0xab, 0x43, 0x3e, 0x1f, 0xa8, 0xed, 0x73, 0x9a, 0xaf, 0xfa, 0x59, 0x7f, - 0xc4, 0x38, 0xeb, 0x8b, 0x23, 0xfe, 0xe3, 0x52, 0x40, 0x45, 0x16, 0x5f, 0x6d, 0xb0, 0xfe, 0xa7, - 0x05, 0xe3, 0xc9, 0xc3, 0xc6, 0x05, 0x88, 0xac, 0x03, 0x43, 0x64, 0xdd, 0xcd, 0xde, 0xb8, 0xde, - 0x33, 0xca, 0xeb, 0x8f, 0xb5, 0xf0, 0x36, 0x89, 0x7c, 0x01, 0x32, 0x63, 0xdf, 0x94, 0x19, 0x38, - 0xfb, 0x1e, 0xf7, 0x10, 0x1a, 0xef, 0x42, 0x9a, 0x7f, 0xe1, 0x74, 0x19, 0x48, 0x8c, 0xb0, 0xf6, - 0xdc, 0xa9, 0xc3, 0xda, 0x7f, 0x3e, 0xd7, 0x3d, 0xc4, 0x4c, 0x50, 0x7d, 0x48, 0x55, 0x33, 0xed, - 0xb4, 0x9b, 0x5d, 0x3a, 0x07, 0xe3, 0x6c, 0xad, 0xda, 0x68, 0x9c, 0xac, 0x0d, 0xce, 0xe8, 0x9d, - 0xb8, 0x25, 0xf4, 0x4b, 0x3d, 0x30, 0xdb, 0x4f, 0xaf, 0x69, 0xce, 0xec, 0xdb, 0xf7, 0x34, 0x4a, - 0xcc, 0xd2, 0x6e, 0xd0, 0xb6, 0x47, 0x60, 0xe8, 0x4d, 0xb7, 0xad, 0x5c, 0x03, 0xd3, 0xdf, 0xfc, - 0xee, 0xf5, 0x27, 0x7e, 0xff, 0xbb, 0xd7, 0x9f, 0xf8, 0xf6, 0x77, 0xaf, 0x3f, 0xf1, 0xc5, 0xe3, - 0xeb, 0xd6, 0x37, 0x8f, 0xaf, 0x5b, 0xbf, 0x7f, 0x7c, 0xdd, 0xfa, 0xf6, 0xf1, 0x75, 0xeb, 0x3f, - 0x1f, 0x5f, 0xb7, 0xfe, 0xe6, 0x7f, 0xb9, 0xfe, 0xc4, 0x9b, 0x05, 0xd9, 0xb7, 0xff, 0x17, 0x00, - 0x00, 0xff, 0xff, 0xe4, 0x4d, 0xfa, 0xee, 0x2a, 0xa9, 0x00, 0x00, + 0xed, 0x25, 0x40, 0xdd, 0x99, 0x1f, 0x13, 0x11, 0x1d, 0xd6, 0xa9, 0x22, 0x3a, 0x7e, 0xd3, 0x82, + 0x11, 0x43, 0x67, 0xc8, 0xdc, 0x2d, 0xb7, 0x00, 0xa8, 0xe5, 0x06, 0x81, 0x1f, 0xe8, 0x8f, 0x2a, + 0x88, 0x54, 0x77, 0x2c, 0x0d, 0xd0, 0x5a, 0x57, 0x29, 0x4e, 0xa9, 0x61, 0xff, 0x93, 0x7e, 0x88, + 0xa3, 0x52, 0x55, 0x02, 0x30, 0xab, 0x67, 0x02, 0xb0, 0x97, 0xa0, 0xf0, 0x4e, 0xe8, 0x7b, 0x9b, + 0x71, 0x9a, 0x30, 0xf5, 0x2d, 0x5e, 0xab, 0x6c, 0xac, 0x33, 0x4c, 0x85, 0xc1, 0xb0, 0xdf, 0x5d, + 0x70, 0x9b, 0x51, 0x77, 0x1e, 0xa9, 0xd7, 0x5e, 0xe7, 0x70, 0xac, 0x30, 0xd8, 0xb3, 0x0f, 0x7b, + 0x44, 0x19, 0xa0, 0xe3, 0x67, 0x1f, 0x78, 0x52, 0x57, 0x56, 0x86, 0x66, 0xa0, 0xa8, 0xec, 0xd7, + 0xc2, 0x9c, 0xae, 0x46, 0x4a, 0xd9, 0xb9, 0x71, 0x8c, 0xc3, 0x14, 0x42, 0x61, 0x1a, 0x15, 0x46, + 0x8d, 0x4a, 0x16, 0x07, 0x86, 0x84, 0xb1, 0x95, 0xcb, 0x76, 0x09, 0xc6, 0x8a, 0x65, 0x9a, 0x6f, + 0xb2, 0x78, 0x1e, 0xbe, 0x49, 0x3d, 0x44, 0x3a, 0x7f, 0xda, 0x10, 0x69, 0x73, 0x6e, 0x17, 0x4e, + 0x35, 0xb7, 0x7f, 0xa6, 0x0f, 0x06, 0xef, 0x92, 0x80, 0x25, 0x37, 0xbc, 0x01, 0x83, 0x7b, 0xfc, + 0x67, 0xf2, 0x1a, 0x92, 0xc0, 0xc0, 0xb2, 0x9c, 0x7e, 0xb7, 0xed, 0x8e, 0xdb, 0xac, 0xcd, 0xc7, + 0xab, 0x58, 0x7d, 0xb7, 0xb2, 0x2c, 0xc0, 0x31, 0x0e, 0xad, 0x50, 0xa7, 0x9a, 0x7d, 0xab, 0xe5, + 0x46, 0xc9, 0x48, 0x9d, 0x45, 0x59, 0x80, 0x63, 0x1c, 0xf4, 0x02, 0x0c, 0xd4, 0xdd, 0x68, 0xcb, + 0xa9, 0x27, 0x5d, 0x71, 0x8b, 0x0c, 0x8a, 0x45, 0x29, 0xf3, 0xe5, 0xb8, 0xd1, 0x56, 0x40, 0x98, + 0xad, 0xb5, 0xeb, 0x3e, 0xf2, 0xa2, 0x56, 0x86, 0x0d, 0x4c, 0xd6, 0x24, 0x5f, 0xf4, 0x4c, 0xf8, + 0x58, 0xe2, 0x26, 0xc9, 0x02, 0x1c, 0xe3, 0xd0, 0xf9, 0x5f, 0xf5, 0x5b, 0x6d, 0xb7, 0x29, 0x22, + 0x57, 0xb5, 0xf9, 0x3f, 0x27, 0xe0, 0x58, 0x61, 0x50, 0x6c, 0x2a, 0xc2, 0xa8, 0xf8, 0x49, 0xa6, + 0xd8, 0xdf, 0x14, 0x70, 0xac, 0x30, 0xec, 0xbb, 0x30, 0xc2, 0x57, 0xf2, 0x5c, 0xd3, 0x71, 0x5b, + 0x8b, 0x73, 0xe8, 0x76, 0x57, 0x78, 0xf6, 0x8d, 0x94, 0xf0, 0xec, 0x2b, 0x46, 0xa5, 0xee, 0x30, + 0x6d, 0xfb, 0xdb, 0x39, 0x28, 0x5c, 0xe0, 0x2b, 0x25, 0x6d, 0xe3, 0x95, 0x92, 0xac, 0xdf, 0xaa, + 0x48, 0x7b, 0xa1, 0xe4, 0x20, 0xf1, 0x42, 0xc9, 0x66, 0x96, 0x37, 0x1e, 0x4e, 0x7c, 0x9d, 0xe4, + 0xfb, 0x16, 0x5c, 0x96, 0xa8, 0x4c, 0xa8, 0x95, 0x5d, 0x8f, 0x39, 0xf1, 0xcf, 0x7f, 0x98, 0xdf, + 0x37, 0x86, 0xf9, 0xcd, 0xec, 0xba, 0xac, 0xf7, 0xa3, 0xe7, 0xd3, 0x59, 0xdf, 0xb3, 0xa0, 0x94, + 0x56, 0xe1, 0x02, 0x9e, 0x67, 0x79, 0xcf, 0x7c, 0x9e, 0xe5, 0xee, 0xf9, 0xf4, 0xbc, 0xc7, 0x33, + 0x2d, 0xdf, 0xef, 0xd1, 0x6f, 0xf6, 0x26, 0x4a, 0x53, 0x6e, 0x77, 0x56, 0x56, 0xce, 0x2c, 0xce, + 0x22, 0x7d, 0xdf, 0x6c, 0xc2, 0x40, 0xc8, 0x3c, 0xde, 0x62, 0x0a, 0x2c, 0x65, 0xb1, 0x09, 0x52, + 0x7a, 0xc2, 0x18, 0xc9, 0x7e, 0x63, 0xc1, 0xc3, 0xfe, 0x4f, 0x16, 0x0c, 0x5f, 0xe0, 0x1b, 0x3c, + 0xbe, 0xf9, 0x91, 0x5f, 0xcb, 0xee, 0x23, 0xf7, 0xf8, 0xb0, 0xbf, 0x7a, 0x1d, 0x8c, 0xe7, 0x6e, + 0xd0, 0x7b, 0x50, 0x94, 0x1a, 0xa8, 0xbc, 0x49, 0x95, 0xe5, 0xab, 0x16, 0x6a, 0x9b, 0x91, 0x90, + 0x10, 0xc7, 0xfc, 0x12, 0x31, 0x06, 0xb9, 0x53, 0xc5, 0x18, 0x3c, 0xde, 0x37, 0x31, 0xd2, 0xed, + 0x03, 0xfd, 0xe7, 0x62, 0x1f, 0x78, 0x3a, 0x73, 0xfb, 0xc0, 0x33, 0x17, 0x6c, 0x1f, 0xd0, 0x8c, + 0xb5, 0xf9, 0x47, 0x30, 0xd6, 0xbe, 0x07, 0x97, 0xf7, 0xe2, 0xcd, 0x5f, 0xcd, 0x24, 0xf1, 0xb4, + 0xc7, 0x8d, 0x54, 0xab, 0x00, 0x55, 0x64, 0xc2, 0x88, 0x78, 0x91, 0xa6, 0x36, 0xc4, 0x11, 0x0a, + 0x77, 0x53, 0xc8, 0xe1, 0x54, 0x26, 0x49, 0xab, 0xdb, 0xe0, 0x29, 0xac, 0x6e, 0xbf, 0xd5, 0xf3, + 0x3d, 0xdf, 0xc2, 0xf9, 0xbe, 0xe7, 0xfb, 0xe4, 0x99, 0xdf, 0xf2, 0x7d, 0x3e, 0x76, 0x4a, 0xf0, + 0xb8, 0x96, 0x74, 0x0f, 0xc2, 0xd7, 0x92, 0x9e, 0x4e, 0x60, 0x43, 0xff, 0xd9, 0x6c, 0xb5, 0x9e, + 0x0c, 0xbc, 0x9d, 0x43, 0x8f, 0xe0, 0xed, 0x4c, 0x98, 0x40, 0x87, 0x33, 0x32, 0x81, 0x7a, 0x30, + 0xee, 0xb6, 0x9c, 0x3a, 0xd9, 0xec, 0x34, 0x9b, 0x3c, 0xfc, 0x55, 0xbe, 0x3b, 0x92, 0x7a, 0x92, + 0x5a, 0xf5, 0xab, 0x4e, 0x33, 0xf9, 0xbc, 0x93, 0x0a, 0xf3, 0x5d, 0x4e, 0x50, 0xc2, 0x5d, 0xb4, + 0xe9, 0x84, 0x65, 0xf9, 0x31, 0x48, 0x44, 0x47, 0x9b, 0xb9, 0xd4, 0xc4, 0xc3, 0xeb, 0x4b, 0x31, + 0x18, 0xeb, 0x38, 0x68, 0x05, 0x8a, 0x35, 0x2f, 0x14, 0x17, 0x67, 0xc6, 0x98, 0x30, 0xfb, 0x18, + 0x15, 0x81, 0xf3, 0xeb, 0x15, 0x75, 0x65, 0xe6, 0xe9, 0x94, 0xd4, 0x2b, 0xaa, 0x1c, 0xc7, 0xf5, + 0xd1, 0x1a, 0x23, 0x26, 0x52, 0x47, 0x73, 0x4f, 0xd7, 0xb3, 0x3d, 0x0c, 0x77, 0xf3, 0xeb, 0x32, + 0xf9, 0xf5, 0x88, 0x60, 0x27, 0x72, 0x40, 0xc7, 0x14, 0xb4, 0xf7, 0x5f, 0x26, 0x4e, 0x7c, 0xff, + 0x85, 0xe5, 0x5c, 0x8a, 0x9a, 0xca, 0x4c, 0x7f, 0x3d, 0xb3, 0x9c, 0x4b, 0x71, 0x0c, 0x89, 0xc8, + 0xb9, 0x14, 0x03, 0xb0, 0xce, 0x12, 0x6d, 0xf4, 0x72, 0x57, 0x5c, 0x62, 0x42, 0xe3, 0xec, 0xce, + 0x07, 0xdd, 0x6e, 0x7d, 0xf9, 0x44, 0xbb, 0x75, 0x97, 0x9d, 0xfd, 0xca, 0x19, 0xec, 0xec, 0x0d, + 0x96, 0x0d, 0x67, 0x71, 0x4e, 0xb8, 0x36, 0x32, 0x50, 0xe8, 0xd8, 0x55, 0x5a, 0x1e, 0x93, 0xc3, + 0x7e, 0x62, 0xce, 0xa0, 0x67, 0x00, 0xd9, 0xb5, 0x87, 0x0d, 0x20, 0x63, 0xe2, 0x39, 0x86, 0xb3, + 0xb4, 0x4a, 0x79, 0x21, 0x9e, 0x63, 0x30, 0xd6, 0x71, 0x92, 0x56, 0xeb, 0x27, 0xcf, 0xcd, 0x6a, + 0x3d, 0x79, 0x01, 0x56, 0xeb, 0xa7, 0x4e, 0x6d, 0xb5, 0xfe, 0x00, 0x2e, 0xb5, 0xfd, 0xda, 0xbc, + 0x1b, 0x06, 0x1d, 0x76, 0x1f, 0xa0, 0xdc, 0xa9, 0xd5, 0x49, 0xc4, 0xcc, 0xde, 0x43, 0x37, 0x6f, + 0xea, 0x8d, 0x6c, 0xb3, 0x85, 0x3c, 0xbd, 0xf7, 0xf2, 0x36, 0x89, 0xf8, 0xc7, 0x4c, 0xd6, 0x62, + 0x07, 0x26, 0x16, 0x94, 0x94, 0x52, 0x88, 0xd3, 0xf8, 0xe8, 0x46, 0xf3, 0x67, 0x2f, 0xc6, 0x68, + 0xfe, 0x69, 0x28, 0x84, 0x8d, 0x4e, 0x54, 0xf3, 0xf7, 0x3d, 0xe6, 0x19, 0x29, 0xaa, 0x17, 0x20, + 0x0b, 0x15, 0x01, 0xbf, 0x7f, 0x34, 0x35, 0x2e, 0x7f, 0x6b, 0x26, 0x05, 0x01, 0x41, 0xbf, 0xd6, + 0x23, 0xe2, 0xd9, 0x3e, 0xcf, 0x88, 0xe7, 0x6b, 0x67, 0x8a, 0x76, 0x4e, 0xf3, 0x0c, 0x3c, 0xf7, + 0x03, 0xe7, 0x19, 0xf8, 0x15, 0x0b, 0x46, 0xf6, 0x74, 0xfb, 0x8d, 0xf0, 0x5e, 0x64, 0xe0, 0x45, + 0x35, 0xcc, 0x42, 0x65, 0x9b, 0x0a, 0x3b, 0x03, 0x74, 0x3f, 0x09, 0xc0, 0x66, 0x4b, 0x52, 0x3c, + 0xbc, 0xcf, 0x3f, 0x2e, 0x0f, 0xef, 0x07, 0x4c, 0x98, 0xc9, 0x70, 0x28, 0xe6, 0xd2, 0xc8, 0x36, + 0xe4, 0x4a, 0x0a, 0x46, 0x15, 0x71, 0xa5, 0xf3, 0x43, 0x5f, 0xb1, 0x60, 0x5c, 0x1e, 0xce, 0x84, + 0xfd, 0x35, 0x14, 0x41, 0x23, 0x59, 0x9e, 0x09, 0x59, 0xd4, 0xe1, 0x56, 0x82, 0x0f, 0xee, 0xe2, + 0x4c, 0x45, 0xbb, 0x8a, 0x08, 0xa8, 0x87, 0x2c, 0x36, 0x4a, 0x28, 0x32, 0xb3, 0x31, 0x18, 0xeb, + 0x38, 0x8f, 0xee, 0xe4, 0xf9, 0x43, 0x04, 0xa3, 0x89, 0xf7, 0x38, 0x3f, 0x6e, 0xe6, 0xe1, 0xbc, + 0x9e, 0x4c, 0x86, 0x38, 0x22, 0xf1, 0x8d, 0x84, 0x88, 0x46, 0xc6, 0xc2, 0xdc, 0xb9, 0x66, 0x2c, + 0xec, 0xbb, 0x98, 0x8c, 0x85, 0xe3, 0xe7, 0x91, 0xb1, 0x70, 0xe2, 0x4c, 0x19, 0x0b, 0xb5, 0x8c, + 0x91, 0xfd, 0x0f, 0xc8, 0x18, 0x39, 0x0b, 0x63, 0x32, 0x8c, 0x95, 0x88, 0x54, 0x74, 0xdc, 0x5e, + 0x7e, 0x4d, 0x54, 0x19, 0x9b, 0x33, 0x8b, 0x71, 0x12, 0x1f, 0x7d, 0x64, 0x41, 0xde, 0x63, 0x35, + 0x07, 0xb2, 0x4a, 0xc2, 0x6c, 0x4e, 0x2d, 0x76, 0xde, 0x11, 0xa9, 0x8f, 0x65, 0x98, 0x50, 0x9e, + 0xc1, 0xee, 0xcb, 0x1f, 0x98, 0xb7, 0x00, 0xbd, 0x0d, 0x25, 0x7f, 0x67, 0xa7, 0xe9, 0x3b, 0xb5, + 0x38, 0xad, 0xa2, 0x34, 0xe8, 0xf3, 0xcb, 0x05, 0x2a, 0xad, 0xd4, 0x46, 0x0f, 0x3c, 0xdc, 0x93, + 0x02, 0x3d, 0xb0, 0x8e, 0x85, 0x91, 0x1f, 0x90, 0x5a, 0x7c, 0xb8, 0x2e, 0xb2, 0x3e, 0x93, 0xcc, + 0xfb, 0x5c, 0x31, 0xf9, 0xf0, 0xde, 0xab, 0x8f, 0x92, 0x28, 0xc5, 0xc9, 0x66, 0xa1, 0x00, 0xae, + 0xb6, 0xd3, 0xce, 0xf6, 0xa1, 0x08, 0xbe, 0x3d, 0xc9, 0xc2, 0x20, 0x97, 0xee, 0xd5, 0x54, 0xeb, + 0x40, 0x88, 0x7b, 0x50, 0xd6, 0x13, 0x2e, 0x16, 0x2e, 0x26, 0xe1, 0xa2, 0xf9, 0x8a, 0xee, 0xc8, + 0x85, 0xbf, 0xa2, 0x8b, 0xfe, 0x6f, 0x6a, 0x6e, 0x50, 0x7e, 0x24, 0xae, 0x67, 0x3e, 0x27, 0x7e, + 0xe0, 0xf2, 0x83, 0xfe, 0x43, 0x0b, 0x26, 0xf9, 0xcc, 0x4b, 0x2a, 0x62, 0xec, 0x7d, 0xf2, 0xd1, + 0x73, 0xf1, 0xf9, 0x30, 0xf7, 0x77, 0xc5, 0xe0, 0xca, 0x5c, 0x11, 0x27, 0xb4, 0x04, 0xfd, 0x52, + 0x8a, 0xfa, 0x37, 0x96, 0x95, 0x91, 0x29, 0x3d, 0xaf, 0xe4, 0xa5, 0xe3, 0xd3, 0x68, 0x7c, 0xff, + 0xb8, 0xa7, 0x0d, 0x0c, 0xb1, 0xe6, 0xfd, 0xd5, 0x73, 0xb2, 0x81, 0xe9, 0xc9, 0x2f, 0xcf, 0x62, + 0x09, 0x9b, 0xfc, 0x59, 0x91, 0x7d, 0xbb, 0x67, 0x8e, 0xf8, 0x6d, 0xf3, 0xd1, 0xd5, 0xd5, 0x2c, + 0x33, 0xe4, 0xea, 0xc9, 0xea, 0xff, 0x86, 0x05, 0x97, 0xd3, 0x84, 0x64, 0x4a, 0x93, 0x3e, 0x6b, + 0x36, 0x29, 0x43, 0x25, 0x4d, 0x6f, 0x50, 0x36, 0x69, 0x41, 0xbf, 0x57, 0xd4, 0x3c, 0x0f, 0x11, + 0x69, 0x9f, 0xe3, 0xe3, 0xdc, 0x23, 0x7f, 0xf6, 0x38, 0xf7, 0x45, 0xa4, 0x18, 0x37, 0x9e, 0xd9, + 0xce, 0x3f, 0xae, 0x67, 0xb6, 0x07, 0x1e, 0xe6, 0x99, 0xed, 0xc1, 0xc7, 0xf6, 0xcc, 0x76, 0xe1, + 0x94, 0xcf, 0x6c, 0x17, 0x7f, 0x40, 0x9f, 0xd9, 0xfe, 0x75, 0xf5, 0x76, 0x36, 0x57, 0x06, 0xde, + 0xc8, 0x36, 0xed, 0xe2, 0xff, 0x7f, 0x0f, 0x68, 0xff, 0x71, 0x0e, 0xc6, 0xd4, 0xd6, 0xed, 0x84, + 0xbb, 0x15, 0x12, 0x5d, 0x40, 0xd8, 0xc4, 0xbe, 0x11, 0x36, 0x91, 0xa5, 0xa5, 0x8a, 0x77, 0xa1, + 0x67, 0x90, 0xca, 0x17, 0x12, 0x41, 0x2a, 0xf7, 0xb2, 0x67, 0x7d, 0x72, 0xac, 0xca, 0xff, 0xb0, + 0xe0, 0x52, 0xa2, 0xc6, 0x05, 0x38, 0xf2, 0xf7, 0x4c, 0x47, 0xfe, 0xeb, 0x99, 0xf7, 0xba, 0x87, + 0x3f, 0xff, 0x37, 0x72, 0x5d, 0xbd, 0x65, 0x7a, 0xe1, 0xcf, 0x58, 0xf2, 0xfd, 0x75, 0x2b, 0x6b, + 0x4f, 0x9d, 0xc6, 0x66, 0x9a, 0x3d, 0xc1, 0xce, 0x57, 0x6b, 0xea, 0xb3, 0xec, 0x93, 0x3f, 0x6d, + 0x01, 0xc4, 0x48, 0x8f, 0x4b, 0x85, 0xb1, 0x7f, 0x3b, 0x07, 0x57, 0x52, 0xa7, 0x11, 0xfa, 0xb2, + 0x3a, 0xe4, 0xf3, 0x81, 0xda, 0x3e, 0xa7, 0xf9, 0xaa, 0x9f, 0xf5, 0x47, 0x8c, 0xb3, 0xbe, 0x38, + 0xe2, 0x3f, 0x2e, 0x05, 0x54, 0x64, 0xe4, 0xd5, 0x06, 0xeb, 0x7f, 0x5a, 0x30, 0x9e, 0x3c, 0x6c, + 0x5c, 0x80, 0xc8, 0x3a, 0x30, 0x44, 0xd6, 0xdd, 0xec, 0x8d, 0xeb, 0x3d, 0xa3, 0xbc, 0xfe, 0x58, + 0x0b, 0x6f, 0x93, 0xc8, 0x17, 0x20, 0x33, 0xf6, 0x4d, 0x99, 0x81, 0xb3, 0xef, 0x71, 0x0f, 0xa1, + 0xf1, 0x2e, 0xa4, 0xf9, 0x17, 0x4e, 0x97, 0x4d, 0xc4, 0x08, 0x51, 0xcf, 0x9d, 0x3a, 0x44, 0xfd, + 0xe7, 0x73, 0xdd, 0x43, 0xcc, 0x04, 0xd5, 0x87, 0x54, 0x35, 0xd3, 0x4e, 0xbb, 0xd9, 0xa5, 0x66, + 0x30, 0xce, 0xd6, 0xaa, 0x8d, 0xc6, 0xc9, 0xda, 0xe0, 0x8c, 0xde, 0x89, 0x5b, 0x42, 0xbf, 0xd4, + 0x03, 0x33, 0xf7, 0xf4, 0x9a, 0xe6, 0xcc, 0xbe, 0x7d, 0x4f, 0xa3, 0xc4, 0x2c, 0xed, 0x06, 0x6d, + 0x7b, 0x04, 0x86, 0xde, 0x74, 0xdb, 0xca, 0x35, 0x30, 0xfd, 0xcd, 0xef, 0x5e, 0x7f, 0xe2, 0xf7, + 0xbf, 0x7b, 0xfd, 0x89, 0x6f, 0x7f, 0xf7, 0xfa, 0x13, 0x5f, 0x3c, 0xbe, 0x6e, 0x7d, 0xf3, 0xf8, + 0xba, 0xf5, 0xfb, 0xc7, 0xd7, 0xad, 0x6f, 0x1f, 0x5f, 0xb7, 0xfe, 0xf3, 0xf1, 0x75, 0xeb, 0x6f, + 0xfe, 0x97, 0xeb, 0x4f, 0xbc, 0x59, 0x90, 0x7d, 0xfb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x87, + 0x93, 0x10, 0x4a, 0xf6, 0xa8, 0x00, 0x00, } func (m *Amount) Marshal() (dAtA []byte, err error) { @@ -9546,34 +9516,6 @@ func (m *TransformationStep) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *UI) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UI) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UI) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - i -= len(m.NavColor) - copy(dAtA[i:], m.NavColor) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.NavColor))) - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - func (m *UserContainer) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -13270,17 +13212,6 @@ func (m *TransformationStep) Size() (n int) { return n } -func (m *UI) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.NavColor) - n += 1 + l + sovGenerated(uint64(l)) - return n -} - func (m *UserContainer) Size() (n int) { if m == nil { return 0 @@ -15279,16 +15210,6 @@ func (this *TransformationStep) String() string { }, "") return s } -func (this *UI) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&UI{`, - `NavColor:` + fmt.Sprintf("%v", this.NavColor) + `,`, - `}`, - }, "") - return s -} func (this *UserContainer) String() string { if this == nil { return "nil" @@ -32265,88 +32186,6 @@ func (m *TransformationStep) Unmarshal(dAtA []byte) error { } return nil } -func (m *UI) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UI: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UI: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NavColor", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenerated - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.NavColor = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *UserContainer) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/pkg/apis/workflow/v1alpha1/generated.proto b/pkg/apis/workflow/v1alpha1/generated.proto index 5acb8a01fd2c..7ebb9db8ef92 100644 --- a/pkg/apis/workflow/v1alpha1/generated.proto +++ b/pkg/apis/workflow/v1alpha1/generated.proto @@ -1429,12 +1429,6 @@ message TransformationStep { optional string expression = 1; } -// UI defines a config for UI -message UI { - // NavColor is an ui navigation bar theme which switch the design - optional string navColor = 1; -} - // UserContainer is a container specified by a user. message UserContainer { optional k8s.io.api.core.v1.Container container = 1; diff --git a/pkg/apis/workflow/v1alpha1/info.go b/pkg/apis/workflow/v1alpha1/info.go index cc505df00866..1a17e5af04ce 100644 --- a/pkg/apis/workflow/v1alpha1/info.go +++ b/pkg/apis/workflow/v1alpha1/info.go @@ -11,9 +11,3 @@ type Link struct { // The URL. Can contain "${metadata.namespace}", "${metadata.name}", "${status.startedAt}", "${status.finishedAt}" or any other element in workflow yaml, e.g. "${workflow.metadata.annotations.userDefinedKey}" URL string `json:"url" protobuf:"bytes,3,opt,name=url"` } - -// UI defines a config for UI -type UI struct { - // NavColor is an ui navigation bar theme which switch the design - NavColor string `json:"navColor,omitempty" protobuf:"bytes,1,opt,name=navColor"` -} diff --git a/pkg/apis/workflow/v1alpha1/openapi_generated.go b/pkg/apis/workflow/v1alpha1/openapi_generated.go index 0c1c8e7f3b86..ae04367b11e9 100644 --- a/pkg/apis/workflow/v1alpha1/openapi_generated.go +++ b/pkg/apis/workflow/v1alpha1/openapi_generated.go @@ -113,7 +113,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1.Template": schema_pkg_apis_workflow_v1alpha1_Template(ref), "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1.TemplateRef": schema_pkg_apis_workflow_v1alpha1_TemplateRef(ref), "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1.TransformationStep": schema_pkg_apis_workflow_v1alpha1_TransformationStep(ref), - "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1.UI": schema_pkg_apis_workflow_v1alpha1_UI(ref), "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1.UserContainer": schema_pkg_apis_workflow_v1alpha1_UserContainer(ref), "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1.ValueFrom": schema_pkg_apis_workflow_v1alpha1_ValueFrom(ref), "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1.Version": schema_pkg_apis_workflow_v1alpha1_Version(ref), @@ -5382,26 +5381,6 @@ func schema_pkg_apis_workflow_v1alpha1_TransformationStep(ref common.ReferenceCa } } -func schema_pkg_apis_workflow_v1alpha1_UI(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "UI defines a config for UI", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "navColor": { - SchemaProps: spec.SchemaProps{ - Description: "NavColor is an ui navigation bar theme which switch the design", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - } -} - func schema_pkg_apis_workflow_v1alpha1_UserContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go index 30c644023546..7b241fdf0a1a 100644 --- a/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go @@ -2713,22 +2713,6 @@ func (in *TransformationStep) DeepCopy() *TransformationStep { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UI) DeepCopyInto(out *UI) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UI. -func (in *UI) DeepCopy() *UI { - if in == nil { - return nil - } - out := new(UI) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *UserContainer) DeepCopyInto(out *UserContainer) { *out = *in diff --git a/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md b/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md index 934dc00dbfdb..aad21185d13b 100644 --- a/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md +++ b/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **links** | [**List<IoArgoprojWorkflowV1alpha1Link>**](IoArgoprojWorkflowV1alpha1Link.md) | | [optional] **managedNamespace** | **String** | | [optional] -**ui** | [**IoArgoprojWorkflowV1alpha1UI**](IoArgoprojWorkflowV1alpha1UI.md) | | [optional] +**navColor** | **String** | | [optional] diff --git a/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1Ui.md b/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1Ui.md deleted file mode 100644 index b78e2df65270..000000000000 --- a/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1Ui.md +++ /dev/null @@ -1,14 +0,0 @@ - - -# IoArgoprojWorkflowV1alpha1UI - -UI defines a config for UI - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**navColor** | **String** | NavColor is an ui navigation bar theme which switch the design | [optional] - - - diff --git a/sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_info_response.py b/sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_info_response.py index d764fa3c3341..f8f73b0dea30 100644 --- a/sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_info_response.py +++ b/sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_info_response.py @@ -31,9 +31,7 @@ def lazy_import(): from argo_workflows.model.io_argoproj_workflow_v1alpha1_link import IoArgoprojWorkflowV1alpha1Link - from argo_workflows.model.io_argoproj_workflow_v1alpha1_ui import IoArgoprojWorkflowV1alpha1UI globals()['IoArgoprojWorkflowV1alpha1Link'] = IoArgoprojWorkflowV1alpha1Link - globals()['IoArgoprojWorkflowV1alpha1UI'] = IoArgoprojWorkflowV1alpha1UI class IoArgoprojWorkflowV1alpha1InfoResponse(ModelNormal): @@ -91,7 +89,7 @@ def openapi_types(): return { 'links': ([IoArgoprojWorkflowV1alpha1Link],), # noqa: E501 'managed_namespace': (str,), # noqa: E501 - 'ui': (IoArgoprojWorkflowV1alpha1UI,), # noqa: E501 + 'nav_color': (str,), # noqa: E501 } @cached_property @@ -102,7 +100,7 @@ def discriminator(): attribute_map = { 'links': 'links', # noqa: E501 'managed_namespace': 'managedNamespace', # noqa: E501 - 'ui': 'ui', # noqa: E501 + 'nav_color': 'navColor', # noqa: E501 } read_only_vars = { @@ -148,7 +146,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 _visited_composed_classes = (Animal,) links ([IoArgoprojWorkflowV1alpha1Link]): [optional] # noqa: E501 managed_namespace (str): [optional] # noqa: E501 - ui (IoArgoprojWorkflowV1alpha1UI): [optional] # noqa: E501 + nav_color (str): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -232,7 +230,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 _visited_composed_classes = (Animal,) links ([IoArgoprojWorkflowV1alpha1Link]): [optional] # noqa: E501 managed_namespace (str): [optional] # noqa: E501 - ui (IoArgoprojWorkflowV1alpha1UI): [optional] # noqa: E501 + nav_color (str): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_ui.py b/sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_ui.py deleted file mode 100644 index 179a450ec4e3..000000000000 --- a/sdks/python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_ui.py +++ /dev/null @@ -1,255 +0,0 @@ -""" - Argo Server API - - You can get examples of requests and responses by using the CLI with `--gloglevel=9`, e.g. `argo list --gloglevel=9` # noqa: E501 - - The version of the OpenAPI document: VERSION - Generated by: https://openapi-generator.tech -""" - - -import re # noqa: F401 -import sys # noqa: F401 - -from argo_workflows.model_utils import ( # noqa: F401 - ApiTypeError, - ModelComposed, - ModelNormal, - ModelSimple, - cached_property, - change_keys_js_to_python, - convert_js_args_to_python_args, - date, - datetime, - file_type, - none_type, - validate_get_composed_info, -) -from ..model_utils import OpenApiModel -from argo_workflows.exceptions import ApiAttributeError - - - -class IoArgoprojWorkflowV1alpha1UI(ModelNormal): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. - - Attributes: - allowed_values (dict): The key is the tuple path to the attribute - and the for var_name this is (var_name,). The value is a dict - with a capitalized key describing the allowed value and an allowed - value. These dicts store the allowed enum values. - attribute_map (dict): The key is attribute name - and the value is json key in definition. - discriminator_value_class_map (dict): A dict to go from the discriminator - variable value to the discriminator class name. - validations (dict): The key is the tuple path to the attribute - and the for var_name this is (var_name,). The value is a dict - that stores validations for max_length, min_length, max_items, - min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum, - inclusive_minimum, and regex. - additional_properties_type (tuple): A tuple of classes accepted - as additional properties values. - """ - - allowed_values = { - } - - validations = { - } - - @cached_property - def additional_properties_type(): - """ - This must be a method because a model may have properties that are - of type self, this must run after the class is loaded - """ - return (bool, date, datetime, dict, float, int, list, str, none_type,) # noqa: E501 - - _nullable = False - - @cached_property - def openapi_types(): - """ - This must be a method because a model may have properties that are - of type self, this must run after the class is loaded - - Returns - openapi_types (dict): The key is attribute name - and the value is attribute type. - """ - return { - 'nav_color': (str,), # noqa: E501 - } - - @cached_property - def discriminator(): - return None - - - attribute_map = { - 'nav_color': 'navColor', # noqa: E501 - } - - read_only_vars = { - } - - _composed_schemas = {} - - @classmethod - @convert_js_args_to_python_args - def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 - """IoArgoprojWorkflowV1alpha1UI - a model defined in OpenAPI - - Keyword Args: - _check_type (bool): if True, values for parameters in openapi_types - will be type checked and a TypeError will be - raised if the wrong type is input. - Defaults to True - _path_to_item (tuple/list): This is a list of keys or values to - drill down to the model in received_data - when deserializing a response - _spec_property_naming (bool): True if the variable names in the input data - are serialized names, as specified in the OpenAPI document. - False if the variable names in the input data - are pythonic names, e.g. snake case (default) - _configuration (Configuration): the instance to use when - deserializing a file_type parameter. - If passed, type conversion is attempted - If omitted no type conversion is done. - _visited_composed_classes (tuple): This stores a tuple of - classes that we have traveled through so that - if we see that class again we will not use its - discriminator again. - When traveling through a discriminator, the - composed schema that is - is traveled through is added to this set. - For example if Animal has a discriminator - petType and we pass in "Dog", and the class Dog - allOf includes Animal, we move through Animal - once using the discriminator, and pick Dog. - Then in Dog, we will make an instance of the - Animal class but this time we won't travel - through its discriminator because we passed in - _visited_composed_classes = (Animal,) - nav_color (str): NavColor is an ui navigation bar theme which switch the design. [optional] # noqa: E501 - """ - - _check_type = kwargs.pop('_check_type', True) - _spec_property_naming = kwargs.pop('_spec_property_naming', False) - _path_to_item = kwargs.pop('_path_to_item', ()) - _configuration = kwargs.pop('_configuration', None) - _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) - - self = super(OpenApiModel, cls).__new__(cls) - - if args: - raise ApiTypeError( - "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( - args, - self.__class__.__name__, - ), - path_to_item=_path_to_item, - valid_classes=(self.__class__,), - ) - - self._data_store = {} - self._check_type = _check_type - self._spec_property_naming = _spec_property_naming - self._path_to_item = _path_to_item - self._configuration = _configuration - self._visited_composed_classes = _visited_composed_classes + (self.__class__,) - - for var_name, var_value in kwargs.items(): - if var_name not in self.attribute_map and \ - self._configuration is not None and \ - self._configuration.discard_unknown_keys and \ - self.additional_properties_type is None: - # discard variable. - continue - setattr(self, var_name, var_value) - return self - - required_properties = set([ - '_data_store', - '_check_type', - '_spec_property_naming', - '_path_to_item', - '_configuration', - '_visited_composed_classes', - ]) - - @convert_js_args_to_python_args - def __init__(self, *args, **kwargs): # noqa: E501 - """IoArgoprojWorkflowV1alpha1UI - a model defined in OpenAPI - - Keyword Args: - _check_type (bool): if True, values for parameters in openapi_types - will be type checked and a TypeError will be - raised if the wrong type is input. - Defaults to True - _path_to_item (tuple/list): This is a list of keys or values to - drill down to the model in received_data - when deserializing a response - _spec_property_naming (bool): True if the variable names in the input data - are serialized names, as specified in the OpenAPI document. - False if the variable names in the input data - are pythonic names, e.g. snake case (default) - _configuration (Configuration): the instance to use when - deserializing a file_type parameter. - If passed, type conversion is attempted - If omitted no type conversion is done. - _visited_composed_classes (tuple): This stores a tuple of - classes that we have traveled through so that - if we see that class again we will not use its - discriminator again. - When traveling through a discriminator, the - composed schema that is - is traveled through is added to this set. - For example if Animal has a discriminator - petType and we pass in "Dog", and the class Dog - allOf includes Animal, we move through Animal - once using the discriminator, and pick Dog. - Then in Dog, we will make an instance of the - Animal class but this time we won't travel - through its discriminator because we passed in - _visited_composed_classes = (Animal,) - nav_color (str): NavColor is an ui navigation bar theme which switch the design. [optional] # noqa: E501 - """ - - _check_type = kwargs.pop('_check_type', True) - _spec_property_naming = kwargs.pop('_spec_property_naming', False) - _path_to_item = kwargs.pop('_path_to_item', ()) - _configuration = kwargs.pop('_configuration', None) - _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) - - if args: - raise ApiTypeError( - "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( - args, - self.__class__.__name__, - ), - path_to_item=_path_to_item, - valid_classes=(self.__class__,), - ) - - self._data_store = {} - self._check_type = _check_type - self._spec_property_naming = _spec_property_naming - self._path_to_item = _path_to_item - self._configuration = _configuration - self._visited_composed_classes = _visited_composed_classes + (self.__class__,) - - for var_name, var_value in kwargs.items(): - if var_name not in self.attribute_map and \ - self._configuration is not None and \ - self._configuration.discard_unknown_keys and \ - self.additional_properties_type is None: - # discard variable. - continue - setattr(self, var_name, var_value) - if var_name in self.read_only_vars: - raise ApiAttributeError(f"`{var_name}` is a read-only attribute. Use `from_openapi_data` to instantiate " - f"class with read only attributes.") diff --git a/sdks/python/client/argo_workflows/models/__init__.py b/sdks/python/client/argo_workflows/models/__init__.py index ef88ef63865a..e12b0a511ec0 100644 --- a/sdks/python/client/argo_workflows/models/__init__.py +++ b/sdks/python/client/argo_workflows/models/__init__.py @@ -308,7 +308,6 @@ from argo_workflows.model.io_argoproj_workflow_v1alpha1_template import IoArgoprojWorkflowV1alpha1Template from argo_workflows.model.io_argoproj_workflow_v1alpha1_template_ref import IoArgoprojWorkflowV1alpha1TemplateRef from argo_workflows.model.io_argoproj_workflow_v1alpha1_transformation_step import IoArgoprojWorkflowV1alpha1TransformationStep -from argo_workflows.model.io_argoproj_workflow_v1alpha1_ui import IoArgoprojWorkflowV1alpha1UI from argo_workflows.model.io_argoproj_workflow_v1alpha1_update_cron_workflow_request import IoArgoprojWorkflowV1alpha1UpdateCronWorkflowRequest from argo_workflows.model.io_argoproj_workflow_v1alpha1_user_container import IoArgoprojWorkflowV1alpha1UserContainer from argo_workflows.model.io_argoproj_workflow_v1alpha1_value_from import IoArgoprojWorkflowV1alpha1ValueFrom diff --git a/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md b/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md index 883e8f4a14ff..579962ddd6c7 100644 --- a/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md +++ b/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1InfoResponse.md @@ -6,7 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **links** | [**[IoArgoprojWorkflowV1alpha1Link]**](IoArgoprojWorkflowV1alpha1Link.md) | | [optional] **managed_namespace** | **str** | | [optional] -**ui** | [**IoArgoprojWorkflowV1alpha1UI**](IoArgoprojWorkflowV1alpha1UI.md) | | [optional] +**nav_color** | **str** | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1Ui.md b/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1Ui.md deleted file mode 100644 index 70ae00a97c55..000000000000 --- a/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1Ui.md +++ /dev/null @@ -1,13 +0,0 @@ -# IoArgoprojWorkflowV1alpha1UI - -UI defines a config for UI - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**nav_color** | **str** | NavColor is an ui navigation bar theme which switch the design | [optional] -**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/server/apiserver/argoserver.go b/server/apiserver/argoserver.go index 6394a6b57596..ac40768f28fb 100644 --- a/server/apiserver/argoserver.go +++ b/server/apiserver/argoserver.go @@ -200,7 +200,7 @@ func (as *argoServer) Run(ctx context.Context, port int, browserOpenFunc func(st artifactRepositories := artifactrepositories.New(as.clients.Kubernetes, as.managedNamespace, &config.ArtifactRepository) artifactServer := artifacts.NewArtifactServer(as.gatekeeper, hydrator.New(offloadRepo), wfArchive, instanceIDService, artifactRepositories) eventServer := event.NewController(instanceIDService, eventRecorderManager, as.eventQueueSize, as.eventWorkerCount, as.eventAsyncDispatch) - grpcServer := as.newGRPCServer(instanceIDService, offloadRepo, wfArchive, eventServer, config.Links, config.UI) + grpcServer := as.newGRPCServer(instanceIDService, offloadRepo, wfArchive, eventServer, config.Links, config.NavColor) httpServer := as.newHTTPServer(ctx, port, artifactServer) // Start listener @@ -247,7 +247,7 @@ func (as *argoServer) Run(ctx context.Context, port int, browserOpenFunc func(st <-as.stopCh } -func (as *argoServer) newGRPCServer(instanceIDService instanceid.Service, offloadNodeStatusRepo sqldb.OffloadNodeStatusRepo, wfArchive sqldb.WorkflowArchive, eventServer *event.Controller, links []*v1alpha1.Link, ui *v1alpha1.UI) *grpc.Server { +func (as *argoServer) newGRPCServer(instanceIDService instanceid.Service, offloadNodeStatusRepo sqldb.OffloadNodeStatusRepo, wfArchive sqldb.WorkflowArchive, eventServer *event.Controller, links []*v1alpha1.Link, navColor string) *grpc.Server { serverLog := log.NewEntry(log.StandardLogger()) // "Prometheus histograms are a great way to measure latency distributions of your RPCs. However, since it is bad practice to have metrics of high cardinality the latency monitoring metrics are disabled by default. To enable them please call the following in your server initialization code:" @@ -278,7 +278,7 @@ func (as *argoServer) newGRPCServer(instanceIDService instanceid.Service, offloa grpcServer := grpc.NewServer(sOpts...) - infopkg.RegisterInfoServiceServer(grpcServer, info.NewInfoServer(as.managedNamespace, links, ui)) + infopkg.RegisterInfoServiceServer(grpcServer, info.NewInfoServer(as.managedNamespace, links, navColor)) eventpkg.RegisterEventServiceServer(grpcServer, eventServer) eventsourcepkg.RegisterEventSourceServiceServer(grpcServer, eventsource.NewEventSourceServer()) pipelinepkg.RegisterPipelineServiceServer(grpcServer, pipeline.NewPipelineServer()) diff --git a/server/info/info_server.go b/server/info/info_server.go index a5056ec60651..5c3d52c4c675 100644 --- a/server/info/info_server.go +++ b/server/info/info_server.go @@ -12,7 +12,7 @@ import ( type infoServer struct { managedNamespace string links []*wfv1.Link - ui *wfv1.UI + navColor string } func (i *infoServer) GetUserInfo(ctx context.Context, _ *infopkg.GetUserInfoRequest) (*infopkg.GetUserInfoResponse, error) { @@ -31,7 +31,7 @@ func (i *infoServer) GetUserInfo(ctx context.Context, _ *infopkg.GetUserInfoRequ } func (i *infoServer) GetInfo(context.Context, *infopkg.GetInfoRequest) (*infopkg.InfoResponse, error) { - return &infopkg.InfoResponse{ManagedNamespace: i.managedNamespace, Links: i.links, Ui: i.ui}, nil + return &infopkg.InfoResponse{ManagedNamespace: i.managedNamespace, Links: i.links, NavColor: i.navColor}, nil } func (i *infoServer) GetVersion(context.Context, *infopkg.GetVersionRequest) (*wfv1.Version, error) { @@ -39,6 +39,6 @@ func (i *infoServer) GetVersion(context.Context, *infopkg.GetVersionRequest) (*w return &version, nil } -func NewInfoServer(managedNamespace string, links []*wfv1.Link, ui *wfv1.UI) infopkg.InfoServiceServer { - return &infoServer{managedNamespace, links, ui} +func NewInfoServer(managedNamespace string, links []*wfv1.Link, navColor string) infopkg.InfoServiceServer { + return &infoServer{managedNamespace, links, navColor} } diff --git a/server/info/info_server_test.go b/server/info/info_server_test.go index eaa952c712df..b78b445f7126 100644 --- a/server/info/info_server_test.go +++ b/server/info/info_server_test.go @@ -7,6 +7,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/square/go-jose.v2/jwt" + wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1" "github.com/argoproj/argo-workflows/v3/server/auth" "github.com/argoproj/argo-workflows/v3/server/auth/types" ) @@ -24,3 +25,31 @@ func Test_infoServer_GetUserInfo(t *testing.T) { assert.Equal(t, "my-sa", info.ServiceAccountName) } } + +func Test_infoServer_GetInfo(t *testing.T) { + t.Run("Ful Fields", func(t *testing.T) { + i := &infoServer{ + managedNamespace: "argo", + links: []*wfv1.Link{ + {Name: "link-name", Scope: "scope", URL: "https://example.com"}, + }, + navColor: "red", + } + info, err := i.GetInfo(context.TODO(), nil) + if assert.NoError(t, err) { + assert.Equal(t, "argo", info.ManagedNamespace) + assert.Equal(t, "link-name", info.Links[0].Name) + assert.Equal(t, "red", info.NavColor) + } + }) + + t.Run("Min Fields", func(t *testing.T) { + i := &infoServer{} + info, err := i.GetInfo(context.TODO(), nil) + if assert.NoError(t, err) { + assert.Equal(t, "", info.ManagedNamespace) + assert.Equal(t, 0, len(info.Links)) + assert.Equal(t, "", info.NavColor) + } + }) +} diff --git a/ui/package.json b/ui/package.json index 36138ddd837e..892de5c1a435 100644 --- a/ui/package.json +++ b/ui/package.json @@ -12,7 +12,7 @@ "test": "jest" }, "dependencies": { - "argo-ui": "https://github.com/argoproj/argo-ui.git", + "argo-ui": "file:.yalc/argo-ui", "chart.js": "^2.9.4", "chartjs-plugin-annotation": "^0.5.7", "classnames": "^2.2.5", diff --git a/ui/src/app/app-router.tsx b/ui/src/app/app-router.tsx index e91ca5bc5d2f..0f51cbde1cf0 100644 --- a/ui/src/app/app-router.tsx +++ b/ui/src/app/app-router.tsx @@ -66,7 +66,7 @@ export const AppRouter = ({popupManager, history, notificationsManager}: {popupM .then(info => { Utils.managedNamespace = info.managedNamespace; setNamespace(Utils.currentNamespace); - setNavBarBackgroundColor(info.ui.navColor); + setNavBarBackgroundColor(info.navColor); }) .then(() => services.info.getVersion()) .then(setVersion) diff --git a/ui/src/models/info.ts b/ui/src/models/info.ts index e8ba589cc259..ce59f7662bd3 100644 --- a/ui/src/models/info.ts +++ b/ui/src/models/info.ts @@ -4,14 +4,10 @@ export interface Link { url: string; } -export interface UI { - navColor?: string; -} - export interface Info { managedNamespace?: string; links?: Link[]; - ui?: UI; + navColor?: string; } export interface Version {