diff --git a/assets/swagger.json b/assets/swagger.json index e283f7c093110..bc0619fad75fc 100644 --- a/assets/swagger.json +++ b/assets/swagger.json @@ -5468,6 +5468,17 @@ } } }, + "repositoryRef": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "target": { + "type": "string" + } + } + }, "repositoryRefs": { "type": "object", "title": "A subset of the repository's named refs", @@ -5478,6 +5489,12 @@ "type": "string" } }, + "refs": { + "type": "array", + "items": { + "$ref": "#/definitions/repositoryRef" + } + }, "tags": { "type": "array", "items": { diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go index e6f8c4ee78591..6b9af2c6afa0b 100644 --- a/reposerver/apiclient/repository.pb.go +++ b/reposerver/apiclient/repository.pb.go @@ -837,10 +837,66 @@ func (m *ListRefsRequest) GetRepo() *v1alpha1.Repository { return nil } +type Ref struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Ref) Reset() { *m = Ref{} } +func (m *Ref) String() string { return proto.CompactTextString(m) } +func (*Ref) ProtoMessage() {} +func (*Ref) Descriptor() ([]byte, []int) { + return fileDescriptor_dd8723cfcc820480, []int{10} +} +func (m *Ref) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Ref) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Ref.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 *Ref) XXX_Merge(src proto.Message) { + xxx_messageInfo_Ref.Merge(m, src) +} +func (m *Ref) XXX_Size() int { + return m.Size() +} +func (m *Ref) XXX_DiscardUnknown() { + xxx_messageInfo_Ref.DiscardUnknown(m) +} + +var xxx_messageInfo_Ref proto.InternalMessageInfo + +func (m *Ref) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Ref) GetTarget() string { + if m != nil { + return m.Target + } + return "" +} + // A subset of the repository's named refs type Refs struct { Branches []string `protobuf:"bytes,1,rep,name=branches,proto3" json:"branches,omitempty"` Tags []string `protobuf:"bytes,2,rep,name=tags,proto3" json:"tags,omitempty"` + Refs []*Ref `protobuf:"bytes,3,rep,name=refs,proto3" json:"refs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -850,7 +906,7 @@ func (m *Refs) Reset() { *m = Refs{} } func (m *Refs) String() string { return proto.CompactTextString(m) } func (*Refs) ProtoMessage() {} func (*Refs) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{10} + return fileDescriptor_dd8723cfcc820480, []int{11} } func (m *Refs) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -893,6 +949,13 @@ func (m *Refs) GetTags() []string { return nil } +func (m *Refs) GetRefs() []*Ref { + if m != nil { + return m.Refs + } + return nil +} + // ListAppsRequest requests a repository directory structure type ListAppsRequest struct { Repo *v1alpha1.Repository `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` @@ -907,7 +970,7 @@ func (m *ListAppsRequest) Reset() { *m = ListAppsRequest{} } func (m *ListAppsRequest) String() string { return proto.CompactTextString(m) } func (*ListAppsRequest) ProtoMessage() {} func (*ListAppsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{11} + return fileDescriptor_dd8723cfcc820480, []int{12} } func (m *ListAppsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -969,7 +1032,7 @@ func (m *AppList) Reset() { *m = AppList{} } func (m *AppList) String() string { return proto.CompactTextString(m) } func (*AppList) ProtoMessage() {} func (*AppList) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{12} + return fileDescriptor_dd8723cfcc820480, []int{13} } func (m *AppList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1016,7 +1079,7 @@ func (m *PluginInfo) Reset() { *m = PluginInfo{} } func (m *PluginInfo) String() string { return proto.CompactTextString(m) } func (*PluginInfo) ProtoMessage() {} func (*PluginInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{13} + return fileDescriptor_dd8723cfcc820480, []int{14} } func (m *PluginInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1064,7 +1127,7 @@ func (m *PluginList) Reset() { *m = PluginList{} } func (m *PluginList) String() string { return proto.CompactTextString(m) } func (*PluginList) ProtoMessage() {} func (*PluginList) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{14} + return fileDescriptor_dd8723cfcc820480, []int{15} } func (m *PluginList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1122,7 +1185,7 @@ func (m *RepoServerAppDetailsQuery) Reset() { *m = RepoServerAppDetailsQ func (m *RepoServerAppDetailsQuery) String() string { return proto.CompactTextString(m) } func (*RepoServerAppDetailsQuery) ProtoMessage() {} func (*RepoServerAppDetailsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{15} + return fileDescriptor_dd8723cfcc820480, []int{16} } func (m *RepoServerAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1244,7 +1307,7 @@ func (m *RepoAppDetailsResponse) Reset() { *m = RepoAppDetailsResponse{} func (m *RepoAppDetailsResponse) String() string { return proto.CompactTextString(m) } func (*RepoAppDetailsResponse) ProtoMessage() {} func (*RepoAppDetailsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{16} + return fileDescriptor_dd8723cfcc820480, []int{17} } func (m *RepoAppDetailsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1324,7 +1387,7 @@ func (m *RepoServerRevisionMetadataRequest) Reset() { *m = RepoServerRev func (m *RepoServerRevisionMetadataRequest) String() string { return proto.CompactTextString(m) } func (*RepoServerRevisionMetadataRequest) ProtoMessage() {} func (*RepoServerRevisionMetadataRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{17} + return fileDescriptor_dd8723cfcc820480, []int{18} } func (m *RepoServerRevisionMetadataRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1390,7 +1453,7 @@ func (m *RepoServerRevisionChartDetailsRequest) Reset() { *m = RepoServe func (m *RepoServerRevisionChartDetailsRequest) String() string { return proto.CompactTextString(m) } func (*RepoServerRevisionChartDetailsRequest) ProtoMessage() {} func (*RepoServerRevisionChartDetailsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{18} + return fileDescriptor_dd8723cfcc820480, []int{19} } func (m *RepoServerRevisionChartDetailsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1459,7 +1522,7 @@ func (m *HelmAppSpec) Reset() { *m = HelmAppSpec{} } func (m *HelmAppSpec) String() string { return proto.CompactTextString(m) } func (*HelmAppSpec) ProtoMessage() {} func (*HelmAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{19} + return fileDescriptor_dd8723cfcc820480, []int{20} } func (m *HelmAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1536,7 +1599,7 @@ func (m *KustomizeAppSpec) Reset() { *m = KustomizeAppSpec{} } func (m *KustomizeAppSpec) String() string { return proto.CompactTextString(m) } func (*KustomizeAppSpec) ProtoMessage() {} func (*KustomizeAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{20} + return fileDescriptor_dd8723cfcc820480, []int{21} } func (m *KustomizeAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1583,7 +1646,7 @@ func (m *DirectoryAppSpec) Reset() { *m = DirectoryAppSpec{} } func (m *DirectoryAppSpec) String() string { return proto.CompactTextString(m) } func (*DirectoryAppSpec) ProtoMessage() {} func (*DirectoryAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{21} + return fileDescriptor_dd8723cfcc820480, []int{22} } func (m *DirectoryAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1643,7 +1706,7 @@ func (m *ParameterAnnouncement) Reset() { *m = ParameterAnnouncement{} } func (m *ParameterAnnouncement) String() string { return proto.CompactTextString(m) } func (*ParameterAnnouncement) ProtoMessage() {} func (*ParameterAnnouncement) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{22} + return fileDescriptor_dd8723cfcc820480, []int{23} } func (m *ParameterAnnouncement) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1747,7 +1810,7 @@ func (m *PluginAppSpec) Reset() { *m = PluginAppSpec{} } func (m *PluginAppSpec) String() string { return proto.CompactTextString(m) } func (*PluginAppSpec) ProtoMessage() {} func (*PluginAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{23} + return fileDescriptor_dd8723cfcc820480, []int{24} } func (m *PluginAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1794,7 +1857,7 @@ func (m *HelmChartsRequest) Reset() { *m = HelmChartsRequest{} } func (m *HelmChartsRequest) String() string { return proto.CompactTextString(m) } func (*HelmChartsRequest) ProtoMessage() {} func (*HelmChartsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{24} + return fileDescriptor_dd8723cfcc820480, []int{25} } func (m *HelmChartsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1842,7 +1905,7 @@ func (m *HelmChart) Reset() { *m = HelmChart{} } func (m *HelmChart) String() string { return proto.CompactTextString(m) } func (*HelmChart) ProtoMessage() {} func (*HelmChart) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{25} + return fileDescriptor_dd8723cfcc820480, []int{26} } func (m *HelmChart) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1896,7 +1959,7 @@ func (m *HelmChartsResponse) Reset() { *m = HelmChartsResponse{} } func (m *HelmChartsResponse) String() string { return proto.CompactTextString(m) } func (*HelmChartsResponse) ProtoMessage() {} func (*HelmChartsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{26} + return fileDescriptor_dd8723cfcc820480, []int{27} } func (m *HelmChartsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1949,7 +2012,7 @@ func (m *GitFilesRequest) Reset() { *m = GitFilesRequest{} } func (m *GitFilesRequest) String() string { return proto.CompactTextString(m) } func (*GitFilesRequest) ProtoMessage() {} func (*GitFilesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{27} + return fileDescriptor_dd8723cfcc820480, []int{28} } func (m *GitFilesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2039,7 +2102,7 @@ func (m *GitFilesResponse) Reset() { *m = GitFilesResponse{} } func (m *GitFilesResponse) String() string { return proto.CompactTextString(m) } func (*GitFilesResponse) ProtoMessage() {} func (*GitFilesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{28} + return fileDescriptor_dd8723cfcc820480, []int{29} } func (m *GitFilesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2090,7 +2153,7 @@ func (m *GitDirectoriesRequest) Reset() { *m = GitDirectoriesRequest{} } func (m *GitDirectoriesRequest) String() string { return proto.CompactTextString(m) } func (*GitDirectoriesRequest) ProtoMessage() {} func (*GitDirectoriesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{29} + return fileDescriptor_dd8723cfcc820480, []int{30} } func (m *GitDirectoriesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2166,7 +2229,7 @@ func (m *GitDirectoriesResponse) Reset() { *m = GitDirectoriesResponse{} func (m *GitDirectoriesResponse) String() string { return proto.CompactTextString(m) } func (*GitDirectoriesResponse) ProtoMessage() {} func (*GitDirectoriesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{30} + return fileDescriptor_dd8723cfcc820480, []int{31} } func (m *GitDirectoriesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2227,7 +2290,7 @@ func (m *UpdateRevisionForPathsRequest) Reset() { *m = UpdateRevisionFor func (m *UpdateRevisionForPathsRequest) String() string { return proto.CompactTextString(m) } func (*UpdateRevisionForPathsRequest) ProtoMessage() {} func (*UpdateRevisionForPathsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{31} + return fileDescriptor_dd8723cfcc820480, []int{32} } func (m *UpdateRevisionForPathsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2373,7 +2436,7 @@ func (m *UpdateRevisionForPathsResponse) Reset() { *m = UpdateRevisionFo func (m *UpdateRevisionForPathsResponse) String() string { return proto.CompactTextString(m) } func (*UpdateRevisionForPathsResponse) ProtoMessage() {} func (*UpdateRevisionForPathsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dd8723cfcc820480, []int{32} + return fileDescriptor_dd8723cfcc820480, []int{33} } func (m *UpdateRevisionForPathsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2429,6 +2492,7 @@ func init() { proto.RegisterType((*ResolveRevisionResponse)(nil), "repository.ResolveRevisionResponse") proto.RegisterType((*ManifestResponse)(nil), "repository.ManifestResponse") proto.RegisterType((*ListRefsRequest)(nil), "repository.ListRefsRequest") + proto.RegisterType((*Ref)(nil), "repository.Ref") proto.RegisterType((*Refs)(nil), "repository.Refs") proto.RegisterType((*ListAppsRequest)(nil), "repository.ListAppsRequest") proto.RegisterMapType((map[string]bool)(nil), "repository.ListAppsRequest.EnabledSourceTypesEntry") @@ -2466,155 +2530,157 @@ func init() { } var fileDescriptor_dd8723cfcc820480 = []byte{ - // 2353 bytes of a gzipped FileDescriptorProto + // 2387 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x1a, 0x4d, 0x73, 0x1c, 0x47, - 0x55, 0xfb, 0x25, 0xed, 0x3e, 0x59, 0x5f, 0x6d, 0x5b, 0x1e, 0xaf, 0x6d, 0x95, 0x32, 0x60, 0x97, - 0x63, 0x27, 0xab, 0xb2, 0x5c, 0x89, 0xc1, 0x09, 0xa1, 0x14, 0xd9, 0x96, 0x1c, 0x5b, 0xb6, 0x18, - 0x3b, 0xa1, 0x0c, 0x06, 0xaa, 0x77, 0xb6, 0xb5, 0xdb, 0xd1, 0x7c, 0xb4, 0x67, 0x7a, 0x14, 0xe4, - 0x2a, 0x2e, 0x40, 0x71, 0xe1, 0xc6, 0x81, 0x03, 0x57, 0x7e, 0x03, 0xc5, 0x91, 0x03, 0x45, 0xc1, - 0x91, 0xe2, 0xc2, 0x11, 0xca, 0xbf, 0x84, 0xea, 0x8f, 0xf9, 0xdc, 0xd9, 0xb5, 0xc2, 0xca, 0x0a, - 0xe4, 0x22, 0x4d, 0xbf, 0x7e, 0xfd, 0xde, 0xeb, 0xf7, 0xd5, 0xef, 0x75, 0x2f, 0x5c, 0x09, 0x08, + 0x55, 0xfb, 0x25, 0xed, 0x3e, 0x59, 0x5f, 0x6d, 0x5b, 0x1e, 0xaf, 0x6d, 0x95, 0x32, 0xc1, 0x2e, + 0xc7, 0x4e, 0x56, 0x25, 0xb9, 0x82, 0xc1, 0x09, 0xa1, 0x14, 0xd9, 0x96, 0x1c, 0x5b, 0xb6, 0x18, + 0x3b, 0xa1, 0x4c, 0x0c, 0x54, 0xef, 0x6c, 0xef, 0x6e, 0x47, 0xf3, 0xd1, 0x9e, 0xe9, 0x51, 0x90, + 0xab, 0xb8, 0x00, 0xc5, 0x85, 0x1b, 0x07, 0x0e, 0x5c, 0xf9, 0x0d, 0x14, 0x47, 0x0e, 0x14, 0x05, + 0x47, 0x8a, 0x0b, 0x47, 0x28, 0xff, 0x12, 0xaa, 0x3f, 0xe6, 0x73, 0x67, 0xd7, 0x0a, 0xb2, 0x15, + 0xe0, 0x22, 0x4d, 0xbf, 0x7e, 0xfd, 0xde, 0xeb, 0xf7, 0xd5, 0xef, 0x75, 0x2f, 0x5c, 0x09, 0x08, 0xf3, 0x43, 0x12, 0x1c, 0x90, 0x60, 0x4d, 0x7e, 0x52, 0xee, 0x07, 0x87, 0x99, 0xcf, 0x0e, 0x0b, - 0x7c, 0xee, 0x23, 0x48, 0x21, 0xed, 0x87, 0x7d, 0xca, 0x07, 0x51, 0xb7, 0x63, 0xfb, 0xee, 0x1a, - 0x0e, 0xfa, 0x3e, 0x0b, 0xfc, 0xcf, 0xe5, 0xc7, 0xbb, 0x76, 0x6f, 0xed, 0x60, 0x7d, 0x8d, 0xed, - 0xf7, 0xd7, 0x30, 0xa3, 0xe1, 0x1a, 0x66, 0xcc, 0xa1, 0x36, 0xe6, 0xd4, 0xf7, 0xd6, 0x0e, 0x6e, - 0x60, 0x87, 0x0d, 0xf0, 0x8d, 0xb5, 0x3e, 0xf1, 0x48, 0x80, 0x39, 0xe9, 0x29, 0xca, 0xed, 0x0b, - 0x7d, 0xdf, 0xef, 0x3b, 0x64, 0x4d, 0x8e, 0xba, 0xd1, 0xde, 0x1a, 0x71, 0x19, 0xd7, 0x6c, 0xcd, - 0xdf, 0xcc, 0xc1, 0xc2, 0x0e, 0xf6, 0xe8, 0x1e, 0x09, 0xb9, 0x45, 0x5e, 0x44, 0x24, 0xe4, 0xe8, - 0x39, 0xd4, 0x85, 0x30, 0x46, 0x65, 0xb5, 0x72, 0x75, 0x76, 0x7d, 0xbb, 0x93, 0x4a, 0xd3, 0x89, - 0xa5, 0x91, 0x1f, 0x3f, 0xb1, 0x7b, 0x9d, 0x83, 0xf5, 0x0e, 0xdb, 0xef, 0x77, 0x84, 0x34, 0x9d, - 0x8c, 0x34, 0x9d, 0x58, 0x9a, 0x8e, 0x95, 0x6c, 0xcb, 0x92, 0x54, 0x51, 0x1b, 0x9a, 0x01, 0x39, - 0xa0, 0x21, 0xf5, 0x3d, 0xa3, 0xba, 0x5a, 0xb9, 0xda, 0xb2, 0x92, 0x31, 0x32, 0x60, 0xc6, 0xf3, - 0x37, 0xb1, 0x3d, 0x20, 0x46, 0x6d, 0xb5, 0x72, 0xb5, 0x69, 0xc5, 0x43, 0xb4, 0x0a, 0xb3, 0x98, - 0xb1, 0x87, 0xb8, 0x4b, 0x9c, 0x07, 0xe4, 0xd0, 0xa8, 0xcb, 0x85, 0x59, 0x90, 0x58, 0x8b, 0x19, - 0x7b, 0x84, 0x5d, 0x62, 0x34, 0xe4, 0x6c, 0x3c, 0x44, 0x17, 0xa1, 0xe5, 0x61, 0x97, 0x84, 0x0c, - 0xdb, 0xc4, 0x68, 0xca, 0xb9, 0x14, 0x80, 0x7e, 0x06, 0x4b, 0x19, 0xc1, 0x9f, 0xf8, 0x51, 0x60, - 0x13, 0x03, 0xe4, 0xd6, 0x1f, 0x4f, 0xb6, 0xf5, 0x8d, 0x22, 0x59, 0x6b, 0x98, 0x13, 0xfa, 0x31, - 0x34, 0xa4, 0xe5, 0x8d, 0xd9, 0xd5, 0xda, 0xb1, 0x6a, 0x5b, 0x91, 0x45, 0x1e, 0xcc, 0x30, 0x27, - 0xea, 0x53, 0x2f, 0x34, 0x4e, 0x49, 0x0e, 0x4f, 0x27, 0xe3, 0xb0, 0xe9, 0x7b, 0x7b, 0xb4, 0xbf, - 0x83, 0x3d, 0xdc, 0x27, 0x2e, 0xf1, 0xf8, 0xae, 0x24, 0x6e, 0xc5, 0x4c, 0xd0, 0x4b, 0x58, 0xdc, - 0x8f, 0x42, 0xee, 0xbb, 0xf4, 0x25, 0x79, 0xcc, 0xc4, 0xda, 0xd0, 0x98, 0x93, 0xda, 0x7c, 0x34, - 0x19, 0xe3, 0x07, 0x05, 0xaa, 0xd6, 0x10, 0x1f, 0xe1, 0x24, 0xfb, 0x51, 0x97, 0x7c, 0x46, 0x02, - 0xe9, 0x5d, 0xf3, 0xca, 0x49, 0x32, 0x20, 0xe5, 0x46, 0x54, 0x8f, 0x42, 0x63, 0x61, 0xb5, 0xa6, - 0xdc, 0x28, 0x01, 0xa1, 0xab, 0xb0, 0x70, 0x40, 0x02, 0xba, 0x77, 0xf8, 0x84, 0xf6, 0x3d, 0xcc, - 0xa3, 0x80, 0x18, 0x8b, 0xd2, 0x15, 0x8b, 0x60, 0xe4, 0xc2, 0xdc, 0x80, 0x38, 0xae, 0x50, 0xf9, - 0x66, 0x40, 0x7a, 0xa1, 0xb1, 0x24, 0xf5, 0xbb, 0x35, 0xb9, 0x05, 0x25, 0x39, 0x2b, 0x4f, 0x5d, - 0x08, 0xe6, 0xf9, 0x96, 0x8e, 0x14, 0x15, 0x23, 0x48, 0x09, 0x56, 0x00, 0xa3, 0x2b, 0x30, 0xcf, - 0x03, 0x6c, 0xef, 0x53, 0xaf, 0xbf, 0x43, 0xf8, 0xc0, 0xef, 0x19, 0xa7, 0xa5, 0x26, 0x0a, 0x50, - 0x64, 0x03, 0x22, 0x1e, 0xee, 0x3a, 0xa4, 0xa7, 0x7c, 0xf1, 0xe9, 0x21, 0x23, 0xa1, 0x71, 0x46, - 0xee, 0xe2, 0x66, 0x27, 0x93, 0xa1, 0x0a, 0x09, 0xa2, 0x73, 0x77, 0x68, 0xd5, 0x5d, 0x8f, 0x07, - 0x87, 0x56, 0x09, 0x39, 0xb4, 0x0f, 0xb3, 0x62, 0x1f, 0xb1, 0x2b, 0x9c, 0x95, 0xae, 0x70, 0x7f, - 0x32, 0x1d, 0x6d, 0xa7, 0x04, 0xad, 0x2c, 0x75, 0xd4, 0x01, 0x34, 0xc0, 0xe1, 0x4e, 0xe4, 0x70, - 0xca, 0x1c, 0xa2, 0xc4, 0x08, 0x8d, 0x65, 0xa9, 0xa6, 0x92, 0x19, 0xf4, 0x00, 0x20, 0x20, 0x7b, - 0x31, 0xde, 0x39, 0xb9, 0xf3, 0xeb, 0xe3, 0x76, 0x6e, 0x25, 0xd8, 0x6a, 0xc7, 0x99, 0xe5, 0x82, - 0xb9, 0xd8, 0x06, 0xb1, 0xb9, 0x8e, 0x76, 0x19, 0xd6, 0x86, 0x74, 0xb1, 0x92, 0x19, 0xe1, 0x8b, - 0x1a, 0x2a, 0x93, 0xd6, 0x79, 0xe5, 0xad, 0x19, 0x90, 0x30, 0x24, 0xf5, 0x42, 0x8e, 0x1d, 0x47, - 0x2a, 0xe0, 0xfe, 0x1d, 0xe3, 0x82, 0x32, 0x64, 0x1e, 0xda, 0xbe, 0x0b, 0xe7, 0x46, 0x98, 0x04, - 0x2d, 0x42, 0x6d, 0x9f, 0x1c, 0xca, 0x54, 0xde, 0xb2, 0xc4, 0x27, 0x3a, 0x03, 0x8d, 0x03, 0xec, - 0x44, 0x44, 0x26, 0xdf, 0xa6, 0xa5, 0x06, 0xb7, 0xab, 0xdf, 0xaa, 0xb4, 0x7f, 0x55, 0x81, 0x85, - 0xc2, 0x06, 0x4b, 0xd6, 0xff, 0x28, 0xbb, 0xfe, 0x18, 0xdc, 0x7d, 0xef, 0x29, 0x0e, 0xfa, 0x84, - 0x67, 0x04, 0x31, 0xff, 0x51, 0x01, 0xa3, 0xa0, 0xf9, 0xef, 0x53, 0x3e, 0xb8, 0x47, 0x1d, 0x12, - 0xa2, 0x5b, 0x30, 0x13, 0x28, 0x98, 0x3e, 0xa0, 0x2e, 0x8c, 0x31, 0xd8, 0xf6, 0x94, 0x15, 0x63, - 0xa3, 0x8f, 0xa0, 0xe9, 0x12, 0x8e, 0x7b, 0x98, 0x63, 0x2d, 0xfb, 0x6a, 0xd9, 0x4a, 0xc1, 0x65, - 0x47, 0xe3, 0x6d, 0x4f, 0x59, 0xc9, 0x1a, 0xf4, 0x1e, 0x34, 0xec, 0x41, 0xe4, 0xed, 0xcb, 0xa3, - 0x69, 0x76, 0xfd, 0xd2, 0xa8, 0xc5, 0x9b, 0x02, 0x69, 0x7b, 0xca, 0x52, 0xd8, 0x1f, 0x4f, 0x43, - 0x9d, 0xe1, 0x80, 0x9b, 0xf7, 0xe0, 0x4c, 0x19, 0x0b, 0x71, 0x1e, 0xda, 0x03, 0x62, 0xef, 0x87, - 0x91, 0xab, 0xd5, 0x9c, 0x8c, 0x11, 0x82, 0x7a, 0x48, 0x5f, 0x2a, 0x55, 0xd7, 0x2c, 0xf9, 0x6d, - 0xbe, 0x0d, 0x4b, 0x43, 0xdc, 0x84, 0x51, 0x95, 0x6c, 0x82, 0xc2, 0x29, 0xcd, 0xda, 0x8c, 0xe0, - 0xec, 0x53, 0xa9, 0x8b, 0xe4, 0x50, 0x38, 0x89, 0x13, 0xde, 0xdc, 0x86, 0xe5, 0x22, 0xdb, 0x90, - 0xf9, 0x5e, 0x48, 0x44, 0x88, 0xc8, 0x2c, 0x4a, 0x49, 0x2f, 0x9d, 0x95, 0x52, 0x34, 0xad, 0x92, - 0x19, 0xf3, 0xf7, 0x55, 0x58, 0xb6, 0x48, 0xe8, 0x3b, 0x07, 0x24, 0x4e, 0x71, 0x27, 0x53, 0xa4, - 0xfc, 0x10, 0x6a, 0x98, 0x31, 0xed, 0x26, 0xf7, 0x8f, 0xad, 0x0c, 0xb0, 0x04, 0x55, 0xf4, 0x0e, - 0x2c, 0x61, 0xb7, 0x4b, 0xfb, 0x91, 0x1f, 0x85, 0xf1, 0xb6, 0xa4, 0x53, 0xb5, 0xac, 0xe1, 0x09, - 0x91, 0x26, 0x42, 0x19, 0x91, 0xf7, 0xbd, 0x1e, 0xf9, 0xa9, 0xac, 0x7c, 0x6a, 0x56, 0x16, 0x64, - 0xda, 0x70, 0x6e, 0x48, 0x49, 0x5a, 0xe1, 0xd9, 0x62, 0xab, 0x52, 0x28, 0xb6, 0x4a, 0xc5, 0xa8, - 0x8e, 0x10, 0xc3, 0x7c, 0x55, 0x81, 0xc5, 0x34, 0xb8, 0x34, 0xf9, 0x8b, 0xd0, 0x72, 0x35, 0x2c, - 0x34, 0x2a, 0x32, 0xd3, 0xa5, 0x80, 0x7c, 0xdd, 0x55, 0x2d, 0xd6, 0x5d, 0xcb, 0x30, 0xad, 0xca, - 0x62, 0xbd, 0x75, 0x3d, 0xca, 0x89, 0x5c, 0x2f, 0x88, 0xbc, 0x02, 0x10, 0x26, 0x19, 0xce, 0x98, - 0x96, 0xb3, 0x19, 0x08, 0x32, 0xe1, 0x94, 0x3a, 0xa5, 0x2d, 0x12, 0x46, 0x0e, 0x37, 0x66, 0x24, - 0x46, 0x0e, 0x26, 0xe3, 0xcd, 0x77, 0x5d, 0xec, 0xf5, 0x42, 0xa3, 0x29, 0x45, 0x4e, 0xc6, 0xa6, - 0x0f, 0x0b, 0x0f, 0xa9, 0xd8, 0xdf, 0x5e, 0x78, 0x32, 0xa1, 0xf2, 0x3e, 0xd4, 0x05, 0x33, 0x21, - 0x54, 0x37, 0xc0, 0x9e, 0x3d, 0x20, 0xb1, 0x1e, 0x93, 0xb1, 0x48, 0x02, 0x1c, 0xf7, 0x43, 0xa3, - 0x2a, 0xe1, 0xf2, 0xdb, 0xfc, 0x63, 0x55, 0x49, 0xba, 0xc1, 0x58, 0xf8, 0xd5, 0x97, 0xed, 0xe5, - 0x85, 0x44, 0x6d, 0xb8, 0x90, 0x28, 0x88, 0xfc, 0x65, 0x0a, 0x89, 0x63, 0x3a, 0xe4, 0xcc, 0x08, - 0x66, 0x36, 0x18, 0x13, 0x82, 0xa0, 0x1b, 0x50, 0xc7, 0x8c, 0x29, 0x85, 0x17, 0xf2, 0xb9, 0x46, - 0x11, 0xff, 0xb5, 0x48, 0x12, 0xb5, 0x7d, 0x0b, 0x5a, 0x09, 0xe8, 0x75, 0x6c, 0x5b, 0x59, 0xb6, - 0xab, 0x00, 0xaa, 0x52, 0xbe, 0xef, 0xed, 0xf9, 0xc2, 0xa4, 0x22, 0x10, 0xf4, 0x52, 0xf9, 0x6d, - 0xde, 0x8e, 0x31, 0xa4, 0x6c, 0xef, 0x40, 0x83, 0x72, 0xe2, 0xc6, 0xc2, 0x2d, 0x67, 0x85, 0x4b, - 0x09, 0x59, 0x0a, 0xc9, 0xfc, 0x6b, 0x13, 0xce, 0x0b, 0x8b, 0x3d, 0x91, 0x21, 0xb4, 0xc1, 0xd8, - 0x1d, 0xc2, 0x31, 0x75, 0xc2, 0xef, 0x45, 0x24, 0x38, 0x7c, 0xc3, 0x8e, 0xd1, 0x87, 0x69, 0x15, - 0x81, 0x3a, 0x5b, 0x1e, 0x7b, 0xd3, 0xa4, 0xc9, 0xa7, 0x9d, 0x52, 0xed, 0xcd, 0x74, 0x4a, 0x65, - 0x9d, 0x4b, 0xfd, 0x84, 0x3a, 0x97, 0xd1, 0xcd, 0x6b, 0xa6, 0x25, 0x9e, 0xce, 0xb7, 0xc4, 0x25, - 0x0d, 0xc1, 0xcc, 0x51, 0x1b, 0x82, 0x66, 0x69, 0x43, 0xe0, 0x96, 0xc6, 0x71, 0x4b, 0xaa, 0xfb, - 0x3b, 0x59, 0x0f, 0x1c, 0xe9, 0x6b, 0x93, 0xb4, 0x06, 0xf0, 0x46, 0x5b, 0x83, 0x4f, 0x73, 0xa5, - 0xbe, 0x6a, 0xb6, 0xdf, 0x3b, 0xda, 0x9e, 0xc6, 0x14, 0xfd, 0x5f, 0xbb, 0xd2, 0xfb, 0x97, 0xb2, - 0xe2, 0x62, 0x7e, 0xaa, 0x83, 0xe4, 0xb0, 0x17, 0xe7, 0x90, 0x38, 0x76, 0x75, 0xd2, 0x12, 0xdf, - 0xe8, 0x3a, 0xd4, 0x85, 0x92, 0x75, 0x49, 0x7c, 0x2e, 0xab, 0x4f, 0x61, 0x89, 0x0d, 0xc6, 0x9e, - 0x30, 0x62, 0x5b, 0x12, 0x09, 0xdd, 0x86, 0x56, 0xe2, 0xf8, 0x3a, 0xb2, 0x2e, 0x66, 0x57, 0x24, - 0x71, 0x12, 0x2f, 0x4b, 0xd1, 0xc5, 0xda, 0x1e, 0x0d, 0x88, 0x2d, 0x0b, 0xc6, 0xc6, 0xf0, 0xda, - 0x3b, 0xf1, 0x64, 0xb2, 0x36, 0x41, 0x47, 0x37, 0x60, 0x5a, 0xdd, 0x4e, 0xc8, 0x08, 0x9a, 0x5d, - 0x3f, 0x3f, 0x9c, 0x4c, 0xe3, 0x55, 0x1a, 0xd1, 0xfc, 0x4b, 0x05, 0xde, 0x4a, 0x1d, 0x22, 0x8e, - 0xa6, 0xb8, 0x66, 0xff, 0xea, 0x4f, 0xdc, 0x2b, 0x30, 0x2f, 0x9b, 0x84, 0xf4, 0x92, 0x42, 0xdd, - 0x97, 0x15, 0xa0, 0xe6, 0x1f, 0x2a, 0x70, 0x79, 0x78, 0x1f, 0x9b, 0x03, 0x1c, 0xf0, 0xc4, 0xbc, - 0x27, 0xb1, 0x97, 0xf8, 0xc0, 0xab, 0xa6, 0x07, 0x5e, 0x6e, 0x7f, 0xb5, 0xfc, 0xfe, 0xcc, 0x3f, - 0x55, 0x61, 0x36, 0xe3, 0x40, 0x65, 0x07, 0xa6, 0x28, 0x06, 0xa5, 0xdf, 0xca, 0xb6, 0x50, 0x1e, - 0x0a, 0x2d, 0x2b, 0x03, 0x41, 0xfb, 0x00, 0x0c, 0x07, 0xd8, 0x25, 0x9c, 0x04, 0x22, 0x93, 0x8b, - 0x88, 0x7f, 0x30, 0x79, 0x76, 0xd9, 0x8d, 0x69, 0x5a, 0x19, 0xf2, 0xa2, 0x9a, 0x95, 0xac, 0x43, - 0x9d, 0xbf, 0xf5, 0x08, 0x7d, 0x01, 0xf3, 0x7b, 0xd4, 0x21, 0xbb, 0xa9, 0x20, 0xd3, 0x52, 0x90, - 0xc7, 0x93, 0x0b, 0x72, 0x2f, 0x4b, 0xd7, 0x2a, 0xb0, 0x31, 0xaf, 0xc1, 0x62, 0x31, 0x9e, 0x84, - 0x90, 0xd4, 0xc5, 0xfd, 0x44, 0x5b, 0x7a, 0x64, 0x22, 0x58, 0x2c, 0xc6, 0x8f, 0xf9, 0xaf, 0x2a, - 0x9c, 0x4d, 0xc8, 0x6d, 0x78, 0x9e, 0x1f, 0x79, 0xb6, 0xbc, 0xf0, 0x2b, 0xb5, 0xc5, 0x19, 0x68, - 0x70, 0xca, 0x9d, 0xa4, 0xf0, 0x91, 0x03, 0x71, 0x76, 0x71, 0xdf, 0x77, 0x38, 0x65, 0xda, 0xc0, - 0xf1, 0x50, 0xd9, 0xfe, 0x45, 0x44, 0x03, 0xd2, 0x93, 0x99, 0xa0, 0x69, 0x25, 0x63, 0x31, 0x27, - 0xaa, 0x1a, 0x59, 0xe2, 0x2b, 0x65, 0x26, 0x63, 0xe9, 0xf7, 0xbe, 0xe3, 0x10, 0x5b, 0xa8, 0x23, - 0xd3, 0x04, 0x14, 0xa0, 0xb2, 0xb9, 0xe0, 0x01, 0xf5, 0xfa, 0xba, 0x05, 0xd0, 0x23, 0x21, 0x27, - 0x0e, 0x02, 0x7c, 0xa8, 0x2b, 0x7f, 0x35, 0x40, 0x1f, 0x42, 0xcd, 0xc5, 0x4c, 0x1f, 0x74, 0xd7, - 0x72, 0xd9, 0xa1, 0x4c, 0x03, 0x9d, 0x1d, 0xcc, 0xd4, 0x49, 0x20, 0x96, 0xb5, 0xdf, 0x87, 0x66, - 0x0c, 0xf8, 0x52, 0x25, 0xe1, 0xe7, 0x30, 0x97, 0x4b, 0x3e, 0xe8, 0x19, 0x2c, 0xa7, 0x1e, 0x95, - 0x65, 0xa8, 0x8b, 0xc0, 0xb7, 0x5e, 0x2b, 0x99, 0x35, 0x82, 0x80, 0xf9, 0x02, 0x96, 0x84, 0xcb, - 0xc8, 0xc0, 0x3f, 0xa1, 0xd6, 0xe6, 0x03, 0x68, 0x25, 0x2c, 0x4b, 0x7d, 0xa6, 0x0d, 0xcd, 0x83, - 0xf8, 0x22, 0x56, 0xf5, 0x36, 0xc9, 0xd8, 0xdc, 0x00, 0x94, 0x95, 0x57, 0x9f, 0x40, 0xd7, 0xf3, - 0x45, 0xf1, 0xd9, 0xe2, 0x71, 0x23, 0xd1, 0xe3, 0x9a, 0xf8, 0x9f, 0x55, 0x58, 0xd8, 0xa2, 0xf2, - 0x8e, 0xe4, 0x84, 0x92, 0xdc, 0x35, 0x58, 0x0c, 0xa3, 0xae, 0xeb, 0xf7, 0x22, 0x87, 0xe8, 0xa2, - 0x40, 0x9f, 0xf4, 0x43, 0xf0, 0x71, 0xc9, 0x4f, 0x28, 0x8b, 0x61, 0x3e, 0xd0, 0xdd, 0xaf, 0xfc, - 0x46, 0x1f, 0xc2, 0xf9, 0x47, 0xe4, 0x0b, 0xbd, 0x9f, 0x2d, 0xc7, 0xef, 0x76, 0xa9, 0xd7, 0x8f, - 0x99, 0x34, 0x24, 0x93, 0xd1, 0x08, 0x65, 0xa5, 0xe2, 0x74, 0x79, 0xa9, 0x98, 0x74, 0xd0, 0x9b, - 0xbe, 0xeb, 0x52, 0xae, 0x2b, 0xca, 0x1c, 0xcc, 0xfc, 0x45, 0x05, 0x16, 0x53, 0xcd, 0x6a, 0xdb, - 0xdc, 0x52, 0x31, 0xa4, 0x2c, 0x73, 0x39, 0x6b, 0x99, 0x22, 0xea, 0x7f, 0x1f, 0x3e, 0xa7, 0xb2, - 0xe1, 0xf3, 0xeb, 0x2a, 0x9c, 0xdd, 0xa2, 0x3c, 0x4e, 0x5c, 0xf4, 0xff, 0xcd, 0xca, 0x25, 0x36, - 0xa9, 0x1f, 0xcd, 0x26, 0x8d, 0x12, 0x9b, 0x74, 0x60, 0xb9, 0xa8, 0x0c, 0x6d, 0x98, 0x33, 0xd0, - 0x10, 0x1e, 0x14, 0xdf, 0x2b, 0xa8, 0x81, 0xf9, 0xf3, 0x19, 0xb8, 0xf4, 0x29, 0xeb, 0x61, 0x9e, - 0xdc, 0x19, 0xdd, 0xf3, 0x83, 0x5d, 0x31, 0x75, 0x32, 0x5a, 0x2c, 0xbc, 0xe7, 0x55, 0xc7, 0xbe, - 0xe7, 0xd5, 0xc6, 0xbc, 0xe7, 0xd5, 0x8f, 0xf4, 0x9e, 0xd7, 0x38, 0xb1, 0xf7, 0xbc, 0xe1, 0x5e, - 0x6b, 0xba, 0xb4, 0xd7, 0x7a, 0x96, 0xeb, 0x47, 0x66, 0x64, 0xd8, 0x7c, 0x3b, 0x1b, 0x36, 0x63, - 0xad, 0x33, 0xf6, 0x21, 0xa2, 0xf0, 0x0c, 0xd6, 0x7c, 0xed, 0x33, 0x58, 0x6b, 0xf8, 0x19, 0xac, - 0xfc, 0x25, 0x05, 0x46, 0xbe, 0xa4, 0x5c, 0x81, 0xf9, 0xf0, 0xd0, 0xb3, 0x49, 0x2f, 0xb9, 0x49, - 0x9c, 0x55, 0xdb, 0xce, 0x43, 0x73, 0x11, 0x71, 0xaa, 0x10, 0x11, 0x89, 0xa7, 0xce, 0x65, 0x3c, - 0xb5, 0x2c, 0x4e, 0xe6, 0x47, 0xb6, 0xb9, 0x85, 0xe7, 0x92, 0x85, 0xd2, 0xe7, 0x92, 0xff, 0x99, - 0x66, 0xeb, 0x33, 0x58, 0x19, 0x65, 0x65, 0x1d, 0xbc, 0x06, 0xcc, 0xd8, 0x03, 0xec, 0xf5, 0xe5, - 0xb5, 0xa0, 0xec, 0xfe, 0xf5, 0x70, 0x5c, 0x77, 0xb0, 0xfe, 0x67, 0x80, 0xa5, 0xb4, 0xea, 0x17, - 0x7f, 0xa9, 0x4d, 0xd0, 0x63, 0x58, 0xdc, 0xd2, 0x3f, 0x0d, 0x88, 0x2f, 0x72, 0xd1, 0xb8, 0xb7, - 0x93, 0xf6, 0xc5, 0xf2, 0x49, 0x25, 0x9a, 0x39, 0x85, 0x6c, 0x38, 0x5f, 0x24, 0x98, 0x3e, 0xd3, - 0x7c, 0x73, 0x0c, 0xe5, 0x04, 0xeb, 0x75, 0x2c, 0xae, 0x56, 0xd0, 0x33, 0x98, 0xcf, 0x3f, 0x26, - 0xa0, 0x5c, 0x19, 0x54, 0xfa, 0xbe, 0xd1, 0x36, 0xc7, 0xa1, 0x24, 0xf2, 0x3f, 0x17, 0x6e, 0x90, - 0xbb, 0x37, 0x47, 0x66, 0xfe, 0x46, 0xa0, 0xec, 0xe5, 0xa1, 0xfd, 0x8d, 0xb1, 0x38, 0x09, 0xf5, - 0x0f, 0xa0, 0x19, 0xdf, 0x25, 0xe7, 0xd5, 0x5c, 0xb8, 0x61, 0x6e, 0x2f, 0xe6, 0xe9, 0xed, 0x85, - 0xe6, 0x14, 0xfa, 0x48, 0x2d, 0xde, 0x60, 0xac, 0x64, 0x71, 0xe6, 0x06, 0xb5, 0x7d, 0xba, 0xe4, - 0xd6, 0xd2, 0x9c, 0x42, 0xdf, 0x85, 0x59, 0xf1, 0xb5, 0xab, 0x1f, 0xe5, 0x97, 0x3b, 0xea, 0x37, - 0x20, 0x9d, 0xf8, 0x37, 0x20, 0x9d, 0xbb, 0x2e, 0xe3, 0x87, 0xed, 0x92, 0x6b, 0x45, 0x4d, 0xe0, - 0x39, 0xcc, 0x6d, 0x11, 0x9e, 0xde, 0x02, 0xa0, 0xcb, 0x47, 0xba, 0x2b, 0x69, 0x9b, 0x45, 0xb4, - 0xe1, 0x8b, 0x04, 0x73, 0x0a, 0xfd, 0xb6, 0x02, 0xa7, 0xb7, 0x08, 0x2f, 0xf6, 0xd5, 0xe8, 0xdd, - 0x72, 0x26, 0x23, 0xfa, 0xef, 0xf6, 0xa3, 0x49, 0x63, 0x32, 0x4f, 0xd6, 0x9c, 0x42, 0xbf, 0xab, - 0xc0, 0xb9, 0x8c, 0x60, 0xd9, 0x46, 0x19, 0xdd, 0x18, 0x2f, 0x5c, 0x49, 0x53, 0xdd, 0xfe, 0x64, - 0xc2, 0xdf, 0x5a, 0x64, 0x48, 0x9a, 0x53, 0x68, 0x57, 0xda, 0x24, 0xad, 0x8b, 0xd1, 0xa5, 0xd2, - 0x02, 0x38, 0xe1, 0xbe, 0x32, 0x6a, 0x3a, 0xb1, 0xc3, 0x27, 0x30, 0xbb, 0x45, 0x78, 0x5c, 0xa0, - 0xe5, 0x3d, 0xad, 0x50, 0x3b, 0xe7, 0x43, 0xb5, 0x58, 0xd3, 0x49, 0x8f, 0x59, 0x52, 0xb4, 0x32, - 0x45, 0x48, 0x3e, 0x56, 0x4b, 0xab, 0xb5, 0xbc, 0xc7, 0x94, 0xd7, 0x30, 0xe6, 0x14, 0x7a, 0x01, - 0xcb, 0xe5, 0xa9, 0x12, 0xbd, 0x7d, 0xe4, 0x43, 0xb3, 0x7d, 0xed, 0x28, 0xa8, 0x31, 0xcb, 0x8f, - 0x37, 0xfe, 0xf6, 0x6a, 0xa5, 0xf2, 0xf7, 0x57, 0x2b, 0x95, 0x7f, 0xbf, 0x5a, 0xa9, 0xfc, 0xe0, - 0xe6, 0x6b, 0x7e, 0x93, 0x95, 0xf9, 0x99, 0x17, 0x66, 0xd4, 0x76, 0x28, 0xf1, 0x78, 0x77, 0x5a, - 0xc6, 0xdb, 0xcd, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x7a, 0xf3, 0x7f, 0x05, 0x26, 0x00, - 0x00, + 0x7c, 0xee, 0x23, 0x48, 0x21, 0xed, 0x07, 0x03, 0xca, 0x87, 0x51, 0xb7, 0x63, 0xfb, 0xee, 0x1a, + 0x0e, 0x06, 0x3e, 0x0b, 0xfc, 0x2f, 0xe4, 0xc7, 0x7b, 0x76, 0x6f, 0xed, 0x60, 0x63, 0x8d, 0xed, + 0x0f, 0xd6, 0x30, 0xa3, 0xe1, 0x1a, 0x66, 0xcc, 0xa1, 0x36, 0xe6, 0xd4, 0xf7, 0xd6, 0x0e, 0xd6, + 0xb1, 0xc3, 0x86, 0x78, 0x7d, 0x6d, 0x40, 0x3c, 0x12, 0x60, 0x4e, 0x7a, 0x8a, 0x72, 0xfb, 0xc2, + 0xc0, 0xf7, 0x07, 0x0e, 0x59, 0x93, 0xa3, 0x6e, 0xd4, 0x5f, 0x23, 0x2e, 0xe3, 0x9a, 0xad, 0xf9, + 0xeb, 0x39, 0x58, 0xd8, 0xc5, 0x1e, 0xed, 0x93, 0x90, 0x5b, 0xe4, 0x79, 0x44, 0x42, 0x8e, 0x9e, + 0x41, 0x5d, 0x08, 0x63, 0x54, 0x56, 0x2b, 0x57, 0x67, 0x37, 0x76, 0x3a, 0xa9, 0x34, 0x9d, 0x58, + 0x1a, 0xf9, 0xf1, 0x63, 0xbb, 0xd7, 0x39, 0xd8, 0xe8, 0xb0, 0xfd, 0x41, 0x47, 0x48, 0xd3, 0xc9, + 0x48, 0xd3, 0x89, 0xa5, 0xe9, 0x58, 0xc9, 0xb6, 0x2c, 0x49, 0x15, 0xb5, 0xa1, 0x19, 0x90, 0x03, + 0x1a, 0x52, 0xdf, 0x33, 0xaa, 0xab, 0x95, 0xab, 0x2d, 0x2b, 0x19, 0x23, 0x03, 0x66, 0x3c, 0x7f, + 0x0b, 0xdb, 0x43, 0x62, 0xd4, 0x56, 0x2b, 0x57, 0x9b, 0x56, 0x3c, 0x44, 0xab, 0x30, 0x8b, 0x19, + 0x7b, 0x80, 0xbb, 0xc4, 0xb9, 0x4f, 0x0e, 0x8d, 0xba, 0x5c, 0x98, 0x05, 0x89, 0xb5, 0x98, 0xb1, + 0x87, 0xd8, 0x25, 0x46, 0x43, 0xce, 0xc6, 0x43, 0x74, 0x11, 0x5a, 0x1e, 0x76, 0x49, 0xc8, 0xb0, + 0x4d, 0x8c, 0xa6, 0x9c, 0x4b, 0x01, 0xe8, 0xa7, 0xb0, 0x94, 0x11, 0xfc, 0xb1, 0x1f, 0x05, 0x36, + 0x31, 0x40, 0x6e, 0xfd, 0xd1, 0xf1, 0xb6, 0xbe, 0x59, 0x24, 0x6b, 0x8d, 0x72, 0x42, 0x3f, 0x82, + 0x86, 0xb4, 0xbc, 0x31, 0xbb, 0x5a, 0x7b, 0xad, 0xda, 0x56, 0x64, 0x91, 0x07, 0x33, 0xcc, 0x89, + 0x06, 0xd4, 0x0b, 0x8d, 0x53, 0x92, 0xc3, 0x93, 0xe3, 0x71, 0xd8, 0xf2, 0xbd, 0x3e, 0x1d, 0xec, + 0x62, 0x0f, 0x0f, 0x88, 0x4b, 0x3c, 0xbe, 0x27, 0x89, 0x5b, 0x31, 0x13, 0xf4, 0x02, 0x16, 0xf7, + 0xa3, 0x90, 0xfb, 0x2e, 0x7d, 0x41, 0x1e, 0x31, 0xb1, 0x36, 0x34, 0xe6, 0xa4, 0x36, 0x1f, 0x1e, + 0x8f, 0xf1, 0xfd, 0x02, 0x55, 0x6b, 0x84, 0x8f, 0x70, 0x92, 0xfd, 0xa8, 0x4b, 0x3e, 0x23, 0x81, + 0xf4, 0xae, 0x79, 0xe5, 0x24, 0x19, 0x90, 0x72, 0x23, 0xaa, 0x47, 0xa1, 0xb1, 0xb0, 0x5a, 0x53, + 0x6e, 0x94, 0x80, 0xd0, 0x55, 0x58, 0x38, 0x20, 0x01, 0xed, 0x1f, 0x3e, 0xa6, 0x03, 0x0f, 0xf3, + 0x28, 0x20, 0xc6, 0xa2, 0x74, 0xc5, 0x22, 0x18, 0xb9, 0x30, 0x37, 0x24, 0x8e, 0x2b, 0x54, 0xbe, + 0x15, 0x90, 0x5e, 0x68, 0x2c, 0x49, 0xfd, 0x6e, 0x1f, 0xdf, 0x82, 0x92, 0x9c, 0x95, 0xa7, 0x2e, + 0x04, 0xf3, 0x7c, 0x4b, 0x47, 0x8a, 0x8a, 0x11, 0xa4, 0x04, 0x2b, 0x80, 0xd1, 0x15, 0x98, 0xe7, + 0x01, 0xb6, 0xf7, 0xa9, 0x37, 0xd8, 0x25, 0x7c, 0xe8, 0xf7, 0x8c, 0xd3, 0x52, 0x13, 0x05, 0x28, + 0xb2, 0x01, 0x11, 0x0f, 0x77, 0x1d, 0xd2, 0x53, 0xbe, 0xf8, 0xe4, 0x90, 0x91, 0xd0, 0x38, 0x23, + 0x77, 0x71, 0xa3, 0x93, 0xc9, 0x50, 0x85, 0x04, 0xd1, 0xb9, 0x33, 0xb2, 0xea, 0x8e, 0xc7, 0x83, + 0x43, 0xab, 0x84, 0x1c, 0xda, 0x87, 0x59, 0xb1, 0x8f, 0xd8, 0x15, 0xce, 0x4a, 0x57, 0xb8, 0x77, + 0x3c, 0x1d, 0xed, 0xa4, 0x04, 0xad, 0x2c, 0x75, 0xd4, 0x01, 0x34, 0xc4, 0xe1, 0x6e, 0xe4, 0x70, + 0xca, 0x1c, 0xa2, 0xc4, 0x08, 0x8d, 0x65, 0xa9, 0xa6, 0x92, 0x19, 0x74, 0x1f, 0x20, 0x20, 0xfd, + 0x18, 0xef, 0x9c, 0xdc, 0xf9, 0xf5, 0x49, 0x3b, 0xb7, 0x12, 0x6c, 0xb5, 0xe3, 0xcc, 0x72, 0xc1, + 0x5c, 0x6c, 0x83, 0xd8, 0x5c, 0x47, 0xbb, 0x0c, 0x6b, 0x43, 0xba, 0x58, 0xc9, 0x8c, 0xf0, 0x45, + 0x0d, 0x95, 0x49, 0xeb, 0xbc, 0xf2, 0xd6, 0x0c, 0x48, 0x18, 0x92, 0x7a, 0x21, 0xc7, 0x8e, 0x23, + 0x15, 0x70, 0xef, 0xb6, 0x71, 0x41, 0x19, 0x32, 0x0f, 0x6d, 0xdf, 0x81, 0x73, 0x63, 0x4c, 0x82, + 0x16, 0xa1, 0xb6, 0x4f, 0x0e, 0x65, 0x2a, 0x6f, 0x59, 0xe2, 0x13, 0x9d, 0x81, 0xc6, 0x01, 0x76, + 0x22, 0x22, 0x93, 0x6f, 0xd3, 0x52, 0x83, 0x5b, 0xd5, 0x6f, 0x55, 0xda, 0xbf, 0xac, 0xc0, 0x42, + 0x61, 0x83, 0x25, 0xeb, 0x7f, 0x98, 0x5d, 0xff, 0x1a, 0xdc, 0xbd, 0xff, 0x04, 0x07, 0x03, 0xc2, + 0x33, 0x82, 0x98, 0x7f, 0xaf, 0x80, 0x51, 0xd0, 0xfc, 0xf7, 0x29, 0x1f, 0xde, 0xa5, 0x0e, 0x09, + 0xd1, 0x4d, 0x98, 0x09, 0x14, 0x4c, 0x1f, 0x50, 0x17, 0x26, 0x18, 0x6c, 0x67, 0xca, 0x8a, 0xb1, + 0xd1, 0x47, 0xd0, 0x74, 0x09, 0xc7, 0x3d, 0xcc, 0xb1, 0x96, 0x7d, 0xb5, 0x6c, 0xa5, 0xe0, 0xb2, + 0xab, 0xf1, 0x76, 0xa6, 0xac, 0x64, 0x0d, 0x7a, 0x1f, 0x1a, 0xf6, 0x30, 0xf2, 0xf6, 0xe5, 0xd1, + 0x34, 0xbb, 0x71, 0x69, 0xdc, 0xe2, 0x2d, 0x81, 0xb4, 0x33, 0x65, 0x29, 0xec, 0x8f, 0xa7, 0xa1, + 0xce, 0x70, 0xc0, 0xcd, 0xbb, 0x70, 0xa6, 0x8c, 0x85, 0x38, 0x0f, 0xed, 0x21, 0xb1, 0xf7, 0xc3, + 0xc8, 0xd5, 0x6a, 0x4e, 0xc6, 0x08, 0x41, 0x3d, 0xa4, 0x2f, 0x94, 0xaa, 0x6b, 0x96, 0xfc, 0x36, + 0xdf, 0x81, 0xa5, 0x11, 0x6e, 0xc2, 0xa8, 0x4a, 0x36, 0x41, 0xe1, 0x94, 0x66, 0x6d, 0x46, 0x70, + 0xf6, 0x89, 0xd4, 0x45, 0x72, 0x28, 0x9c, 0xc4, 0x09, 0x6f, 0xee, 0xc0, 0x72, 0x91, 0x6d, 0xc8, + 0x7c, 0x2f, 0x24, 0x22, 0x44, 0x64, 0x16, 0xa5, 0xa4, 0x97, 0xce, 0x4a, 0x29, 0x9a, 0x56, 0xc9, + 0x8c, 0xf9, 0xbb, 0x2a, 0x2c, 0x5b, 0x24, 0xf4, 0x9d, 0x03, 0x12, 0xa7, 0xb8, 0x93, 0x29, 0x52, + 0x3e, 0x87, 0x1a, 0x66, 0x4c, 0xbb, 0xc9, 0xbd, 0xd7, 0x56, 0x06, 0x58, 0x82, 0x2a, 0x7a, 0x17, + 0x96, 0xb0, 0xdb, 0xa5, 0x83, 0xc8, 0x8f, 0xc2, 0x78, 0x5b, 0xd2, 0xa9, 0x5a, 0xd6, 0xe8, 0x84, + 0x48, 0x13, 0xa1, 0x8c, 0xc8, 0x7b, 0x5e, 0x8f, 0xfc, 0x44, 0x56, 0x3e, 0x35, 0x2b, 0x0b, 0x32, + 0x6d, 0x38, 0x37, 0xa2, 0x24, 0xad, 0xf0, 0x6c, 0xb1, 0x55, 0x29, 0x14, 0x5b, 0xa5, 0x62, 0x54, + 0xc7, 0x88, 0x61, 0xbe, 0xac, 0xc0, 0x62, 0x1a, 0x5c, 0x9a, 0xfc, 0x45, 0x68, 0xb9, 0x1a, 0x16, + 0x1a, 0x15, 0x99, 0xe9, 0x52, 0x40, 0xbe, 0xee, 0xaa, 0x16, 0xeb, 0xae, 0x65, 0x98, 0x56, 0x65, + 0xb1, 0xde, 0xba, 0x1e, 0xe5, 0x44, 0xae, 0x17, 0x44, 0x5e, 0x01, 0x08, 0x93, 0x0c, 0x67, 0x4c, + 0xcb, 0xd9, 0x0c, 0x04, 0x99, 0x70, 0x4a, 0x9d, 0xd2, 0x16, 0x09, 0x23, 0x87, 0x1b, 0x33, 0x12, + 0x23, 0x07, 0x93, 0xf1, 0xe6, 0xbb, 0x2e, 0xf6, 0x7a, 0xa1, 0xd1, 0x94, 0x22, 0x27, 0x63, 0xd3, + 0x87, 0x85, 0x07, 0x54, 0xec, 0xaf, 0x1f, 0x9e, 0x4c, 0xa8, 0xac, 0x43, 0xcd, 0x22, 0x7d, 0x11, + 0xe7, 0x42, 0x31, 0xda, 0x44, 0xf2, 0x5b, 0xe8, 0x87, 0xcb, 0xcc, 0xa8, 0x55, 0xa7, 0x47, 0xe6, + 0xe7, 0x50, 0x17, 0xf2, 0x89, 0x7d, 0x74, 0x03, 0xec, 0xd9, 0x43, 0x12, 0xab, 0x3e, 0x19, 0x0b, + 0x7a, 0x1c, 0x0f, 0x42, 0xa3, 0x2a, 0xe1, 0xf2, 0x1b, 0xbd, 0x2d, 0x36, 0xd2, 0x0f, 0x8d, 0x9a, + 0x3c, 0xe5, 0x16, 0xb2, 0xd9, 0xcb, 0x22, 0x7d, 0x4b, 0x4e, 0x9a, 0x7f, 0xa8, 0x2a, 0x0d, 0x6c, + 0x32, 0x16, 0x7e, 0xfd, 0xed, 0x40, 0x79, 0x81, 0x52, 0x1b, 0x2d, 0x50, 0x0a, 0x22, 0x7f, 0x95, + 0x02, 0xe5, 0x35, 0x1d, 0x9e, 0x66, 0x04, 0x33, 0x9b, 0x8c, 0x09, 0x41, 0xd0, 0x3a, 0xd4, 0x31, + 0x63, 0xca, 0x2a, 0x85, 0x73, 0x42, 0xa3, 0x88, 0xff, 0x5a, 0x24, 0x89, 0xda, 0xbe, 0x09, 0xad, + 0x04, 0xf4, 0x2a, 0xb6, 0xad, 0x2c, 0xdb, 0x55, 0x00, 0x55, 0x81, 0xdf, 0xf3, 0xfa, 0x7e, 0x99, + 0x1f, 0x99, 0xb7, 0x62, 0x0c, 0x29, 0xdb, 0xbb, 0xd0, 0xa0, 0x9c, 0xb8, 0xb1, 0x70, 0xcb, 0x59, + 0xe1, 0x52, 0x42, 0x96, 0x42, 0x32, 0xff, 0xd2, 0x84, 0xf3, 0xc2, 0x62, 0x8f, 0x65, 0x68, 0x6e, + 0x32, 0x76, 0x9b, 0x70, 0x4c, 0x9d, 0xf0, 0x7b, 0x11, 0x09, 0x0e, 0xdf, 0xb0, 0x63, 0x0c, 0x60, + 0x5a, 0x45, 0xb6, 0xce, 0xc2, 0xaf, 0xbd, 0x19, 0xd3, 0xe4, 0xd3, 0x0e, 0xac, 0xf6, 0x66, 0x3a, + 0xb0, 0xb2, 0x8e, 0xa8, 0x7e, 0x42, 0x1d, 0xd1, 0xf8, 0xa6, 0x38, 0xd3, 0x6a, 0x4f, 0xe7, 0x5b, + 0xed, 0x92, 0x46, 0x63, 0xe6, 0xa8, 0x8d, 0x46, 0xb3, 0xb4, 0xd1, 0x70, 0x4b, 0xe3, 0xb8, 0x25, + 0xd5, 0xfd, 0x9d, 0x7c, 0x22, 0x1a, 0xe3, 0x6b, 0xc7, 0x69, 0x39, 0xe0, 0x8d, 0xb6, 0x1c, 0x9f, + 0xe6, 0x5a, 0x08, 0xd5, 0xc4, 0xbf, 0x7f, 0xb4, 0x3d, 0x4d, 0x68, 0x26, 0xfe, 0xef, 0x4a, 0xfa, + 0x5f, 0xc8, 0x4a, 0x8e, 0xf9, 0xa9, 0x0e, 0x92, 0x22, 0x42, 0x1c, 0x56, 0xe2, 0x38, 0xd7, 0x49, + 0x4b, 0x7c, 0xa3, 0xeb, 0x50, 0x17, 0x4a, 0xd6, 0xa5, 0xf6, 0xb9, 0xac, 0x3e, 0x85, 0x25, 0x36, + 0x19, 0x7b, 0xcc, 0x88, 0x6d, 0x49, 0x24, 0x74, 0x0b, 0x5a, 0x89, 0xe3, 0xeb, 0xc8, 0xba, 0x98, + 0x5d, 0x91, 0xc4, 0x49, 0xbc, 0x2c, 0x45, 0x17, 0x6b, 0x7b, 0x34, 0x20, 0xb6, 0x2c, 0x44, 0x1b, + 0xa3, 0x6b, 0x6f, 0xc7, 0x93, 0xc9, 0xda, 0x04, 0x1d, 0xad, 0xc3, 0xb4, 0xba, 0xf5, 0x90, 0x11, + 0x34, 0xbb, 0x71, 0x7e, 0x34, 0x99, 0xc6, 0xab, 0x34, 0xa2, 0xf9, 0xe7, 0x0a, 0xbc, 0x95, 0x3a, + 0x44, 0x1c, 0x4d, 0x71, 0x2f, 0xf0, 0xf5, 0x9f, 0xb8, 0x57, 0x60, 0x5e, 0x36, 0x1f, 0xe9, 0xe5, + 0x87, 0xba, 0x87, 0x2b, 0x40, 0xcd, 0xdf, 0x57, 0xe0, 0xf2, 0xe8, 0x3e, 0xb6, 0x86, 0x38, 0xe0, + 0x89, 0x79, 0x4f, 0x62, 0x2f, 0xf1, 0x81, 0x57, 0xcd, 0x14, 0x4e, 0xd9, 0xfd, 0xd5, 0xf2, 0xfb, + 0x33, 0xff, 0x58, 0x85, 0xd9, 0x8c, 0x03, 0x95, 0x16, 0x5e, 0x2b, 0x00, 0xd2, 0x6f, 0x65, 0xbb, + 0x29, 0x0f, 0x85, 0x96, 0x95, 0x81, 0xa0, 0x7d, 0x00, 0x86, 0x03, 0xec, 0x12, 0x4e, 0x02, 0x91, + 0xc9, 0x45, 0xc4, 0xdf, 0x3f, 0x7e, 0x76, 0xd9, 0x8b, 0x69, 0x5a, 0x19, 0xf2, 0xa2, 0x0a, 0x94, + 0xac, 0x43, 0x9d, 0xbf, 0xf5, 0x08, 0x7d, 0x09, 0xf3, 0x7d, 0xea, 0x90, 0xbd, 0x54, 0x90, 0x69, + 0x29, 0xc8, 0xa3, 0xe3, 0x0b, 0x72, 0x37, 0x4b, 0xd7, 0x2a, 0xb0, 0x31, 0xaf, 0xc1, 0x62, 0x31, + 0x9e, 0x84, 0x90, 0xd4, 0xc5, 0x83, 0x44, 0x5b, 0x7a, 0x64, 0x22, 0x58, 0x2c, 0xc6, 0x8f, 0xf9, + 0xcf, 0x2a, 0x9c, 0x4d, 0xc8, 0x6d, 0x7a, 0x9e, 0x1f, 0x79, 0xb6, 0xbc, 0x48, 0x2c, 0xb5, 0xc5, + 0x19, 0x68, 0x70, 0xca, 0x9d, 0xa4, 0xf0, 0x91, 0x03, 0x71, 0x76, 0x71, 0xdf, 0x77, 0x38, 0x65, + 0xda, 0xc0, 0xf1, 0x50, 0xd9, 0xfe, 0x79, 0x44, 0x03, 0xd2, 0x93, 0x99, 0xa0, 0x69, 0x25, 0x63, + 0x31, 0x27, 0xaa, 0x1a, 0xd9, 0x3a, 0x28, 0x65, 0x26, 0x63, 0xe9, 0xf7, 0xbe, 0xe3, 0x10, 0x5b, + 0xa8, 0x23, 0xd3, 0x5c, 0x14, 0xa0, 0xb2, 0x69, 0xe1, 0x01, 0xf5, 0x06, 0xba, 0xb5, 0xd0, 0x23, + 0x21, 0x27, 0x0e, 0x02, 0x7c, 0xa8, 0x3b, 0x0a, 0x35, 0x40, 0x1f, 0x42, 0xcd, 0xc5, 0x4c, 0x1f, + 0x74, 0xd7, 0x72, 0xd9, 0xa1, 0x4c, 0x03, 0x9d, 0x5d, 0xcc, 0xd4, 0x49, 0x20, 0x96, 0xb5, 0xbf, + 0x09, 0xcd, 0x18, 0xf0, 0x95, 0x4a, 0xc2, 0x2f, 0x60, 0x2e, 0x97, 0x7c, 0xd0, 0x53, 0x58, 0x4e, + 0x3d, 0x2a, 0xcb, 0x50, 0x17, 0x81, 0x6f, 0xbd, 0x52, 0x32, 0x6b, 0x0c, 0x01, 0xf3, 0x39, 0x2c, + 0x09, 0x97, 0x91, 0x81, 0x7f, 0x42, 0x2d, 0xd3, 0x07, 0xd0, 0x4a, 0x58, 0x96, 0xfa, 0x4c, 0x1b, + 0x9a, 0x07, 0xf1, 0x05, 0xaf, 0x6a, 0x80, 0x92, 0xb1, 0xb9, 0x09, 0x28, 0x2b, 0xaf, 0x3e, 0x81, + 0xae, 0xe7, 0x8b, 0xe2, 0xb3, 0xc5, 0xe3, 0x46, 0xa2, 0xc7, 0x35, 0xf1, 0x3f, 0xaa, 0xb0, 0xb0, + 0x4d, 0xe5, 0xdd, 0xcb, 0x09, 0x25, 0xb9, 0x6b, 0xb0, 0x18, 0x46, 0x5d, 0xd7, 0xef, 0x45, 0x0e, + 0xd1, 0x45, 0x81, 0x3e, 0xe9, 0x47, 0xe0, 0x93, 0x92, 0x9f, 0x50, 0x16, 0xc3, 0x7c, 0xa8, 0xbb, + 0x6a, 0xf9, 0x8d, 0x3e, 0x84, 0xf3, 0x0f, 0xc9, 0x97, 0x7a, 0x3f, 0xdb, 0x8e, 0xdf, 0xed, 0x52, + 0x6f, 0x10, 0x33, 0x69, 0x48, 0x26, 0xe3, 0x11, 0xca, 0x4a, 0xc5, 0xe9, 0xf2, 0x52, 0x31, 0xe9, + 0xcc, 0xb7, 0x7c, 0xd7, 0xa5, 0x5c, 0x57, 0x94, 0x39, 0x98, 0xf9, 0xf3, 0x0a, 0x2c, 0xa6, 0x9a, + 0xd5, 0xb6, 0xb9, 0xa9, 0x62, 0x48, 0x59, 0xe6, 0x72, 0xd6, 0x32, 0x45, 0xd4, 0xff, 0x3c, 0x7c, + 0x4e, 0x65, 0xc3, 0xe7, 0x57, 0x55, 0x38, 0xbb, 0x4d, 0x79, 0x9c, 0xb8, 0xe8, 0xff, 0x9a, 0x95, + 0x4b, 0x6c, 0x52, 0x3f, 0x9a, 0x4d, 0x1a, 0x25, 0x36, 0xe9, 0xc0, 0x72, 0x51, 0x19, 0xda, 0x30, + 0x67, 0xa0, 0x21, 0x3c, 0x28, 0xbe, 0x7c, 0x50, 0x03, 0xf3, 0x67, 0x33, 0x70, 0xe9, 0x53, 0xd6, + 0xc3, 0x3c, 0xb9, 0x8b, 0xba, 0xeb, 0x07, 0x7b, 0x62, 0xea, 0x64, 0xb4, 0x58, 0x78, 0x27, 0xac, + 0x4e, 0x7c, 0x27, 0xac, 0x4d, 0x78, 0x27, 0xac, 0x1f, 0xe9, 0x9d, 0xb0, 0x71, 0x62, 0xef, 0x84, + 0xa3, 0xbd, 0xd6, 0x74, 0x69, 0xaf, 0xf5, 0x34, 0xd7, 0x8f, 0xcc, 0xc8, 0xb0, 0xf9, 0x76, 0x36, + 0x6c, 0x26, 0x5a, 0x67, 0xe2, 0x03, 0x47, 0xe1, 0x79, 0xad, 0xf9, 0xca, 0xe7, 0xb5, 0xd6, 0xe8, + 0xf3, 0x5a, 0xf9, 0x0b, 0x0d, 0x8c, 0x7d, 0xa1, 0xb9, 0x02, 0xf3, 0xe1, 0xa1, 0x67, 0x93, 0x5e, + 0x72, 0x43, 0x39, 0xab, 0xb6, 0x9d, 0x87, 0xe6, 0x22, 0xe2, 0x54, 0x21, 0x22, 0x12, 0x4f, 0x9d, + 0xcb, 0x78, 0x6a, 0x59, 0x9c, 0xcc, 0x8f, 0x6d, 0x73, 0x0b, 0xcf, 0x30, 0x0b, 0xa5, 0xcf, 0x30, + 0xff, 0x35, 0xcd, 0xd6, 0x67, 0xb0, 0x32, 0xce, 0xca, 0x3a, 0x78, 0x0d, 0x98, 0xb1, 0x87, 0xd8, + 0x1b, 0xc8, 0xbb, 0x43, 0xd9, 0xfd, 0xeb, 0xe1, 0xa4, 0xee, 0x60, 0xe3, 0x4f, 0x00, 0x4b, 0x69, + 0xd5, 0x2f, 0xfe, 0x52, 0x9b, 0xa0, 0x47, 0xb0, 0xb8, 0xad, 0x7f, 0x72, 0x10, 0x5f, 0x10, 0xa3, + 0x49, 0x6f, 0x32, 0xed, 0x8b, 0xe5, 0x93, 0x4a, 0x34, 0x73, 0x0a, 0xd9, 0x70, 0xbe, 0x48, 0x30, + 0x7d, 0xfe, 0xf9, 0xc6, 0x04, 0xca, 0x09, 0xd6, 0xab, 0x58, 0x5c, 0xad, 0xa0, 0xa7, 0x30, 0x9f, + 0x7f, 0xa4, 0x40, 0xb9, 0x32, 0xa8, 0xf4, 0xdd, 0xa4, 0x6d, 0x4e, 0x42, 0x49, 0xe4, 0x7f, 0x26, + 0xdc, 0x20, 0x77, 0x1f, 0x8f, 0xcc, 0xfc, 0x8d, 0x40, 0xd9, 0x8b, 0x46, 0xfb, 0xed, 0x89, 0x38, + 0x09, 0xf5, 0x0f, 0xa0, 0x19, 0xdf, 0x51, 0xe7, 0xd5, 0x5c, 0xb8, 0xb9, 0x6e, 0x2f, 0x16, 0xae, + 0x78, 0x43, 0x73, 0x0a, 0x7d, 0xa4, 0x16, 0x6f, 0x32, 0x56, 0xb2, 0x38, 0x73, 0x83, 0xda, 0x3e, + 0x5d, 0x72, 0x6b, 0x69, 0x4e, 0xa1, 0xef, 0xc2, 0xac, 0xf8, 0xda, 0xd3, 0x8f, 0xfd, 0xcb, 0x1d, + 0xf5, 0xdb, 0x92, 0x4e, 0xfc, 0xdb, 0x92, 0xce, 0x1d, 0x97, 0xf1, 0xc3, 0x76, 0xc9, 0xb5, 0xa2, + 0x26, 0xf0, 0x0c, 0xe6, 0xb6, 0x09, 0x4f, 0x6f, 0x01, 0xd0, 0xe5, 0x23, 0xdd, 0x95, 0xb4, 0xcd, + 0x22, 0xda, 0xe8, 0x45, 0x82, 0x39, 0x85, 0x7e, 0x53, 0x81, 0xd3, 0xdb, 0x84, 0x17, 0xfb, 0x6a, + 0xf4, 0x5e, 0x39, 0x93, 0x31, 0xfd, 0x77, 0xfb, 0xe1, 0x71, 0x63, 0x32, 0x4f, 0xd6, 0x9c, 0x42, + 0xbf, 0xad, 0xc0, 0xb9, 0x8c, 0x60, 0xd9, 0x46, 0x19, 0xad, 0x4f, 0x16, 0xae, 0xa4, 0xa9, 0x6e, + 0x7f, 0x72, 0xcc, 0xdf, 0x70, 0x64, 0x48, 0x9a, 0x53, 0x68, 0x4f, 0xda, 0x24, 0xad, 0x8b, 0xd1, + 0xa5, 0xd2, 0x02, 0x38, 0xe1, 0xbe, 0x32, 0x6e, 0x3a, 0xb1, 0xc3, 0x27, 0x30, 0xbb, 0x4d, 0x78, + 0x5c, 0xa0, 0xe5, 0x3d, 0xad, 0x50, 0x3b, 0xe7, 0x43, 0xb5, 0x58, 0xd3, 0x49, 0x8f, 0x59, 0x52, + 0xb4, 0x32, 0x45, 0x48, 0x3e, 0x56, 0x4b, 0xab, 0xb5, 0xbc, 0xc7, 0x94, 0xd7, 0x30, 0xe6, 0x14, + 0x7a, 0x0e, 0xcb, 0xe5, 0xa9, 0x12, 0xbd, 0x73, 0xe4, 0x43, 0xb3, 0x7d, 0xed, 0x28, 0xa8, 0x31, + 0xcb, 0x8f, 0x37, 0xff, 0xfa, 0x72, 0xa5, 0xf2, 0xb7, 0x97, 0x2b, 0x95, 0x7f, 0xbd, 0x5c, 0xa9, + 0xfc, 0xe0, 0xc6, 0x2b, 0x7e, 0xeb, 0x95, 0xf9, 0xf9, 0x18, 0x66, 0xd4, 0x76, 0x28, 0xf1, 0x78, + 0x77, 0x5a, 0xc6, 0xdb, 0x8d, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x78, 0xb9, 0xa2, 0x70, 0x5d, + 0x26, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4000,6 +4066,47 @@ func (m *ListRefsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Ref) 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 *Ref) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Ref) 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 len(m.Target) > 0 { + i -= len(m.Target) + copy(dAtA[i:], m.Target) + i = encodeVarintRepository(dAtA, i, uint64(len(m.Target))) + i-- + dAtA[i] = 0x12 + } + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintRepository(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Refs) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4024,6 +4131,20 @@ func (m *Refs) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.Refs) > 0 { + for iNdEx := len(m.Refs) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Refs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintRepository(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } if len(m.Tags) > 0 { for iNdEx := len(m.Tags) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Tags[iNdEx]) @@ -5834,6 +5955,26 @@ func (m *ListRefsRequest) Size() (n int) { return n } +func (m *Ref) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovRepository(uint64(l)) + } + l = len(m.Target) + if l > 0 { + n += 1 + l + sovRepository(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *Refs) Size() (n int) { if m == nil { return 0 @@ -5852,6 +5993,12 @@ func (m *Refs) Size() (n int) { n += 1 + l + sovRepository(uint64(l)) } } + if len(m.Refs) > 0 { + for _, e := range m.Refs { + l = e.Size() + n += 1 + l + sovRepository(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -8591,6 +8738,121 @@ func (m *ListRefsRequest) Unmarshal(dAtA []byte) error { } return nil } +func (m *Ref) 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 ErrIntOverflowRepository + } + 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: Ref: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Ref: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRepository + } + 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 ErrInvalidLengthRepository + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRepository + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Target", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRepository + } + 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 ErrInvalidLengthRepository + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRepository + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Target = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipRepository(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthRepository + } + 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 *Refs) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -8684,6 +8946,40 @@ func (m *Refs) Unmarshal(dAtA []byte) error { } m.Tags = append(m.Tags, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Refs", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRepository + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRepository + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRepository + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Refs = append(m.Refs, &Ref{}) + if err := m.Refs[len(m.Refs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRepository(dAtA[iNdEx:]) diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go index d6a33934415e2..02ecf5b59a1b7 100644 --- a/reposerver/repository/repository.go +++ b/reposerver/repository/repository.go @@ -13,6 +13,7 @@ import ( "path" "path/filepath" "regexp" + "sort" "strings" "time" @@ -194,9 +195,29 @@ func (s *Service) ListRefs(ctx context.Context, q *apiclient.ListRefsRequest) (* return nil, err } + var branches []string + var tags []string + var apiRefs []*apiclient.Ref + for _, revision := range refs { + if revision.Name().IsBranch() { + branches = append(branches, revision.Name().Short()) + } else if revision.Name().IsTag() { + tags = append(tags, revision.Name().Short()) + } + strs := revision.Strings() + apiRefs = append(apiRefs, &apiclient.Ref{Name: strs[0], Target: strs[1]}) + } + + log.Debugf("LsRefs resolved %d branches and %d tags on repository", len(branches), len(tags)) + + // Would prefer to sort by last modified date but that info does not appear to be available without resolving each ref + sort.Strings(branches) + sort.Strings(tags) + res := apiclient.Refs{ - Branches: refs.Branches, - Tags: refs.Tags, + Branches: branches, + Tags: tags, + Refs: apiRefs, } return &res, nil diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto index b5bdb85ee782e..38be37a056f2e 100644 --- a/reposerver/repository/repository.proto +++ b/reposerver/repository/repository.proto @@ -104,10 +104,16 @@ message ListRefsRequest { github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; } +message Ref { + string name = 1; + string target = 2; +} + // A subset of the repository's named refs message Refs { repeated string branches = 1; repeated string tags = 2; + repeated Ref refs = 3; } // ListAppsRequest requests a repository directory structure diff --git a/util/git/client.go b/util/git/client.go index 80ec706062801..5b291369738db 100644 --- a/util/git/client.go +++ b/util/git/client.go @@ -11,7 +11,6 @@ import ( "os/exec" "path/filepath" "regexp" - "sort" "strconv" "strings" "syscall" @@ -50,13 +49,6 @@ type RevisionMetadata struct { Message string } -// this should match reposerver/repository/repository.proto/RefsList -type Refs struct { - Branches []string - Tags []string - // heads and remotes are also refs, but are not needed at this time. -} - type gitRefCache interface { SetGitReferences(repo string, references []*plumbing.Reference) error GetOrLockGitReferences(repo string, lockId string, references *[]*plumbing.Reference) (string, error) @@ -70,7 +62,7 @@ type Client interface { Fetch(revision string) error Submodule() error Checkout(revision string, submoduleEnabled bool) error - LsRefs() (*Refs, error) + LsRefs() ([]*plumbing.Reference, error) LsRemote(revision string) (string, error) LsFiles(path string, enableNewGitFileGlobbing bool) ([]string, error) LsLargeFiles() ([]string, error) @@ -498,7 +490,7 @@ func (m *nativeGitClient) Checkout(revision string, submoduleEnabled bool) error return nil } -func (m *nativeGitClient) getRefs() ([]*plumbing.Reference, error) { +func (m *nativeGitClient) LsRefs() ([]*plumbing.Reference, error) { myLockUUID, err := uuid.NewRandom() myLockId := "" if err != nil { @@ -564,34 +556,6 @@ func (m *nativeGitClient) getRefs() ([]*plumbing.Reference, error) { return res, err } -func (m *nativeGitClient) LsRefs() (*Refs, error) { - refs, err := m.getRefs() - if err != nil { - return nil, err - } - - sortedRefs := &Refs{ - Branches: []string{}, - Tags: []string{}, - } - - for _, revision := range refs { - if revision.Name().IsBranch() { - sortedRefs.Branches = append(sortedRefs.Branches, revision.Name().Short()) - } else if revision.Name().IsTag() { - sortedRefs.Tags = append(sortedRefs.Tags, revision.Name().Short()) - } - } - - log.Debugf("LsRefs resolved %d branches and %d tags on repository", len(sortedRefs.Branches), len(sortedRefs.Tags)) - - // Would prefer to sort by last modified date but that info does not appear to be available without resolving each ref - sort.Strings(sortedRefs.Branches) - sort.Strings(sortedRefs.Tags) - - return sortedRefs, nil -} - // LsRemote resolves the commit SHA of a specific branch, tag (with semantic versioning or not), // or HEAD. If the supplied revision does not resolve, and "looks" like a 7+ hexadecimal commit SHA, // it will return the revision string. Otherwise, it returns an error indicating that the revision could @@ -622,7 +586,8 @@ func (m *nativeGitClient) lsRemote(revision string) (string, error) { return revision, nil } - refs, err := m.getRefs() + refs, err := m.LsRefs() + if err != nil { return "", err } diff --git a/util/git/mocks/Client.go b/util/git/mocks/Client.go index 490aa4e99b90d..530fe33ecf093 100644 --- a/util/git/mocks/Client.go +++ b/util/git/mocks/Client.go @@ -5,6 +5,8 @@ package mocks import ( git "github.com/argoproj/argo-cd/v2/util/git" mock "github.com/stretchr/testify/mock" + + plumbing "github.com/go-git/go-git/v5/plumbing" ) // Client is an autogenerated mock type for the Client type @@ -221,23 +223,23 @@ func (_m *Client) LsLargeFiles() ([]string, error) { } // LsRefs provides a mock function with given fields: -func (_m *Client) LsRefs() (*git.Refs, error) { +func (_m *Client) LsRefs() ([]*plumbing.Reference, error) { ret := _m.Called() if len(ret) == 0 { panic("no return value specified for LsRefs") } - var r0 *git.Refs + var r0 []*plumbing.Reference var r1 error - if rf, ok := ret.Get(0).(func() (*git.Refs, error)); ok { + if rf, ok := ret.Get(0).(func() ([]*plumbing.Reference, error)); ok { return rf() } - if rf, ok := ret.Get(0).(func() *git.Refs); ok { + if rf, ok := ret.Get(0).(func() []*plumbing.Reference); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*git.Refs) + r0 = ret.Get(0).([]*plumbing.Reference) } }