diff --git a/VERSION b/VERSION index 7374400a0fa54..885a00155ded6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.4-cap-CR-13459-change-haproxy-to-quay +2.3.4-cap-CR-13082-improve-validation diff --git a/assets/swagger.json b/assets/swagger.json index 5897a16adb6c5..f0d983349fb77 100644 --- a/assets/swagger.json +++ b/assets/swagger.json @@ -239,7 +239,7 @@ "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/applicationApplicationResponse" + "$ref": "#/definitions/applicationApplicationValidateResponse" } }, "default": { @@ -3591,6 +3591,17 @@ } } }, + "applicationApplicationValidateResponse": { + "type": "object", + "properties": { + "entity": { + "type": "string" + }, + "error": { + "type": "string" + } + } + }, "applicationLogEntry": { "type": "object", "properties": { diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go index 9b86fc722c5f1..5af64b01d636e 100644 --- a/pkg/apiclient/application/application.pb.go +++ b/pkg/apiclient/application/application.pb.go @@ -364,6 +364,61 @@ func (m *ApplicationManifestQuery) GetRevision() string { return "" } +type ApplicationValidateResponse struct { + Error *string `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` + Entity *string `protobuf:"bytes,2,opt,name=entity" json:"entity,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ApplicationValidateResponse) Reset() { *m = ApplicationValidateResponse{} } +func (m *ApplicationValidateResponse) String() string { return proto.CompactTextString(m) } +func (*ApplicationValidateResponse) ProtoMessage() {} +func (*ApplicationValidateResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_df6e82b174b5eaec, []int{5} +} +func (m *ApplicationValidateResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ApplicationValidateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ApplicationValidateResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ApplicationValidateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ApplicationValidateResponse.Merge(m, src) +} +func (m *ApplicationValidateResponse) XXX_Size() int { + return m.Size() +} +func (m *ApplicationValidateResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ApplicationValidateResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ApplicationValidateResponse proto.InternalMessageInfo + +func (m *ApplicationValidateResponse) GetError() string { + if m != nil && m.Error != nil { + return *m.Error + } + return "" +} + +func (m *ApplicationValidateResponse) GetEntity() string { + if m != nil && m.Entity != nil { + return *m.Entity + } + return "" +} + type ApplicationResponse struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -374,7 +429,7 @@ func (m *ApplicationResponse) Reset() { *m = ApplicationResponse{} } func (m *ApplicationResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationResponse) ProtoMessage() {} func (*ApplicationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{5} + return fileDescriptor_df6e82b174b5eaec, []int{6} } func (m *ApplicationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -416,7 +471,7 @@ func (m *ApplicationCreateRequest) Reset() { *m = ApplicationCreateReque func (m *ApplicationCreateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationCreateRequest) ProtoMessage() {} func (*ApplicationCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{6} + return fileDescriptor_df6e82b174b5eaec, []int{7} } func (m *ApplicationCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -478,7 +533,7 @@ func (m *ApplicationUpdateRequest) Reset() { *m = ApplicationUpdateReque func (m *ApplicationUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateRequest) ProtoMessage() {} func (*ApplicationUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{7} + return fileDescriptor_df6e82b174b5eaec, []int{8} } func (m *ApplicationUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -534,7 +589,7 @@ func (m *ApplicationDeleteRequest) Reset() { *m = ApplicationDeleteReque func (m *ApplicationDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationDeleteRequest) ProtoMessage() {} func (*ApplicationDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{8} + return fileDescriptor_df6e82b174b5eaec, []int{9} } func (m *ApplicationDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -595,7 +650,7 @@ func (m *SyncOptions) Reset() { *m = SyncOptions{} } func (m *SyncOptions) String() string { return proto.CompactTextString(m) } func (*SyncOptions) ProtoMessage() {} func (*SyncOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{9} + return fileDescriptor_df6e82b174b5eaec, []int{10} } func (m *SyncOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -652,7 +707,7 @@ func (m *ApplicationSyncRequest) Reset() { *m = ApplicationSyncRequest{} func (m *ApplicationSyncRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationSyncRequest) ProtoMessage() {} func (*ApplicationSyncRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{10} + return fileDescriptor_df6e82b174b5eaec, []int{11} } func (m *ApplicationSyncRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -762,7 +817,7 @@ func (m *ApplicationValidationRequest) Reset() { *m = ApplicationValidat func (m *ApplicationValidationRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationValidationRequest) ProtoMessage() {} func (*ApplicationValidationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{11} + return fileDescriptor_df6e82b174b5eaec, []int{12} } func (m *ApplicationValidationRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -812,7 +867,7 @@ func (m *ApplicationUpdateSpecRequest) Reset() { *m = ApplicationUpdateS func (m *ApplicationUpdateSpecRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateSpecRequest) ProtoMessage() {} func (*ApplicationUpdateSpecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{12} + return fileDescriptor_df6e82b174b5eaec, []int{13} } func (m *ApplicationUpdateSpecRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -876,7 +931,7 @@ func (m *ApplicationPatchRequest) Reset() { *m = ApplicationPatchRequest func (m *ApplicationPatchRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationPatchRequest) ProtoMessage() {} func (*ApplicationPatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{13} + return fileDescriptor_df6e82b174b5eaec, []int{14} } func (m *ApplicationPatchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -940,7 +995,7 @@ func (m *ApplicationRollbackRequest) Reset() { *m = ApplicationRollbackR func (m *ApplicationRollbackRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationRollbackRequest) ProtoMessage() {} func (*ApplicationRollbackRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{14} + return fileDescriptor_df6e82b174b5eaec, []int{15} } func (m *ApplicationRollbackRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1013,7 +1068,7 @@ func (m *ApplicationResourceRequest) Reset() { *m = ApplicationResourceR func (m *ApplicationResourceRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceRequest) ProtoMessage() {} func (*ApplicationResourceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{15} + return fileDescriptor_df6e82b174b5eaec, []int{16} } func (m *ApplicationResourceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1102,7 +1157,7 @@ func (m *ApplicationResourcePatchRequest) Reset() { *m = ApplicationReso func (m *ApplicationResourcePatchRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourcePatchRequest) ProtoMessage() {} func (*ApplicationResourcePatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{16} + return fileDescriptor_df6e82b174b5eaec, []int{17} } func (m *ApplicationResourcePatchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1205,7 +1260,7 @@ func (m *ApplicationResourceDeleteRequest) Reset() { *m = ApplicationRes func (m *ApplicationResourceDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceDeleteRequest) ProtoMessage() {} func (*ApplicationResourceDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{17} + return fileDescriptor_df6e82b174b5eaec, []int{18} } func (m *ApplicationResourceDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1307,7 +1362,7 @@ func (m *ResourceActionRunRequest) Reset() { *m = ResourceActionRunReque func (m *ResourceActionRunRequest) String() string { return proto.CompactTextString(m) } func (*ResourceActionRunRequest) ProtoMessage() {} func (*ResourceActionRunRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{18} + return fileDescriptor_df6e82b174b5eaec, []int{19} } func (m *ResourceActionRunRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1396,7 +1451,7 @@ func (m *ResourceActionsListResponse) Reset() { *m = ResourceActionsList func (m *ResourceActionsListResponse) String() string { return proto.CompactTextString(m) } func (*ResourceActionsListResponse) ProtoMessage() {} func (*ResourceActionsListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{19} + return fileDescriptor_df6e82b174b5eaec, []int{20} } func (m *ResourceActionsListResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1443,7 +1498,7 @@ func (m *ApplicationResourceResponse) Reset() { *m = ApplicationResource func (m *ApplicationResourceResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceResponse) ProtoMessage() {} func (*ApplicationResourceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{20} + return fileDescriptor_df6e82b174b5eaec, []int{21} } func (m *ApplicationResourceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1503,7 +1558,7 @@ func (m *ApplicationPodLogsQuery) Reset() { *m = ApplicationPodLogsQuery func (m *ApplicationPodLogsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationPodLogsQuery) ProtoMessage() {} func (*ApplicationPodLogsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{21} + return fileDescriptor_df6e82b174b5eaec, []int{22} } func (m *ApplicationPodLogsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1646,7 +1701,7 @@ func (m *LogEntry) Reset() { *m = LogEntry{} } func (m *LogEntry) String() string { return proto.CompactTextString(m) } func (*LogEntry) ProtoMessage() {} func (*LogEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{22} + return fileDescriptor_df6e82b174b5eaec, []int{23} } func (m *LogEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1722,7 +1777,7 @@ func (m *OperationTerminateRequest) Reset() { *m = OperationTerminateReq func (m *OperationTerminateRequest) String() string { return proto.CompactTextString(m) } func (*OperationTerminateRequest) ProtoMessage() {} func (*OperationTerminateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{23} + return fileDescriptor_df6e82b174b5eaec, []int{24} } func (m *OperationTerminateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1769,7 +1824,7 @@ func (m *ApplicationSyncWindowsQuery) Reset() { *m = ApplicationSyncWind func (m *ApplicationSyncWindowsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationSyncWindowsQuery) ProtoMessage() {} func (*ApplicationSyncWindowsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{24} + return fileDescriptor_df6e82b174b5eaec, []int{25} } func (m *ApplicationSyncWindowsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1818,7 +1873,7 @@ func (m *ApplicationSyncWindowsResponse) Reset() { *m = ApplicationSyncW func (m *ApplicationSyncWindowsResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationSyncWindowsResponse) ProtoMessage() {} func (*ApplicationSyncWindowsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{25} + return fileDescriptor_df6e82b174b5eaec, []int{26} } func (m *ApplicationSyncWindowsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1882,7 +1937,7 @@ func (m *ApplicationSyncWindow) Reset() { *m = ApplicationSyncWindow{} } func (m *ApplicationSyncWindow) String() string { return proto.CompactTextString(m) } func (*ApplicationSyncWindow) ProtoMessage() {} func (*ApplicationSyncWindow) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{26} + return fileDescriptor_df6e82b174b5eaec, []int{27} } func (m *ApplicationSyncWindow) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1949,7 +2004,7 @@ func (m *OperationTerminateResponse) Reset() { *m = OperationTerminateRe func (m *OperationTerminateResponse) String() string { return proto.CompactTextString(m) } func (*OperationTerminateResponse) ProtoMessage() {} func (*OperationTerminateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{27} + return fileDescriptor_df6e82b174b5eaec, []int{28} } func (m *OperationTerminateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1994,7 +2049,7 @@ func (m *ResourcesQuery) Reset() { *m = ResourcesQuery{} } func (m *ResourcesQuery) String() string { return proto.CompactTextString(m) } func (*ResourcesQuery) ProtoMessage() {} func (*ResourcesQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{28} + return fileDescriptor_df6e82b174b5eaec, []int{29} } func (m *ResourcesQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2076,7 +2131,7 @@ func (m *ManagedResourcesResponse) Reset() { *m = ManagedResourcesRespon func (m *ManagedResourcesResponse) String() string { return proto.CompactTextString(m) } func (*ManagedResourcesResponse) ProtoMessage() {} func (*ManagedResourcesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_df6e82b174b5eaec, []int{29} + return fileDescriptor_df6e82b174b5eaec, []int{30} } func (m *ManagedResourcesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2118,6 +2173,7 @@ func init() { proto.RegisterType((*RevisionMetadataQuery)(nil), "application.RevisionMetadataQuery") proto.RegisterType((*ApplicationResourceEventsQuery)(nil), "application.ApplicationResourceEventsQuery") proto.RegisterType((*ApplicationManifestQuery)(nil), "application.ApplicationManifestQuery") + proto.RegisterType((*ApplicationValidateResponse)(nil), "application.ApplicationValidateResponse") proto.RegisterType((*ApplicationResponse)(nil), "application.ApplicationResponse") proto.RegisterType((*ApplicationCreateRequest)(nil), "application.ApplicationCreateRequest") proto.RegisterType((*ApplicationUpdateRequest)(nil), "application.ApplicationUpdateRequest") @@ -2150,157 +2206,159 @@ func init() { } var fileDescriptor_df6e82b174b5eaec = []byte{ - // 2396 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x8c, 0x1c, 0x47, - 0x15, 0xa6, 0x66, 0xff, 0x66, 0xde, 0xd8, 0x49, 0x5c, 0xb1, 0x4d, 0x67, 0xbc, 0xde, 0x1d, 0x95, - 0xff, 0xd6, 0x6b, 0x6f, 0x8f, 0x77, 0xb0, 0x90, 0xd9, 0x80, 0x82, 0x37, 0x36, 0x8e, 0x61, 0xed, - 0x2c, 0xbd, 0x76, 0x8c, 0xc2, 0x01, 0x3a, 0xdd, 0xb5, 0xb3, 0xcd, 0xce, 0x74, 0xb7, 0xbb, 0x7b, - 0xc6, 0x1a, 0x19, 0x5f, 0x82, 0xc4, 0x05, 0x04, 0x88, 0xf8, 0x00, 0x08, 0x21, 0x44, 0x94, 0x33, - 0x37, 0x40, 0xdc, 0x72, 0x41, 0xe1, 0x86, 0x20, 0x67, 0x2b, 0xb2, 0xb8, 0x71, 0xe1, 0xc6, 0x15, - 0x55, 0x75, 0x55, 0x77, 0xd5, 0xec, 0x4c, 0xcf, 0x38, 0xbb, 0x01, 0xf9, 0xd6, 0xfd, 0xaa, 0xfa, - 0xbd, 0xef, 0xfd, 0x57, 0xbd, 0x19, 0x38, 0x1d, 0xd3, 0xa8, 0x47, 0xa3, 0x86, 0x1d, 0x86, 0x6d, - 0xcf, 0xb1, 0x13, 0x2f, 0xf0, 0xd5, 0x67, 0x33, 0x8c, 0x82, 0x24, 0xc0, 0x55, 0x85, 0x54, 0x3b, - 0xda, 0x0a, 0x5a, 0x01, 0xa7, 0x37, 0xd8, 0x53, 0xba, 0xa5, 0x36, 0xdf, 0x0a, 0x82, 0x56, 0x9b, - 0x36, 0xec, 0xd0, 0x6b, 0xd8, 0xbe, 0x1f, 0x24, 0x7c, 0x73, 0x2c, 0x56, 0xc9, 0xee, 0x95, 0xd8, - 0xf4, 0x02, 0xbe, 0xea, 0x04, 0x11, 0x6d, 0xf4, 0x56, 0x1b, 0x2d, 0xea, 0xd3, 0xc8, 0x4e, 0xa8, - 0x2b, 0xf6, 0x5c, 0xce, 0xf7, 0x74, 0x6c, 0x67, 0xc7, 0xf3, 0x69, 0xd4, 0x6f, 0x84, 0xbb, 0x2d, - 0x46, 0x88, 0x1b, 0x1d, 0x9a, 0xd8, 0xc3, 0xbe, 0xda, 0x68, 0x79, 0xc9, 0x4e, 0xf7, 0x1d, 0xd3, - 0x09, 0x3a, 0x0d, 0x3b, 0xe2, 0xc0, 0xbe, 0xc7, 0x1f, 0x56, 0x1c, 0xb7, 0xd1, 0x6b, 0xe6, 0x0c, - 0x54, 0x0d, 0x7b, 0xab, 0x76, 0x3b, 0xdc, 0xb1, 0xf7, 0x72, 0xbb, 0x3e, 0x86, 0x5b, 0x44, 0xc3, - 0x40, 0x58, 0x8c, 0x3f, 0x7a, 0x49, 0x10, 0xf5, 0x95, 0xc7, 0x94, 0x0d, 0xf9, 0x18, 0xc1, 0x4b, - 0x57, 0x73, 0x79, 0xdf, 0xec, 0xd2, 0xa8, 0x8f, 0x31, 0x4c, 0xfb, 0x76, 0x87, 0x1a, 0xa8, 0x8e, - 0x96, 0x2a, 0x16, 0x7f, 0xc6, 0x06, 0xcc, 0x45, 0x74, 0x3b, 0xa2, 0xf1, 0x8e, 0x51, 0xe2, 0x64, - 0xf9, 0x8a, 0xcf, 0xc2, 0x1c, 0x13, 0x4e, 0x9d, 0xc4, 0x98, 0xaa, 0x4f, 0x2d, 0x55, 0xd6, 0x0f, - 0x3d, 0x7d, 0xb2, 0x58, 0xde, 0x4c, 0x49, 0xb1, 0x25, 0x17, 0xb1, 0x09, 0x2f, 0x46, 0x34, 0x0e, - 0xba, 0x91, 0x43, 0xdf, 0xa2, 0x51, 0xec, 0x05, 0xbe, 0x31, 0xcd, 0x38, 0xad, 0x4f, 0x7f, 0xf4, - 0x64, 0xf1, 0x73, 0xd6, 0xe0, 0x22, 0xae, 0x43, 0x39, 0xa6, 0x6d, 0xea, 0x24, 0x41, 0x64, 0xcc, - 0x28, 0x1b, 0x33, 0x2a, 0x36, 0x60, 0x9a, 0x29, 0x64, 0xcc, 0x2a, 0xab, 0x9c, 0x42, 0x16, 0xa1, - 0x72, 0x3b, 0x70, 0xe9, 0x48, 0x75, 0xc8, 0x0d, 0x38, 0x66, 0xd1, 0x9e, 0xc7, 0x04, 0xdd, 0xa2, - 0x89, 0xed, 0xda, 0x89, 0x3d, 0xb8, 0xb9, 0x94, 0xe9, 0x5e, 0x83, 0x72, 0x24, 0x36, 0x1b, 0x25, - 0x4e, 0xcf, 0xde, 0xc9, 0x9f, 0x11, 0x2c, 0x28, 0x06, 0xb4, 0x84, 0x12, 0xd7, 0x7b, 0xd4, 0x4f, - 0xe2, 0xd1, 0x2c, 0x9b, 0x70, 0x44, 0xea, 0x7b, 0xdb, 0xee, 0xd0, 0x38, 0xb4, 0x1d, 0x9a, 0xf2, - 0x16, 0x7a, 0xec, 0x5d, 0xc6, 0x4b, 0x70, 0x48, 0x25, 0x1a, 0x53, 0xca, 0x76, 0x6d, 0x05, 0x9f, - 0x85, 0xaa, 0x7c, 0xbf, 0x7b, 0xf3, 0x9a, 0x31, 0xad, 0x6c, 0x54, 0x17, 0xc8, 0x26, 0x18, 0x0a, - 0xf6, 0x5b, 0xb6, 0xef, 0x6d, 0xd3, 0x38, 0x19, 0x8d, 0xba, 0xae, 0x19, 0x42, 0x71, 0x49, 0x66, - 0x8e, 0x63, 0xf0, 0xb2, 0x6e, 0x8d, 0x30, 0xf0, 0x63, 0x4a, 0x3e, 0x44, 0x9a, 0xa4, 0xd7, 0x23, - 0x6a, 0x27, 0xd4, 0xa2, 0xf7, 0xbb, 0x34, 0x4e, 0xf0, 0x7d, 0x50, 0xb3, 0x96, 0x0b, 0xac, 0x36, - 0x6f, 0x9a, 0x79, 0x80, 0x9b, 0x32, 0xc0, 0xf9, 0xc3, 0x77, 0x1c, 0xd7, 0xec, 0x35, 0xcd, 0x70, - 0xb7, 0x65, 0xb2, 0x74, 0x31, 0xd5, 0x22, 0x20, 0xd3, 0xc5, 0x54, 0x84, 0x49, 0xc5, 0x95, 0x7d, - 0xf8, 0x38, 0xcc, 0x76, 0xc3, 0x98, 0x46, 0x09, 0x57, 0xa3, 0x6c, 0x89, 0x37, 0xe6, 0xe9, 0x9e, - 0xdd, 0xf6, 0x5c, 0x3b, 0x61, 0xe6, 0x65, 0x2b, 0xd9, 0x3b, 0x79, 0x5f, 0xd7, 0xe1, 0x6e, 0xe8, - 0x2a, 0x3a, 0xec, 0x7e, 0xb6, 0x3a, 0xe8, 0xe8, 0x55, 0x94, 0xa5, 0x01, 0x94, 0x3d, 0x0d, 0xe4, - 0x35, 0xda, 0xa6, 0x39, 0xc8, 0x61, 0x2e, 0x35, 0x60, 0xce, 0xb1, 0x63, 0xc7, 0x76, 0x25, 0x2b, - 0xf9, 0x8a, 0x2f, 0xc2, 0x91, 0x30, 0x0a, 0x42, 0xbb, 0xc5, 0x39, 0x6d, 0x06, 0x6d, 0xcf, 0xe9, - 0x73, 0xa3, 0x54, 0xac, 0xbd, 0x0b, 0xe4, 0x14, 0x54, 0xb7, 0xfa, 0xbe, 0xf3, 0x66, 0xc8, 0x8b, - 0x29, 0x3e, 0x0a, 0x33, 0x5e, 0x42, 0x3b, 0xb1, 0x81, 0x58, 0x49, 0xb0, 0xd2, 0x17, 0xf2, 0xb3, - 0x19, 0x38, 0xae, 0xa0, 0x63, 0x1f, 0x14, 0x61, 0x1b, 0x1b, 0x6e, 0x78, 0x1e, 0x66, 0xdd, 0xa8, - 0x6f, 0x75, 0xfd, 0xd4, 0x5b, 0x62, 0x5d, 0xd0, 0x70, 0x0d, 0x66, 0xc2, 0xa8, 0xeb, 0x53, 0x5e, - 0x67, 0xe4, 0x62, 0x4a, 0xc2, 0xdb, 0x50, 0x8e, 0x13, 0x56, 0x50, 0x5b, 0x7d, 0x5e, 0x5d, 0xaa, - 0xcd, 0xaf, 0xef, 0xcf, 0x5b, 0x4c, 0x99, 0x2d, 0xc1, 0xd1, 0xca, 0x78, 0xe3, 0x07, 0x50, 0x91, - 0x19, 0x17, 0x1b, 0x73, 0xf5, 0xa9, 0xa5, 0x6a, 0x73, 0x6b, 0xff, 0x82, 0xde, 0x0c, 0x59, 0x33, - 0x50, 0xea, 0x8d, 0x50, 0x2e, 0x97, 0x85, 0xe7, 0xa1, 0xd2, 0x11, 0x09, 0x1d, 0x1b, 0x65, 0xee, - 0x85, 0x9c, 0x80, 0xbf, 0x05, 0x33, 0x9e, 0xbf, 0x1d, 0xc4, 0x46, 0x85, 0x43, 0x5a, 0xdf, 0x1f, - 0xa4, 0x9b, 0xfe, 0x76, 0x60, 0xa5, 0x0c, 0xf1, 0x7d, 0x38, 0x1c, 0xd1, 0x24, 0xea, 0x4b, 0x5b, - 0x18, 0xc0, 0xad, 0xfb, 0x8d, 0xfd, 0x49, 0xb0, 0x54, 0x96, 0x96, 0x2e, 0x01, 0xaf, 0x41, 0x35, - 0xce, 0x63, 0xcf, 0xa8, 0x72, 0x81, 0x86, 0xc6, 0x48, 0x89, 0x4d, 0x4b, 0xdd, 0x4c, 0x7e, 0x84, - 0x60, 0x5e, 0x09, 0xc9, 0xb7, 0xd2, 0x3c, 0xe2, 0x96, 0xfd, 0xdf, 0x67, 0x36, 0xf9, 0xa3, 0x8e, - 0x26, 0xad, 0x31, 0x5b, 0x21, 0x2d, 0x4c, 0x93, 0x16, 0x4c, 0xc7, 0x21, 0x75, 0x78, 0xfb, 0xa8, - 0x36, 0x6f, 0x1d, 0x18, 0x34, 0x26, 0x57, 0x76, 0x55, 0x26, 0xa0, 0xb0, 0x3a, 0x76, 0xe0, 0xf3, - 0xca, 0xa7, 0x9b, 0x76, 0xe2, 0xec, 0x14, 0x61, 0x66, 0xa9, 0xc9, 0xf6, 0x68, 0x3d, 0x2f, 0x25, - 0x61, 0x02, 0x15, 0xfe, 0x70, 0xa7, 0x1f, 0xea, 0x4d, 0x2e, 0x27, 0x93, 0x1f, 0x22, 0xa8, 0xa9, - 0x56, 0x0c, 0xda, 0xed, 0x77, 0x6c, 0x67, 0xb7, 0x58, 0x64, 0xc9, 0x73, 0xb9, 0xbc, 0xa9, 0x75, - 0x60, 0xfc, 0x9e, 0x3e, 0x59, 0x2c, 0xdd, 0xbc, 0x66, 0x95, 0x3c, 0xf7, 0xd3, 0xd7, 0x11, 0x76, - 0x80, 0xaa, 0x0d, 0xe9, 0xff, 0x45, 0x40, 0x08, 0x54, 0xfc, 0xa1, 0x3d, 0x3f, 0x27, 0x3f, 0x43, - 0xaf, 0x5f, 0x80, 0xb9, 0x5e, 0x76, 0x9c, 0xca, 0x37, 0x49, 0x22, 0x03, 0xdf, 0x8a, 0x82, 0x6e, - 0x68, 0xcc, 0xa8, 0x96, 0xe6, 0x24, 0x76, 0x80, 0xda, 0xf5, 0x7c, 0xd7, 0x98, 0x55, 0x96, 0x38, - 0x85, 0xfc, 0xb2, 0x04, 0x8b, 0x43, 0xd4, 0x1a, 0xeb, 0xd7, 0xe7, 0x40, 0xb7, 0x3c, 0xf6, 0xe6, - 0xc6, 0xc4, 0x5e, 0x79, 0x78, 0xec, 0x3d, 0x2e, 0x41, 0x7d, 0x88, 0x6d, 0xc6, 0xf7, 0xda, 0xe7, - 0xc4, 0x38, 0xdb, 0x41, 0xe4, 0x50, 0x63, 0x2e, 0x8b, 0x75, 0x64, 0xa5, 0x24, 0x96, 0x25, 0x41, - 0x14, 0xee, 0xd8, 0xbe, 0x51, 0x56, 0x16, 0x05, 0x8d, 0xfc, 0x1b, 0x81, 0x21, 0x6d, 0x71, 0xd5, - 0xe1, 0x96, 0xe9, 0xfa, 0xcf, 0xbb, 0x39, 0xe6, 0x61, 0xd6, 0xe6, 0xba, 0x68, 0xc1, 0x22, 0x68, - 0xac, 0x79, 0x9c, 0xd0, 0x55, 0x8e, 0x37, 0xbc, 0x38, 0x91, 0xc7, 0x5e, 0xdc, 0x86, 0xb9, 0x74, - 0x67, 0x7a, 0x0e, 0xaa, 0x36, 0x37, 0xf6, 0xdb, 0x05, 0x55, 0x59, 0x52, 0x43, 0x21, 0x82, 0xbc, - 0x06, 0x27, 0x86, 0x56, 0x22, 0x01, 0xa6, 0x0e, 0x65, 0xd9, 0xff, 0x53, 0x37, 0xc8, 0xd3, 0x94, - 0xa4, 0x92, 0x7f, 0x4d, 0xe9, 0x45, 0x3c, 0x70, 0x37, 0x82, 0x56, 0xc1, 0x25, 0x66, 0x12, 0x07, - 0x1a, 0x30, 0x17, 0x06, 0xae, 0xf0, 0x1d, 0xbf, 0x37, 0x8a, 0x57, 0xf6, 0xb5, 0x13, 0xf8, 0x89, - 0xcd, 0xae, 0xcf, 0x9a, 0xcb, 0x72, 0x32, 0x73, 0x7f, 0xec, 0xf9, 0x0e, 0xdd, 0xa2, 0x4e, 0xe0, - 0xbb, 0x31, 0xf7, 0xdd, 0x94, 0x74, 0xbf, 0xba, 0x82, 0xdf, 0x80, 0x0a, 0x7f, 0xbf, 0xe3, 0x75, - 0x28, 0xbf, 0x10, 0x56, 0x9b, 0xcb, 0x66, 0x7a, 0x4f, 0x37, 0xd5, 0x7b, 0x7a, 0x6e, 0x61, 0x76, - 0x4f, 0x37, 0x7b, 0xab, 0x26, 0xfb, 0xc2, 0xca, 0x3f, 0x66, 0xb8, 0x12, 0xdb, 0x6b, 0x6f, 0x78, - 0x3e, 0x3f, 0xb1, 0xe5, 0x02, 0x73, 0x32, 0x0b, 0x8b, 0xed, 0xa0, 0xdd, 0x0e, 0x1e, 0xf0, 0x1a, - 0x91, 0xf5, 0x8b, 0x94, 0xc6, 0x8e, 0x5e, 0x5d, 0x3f, 0xf1, 0xda, 0x1c, 0x4b, 0x85, 0x6b, 0x9d, - 0x13, 0xd8, 0xdd, 0x63, 0xdb, 0x6b, 0x27, 0x34, 0xe2, 0x27, 0xa3, 0x8a, 0x25, 0xde, 0x98, 0x85, - 0x79, 0x10, 0x56, 0xd3, 0x6b, 0x2a, 0x0f, 0xbf, 0xa3, 0x32, 0x68, 0x0f, 0x71, 0xa2, 0x08, 0x57, - 0x32, 0x90, 0x14, 0x87, 0xf9, 0xa2, 0x9e, 0x0e, 0x75, 0x28, 0x87, 0xec, 0x98, 0x1c, 0x74, 0x63, - 0xe3, 0x05, 0xa5, 0x6d, 0x65, 0x54, 0xf2, 0x09, 0x82, 0xf2, 0x46, 0xd0, 0xba, 0xee, 0x27, 0x51, - 0x9f, 0x65, 0x0f, 0xb3, 0x3a, 0xf5, 0xf5, 0xd8, 0x90, 0x44, 0xbc, 0x09, 0x95, 0xc4, 0xeb, 0xd0, - 0xad, 0xc4, 0xee, 0x84, 0xe2, 0xa0, 0xf1, 0x0c, 0xe6, 0x5d, 0x9f, 0x65, 0xdc, 0x0c, 0x64, 0xe5, - 0x4c, 0x58, 0xce, 0xb5, 0xed, 0x38, 0xe1, 0x19, 0x2d, 0xc1, 0x71, 0x0a, 0x73, 0x7a, 0xb6, 0x6d, - 0x2b, 0xd1, 0x63, 0x43, 0x5b, 0x61, 0xa8, 0x65, 0x70, 0xa9, 0x59, 0x2d, 0x89, 0xa4, 0x01, 0xaf, - 0x64, 0x27, 0xe5, 0x3b, 0x34, 0xea, 0x78, 0xbe, 0x5d, 0x58, 0xa1, 0xc9, 0xaa, 0x96, 0x42, 0xec, - 0xd0, 0x78, 0xcf, 0xf3, 0xdd, 0xe0, 0xc1, 0xe8, 0x24, 0x20, 0x7f, 0xd7, 0x07, 0x00, 0xca, 0x37, - 0x59, 0xe6, 0xbd, 0x01, 0x87, 0x59, 0x8e, 0xf6, 0xa8, 0x58, 0x10, 0xc5, 0x80, 0x68, 0x49, 0x3e, - 0x94, 0x87, 0xa5, 0x7f, 0x88, 0x37, 0xe0, 0x45, 0x3b, 0x8e, 0xbd, 0x96, 0x4f, 0x5d, 0xc9, 0xab, - 0x34, 0x31, 0xaf, 0xc1, 0x4f, 0xd3, 0xbb, 0x1f, 0xdf, 0x91, 0x7a, 0xc1, 0x92, 0xaf, 0xe4, 0x07, - 0x08, 0x8e, 0x0d, 0x65, 0x92, 0x45, 0xa9, 0x30, 0x81, 0xe8, 0x19, 0xe5, 0xd8, 0xd9, 0xa1, 0x6e, - 0xb7, 0x4d, 0xe5, 0x7c, 0x44, 0xbe, 0xb3, 0x35, 0xb7, 0x9b, 0x7a, 0x20, 0x2d, 0xde, 0x56, 0xf6, - 0x8e, 0x17, 0x00, 0x3a, 0xb6, 0xdf, 0xb5, 0xdb, 0x1c, 0xc2, 0x34, 0x87, 0xa0, 0x50, 0xc8, 0x3c, - 0xd4, 0x86, 0xb9, 0x4f, 0xcc, 0x14, 0x3e, 0x46, 0xf0, 0x82, 0x2c, 0x72, 0xc2, 0x3f, 0x26, 0xbc, - 0xa8, 0x98, 0xe1, 0x76, 0xe6, 0x2a, 0xd1, 0xa9, 0x06, 0x17, 0x07, 0x0b, 0x18, 0x1a, 0x5e, 0xc0, - 0x52, 0x9f, 0x4f, 0xa9, 0x43, 0x26, 0x7f, 0x4f, 0xc7, 0x41, 0x85, 0x1d, 0x07, 0x8d, 0xee, 0x38, - 0x68, 0xe0, 0xe4, 0xf5, 0x7d, 0x30, 0x6e, 0xd9, 0xbe, 0xdd, 0xa2, 0x6e, 0xa6, 0x5c, 0x16, 0x48, - 0xdf, 0x55, 0x6f, 0xd5, 0xfb, 0xbe, 0xb1, 0x66, 0x07, 0x17, 0x6f, 0x7b, 0x5b, 0xdc, 0xd0, 0x9b, - 0xff, 0x59, 0x04, 0xac, 0x3a, 0x9e, 0x46, 0x3d, 0xcf, 0xa1, 0xf8, 0xe7, 0x08, 0xa6, 0x59, 0x67, - 0xc3, 0x27, 0x47, 0xc5, 0x19, 0x77, 0x40, 0xed, 0xe0, 0x2e, 0x1f, 0x4c, 0x1a, 0x99, 0x7f, 0xf7, - 0x1f, 0xff, 0x7c, 0xaf, 0x74, 0x1c, 0x1f, 0xe5, 0xe3, 0xd8, 0xde, 0xaa, 0x3a, 0x1a, 0x8d, 0xf1, - 0x8f, 0x11, 0x60, 0xd1, 0x6e, 0x95, 0x99, 0x1b, 0xbe, 0x30, 0x0a, 0xe2, 0x90, 0xd9, 0x5c, 0xed, - 0xa4, 0x52, 0xc4, 0x4c, 0x27, 0x88, 0x28, 0x2b, 0x59, 0x7c, 0x03, 0x07, 0xb0, 0xcc, 0x01, 0x9c, - 0xc6, 0x64, 0x18, 0x80, 0xc6, 0x43, 0x16, 0x06, 0x8f, 0x1a, 0x34, 0x95, 0xfb, 0x3b, 0x04, 0x33, - 0xf7, 0xf8, 0x21, 0x72, 0x8c, 0x91, 0xb6, 0x0e, 0xcc, 0x48, 0x5c, 0x1c, 0x47, 0x4b, 0x4e, 0x71, - 0xa4, 0x27, 0xf1, 0x09, 0x89, 0x34, 0x4e, 0x22, 0x6a, 0x77, 0x34, 0xc0, 0x97, 0x10, 0xfe, 0x00, - 0xc1, 0x6c, 0x3a, 0x7d, 0xc3, 0x67, 0x46, 0xa1, 0xd4, 0xa6, 0x73, 0xb5, 0x83, 0xbb, 0xea, 0x92, - 0xf3, 0x1c, 0xe3, 0x29, 0x32, 0xd4, 0x9d, 0x6b, 0xda, 0x88, 0xeb, 0x31, 0x82, 0xa9, 0x1b, 0x74, - 0x6c, 0xbc, 0x1d, 0x20, 0xb8, 0x3d, 0x06, 0x1c, 0xe2, 0x6a, 0xfc, 0x3e, 0x82, 0x57, 0x6e, 0xd0, - 0x64, 0x78, 0xbd, 0xc7, 0x4b, 0xe3, 0x8b, 0xb0, 0x08, 0xbb, 0x0b, 0x13, 0xec, 0xcc, 0x0a, 0x5d, - 0x83, 0x23, 0x3b, 0x8f, 0xcf, 0x15, 0x05, 0x61, 0xdc, 0xf7, 0x9d, 0x07, 0x02, 0xc7, 0x5f, 0x11, - 0xbc, 0x34, 0x38, 0xdd, 0xc6, 0x7a, 0x87, 0x18, 0x3a, 0xfc, 0xae, 0xdd, 0xde, 0x6f, 0x41, 0xd1, - 0x99, 0x92, 0xab, 0x1c, 0xf9, 0xab, 0xf8, 0x4b, 0x45, 0xc8, 0xe5, 0x30, 0x2f, 0x6e, 0x3c, 0x94, - 0x8f, 0x8f, 0xf8, 0x8f, 0x28, 0x1c, 0xf6, 0xbb, 0x08, 0x0e, 0xdd, 0xa0, 0xc9, 0xad, 0x6c, 0x72, - 0x35, 0x32, 0x6c, 0xb5, 0xf1, 0x75, 0x6d, 0xde, 0x54, 0x7e, 0xeb, 0x90, 0x4b, 0x99, 0x49, 0x57, - 0x38, 0xb0, 0x73, 0xf8, 0x4c, 0x11, 0xb0, 0x7c, 0x5a, 0xf6, 0x21, 0x82, 0xd9, 0x74, 0x16, 0x33, - 0x5a, 0xbc, 0x36, 0x0f, 0x3e, 0xc8, 0xc0, 0xbc, 0xce, 0xb1, 0xbe, 0x56, 0xbb, 0x34, 0x1c, 0xab, - 0xfa, 0xbd, 0xb4, 0x9a, 0xc9, 0x15, 0xd0, 0x33, 0xea, 0x0f, 0x08, 0x20, 0x9f, 0x27, 0xe1, 0xf3, - 0xc5, 0x7a, 0x28, 0x33, 0xa7, 0xda, 0xc1, 0x4e, 0x94, 0x88, 0xc9, 0xf5, 0x59, 0xaa, 0xd5, 0x0b, - 0xc3, 0x39, 0xa4, 0xce, 0x5a, 0x3a, 0x75, 0xfa, 0x2d, 0x82, 0x19, 0x3e, 0x77, 0xc0, 0xa7, 0x47, - 0x61, 0x56, 0xc7, 0x12, 0x07, 0x69, 0xfa, 0xb3, 0x1c, 0x6a, 0xbd, 0x59, 0x54, 0x13, 0xd6, 0xd0, - 0x32, 0xee, 0xc1, 0x6c, 0x7a, 0xfb, 0x1f, 0x1d, 0x1e, 0xda, 0x74, 0xa0, 0x56, 0x2f, 0xe8, 0x51, - 0x69, 0x84, 0x8a, 0x72, 0xb4, 0x3c, 0xae, 0x1c, 0x4d, 0xb3, 0x8a, 0x81, 0x4f, 0x15, 0xd5, 0x93, - 0xcf, 0xc0, 0x30, 0x17, 0x38, 0xba, 0x33, 0xa4, 0x3e, 0xae, 0x24, 0x31, 0xeb, 0xfc, 0x02, 0xc1, - 0x4b, 0x83, 0x47, 0x1a, 0x7c, 0x62, 0xa0, 0x1c, 0xa9, 0xe7, 0xb8, 0x9a, 0x6e, 0xc5, 0x51, 0xc7, - 0x21, 0xf2, 0x55, 0x8e, 0x62, 0x0d, 0x5f, 0x19, 0x9b, 0x19, 0xb7, 0x65, 0x42, 0x33, 0x46, 0x2b, - 0xf9, 0x90, 0xfc, 0x4f, 0x08, 0x0e, 0x49, 0xbe, 0x77, 0x22, 0x4a, 0x8b, 0x61, 0x1d, 0x5c, 0x22, - 0x30, 0x59, 0xe4, 0xcb, 0x1c, 0xfe, 0x17, 0xf1, 0xe5, 0x09, 0xe1, 0x4b, 0xd8, 0x2b, 0x09, 0x43, - 0xfa, 0x17, 0x04, 0x47, 0xee, 0xa5, 0x71, 0xff, 0x7f, 0xc2, 0xff, 0x3a, 0xc7, 0xff, 0x15, 0xfc, - 0x6a, 0xc1, 0x91, 0x63, 0x9c, 0x1a, 0x97, 0x10, 0xfe, 0x3d, 0x82, 0xb2, 0x9c, 0xdf, 0xe2, 0x73, - 0x23, 0x13, 0x43, 0x9f, 0xf0, 0x1e, 0x64, 0x30, 0x8b, 0xfe, 0x4a, 0x4e, 0x17, 0x76, 0x29, 0x21, - 0x9f, 0x05, 0xf4, 0x63, 0x04, 0x38, 0xbb, 0x8f, 0x64, 0x37, 0x14, 0x7c, 0x56, 0x13, 0x35, 0xf2, - 0xe2, 0x59, 0x3b, 0x37, 0x76, 0x9f, 0xde, 0xa5, 0x96, 0x0b, 0xbb, 0x54, 0x90, 0xc9, 0xff, 0x09, - 0x82, 0xea, 0x0d, 0x9a, 0x1d, 0x87, 0x0b, 0x6c, 0xa9, 0x0f, 0xa9, 0x6b, 0x4b, 0xe3, 0x37, 0x0a, - 0x44, 0x17, 0x39, 0xa2, 0xb3, 0xb8, 0xd8, 0x54, 0x12, 0xc0, 0xaf, 0x11, 0x1c, 0xde, 0x54, 0x43, - 0x14, 0x5f, 0x1c, 0x27, 0x49, 0xab, 0xe4, 0x93, 0xe3, 0xfa, 0x02, 0xc7, 0xb5, 0x42, 0x26, 0xc2, - 0xb5, 0x26, 0x66, 0xbd, 0xbf, 0x41, 0xf0, 0xb2, 0x7a, 0x7f, 0x10, 0x13, 0xbc, 0x4f, 0x6b, 0xb7, - 0x82, 0x41, 0x20, 0xb9, 0xcc, 0xf1, 0x99, 0xf8, 0xe2, 0x24, 0xf8, 0x1a, 0x62, 0xa0, 0x87, 0x7f, - 0x85, 0xe0, 0x08, 0x9f, 0xa1, 0xaa, 0x8c, 0x07, 0x5a, 0xcc, 0xa8, 0x89, 0xeb, 0x04, 0x2d, 0x46, - 0xd4, 0x1f, 0xf2, 0x4c, 0xa0, 0xd6, 0xc4, 0xec, 0x13, 0xff, 0x14, 0xc1, 0x0b, 0xb2, 0xa9, 0x09, - 0xef, 0xae, 0x8c, 0x33, 0xdc, 0xb3, 0x36, 0x41, 0x11, 0x6e, 0xcb, 0x93, 0x85, 0xdb, 0x7b, 0x08, - 0x8e, 0x88, 0xdf, 0xef, 0xe8, 0x56, 0xe4, 0x5c, 0xf5, 0xdd, 0x6b, 0x71, 0x32, 0xfa, 0xa0, 0xb3, - 0xe7, 0xa7, 0xbe, 0x09, 0x00, 0xad, 0x72, 0x40, 0x17, 0xc8, 0xfc, 0x10, 0x40, 0x2b, 0xf2, 0xb7, - 0x30, 0xfd, 0xdc, 0xf5, 0x01, 0x82, 0x39, 0x31, 0x49, 0x2d, 0x38, 0xc0, 0x28, 0xa3, 0xd6, 0xda, - 0x31, 0x6d, 0x97, 0x1c, 0xd1, 0x91, 0x6f, 0x73, 0xd9, 0x77, 0x71, 0xa3, 0xc8, 0x18, 0x61, 0xe0, - 0xc6, 0x8d, 0x87, 0x62, 0xfe, 0xf5, 0xa8, 0xd1, 0x0e, 0x5a, 0xf1, 0xdb, 0x04, 0x17, 0xb6, 0x69, - 0xb6, 0xe7, 0x12, 0x5a, 0xff, 0xda, 0x47, 0x4f, 0x17, 0xd0, 0xdf, 0x9e, 0x2e, 0xa0, 0x4f, 0x9e, - 0x2e, 0xa0, 0xb7, 0xaf, 0x4c, 0xf6, 0x67, 0x25, 0xa7, 0xed, 0x51, 0x3f, 0x51, 0xd9, 0xfe, 0x37, - 0x00, 0x00, 0xff, 0xff, 0xe2, 0x3a, 0x46, 0xb5, 0xa8, 0x25, 0x00, 0x00, + // 2429 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x8f, 0x1c, 0x47, + 0x15, 0xa7, 0x66, 0xbf, 0x66, 0xde, 0xf8, 0xb3, 0x62, 0x9b, 0xce, 0x78, 0xbd, 0x3b, 0x2a, 0x7f, + 0xad, 0xd7, 0xde, 0x1e, 0xef, 0x60, 0x21, 0xb3, 0x01, 0x05, 0x6f, 0x6c, 0x1c, 0x93, 0xb5, 0xb3, + 0xf4, 0xda, 0x31, 0x0a, 0x07, 0xe8, 0x74, 0xd7, 0xce, 0x36, 0x3b, 0xd3, 0xdd, 0xee, 0xee, 0x19, + 0x6b, 0x64, 0x7c, 0x09, 0x12, 0x17, 0x10, 0x20, 0xf0, 0x81, 0x2f, 0x21, 0x44, 0x94, 0x33, 0x37, + 0x40, 0xdc, 0x72, 0x41, 0xe1, 0x86, 0x20, 0x67, 0x2b, 0xb2, 0xb8, 0x71, 0xe1, 0x3f, 0x00, 0x55, + 0x75, 0x55, 0x77, 0xd5, 0xec, 0x4c, 0xcf, 0x3a, 0xbb, 0x21, 0xf2, 0xad, 0xfb, 0x55, 0xf5, 0x7b, + 0xbf, 0x7a, 0xdf, 0xf5, 0x66, 0xe0, 0x4c, 0x4c, 0xa3, 0x1e, 0x8d, 0x1a, 0x76, 0x18, 0xb6, 0x3d, + 0xc7, 0x4e, 0xbc, 0xc0, 0x57, 0x9f, 0xcd, 0x30, 0x0a, 0x92, 0x00, 0x57, 0x15, 0x52, 0xed, 0x58, + 0x2b, 0x68, 0x05, 0x9c, 0xde, 0x60, 0x4f, 0xe9, 0x96, 0xda, 0x6c, 0x2b, 0x08, 0x5a, 0x6d, 0xda, + 0xb0, 0x43, 0xaf, 0x61, 0xfb, 0x7e, 0x90, 0xf0, 0xcd, 0xb1, 0x58, 0x25, 0xdb, 0x57, 0x63, 0xd3, + 0x0b, 0xf8, 0xaa, 0x13, 0x44, 0xb4, 0xd1, 0x5b, 0x6e, 0xb4, 0xa8, 0x4f, 0x23, 0x3b, 0xa1, 0xae, + 0xd8, 0x73, 0x25, 0xdf, 0xd3, 0xb1, 0x9d, 0x2d, 0xcf, 0xa7, 0x51, 0xbf, 0x11, 0x6e, 0xb7, 0x18, + 0x21, 0x6e, 0x74, 0x68, 0x62, 0x0f, 0xfb, 0x6a, 0xad, 0xe5, 0x25, 0x5b, 0xdd, 0x77, 0x4c, 0x27, + 0xe8, 0x34, 0xec, 0x88, 0x03, 0xfb, 0x2e, 0x7f, 0x58, 0x72, 0xdc, 0x46, 0xaf, 0x99, 0x33, 0x50, + 0x4f, 0xd8, 0x5b, 0xb6, 0xdb, 0xe1, 0x96, 0xbd, 0x93, 0xdb, 0x8d, 0x31, 0xdc, 0x22, 0x1a, 0x06, + 0x42, 0x63, 0xfc, 0xd1, 0x4b, 0x82, 0xa8, 0xaf, 0x3c, 0xa6, 0x6c, 0xc8, 0x47, 0x08, 0x8e, 0x5c, + 0xcb, 0xe5, 0x7d, 0xa3, 0x4b, 0xa3, 0x3e, 0xc6, 0x30, 0xe9, 0xdb, 0x1d, 0x6a, 0xa0, 0x3a, 0x5a, + 0xa8, 0x58, 0xfc, 0x19, 0x1b, 0x30, 0x13, 0xd1, 0xcd, 0x88, 0xc6, 0x5b, 0x46, 0x89, 0x93, 0xe5, + 0x2b, 0x3e, 0x07, 0x33, 0x4c, 0x38, 0x75, 0x12, 0x63, 0xa2, 0x3e, 0xb1, 0x50, 0x59, 0x3d, 0xf0, + 0xec, 0xe9, 0x7c, 0x79, 0x3d, 0x25, 0xc5, 0x96, 0x5c, 0xc4, 0x26, 0x1c, 0x8e, 0x68, 0x1c, 0x74, + 0x23, 0x87, 0xbe, 0x45, 0xa3, 0xd8, 0x0b, 0x7c, 0x63, 0x92, 0x71, 0x5a, 0x9d, 0xfc, 0xf0, 0xe9, + 0xfc, 0xe7, 0xac, 0xc1, 0x45, 0x5c, 0x87, 0x72, 0x4c, 0xdb, 0xd4, 0x49, 0x82, 0xc8, 0x98, 0x52, + 0x36, 0x66, 0x54, 0x6c, 0xc0, 0x24, 0x3b, 0x90, 0x31, 0xad, 0xac, 0x72, 0x0a, 0x99, 0x87, 0xca, + 0x9d, 0xc0, 0xa5, 0x23, 0x8f, 0x43, 0x6e, 0xc2, 0x71, 0x8b, 0xf6, 0x3c, 0x26, 0xe8, 0x36, 0x4d, + 0x6c, 0xd7, 0x4e, 0xec, 0xc1, 0xcd, 0xa5, 0xec, 0xec, 0x35, 0x28, 0x47, 0x62, 0xb3, 0x51, 0xe2, + 0xf4, 0xec, 0x9d, 0xfc, 0x05, 0xc1, 0x9c, 0xa2, 0x40, 0x4b, 0x1c, 0xe2, 0x46, 0x8f, 0xfa, 0x49, + 0x3c, 0x9a, 0x65, 0x13, 0x8e, 0xca, 0xf3, 0xde, 0xb1, 0x3b, 0x34, 0x0e, 0x6d, 0x87, 0xa6, 0xbc, + 0xc5, 0x39, 0x76, 0x2e, 0xe3, 0x05, 0x38, 0xa0, 0x12, 0x8d, 0x09, 0x65, 0xbb, 0xb6, 0x82, 0xcf, + 0x41, 0x55, 0xbe, 0xdf, 0xbb, 0x75, 0xdd, 0x98, 0x54, 0x36, 0xaa, 0x0b, 0x64, 0x1d, 0x0c, 0x05, + 0xfb, 0x6d, 0xdb, 0xf7, 0x36, 0x69, 0x9c, 0x8c, 0x46, 0x5d, 0xd7, 0x14, 0xa1, 0x98, 0x24, 0x53, + 0xc7, 0x1b, 0x70, 0x52, 0xe1, 0xf8, 0x96, 0xdd, 0xf6, 0x5c, 0x3b, 0xa1, 0x16, 0x8d, 0xc3, 0xc0, + 0x8f, 0x29, 0x3e, 0x06, 0x53, 0x34, 0x8a, 0x82, 0x48, 0xd8, 0x22, 0x7d, 0xc1, 0x27, 0x60, 0x9a, + 0xfa, 0x89, 0x97, 0xf4, 0x85, 0x6b, 0x89, 0x37, 0x72, 0x1c, 0x5e, 0xd2, 0x55, 0xcb, 0x99, 0x90, + 0x0f, 0x90, 0x06, 0xfb, 0xb5, 0x88, 0x72, 0x11, 0x0f, 0xba, 0x34, 0x4e, 0xf0, 0x03, 0x50, 0x53, + 0x00, 0x47, 0x5f, 0x6d, 0xde, 0x32, 0xf3, 0x68, 0x31, 0x65, 0xb4, 0xf0, 0x87, 0x6f, 0x3b, 0xae, + 0xd9, 0x6b, 0x9a, 0xe1, 0x76, 0xcb, 0x64, 0xb1, 0x67, 0xaa, 0x19, 0x45, 0xc6, 0x9e, 0xa9, 0x08, + 0x93, 0x5a, 0x54, 0xf6, 0x31, 0xf8, 0xdd, 0x30, 0xa6, 0x51, 0xc2, 0xe1, 0x97, 0x2d, 0xf1, 0xc6, + 0xdc, 0xa6, 0x27, 0x14, 0x60, 0x4c, 0xf0, 0x95, 0xec, 0x9d, 0xbc, 0xa7, 0x9f, 0xe1, 0x5e, 0xe8, + 0x2a, 0x67, 0xd8, 0xfe, 0x74, 0xcf, 0xa0, 0xa3, 0x57, 0x51, 0x96, 0x06, 0x50, 0xf6, 0x34, 0x90, + 0xd7, 0x69, 0x9b, 0xe6, 0x20, 0x87, 0xf9, 0x87, 0x01, 0x33, 0x8e, 0x1d, 0x3b, 0xb6, 0x2b, 0x59, + 0xc9, 0x57, 0x7c, 0x09, 0x8e, 0x86, 0x51, 0x10, 0xda, 0x2d, 0xce, 0x69, 0x3d, 0x68, 0x7b, 0x4e, + 0x9f, 0x2b, 0xa5, 0x62, 0xed, 0x5c, 0x20, 0xa7, 0xa1, 0xba, 0xd1, 0xf7, 0x9d, 0x37, 0x43, 0x9e, + 0x99, 0x99, 0xd7, 0x78, 0x09, 0xed, 0xc4, 0x06, 0x62, 0xf9, 0xc5, 0x4a, 0x5f, 0xc8, 0x4f, 0xa7, + 0xe0, 0x84, 0x82, 0x8e, 0x7d, 0x50, 0x84, 0x6d, 0xac, 0xef, 0xe2, 0x59, 0x98, 0x76, 0xa3, 0xbe, + 0xd5, 0xf5, 0x53, 0x6b, 0x89, 0x75, 0x41, 0xc3, 0x35, 0x98, 0x0a, 0xa3, 0xae, 0x4f, 0x79, 0xd2, + 0x92, 0x8b, 0x29, 0x09, 0x6f, 0x42, 0x39, 0x4e, 0x58, 0x76, 0x6e, 0xf5, 0x79, 0xaa, 0xaa, 0x36, + 0xbf, 0xbe, 0x37, 0x6b, 0xb1, 0xc3, 0x6c, 0x08, 0x8e, 0x56, 0xc6, 0x1b, 0x3f, 0x84, 0x8a, 0x0c, + 0xdf, 0xd8, 0x98, 0xa9, 0x4f, 0x2c, 0x54, 0x9b, 0x1b, 0x7b, 0x17, 0xf4, 0x66, 0xc8, 0x2a, 0x8b, + 0x92, 0xbc, 0xc4, 0xe1, 0x72, 0x59, 0x78, 0x16, 0x2a, 0x1d, 0x91, 0x1d, 0x62, 0xa3, 0xcc, 0xad, + 0x90, 0x13, 0xf0, 0x37, 0x61, 0xca, 0xf3, 0x37, 0x83, 0xd8, 0xa8, 0x70, 0x48, 0xab, 0x7b, 0x83, + 0x74, 0xcb, 0xdf, 0x0c, 0xac, 0x94, 0x21, 0x7e, 0x00, 0x07, 0x23, 0x9a, 0x44, 0x7d, 0xa9, 0x0b, + 0x03, 0xb8, 0x76, 0xdf, 0xd8, 0x9b, 0x04, 0x4b, 0x65, 0x69, 0xe9, 0x12, 0xf0, 0x0a, 0x54, 0xe3, + 0xdc, 0xf7, 0x8c, 0x2a, 0x17, 0x68, 0x68, 0x8c, 0x14, 0xdf, 0xb4, 0xd4, 0xcd, 0xe4, 0x87, 0x08, + 0x66, 0x77, 0xa6, 0x3f, 0xae, 0xd9, 0xff, 0x7f, 0x64, 0x93, 0x3f, 0xe9, 0x68, 0xd2, 0x1c, 0xb3, + 0x11, 0xd2, 0xc2, 0x30, 0x69, 0xc1, 0x64, 0x1c, 0x52, 0x87, 0xd7, 0xa2, 0x6a, 0xf3, 0xf6, 0xbe, + 0x41, 0x63, 0x72, 0x65, 0x89, 0x66, 0x02, 0x0a, 0xb3, 0x63, 0x07, 0x3e, 0xaf, 0x7c, 0xba, 0x6e, + 0x27, 0xce, 0x56, 0x11, 0x66, 0x16, 0x9a, 0x6c, 0x8f, 0x56, 0x40, 0x53, 0x12, 0x26, 0x50, 0xe1, + 0x0f, 0x77, 0xfb, 0xa1, 0x5e, 0x31, 0x73, 0x32, 0xf9, 0x01, 0x82, 0x9a, 0xaa, 0xc5, 0xa0, 0xdd, + 0x7e, 0xc7, 0x76, 0xb6, 0x8b, 0x45, 0x96, 0x3c, 0x97, 0xcb, 0x9b, 0x58, 0x05, 0xc6, 0xef, 0xd9, + 0xd3, 0xf9, 0xd2, 0xad, 0xeb, 0x56, 0xc9, 0x73, 0x3f, 0x79, 0x1e, 0x61, 0xdd, 0x58, 0x6d, 0x48, + 0x33, 0x51, 0x04, 0x84, 0x40, 0xc5, 0x1f, 0xda, 0x40, 0xe4, 0xe4, 0xe7, 0x68, 0x1c, 0xe6, 0x60, + 0xa6, 0x97, 0xf5, 0x66, 0xf9, 0x26, 0x49, 0x64, 0xe0, 0x5b, 0x51, 0xd0, 0x0d, 0x8d, 0x29, 0x55, + 0xd3, 0x9c, 0xc4, 0xba, 0xb1, 0x6d, 0xcf, 0x77, 0x8d, 0x69, 0x65, 0x89, 0x53, 0xc8, 0x2f, 0x4b, + 0x30, 0x3f, 0xe4, 0x58, 0x63, 0xed, 0xfa, 0x02, 0x9c, 0x2d, 0xf7, 0xbd, 0x99, 0x31, 0xbe, 0x57, + 0x1e, 0xee, 0x7b, 0x4f, 0x4a, 0x50, 0x1f, 0xa2, 0x9b, 0xf1, 0xb5, 0xf6, 0x05, 0x51, 0xce, 0x66, + 0x10, 0x39, 0xd4, 0x98, 0xc9, 0x7c, 0x1d, 0x59, 0x29, 0x89, 0x45, 0x49, 0x10, 0x85, 0x5b, 0xb6, + 0x6f, 0x94, 0x95, 0x45, 0x41, 0x23, 0xff, 0x41, 0x60, 0x48, 0x5d, 0x5c, 0x73, 0xb8, 0x66, 0xba, + 0xfe, 0x8b, 0xae, 0x8e, 0x59, 0x98, 0xb6, 0xf9, 0x59, 0x34, 0x67, 0x11, 0x34, 0x56, 0x3c, 0x4e, + 0xea, 0x47, 0x8e, 0xd7, 0xbc, 0x38, 0xc9, 0x7a, 0xe7, 0x36, 0xcc, 0xa4, 0x3b, 0xd3, 0x3e, 0xa8, + 0xda, 0x5c, 0xdb, 0x6b, 0x15, 0x54, 0x65, 0xc9, 0x13, 0x0a, 0x11, 0xe4, 0x55, 0xad, 0x91, 0xcf, + 0x33, 0x91, 0x00, 0x53, 0x87, 0xb2, 0xac, 0xff, 0xa9, 0x19, 0x64, 0x37, 0x25, 0xa9, 0xe4, 0xdf, + 0x13, 0x7a, 0x12, 0x0f, 0xdc, 0xb5, 0xa0, 0x55, 0x70, 0x23, 0xda, 0x8d, 0x01, 0x0d, 0x98, 0x09, + 0x03, 0x57, 0xd8, 0x8e, 0x5f, 0x42, 0xc5, 0x2b, 0xfb, 0xda, 0x09, 0xfc, 0xc4, 0x66, 0x77, 0x71, + 0xcd, 0x64, 0x39, 0x99, 0x99, 0x3f, 0xf6, 0x7c, 0x87, 0x6e, 0x50, 0x27, 0xf0, 0xdd, 0x98, 0xdb, + 0x6e, 0x42, 0x9a, 0x5f, 0x5d, 0xc1, 0xaf, 0x43, 0x85, 0xbf, 0xdf, 0xf5, 0x3a, 0x94, 0xdf, 0x2e, + 0xab, 0xcd, 0x45, 0x33, 0xbd, 0xf4, 0x9b, 0xea, 0xa5, 0x3f, 0xd7, 0x30, 0xbb, 0xf4, 0x9b, 0xbd, + 0x65, 0x93, 0x7d, 0x61, 0xe5, 0x1f, 0x33, 0x5c, 0x89, 0xed, 0xb5, 0xd7, 0x3c, 0x9f, 0x77, 0x6c, + 0xb9, 0xc0, 0x9c, 0xcc, 0xdc, 0x62, 0x33, 0x68, 0xb7, 0x83, 0x87, 0x3c, 0x47, 0x64, 0xf5, 0x22, + 0xa5, 0xb1, 0xd6, 0xab, 0xeb, 0x27, 0x5e, 0x9b, 0x63, 0xa9, 0xf0, 0x53, 0xe7, 0x04, 0x76, 0xf7, + 0xd8, 0xf4, 0xda, 0x09, 0x8d, 0x78, 0x67, 0x54, 0xb1, 0xc4, 0x1b, 0xd3, 0x30, 0x77, 0xc2, 0x6a, + 0x7a, 0xe7, 0xe5, 0xee, 0x77, 0x4c, 0x3a, 0xed, 0x81, 0xf4, 0xf2, 0x95, 0xba, 0x2b, 0x19, 0x08, + 0x8a, 0x83, 0x7c, 0x51, 0x0f, 0x87, 0x3a, 0x94, 0x43, 0xd6, 0x26, 0x07, 0xdd, 0xd8, 0x38, 0xa4, + 0x94, 0xad, 0x8c, 0x4a, 0x3e, 0x46, 0x50, 0x5e, 0x0b, 0x5a, 0x37, 0xfc, 0x24, 0xea, 0xb3, 0xe8, + 0x61, 0x5a, 0xa7, 0xbe, 0xee, 0x1b, 0x92, 0x88, 0xd7, 0xa1, 0x92, 0x78, 0x1d, 0xba, 0x91, 0xd8, + 0x9d, 0x50, 0x34, 0x1a, 0xcf, 0xa1, 0xde, 0xd5, 0x69, 0xc6, 0xcd, 0x40, 0x56, 0xce, 0x84, 0xc5, + 0x5c, 0xdb, 0x8e, 0x13, 0x1e, 0xd1, 0x12, 0x1c, 0xa7, 0x30, 0xa3, 0x67, 0xdb, 0x36, 0x12, 0xdd, + 0x37, 0xb4, 0x15, 0x86, 0x5a, 0x3a, 0x97, 0x1a, 0xd5, 0x92, 0x48, 0x1a, 0xf0, 0x72, 0xd6, 0x29, + 0xdf, 0xa5, 0x51, 0xc7, 0xf3, 0xed, 0xc2, 0x0c, 0x4d, 0x96, 0xb5, 0x10, 0x62, 0x4d, 0xe3, 0x7d, + 0xcf, 0x77, 0x83, 0x87, 0xa3, 0x83, 0x80, 0xfc, 0x43, 0x9f, 0x26, 0x28, 0xdf, 0x64, 0x91, 0xf7, + 0x3a, 0x1c, 0x64, 0x31, 0xda, 0xa3, 0x62, 0x41, 0x24, 0x03, 0xa2, 0x05, 0xf9, 0x50, 0x1e, 0x96, + 0xfe, 0x21, 0x5e, 0x83, 0xc3, 0x76, 0x1c, 0x7b, 0x2d, 0x9f, 0xba, 0x92, 0x57, 0x69, 0xd7, 0xbc, + 0x06, 0x3f, 0x4d, 0xef, 0x7e, 0x7c, 0x47, 0x6a, 0x05, 0x4b, 0xbe, 0x92, 0xef, 0x23, 0x38, 0x3e, + 0x94, 0x49, 0xe6, 0xa5, 0x42, 0x05, 0xa2, 0x66, 0x94, 0x63, 0x67, 0x8b, 0xba, 0xdd, 0x36, 0x95, + 0xc3, 0x16, 0xf9, 0xce, 0xd6, 0xdc, 0x6e, 0x6a, 0x81, 0x34, 0x79, 0x5b, 0xd9, 0x3b, 0x9e, 0x03, + 0xe8, 0xd8, 0x7e, 0xd7, 0x6e, 0x73, 0x08, 0x93, 0x1c, 0x82, 0x42, 0x21, 0xb3, 0x50, 0x1b, 0x66, + 0x3e, 0x31, 0x53, 0xf8, 0x08, 0xc1, 0x21, 0x99, 0xe4, 0x84, 0x7d, 0x4c, 0x38, 0xac, 0xa8, 0xe1, + 0x4e, 0x66, 0x2a, 0x51, 0xa9, 0x06, 0x17, 0x07, 0x13, 0x18, 0x1a, 0x9e, 0xc0, 0x52, 0x9b, 0x4f, + 0xa8, 0x13, 0x2b, 0x7f, 0x47, 0xc5, 0x41, 0x85, 0x15, 0x07, 0x8d, 0xae, 0x38, 0x68, 0xa0, 0xf3, + 0xfa, 0x1e, 0x18, 0xb7, 0x6d, 0xdf, 0x6e, 0x51, 0x37, 0x3b, 0x5c, 0xe6, 0x48, 0xdf, 0x51, 0x6f, + 0xd5, 0x7b, 0xbe, 0xb1, 0x66, 0x8d, 0x8b, 0xb7, 0xb9, 0x29, 0x6e, 0xe8, 0xcd, 0xff, 0xce, 0x03, + 0x56, 0x0d, 0x4f, 0xa3, 0x9e, 0xe7, 0x50, 0xfc, 0x33, 0x04, 0x93, 0xac, 0xb2, 0xe1, 0x53, 0xa3, + 0xfc, 0x8c, 0x1b, 0xa0, 0xb6, 0x7f, 0x97, 0x0f, 0x26, 0x8d, 0xcc, 0xbe, 0xfb, 0xcf, 0x7f, 0xfd, + 0xbc, 0x74, 0x02, 0x1f, 0xe3, 0xb3, 0xdd, 0xde, 0xb2, 0x3a, 0x67, 0x8d, 0xf1, 0x8f, 0x10, 0x60, + 0x51, 0x6e, 0x95, 0x01, 0x1e, 0xbe, 0x38, 0x0a, 0xe2, 0x90, 0x41, 0x5f, 0xed, 0x94, 0x92, 0xc4, + 0x4c, 0x27, 0x88, 0x28, 0x4b, 0x59, 0x7c, 0x03, 0x07, 0xb0, 0xc8, 0x01, 0x9c, 0xc1, 0x64, 0x18, + 0x80, 0xc6, 0x23, 0xe6, 0x06, 0x8f, 0x1b, 0x34, 0x95, 0xfb, 0x7b, 0x04, 0x53, 0xf7, 0x79, 0x13, + 0x39, 0x46, 0x49, 0x1b, 0xfb, 0xa6, 0x24, 0x2e, 0x8e, 0xa3, 0x25, 0xa7, 0x39, 0xd2, 0x53, 0xf8, + 0xa4, 0x44, 0x1a, 0x27, 0x11, 0xb5, 0x3b, 0x1a, 0xe0, 0xcb, 0x08, 0xbf, 0x8f, 0x60, 0x3a, 0x9d, + 0xbe, 0xe1, 0xb3, 0xa3, 0x50, 0x6a, 0xd3, 0xb9, 0xda, 0xfe, 0x5d, 0x75, 0xc9, 0x05, 0x8e, 0xf1, + 0x34, 0x19, 0x6a, 0xce, 0x15, 0x6d, 0xc4, 0xf5, 0x04, 0xc1, 0xc4, 0x4d, 0x3a, 0xd6, 0xdf, 0xf6, + 0x11, 0xdc, 0x0e, 0x05, 0x0e, 0x31, 0x35, 0x7e, 0x0f, 0xc1, 0xcb, 0x37, 0x69, 0x32, 0x3c, 0xdf, + 0xe3, 0x85, 0xf1, 0x49, 0x58, 0xb8, 0xdd, 0xc5, 0x5d, 0xec, 0xcc, 0x12, 0x5d, 0x83, 0x23, 0xbb, + 0x80, 0xcf, 0x17, 0x39, 0x61, 0xdc, 0xf7, 0x9d, 0x87, 0x02, 0xc7, 0xdf, 0x10, 0x1c, 0x19, 0x1c, + 0x95, 0x63, 0xbd, 0x42, 0x0c, 0x9d, 0xa4, 0xd7, 0xee, 0xec, 0x35, 0xa1, 0xe8, 0x4c, 0xc9, 0x35, + 0x8e, 0xfc, 0x15, 0xfc, 0xa5, 0x22, 0xe4, 0x72, 0x98, 0x17, 0x37, 0x1e, 0xc9, 0xc7, 0xc7, 0xfc, + 0x17, 0x19, 0x0e, 0xfb, 0x5d, 0x04, 0x07, 0x6e, 0xd2, 0xe4, 0x76, 0x36, 0xb9, 0x1a, 0xe9, 0xb6, + 0xda, 0x2c, 0xbc, 0x36, 0x6b, 0x2a, 0x3f, 0x9c, 0xc8, 0xa5, 0x4c, 0xa5, 0x4b, 0x1c, 0xd8, 0x79, + 0x7c, 0xb6, 0x08, 0x58, 0x3e, 0x2d, 0xfb, 0x00, 0xc1, 0x74, 0x3a, 0x8b, 0x19, 0x2d, 0x5e, 0x9b, + 0x07, 0xef, 0xa7, 0x63, 0xde, 0xe0, 0x58, 0x5f, 0xad, 0x5d, 0x1e, 0x8e, 0x55, 0xfd, 0x5e, 0x6a, + 0xcd, 0xe4, 0x07, 0xd0, 0x23, 0xea, 0x8f, 0x08, 0x20, 0x9f, 0x27, 0xe1, 0x0b, 0xc5, 0xe7, 0x50, + 0x66, 0x4e, 0xb5, 0xfd, 0x9d, 0x28, 0x11, 0x93, 0x9f, 0x67, 0xa1, 0x56, 0x2f, 0x74, 0xe7, 0x90, + 0x3a, 0x2b, 0xe9, 0xd4, 0xe9, 0x77, 0x08, 0xa6, 0xf8, 0xdc, 0x01, 0x9f, 0x19, 0x85, 0x59, 0x1d, + 0x4b, 0xec, 0xa7, 0xea, 0xcf, 0x71, 0xa8, 0xf5, 0x66, 0x51, 0x4e, 0x58, 0x41, 0x8b, 0xb8, 0x07, + 0xd3, 0xe9, 0xed, 0x7f, 0xb4, 0x7b, 0x68, 0xd3, 0x81, 0x5a, 0xbd, 0xa0, 0x46, 0xa5, 0x1e, 0x2a, + 0xd2, 0xd1, 0xe2, 0xb8, 0x74, 0x34, 0xc9, 0x32, 0x06, 0x3e, 0x5d, 0x94, 0x4f, 0x3e, 0x05, 0xc5, + 0x5c, 0xe4, 0xe8, 0xce, 0x92, 0xfa, 0xb8, 0x94, 0xc4, 0xb4, 0xf3, 0x0b, 0x04, 0x47, 0x06, 0x5b, + 0x1a, 0x7c, 0x72, 0x20, 0x1d, 0xa9, 0x7d, 0x5c, 0x4d, 0xd7, 0xe2, 0xa8, 0x76, 0x88, 0x7c, 0x95, + 0xa3, 0x58, 0xc1, 0x57, 0xc7, 0x46, 0xc6, 0x1d, 0x19, 0xd0, 0x8c, 0xd1, 0x52, 0x3e, 0x24, 0xff, + 0x33, 0x82, 0x03, 0x92, 0xef, 0xdd, 0x88, 0xd2, 0x62, 0x58, 0xfb, 0x17, 0x08, 0x4c, 0x16, 0xf9, + 0x32, 0x87, 0xff, 0x45, 0x7c, 0x65, 0x97, 0xf0, 0x25, 0xec, 0xa5, 0x84, 0x21, 0xfd, 0x2b, 0x82, + 0xa3, 0xf7, 0x53, 0xbf, 0xff, 0x8c, 0xf0, 0xbf, 0xc6, 0xf1, 0x7f, 0x05, 0xbf, 0x52, 0xd0, 0x72, + 0x8c, 0x3b, 0xc6, 0x65, 0x84, 0xff, 0x80, 0xa0, 0x2c, 0xe7, 0xb7, 0xf8, 0xfc, 0xc8, 0xc0, 0xd0, + 0x27, 0xbc, 0xfb, 0xe9, 0xcc, 0xa2, 0xbe, 0x92, 0x33, 0x85, 0x55, 0x4a, 0xc8, 0x67, 0x0e, 0xfd, + 0x04, 0x01, 0xce, 0xee, 0x23, 0xd9, 0x0d, 0x05, 0x9f, 0xd3, 0x44, 0x8d, 0xbc, 0x78, 0xd6, 0xce, + 0x8f, 0xdd, 0xa7, 0x57, 0xa9, 0xc5, 0xc2, 0x2a, 0x15, 0x64, 0xf2, 0x7f, 0x8c, 0xa0, 0x7a, 0x93, + 0x66, 0xed, 0x70, 0x81, 0x2e, 0xf5, 0x21, 0x75, 0x6d, 0x61, 0xfc, 0x46, 0x81, 0xe8, 0x12, 0x47, + 0x74, 0x0e, 0x17, 0xab, 0x4a, 0x02, 0xf8, 0x0d, 0x82, 0x83, 0xeb, 0xaa, 0x8b, 0xe2, 0x4b, 0xe3, + 0x24, 0x69, 0x99, 0x7c, 0xf7, 0xb8, 0xbe, 0xc0, 0x71, 0x2d, 0x91, 0x5d, 0xe1, 0x5a, 0x11, 0xb3, + 0xde, 0xdf, 0x22, 0x78, 0x49, 0xbd, 0x3f, 0x88, 0x09, 0xde, 0x27, 0xd5, 0x5b, 0xc1, 0x20, 0x90, + 0x5c, 0xe1, 0xf8, 0x4c, 0x7c, 0x69, 0x37, 0xf8, 0x1a, 0x62, 0xa0, 0x87, 0x7f, 0x85, 0xe0, 0x28, + 0x9f, 0xa1, 0xaa, 0x8c, 0x07, 0x4a, 0xcc, 0xa8, 0x89, 0xeb, 0x2e, 0x4a, 0x8c, 0xc8, 0x3f, 0xe4, + 0xb9, 0x40, 0xad, 0x88, 0xd9, 0x27, 0xfe, 0x09, 0x82, 0x43, 0xb2, 0xa8, 0x09, 0xeb, 0x2e, 0x8d, + 0x53, 0xdc, 0xf3, 0x16, 0x41, 0xe1, 0x6e, 0x8b, 0xbb, 0x73, 0xb7, 0x5f, 0x23, 0x38, 0x2a, 0xff, + 0xbe, 0xb0, 0x11, 0x39, 0xd7, 0x7c, 0xf7, 0x7a, 0x9c, 0x8c, 0x6e, 0x74, 0x76, 0xfc, 0xd4, 0x37, + 0xda, 0xdf, 0x06, 0xff, 0x14, 0x41, 0x96, 0x39, 0xb0, 0x8b, 0x64, 0x76, 0x08, 0xb0, 0x25, 0xf9, + 0x9b, 0x98, 0xde, 0x7f, 0xbd, 0x8f, 0x60, 0x46, 0x4c, 0x54, 0x0b, 0x1a, 0x19, 0x65, 0xe4, 0x5a, + 0x3b, 0xae, 0xed, 0x92, 0xa3, 0x3a, 0xf2, 0x2d, 0x2e, 0xfb, 0x1e, 0x6e, 0x14, 0x29, 0x25, 0x0c, + 0xdc, 0xb8, 0xf1, 0x48, 0xcc, 0xc1, 0x1e, 0x37, 0xda, 0x41, 0x2b, 0x7e, 0x9b, 0xe0, 0xc2, 0x72, + 0xcd, 0xf6, 0x5c, 0x46, 0xab, 0x5f, 0xfb, 0xf0, 0xd9, 0x1c, 0xfa, 0xfb, 0xb3, 0x39, 0xf4, 0xf1, + 0xb3, 0x39, 0xf4, 0xf6, 0xd5, 0xdd, 0xfd, 0x03, 0xca, 0x69, 0x7b, 0xd4, 0x4f, 0x54, 0xb6, 0xff, + 0x0b, 0x00, 0x00, 0xff, 0xff, 0xe8, 0xaa, 0x19, 0x00, 0xfd, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2362,7 +2420,7 @@ type ApplicationServiceClient interface { // DeleteResource deletes a single application resource DeleteResource(ctx context.Context, in *ApplicationResourceDeleteRequest, opts ...grpc.CallOption) (*ApplicationResponse, error) // Create creates an application - ValidateSrcAndDst(ctx context.Context, in *ApplicationValidationRequest, opts ...grpc.CallOption) (*ApplicationResponse, error) + ValidateSrcAndDst(ctx context.Context, in *ApplicationValidationRequest, opts ...grpc.CallOption) (*ApplicationValidateResponse, error) // PodLogs returns stream of log entries for the specified pod. Pod PodLogs(ctx context.Context, in *ApplicationPodLogsQuery, opts ...grpc.CallOption) (ApplicationService_PodLogsClient, error) } @@ -2628,8 +2686,8 @@ func (c *applicationServiceClient) DeleteResource(ctx context.Context, in *Appli return out, nil } -func (c *applicationServiceClient) ValidateSrcAndDst(ctx context.Context, in *ApplicationValidationRequest, opts ...grpc.CallOption) (*ApplicationResponse, error) { - out := new(ApplicationResponse) +func (c *applicationServiceClient) ValidateSrcAndDst(ctx context.Context, in *ApplicationValidationRequest, opts ...grpc.CallOption) (*ApplicationValidateResponse, error) { + out := new(ApplicationValidateResponse) err := c.cc.Invoke(ctx, "/application.ApplicationService/ValidateSrcAndDst", in, out, opts...) if err != nil { return nil, err @@ -2718,7 +2776,7 @@ type ApplicationServiceServer interface { // DeleteResource deletes a single application resource DeleteResource(context.Context, *ApplicationResourceDeleteRequest) (*ApplicationResponse, error) // Create creates an application - ValidateSrcAndDst(context.Context, *ApplicationValidationRequest) (*ApplicationResponse, error) + ValidateSrcAndDst(context.Context, *ApplicationValidationRequest) (*ApplicationValidateResponse, error) // PodLogs returns stream of log entries for the specified pod. Pod PodLogs(*ApplicationPodLogsQuery, ApplicationService_PodLogsServer) error } @@ -2796,7 +2854,7 @@ func (*UnimplementedApplicationServiceServer) RunResourceAction(ctx context.Cont func (*UnimplementedApplicationServiceServer) DeleteResource(ctx context.Context, req *ApplicationResourceDeleteRequest) (*ApplicationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteResource not implemented") } -func (*UnimplementedApplicationServiceServer) ValidateSrcAndDst(ctx context.Context, req *ApplicationValidationRequest) (*ApplicationResponse, error) { +func (*UnimplementedApplicationServiceServer) ValidateSrcAndDst(ctx context.Context, req *ApplicationValidationRequest) (*ApplicationValidateResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ValidateSrcAndDst not implemented") } func (*UnimplementedApplicationServiceServer) PodLogs(req *ApplicationPodLogsQuery, srv ApplicationService_PodLogsServer) error { @@ -3615,6 +3673,47 @@ func (m *ApplicationManifestQuery) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } +func (m *ApplicationValidateResponse) 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 *ApplicationValidateResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ApplicationValidateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Entity != nil { + i -= len(*m.Entity) + copy(dAtA[i:], *m.Entity) + i = encodeVarintApplication(dAtA, i, uint64(len(*m.Entity))) + i-- + dAtA[i] = 0x12 + } + if m.Error != nil { + i -= len(*m.Error) + copy(dAtA[i:], *m.Error) + i = encodeVarintApplication(dAtA, i, uint64(len(*m.Error))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *ApplicationResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5154,6 +5253,26 @@ func (m *ApplicationManifestQuery) Size() (n int) { return n } +func (m *ApplicationValidateResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Error != nil { + l = len(*m.Error) + n += 1 + l + sovApplication(uint64(l)) + } + if m.Entity != nil { + l = len(*m.Entity) + n += 1 + l + sovApplication(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *ApplicationResponse) Size() (n int) { if m == nil { return 0 @@ -6514,6 +6633,123 @@ func (m *ApplicationManifestQuery) Unmarshal(dAtA []byte) error { } return nil } +func (m *ApplicationValidateResponse) 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 ErrIntOverflowApplication + } + 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: ApplicationValidateResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ApplicationValidateResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApplication + } + 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 ErrInvalidLengthApplication + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApplication + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + s := string(dAtA[iNdEx:postIndex]) + m.Error = &s + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Entity", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApplication + } + 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 ErrInvalidLengthApplication + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApplication + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + s := string(dAtA[iNdEx:postIndex]) + m.Entity = &s + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipApplication(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthApplication + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ApplicationResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/server/application/application.go b/server/application/application.go index bd0951337954f..5cab140983c3c 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -65,6 +65,12 @@ const ( foregroundPropagationPolicy string = "foreground" ) +const ( + projectEntity = "project" + sourceEntity = "source" + destinationEntity = "destination" +) + var ( watchAPIBufferSize = env.ParseNumFromEnv(argocommon.EnvWatchAPIBufferSize, 1000, 0, math.MaxInt32) @@ -927,43 +933,85 @@ func (s *Server) StartEventSource(es *events.EventSource, stream events.Eventing } } -func (s *Server) ValidateSrcAndDst(ctx context.Context, requset *application.ApplicationValidationRequest) (*application.ApplicationResponse, error) { +func (s *Server) ValidateSrcAndDst(ctx context.Context, requset *application.ApplicationValidationRequest) (*application.ApplicationValidateResponse, error) { app := requset.Application proj, err := argo.GetAppProject(&app.Spec, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr, s.db, ctx) if err != nil { + entity := projectEntity if apierr.IsNotFound(err) { - return nil, status.Errorf(codes.InvalidArgument, "application references project %s which does not exist", app.Spec.Project) + errMsg := fmt.Sprintf("application references project %s which does not exist", app.Spec.Project) + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil } - return nil, err + errMsg := err.Error() + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil } if err := argo.ValidateDestination(ctx, &app.Spec.Destination, s.db); err != nil { - return nil, status.Errorf(codes.InvalidArgument, "application destination spec for %s is invalid: %s", app.Name, err.Error()) + entity := destinationEntity + errMsg := fmt.Sprintf("application destination spec for %s is invalid: %s", app.Name, err.Error()) + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil } // If source is Kustomize add build options kustomizeSettings, err := s.settingsMgr.GetKustomizeSettings() if err != nil { - return nil, err + entity := sourceEntity + errMsg := err.Error() + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil } kustomizeOptions, err := kustomizeSettings.GetOptions(app.Spec.Source) if err != nil { - return nil, err + entity := sourceEntity + errMsg := err.Error() + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil } plugins, err := s.plugins() if err != nil { - return nil, err + entity := sourceEntity + errMsg := err.Error() + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil } var conditions []appv1.ApplicationCondition conditions, err = argo.ValidateRepo(ctx, app, s.repoClientset, s.db, kustomizeOptions, plugins, s.kubectl, proj, s.settingsMgr) if err != nil { - return nil, err + entity := sourceEntity + errMsg := err.Error() + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil } if len(conditions) > 0 { - return nil, status.Errorf(codes.InvalidArgument, "application spec for %s is invalid: %s", app.Name, argo.FormatAppConditions(conditions)) - } - return &application.ApplicationResponse{}, nil + entity := sourceEntity + errMsg := fmt.Sprintf("application spec for %s is invalid: %s", app.Name, argo.FormatAppConditions(conditions)) + return &application.ApplicationValidateResponse{ + Error: &errMsg, + Entity: &entity, + }, nil + } + return &application.ApplicationValidateResponse{ + Error: nil, + Entity: nil, + }, nil } func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error { diff --git a/server/application/application.proto b/server/application/application.proto index 3b94cac2deb99..c957855697031 100644 --- a/server/application/application.proto +++ b/server/application/application.proto @@ -56,6 +56,12 @@ message ApplicationManifestQuery { optional string revision = 2 [(gogoproto.nullable) = false]; } + +message ApplicationValidateResponse { + optional string error = 1; + optional string entity = 2; +} + message ApplicationResponse {} message ApplicationCreateRequest { @@ -377,7 +383,7 @@ service ApplicationService { } // Create creates an application - rpc ValidateSrcAndDst(ApplicationValidationRequest) returns (ApplicationResponse) { + rpc ValidateSrcAndDst(ApplicationValidationRequest) returns (ApplicationValidateResponse) { option (google.api.http) = { post: "/api/v1/application-validate" body: "application"