From 1158960340e53901b63b8b889f0df05feb01d4b0 Mon Sep 17 00:00:00 2001 From: Blake Pettersson Date: Fri, 6 Sep 2024 23:00:50 +0200 Subject: [PATCH] feat: metadata + oci fixes Now we can unpack OCI Helm charts. This also adds the beginning of being able to render metadata. Signed-off-by: Blake Pettersson --- assets/swagger.json | 91 +++++ pkg/apiclient/application/application.pb.go | 386 ++++++++++-------- .../application/application.pb.gw.go | 141 +++++++ pkg/apis/application/v1alpha1/generated.proto | 17 + .../application/v1alpha1/openapi_generated.go | 56 +++ pkg/apis/application/v1alpha1/types.go | 11 + .../mocks/RepoServerServiceClient.go | 14 +- reposerver/repository/repository.go | 25 +- reposerver/repository/repository.proto | 4 +- server/application/application.go | 28 ++ server/application/application.proto | 5 + util/oci/client.go | 172 +++++--- 12 files changed, 719 insertions(+), 231 deletions(-) diff --git a/assets/swagger.json b/assets/swagger.json index 3290419af61f28..5da33481a5fb46 100644 --- a/assets/swagger.json +++ b/assets/swagger.json @@ -1729,6 +1729,70 @@ } } }, + "/api/v1/applications/{name}/revisions/{revision}/ocimetadata": { + "get": { + "tags": [ + "ApplicationService" + ], + "summary": "Get the chart metadata (description, maintainers, home) for a specific revision of the application", + "operationId": "ApplicationService_GetOCIMetadata", + "parameters": [ + { + "type": "string", + "description": "the application's name", + "name": "name", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "the revision of the app", + "name": "revision", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "the application's namespace.", + "name": "appNamespace", + "in": "query" + }, + { + "type": "string", + "name": "project", + "in": "query" + }, + { + "type": "integer", + "format": "int32", + "description": "source index (for multi source apps).", + "name": "sourceIndex", + "in": "query" + }, + { + "type": "integer", + "format": "int32", + "description": "versionId from historical data (for multi source apps).", + "name": "versionId", + "in": "query" + } + ], + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/v1alpha1OCIMetadata" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/runtimeError" + } + } + } + } + }, "/api/v1/applications/{name}/rollback": { "post": { "tags": [ @@ -7797,6 +7861,33 @@ } } }, + "v1alpha1OCIMetadata": { + "type": "object", + "title": "OCIMetadata contains metadata for a specific revision in an OCI repository", + "properties": { + "authors": { + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "description": { + "type": "string" + }, + "docsUrl": { + "type": "string" + }, + "imageUrl": { + "type": "string" + }, + "sourceUrl": { + "type": "string" + }, + "version": { + "type": "string" + } + } + }, "v1alpha1Operation": { "type": "object", "title": "Operation contains information about a requested or running operation", diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go index 2f73469d1049ff..6f864cb0d247ee 100644 --- a/pkg/apiclient/application/application.pb.go +++ b/pkg/apiclient/application/application.pb.go @@ -2842,179 +2842,181 @@ func init() { } var fileDescriptor_df6e82b174b5eaec = []byte{ - // 2742 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4d, 0x8c, 0x1b, 0x49, - 0x15, 0xa6, 0xec, 0xf1, 0x8c, 0xe7, 0x79, 0x26, 0x93, 0xd4, 0x26, 0x83, 0xd7, 0x99, 0x0d, 0xde, - 0x4e, 0xb2, 0x71, 0x26, 0x19, 0x3b, 0x31, 0x01, 0x65, 0x67, 0x77, 0x05, 0xc9, 0xe4, 0x17, 0x26, - 0xd9, 0xd0, 0x93, 0x10, 0xb4, 0x1c, 0xa0, 0xb6, 0xbb, 0xc6, 0xd3, 0x4c, 0xbb, 0xbb, 0xd3, 0xdd, - 0x76, 0x18, 0x85, 0x5c, 0x16, 0xed, 0x05, 0xad, 0x40, 0xc0, 0x1e, 0x10, 0x42, 0x80, 0x16, 0xad, - 0x84, 0x10, 0x88, 0x0b, 0x42, 0x48, 0x08, 0x09, 0x0e, 0x20, 0x38, 0x20, 0xad, 0xe0, 0xc8, 0x05, - 0x45, 0x88, 0x23, 0x5c, 0xf6, 0x8c, 0x50, 0x55, 0x57, 0x75, 0x57, 0xfb, 0xa7, 0xed, 0xc1, 0x46, - 0x9b, 0x5b, 0xbf, 0x72, 0xd5, 0x7b, 0xdf, 0x7b, 0xf5, 0xea, 0xbd, 0x57, 0xaf, 0x0c, 0x27, 0x02, - 0xea, 0x77, 0xa9, 0xdf, 0x20, 0x9e, 0x67, 0x5b, 0x06, 0x09, 0x2d, 0xd7, 0x51, 0xbf, 0xeb, 0x9e, - 0xef, 0x86, 0x2e, 0x2e, 0x29, 0x43, 0x95, 0x95, 0x96, 0xeb, 0xb6, 0x6c, 0xda, 0x20, 0x9e, 0xd5, - 0x20, 0x8e, 0xe3, 0x86, 0x7c, 0x38, 0x88, 0xa6, 0x56, 0xb4, 0xdd, 0x8b, 0x41, 0xdd, 0x72, 0xf9, - 0xaf, 0x86, 0xeb, 0xd3, 0x46, 0xf7, 0x7c, 0xa3, 0x45, 0x1d, 0xea, 0x93, 0x90, 0x9a, 0x62, 0xce, - 0x85, 0x64, 0x4e, 0x9b, 0x18, 0x3b, 0x96, 0x43, 0xfd, 0xbd, 0x86, 0xb7, 0xdb, 0x62, 0x03, 0x41, - 0xa3, 0x4d, 0x43, 0x32, 0x68, 0xd5, 0x66, 0xcb, 0x0a, 0x77, 0x3a, 0xaf, 0xd7, 0x0d, 0xb7, 0xdd, - 0x20, 0x7e, 0xcb, 0xf5, 0x7c, 0xf7, 0x4b, 0xfc, 0x63, 0xcd, 0x30, 0x1b, 0xdd, 0x66, 0xc2, 0x40, - 0xd5, 0xa5, 0x7b, 0x9e, 0xd8, 0xde, 0x0e, 0xe9, 0xe7, 0x76, 0x75, 0x04, 0x37, 0x9f, 0x7a, 0xae, - 0xb0, 0x0d, 0xff, 0xb4, 0x42, 0xd7, 0xdf, 0x53, 0x3e, 0x23, 0x36, 0xda, 0xfb, 0x08, 0x0e, 0x5e, - 0x4a, 0xe4, 0x7d, 0xa6, 0x43, 0xfd, 0x3d, 0x8c, 0x61, 0xc6, 0x21, 0x6d, 0x5a, 0x46, 0x55, 0x54, - 0x9b, 0xd7, 0xf9, 0x37, 0x2e, 0xc3, 0x9c, 0x4f, 0xb7, 0x7d, 0x1a, 0xec, 0x94, 0x73, 0x7c, 0x58, - 0x92, 0xb8, 0x02, 0x45, 0x26, 0x9c, 0x1a, 0x61, 0x50, 0xce, 0x57, 0xf3, 0xb5, 0x79, 0x3d, 0xa6, - 0x71, 0x0d, 0x96, 0x7c, 0x1a, 0xb8, 0x1d, 0xdf, 0xa0, 0x9f, 0xa5, 0x7e, 0x60, 0xb9, 0x4e, 0x79, - 0x86, 0xaf, 0xee, 0x1d, 0x66, 0x5c, 0x02, 0x6a, 0x53, 0x23, 0x74, 0xfd, 0x72, 0x81, 0x4f, 0x89, - 0x69, 0x86, 0x87, 0x01, 0x2f, 0xcf, 0x46, 0x78, 0xd8, 0x37, 0xd6, 0x60, 0x81, 0x78, 0xde, 0x6d, - 0xd2, 0xa6, 0x81, 0x47, 0x0c, 0x5a, 0x9e, 0xe3, 0xbf, 0xa5, 0xc6, 0x18, 0x66, 0x81, 0xa4, 0x5c, - 0xe4, 0xc0, 0x24, 0xa9, 0x6d, 0xc0, 0xfc, 0x6d, 0xd7, 0xa4, 0xc3, 0xd5, 0xed, 0x65, 0x9f, 0xeb, - 0x67, 0xaf, 0xfd, 0x1e, 0xc1, 0x11, 0x9d, 0x76, 0x2d, 0x86, 0xff, 0x16, 0x0d, 0x89, 0x49, 0x42, - 0xd2, 0xcb, 0x31, 0x17, 0x73, 0xac, 0x40, 0xd1, 0x17, 0x93, 0xcb, 0x39, 0x3e, 0x1e, 0xd3, 0x7d, - 0xd2, 0xf2, 0xd9, 0xca, 0x44, 0x26, 0x94, 0x24, 0xae, 0x42, 0x29, 0xb2, 0xe5, 0x4d, 0xc7, 0xa4, - 0x5f, 0xe6, 0xd6, 0x2b, 0xe8, 0xea, 0x10, 0x5e, 0x81, 0xf9, 0x6e, 0x64, 0xe7, 0x9b, 0x26, 0xb7, - 0x62, 0x41, 0x4f, 0x06, 0xb4, 0x7f, 0x22, 0x38, 0xa6, 0xf8, 0x80, 0x2e, 0x76, 0xe6, 0x6a, 0x97, - 0x3a, 0x61, 0x30, 0x5c, 0xa1, 0xb3, 0x70, 0x48, 0x6e, 0x62, 0xaf, 0x9d, 0xfa, 0x7f, 0x60, 0x2a, - 0xaa, 0x83, 0x52, 0x45, 0x75, 0x8c, 0x29, 0x22, 0xe9, 0x7b, 0x37, 0xaf, 0x08, 0x35, 0xd5, 0xa1, - 0x3e, 0x43, 0x15, 0xb2, 0x0d, 0x35, 0x9b, 0x32, 0x94, 0xf6, 0x1e, 0x82, 0xb2, 0xa2, 0xe8, 0x2d, - 0xe2, 0x58, 0xdb, 0x34, 0x08, 0xc7, 0xdd, 0x33, 0x34, 0xc5, 0x3d, 0xab, 0xc1, 0x52, 0xa4, 0xd5, - 0x1d, 0x76, 0x1e, 0x59, 0xfc, 0x29, 0x17, 0xaa, 0xf9, 0x5a, 0x5e, 0xef, 0x1d, 0x66, 0x7b, 0x27, - 0x65, 0x06, 0xe5, 0x59, 0xee, 0xc6, 0xc9, 0x80, 0xf6, 0x3c, 0xcc, 0x5f, 0xb3, 0x6c, 0xba, 0xb1, - 0xd3, 0x71, 0x76, 0xf1, 0x61, 0x28, 0x18, 0xec, 0x83, 0xeb, 0xb0, 0xa0, 0x47, 0x84, 0xf6, 0x4d, - 0x04, 0xcf, 0x0f, 0xd3, 0xfa, 0xbe, 0x15, 0xee, 0xb0, 0xf5, 0xc1, 0x30, 0xf5, 0x8d, 0x1d, 0x6a, - 0xec, 0x06, 0x9d, 0xb6, 0x74, 0x59, 0x49, 0x4f, 0xa6, 0xbe, 0xf6, 0x13, 0x04, 0xb5, 0x91, 0x98, - 0xee, 0xfb, 0xc4, 0xf3, 0xa8, 0x8f, 0xaf, 0x41, 0xe1, 0x01, 0xfb, 0x81, 0x1f, 0xd0, 0x52, 0xb3, - 0x5e, 0x57, 0x03, 0xfc, 0x48, 0x2e, 0x37, 0x3e, 0xa4, 0x47, 0xcb, 0x71, 0x5d, 0x9a, 0x27, 0xc7, - 0xf9, 0x2c, 0xa7, 0xf8, 0xc4, 0x56, 0x64, 0xf3, 0xf9, 0xb4, 0xcb, 0xb3, 0x30, 0xe3, 0x11, 0x3f, - 0xd4, 0x8e, 0xc0, 0x33, 0xe9, 0xe3, 0xe1, 0xb9, 0x4e, 0x40, 0xb5, 0x5f, 0xa7, 0xbd, 0x69, 0xc3, - 0xa7, 0x24, 0xa4, 0x3a, 0x7d, 0xd0, 0xa1, 0x41, 0x88, 0x77, 0x41, 0xcd, 0x39, 0xdc, 0xaa, 0xa5, - 0xe6, 0xcd, 0x7a, 0x12, 0xb4, 0xeb, 0x32, 0x68, 0xf3, 0x8f, 0x2f, 0x18, 0x66, 0xbd, 0xdb, 0xac, - 0x7b, 0xbb, 0xad, 0x3a, 0x4b, 0x01, 0x29, 0x64, 0x32, 0x05, 0xa8, 0xaa, 0xea, 0x2a, 0x77, 0xbc, - 0x0c, 0xb3, 0x1d, 0x2f, 0xa0, 0x7e, 0xc8, 0x35, 0x2b, 0xea, 0x82, 0x62, 0xfb, 0xd7, 0x25, 0xb6, - 0x65, 0x92, 0x30, 0xda, 0x9f, 0xa2, 0x1e, 0xd3, 0xda, 0x6f, 0xd2, 0xe8, 0xef, 0x79, 0xe6, 0x07, - 0x85, 0x5e, 0x45, 0x99, 0x4b, 0xa3, 0x54, 0x3d, 0x28, 0x9f, 0xf6, 0xa0, 0x5f, 0xa4, 0xf1, 0x5f, - 0xa1, 0x36, 0x4d, 0xf0, 0x0f, 0x72, 0xe6, 0x32, 0xcc, 0x19, 0x24, 0x30, 0x88, 0x29, 0xa5, 0x48, - 0x92, 0x05, 0x32, 0xcf, 0x77, 0x3d, 0xd2, 0xe2, 0x9c, 0xee, 0xb8, 0xb6, 0x65, 0xec, 0x09, 0x71, - 0xfd, 0x3f, 0xf4, 0x39, 0xfe, 0x4c, 0xb6, 0xe3, 0x17, 0xd2, 0xb0, 0x8f, 0x43, 0x69, 0x6b, 0xcf, - 0x31, 0x5e, 0xf5, 0xa2, 0xc3, 0x7d, 0x18, 0x0a, 0x56, 0x48, 0xdb, 0x41, 0x19, 0xf1, 0x83, 0x1d, - 0x11, 0xda, 0x7f, 0x0a, 0xb0, 0xac, 0xe8, 0xc6, 0x16, 0x64, 0x69, 0x96, 0x15, 0xa5, 0x96, 0x61, - 0xd6, 0xf4, 0xf7, 0xf4, 0x8e, 0x23, 0x1c, 0x40, 0x50, 0x4c, 0xb0, 0xe7, 0x77, 0x9c, 0x08, 0x7e, - 0x51, 0x8f, 0x08, 0xbc, 0x0d, 0xc5, 0x20, 0x64, 0x55, 0x46, 0x6b, 0x8f, 0x03, 0x2f, 0x35, 0x3f, - 0x35, 0xd9, 0xa6, 0x33, 0xe8, 0x5b, 0x82, 0xa3, 0x1e, 0xf3, 0xc6, 0x0f, 0x58, 0x4c, 0x8b, 0x02, - 0x5d, 0x50, 0x9e, 0xab, 0xe6, 0x6b, 0xa5, 0xe6, 0xd6, 0xe4, 0x82, 0x5e, 0xf5, 0x58, 0x85, 0xa4, - 0x64, 0x30, 0x3d, 0x91, 0xc2, 0xc2, 0x68, 0x5b, 0xc4, 0x87, 0x40, 0x54, 0x03, 0xc9, 0x00, 0xfe, - 0x1c, 0x14, 0x2c, 0x67, 0xdb, 0x0d, 0xca, 0xf3, 0x1c, 0xcc, 0xe5, 0xc9, 0xc0, 0xdc, 0x74, 0xb6, - 0x5d, 0x3d, 0x62, 0x88, 0x1f, 0xc0, 0xa2, 0x4f, 0x43, 0x7f, 0x4f, 0x5a, 0xa1, 0x0c, 0xdc, 0xae, - 0x9f, 0x9e, 0x4c, 0x82, 0xae, 0xb2, 0xd4, 0xd3, 0x12, 0xf0, 0x3a, 0x94, 0x82, 0xc4, 0xc7, 0xca, - 0x25, 0x2e, 0xb0, 0x9c, 0x62, 0xa4, 0xf8, 0xa0, 0xae, 0x4e, 0xee, 0xf3, 0xee, 0x85, 0x6c, 0xef, - 0x5e, 0x1c, 0x99, 0xd5, 0x0e, 0x8c, 0x91, 0xd5, 0x96, 0x7a, 0xb3, 0xda, 0xbf, 0x11, 0xac, 0xf4, - 0x05, 0xa7, 0x2d, 0x8f, 0x66, 0x1e, 0x03, 0x02, 0x33, 0x81, 0x47, 0x0d, 0x9e, 0xa9, 0x4a, 0xcd, - 0x5b, 0x53, 0x8b, 0x56, 0x5c, 0x2e, 0x67, 0x9d, 0x15, 0x50, 0x27, 0x8c, 0x0b, 0x3f, 0x40, 0xf0, - 0x61, 0x45, 0xe6, 0x1d, 0x12, 0x1a, 0x3b, 0x59, 0xca, 0xb2, 0xf3, 0xcb, 0xe6, 0x88, 0xbc, 0x1c, - 0x11, 0xcc, 0xaa, 0xfc, 0xe3, 0xee, 0x9e, 0xc7, 0x00, 0xb2, 0x5f, 0x92, 0x81, 0x09, 0x8b, 0xa7, - 0x9f, 0x22, 0xa8, 0xa8, 0x31, 0xdc, 0xb5, 0xed, 0xd7, 0x89, 0xb1, 0x9b, 0x05, 0xf2, 0x00, 0xe4, - 0x2c, 0x93, 0x23, 0xcc, 0xeb, 0x39, 0xcb, 0xdc, 0x67, 0x30, 0xea, 0x85, 0x3b, 0x9b, 0x0d, 0x77, - 0x2e, 0x0d, 0xf7, 0xfd, 0x1e, 0xb8, 0x32, 0x24, 0x64, 0xc0, 0x5d, 0x81, 0x79, 0xa7, 0xa7, 0x90, - 0x4d, 0x06, 0x06, 0x14, 0xb0, 0xb9, 0xbe, 0x02, 0xb6, 0x0c, 0x73, 0xdd, 0xf8, 0x9a, 0xc3, 0x7e, - 0x96, 0x24, 0x53, 0xb1, 0xe5, 0xbb, 0x1d, 0x4f, 0x18, 0x3d, 0x22, 0x18, 0x8a, 0x5d, 0xcb, 0x61, - 0x25, 0x39, 0x47, 0xc1, 0xbe, 0xf7, 0x7f, 0xb1, 0x49, 0xa9, 0xfd, 0xb3, 0x1c, 0x7c, 0x64, 0x80, - 0xda, 0x23, 0xfd, 0xe9, 0xe9, 0xd0, 0x3d, 0xf6, 0xea, 0xb9, 0xa1, 0x5e, 0x5d, 0x1c, 0xe5, 0xd5, - 0xf3, 0xd9, 0xf6, 0x82, 0xb4, 0xbd, 0x7e, 0x9c, 0x83, 0xea, 0x00, 0x7b, 0x8d, 0x2e, 0x27, 0x9e, - 0x1a, 0x83, 0x6d, 0xbb, 0xbe, 0xf0, 0x92, 0xa2, 0x1e, 0x11, 0xec, 0x9c, 0xb9, 0xbe, 0xb7, 0x43, - 0x1c, 0xee, 0x1d, 0x45, 0x5d, 0x50, 0x13, 0x9a, 0xea, 0x6b, 0x39, 0x28, 0x4b, 0xfb, 0x5c, 0x32, - 0xb8, 0xb5, 0x3a, 0xce, 0xd3, 0x6f, 0xa2, 0x65, 0x98, 0x25, 0x1c, 0xad, 0x70, 0x2a, 0x41, 0xf5, - 0x19, 0xa3, 0x98, 0x6d, 0x8c, 0xf9, 0xb4, 0x31, 0xde, 0x44, 0x70, 0x34, 0x6d, 0x8c, 0x60, 0xd3, - 0x0a, 0x42, 0x79, 0x39, 0xc0, 0xdb, 0x30, 0x17, 0xc9, 0x89, 0x4a, 0xbb, 0x52, 0x73, 0x73, 0xd2, - 0x84, 0x9f, 0x32, 0xbc, 0x64, 0xae, 0xbd, 0x08, 0x47, 0x07, 0x46, 0x39, 0x01, 0xa3, 0x02, 0x45, - 0x59, 0xe4, 0x88, 0xad, 0x89, 0x69, 0xed, 0xcd, 0x99, 0x74, 0xca, 0x71, 0xcd, 0x4d, 0xb7, 0x95, - 0x71, 0xdf, 0xcf, 0xde, 0x4e, 0x66, 0x2a, 0xd7, 0x54, 0xae, 0xf6, 0x92, 0x64, 0xeb, 0x0c, 0xd7, - 0x09, 0x89, 0xe5, 0x50, 0x5f, 0x64, 0xc5, 0x64, 0x80, 0x6d, 0x43, 0x60, 0x39, 0x06, 0xdd, 0xa2, - 0x86, 0xeb, 0x98, 0x01, 0xdf, 0xcf, 0xbc, 0x9e, 0x1a, 0xc3, 0x37, 0x60, 0x9e, 0xd3, 0x77, 0xad, - 0x76, 0x94, 0x06, 0x4a, 0xcd, 0xd5, 0x7a, 0xd4, 0x83, 0xab, 0xab, 0x3d, 0xb8, 0xc4, 0x86, 0x6d, - 0x1a, 0x92, 0x7a, 0xf7, 0x7c, 0x9d, 0xad, 0xd0, 0x93, 0xc5, 0x0c, 0x4b, 0x48, 0x2c, 0x7b, 0xd3, - 0x72, 0x78, 0xe1, 0xc9, 0x44, 0x25, 0x03, 0xcc, 0x55, 0xb6, 0x5d, 0xdb, 0x76, 0x1f, 0xca, 0x73, - 0x13, 0x51, 0x6c, 0x55, 0xc7, 0x09, 0x2d, 0x9b, 0xcb, 0x8f, 0x1c, 0x21, 0x19, 0xe0, 0xab, 0x2c, - 0x3b, 0xa4, 0xbe, 0x38, 0x30, 0x82, 0x8a, 0x9d, 0xb1, 0x14, 0xb5, 0x95, 0xe4, 0x79, 0x8d, 0xdc, - 0x76, 0x41, 0x75, 0xdb, 0xde, 0xa3, 0xb0, 0x38, 0xa0, 0x37, 0xc2, 0xbb, 0x6c, 0xb4, 0x6b, 0xb9, - 0x1d, 0x56, 0x53, 0xf1, 0xd2, 0x43, 0xd2, 0x7d, 0xae, 0xbc, 0x94, 0xed, 0xca, 0x07, 0xd3, 0xae, - 0xfc, 0x5b, 0x04, 0xc5, 0x4d, 0xb7, 0x75, 0xd5, 0x09, 0xfd, 0x3d, 0x7e, 0x4b, 0x72, 0x9d, 0x90, - 0x3a, 0xd2, 0x5f, 0x24, 0xc9, 0x36, 0x21, 0xb4, 0xda, 0x74, 0x2b, 0x24, 0x6d, 0x4f, 0xd4, 0x58, - 0xfb, 0xda, 0x84, 0x78, 0x31, 0x33, 0x8c, 0x4d, 0x82, 0x90, 0x9f, 0xf8, 0xa2, 0xce, 0xbf, 0x99, - 0x0a, 0xf1, 0x84, 0xad, 0xd0, 0x17, 0xc7, 0x3d, 0x35, 0xa6, 0xba, 0x58, 0x21, 0xc2, 0x26, 0x48, - 0xad, 0x0d, 0xcf, 0xc6, 0xc5, 0xff, 0x5d, 0xea, 0xb7, 0x2d, 0x87, 0x64, 0x47, 0xef, 0x31, 0xda, - 0x7b, 0x19, 0x77, 0x4f, 0x37, 0x75, 0xe8, 0x58, 0x2d, 0x7d, 0xdf, 0x72, 0x4c, 0xf7, 0x61, 0xc6, - 0xe1, 0x99, 0x4c, 0xe0, 0x5f, 0xd2, 0x1d, 0x3a, 0x45, 0x62, 0x7c, 0xd2, 0x6f, 0xc0, 0x22, 0x8b, - 0x09, 0x5d, 0x2a, 0x7e, 0x10, 0x61, 0x47, 0x1b, 0xd6, 0x2c, 0x49, 0x78, 0xe8, 0xe9, 0x85, 0x78, - 0x13, 0x96, 0x48, 0x10, 0x58, 0x2d, 0x87, 0x9a, 0x92, 0x57, 0x6e, 0x6c, 0x5e, 0xbd, 0x4b, 0xa3, - 0x6b, 0x37, 0x9f, 0x21, 0xf6, 0x5b, 0x92, 0xda, 0x57, 0x11, 0x1c, 0x19, 0xc8, 0x24, 0x3e, 0x39, - 0x48, 0x09, 0xe3, 0x15, 0x28, 0x06, 0xc6, 0x0e, 0x35, 0x3b, 0x36, 0x95, 0xbd, 0x28, 0x49, 0xb3, - 0xdf, 0xcc, 0x4e, 0xb4, 0xfb, 0x22, 0x8d, 0xc4, 0x34, 0x3e, 0x06, 0xd0, 0x26, 0x4e, 0x87, 0xd8, - 0x1c, 0xc2, 0x0c, 0x87, 0xa0, 0x8c, 0x68, 0x2b, 0x50, 0x19, 0xe4, 0x3a, 0xa2, 0xc7, 0xf3, 0x2f, - 0x04, 0x07, 0x64, 0x50, 0x15, 0xbb, 0x5b, 0x83, 0x25, 0xc5, 0x0c, 0xb7, 0x93, 0x8d, 0xee, 0x1d, - 0x1e, 0x11, 0x30, 0xa5, 0x97, 0xe4, 0xd3, 0x4d, 0xf6, 0x6e, 0xaa, 0x4d, 0x3e, 0x76, 0xbe, 0x43, - 0x53, 0xaa, 0x1f, 0xbf, 0x02, 0xe5, 0x5b, 0xc4, 0x21, 0x2d, 0x6a, 0xc6, 0x6a, 0xc7, 0x2e, 0xf6, - 0x45, 0xb5, 0x59, 0x31, 0x71, 0x6b, 0x20, 0x2e, 0xb5, 0xac, 0xed, 0x6d, 0xd9, 0xf8, 0xf0, 0xa1, - 0xb8, 0x69, 0x39, 0xbb, 0xec, 0xfe, 0xcc, 0x34, 0x0e, 0xad, 0xd0, 0x96, 0xd6, 0x8d, 0x08, 0x7c, - 0x10, 0xf2, 0x1d, 0xdf, 0x16, 0x1e, 0xc0, 0x3e, 0x71, 0x15, 0x4a, 0x26, 0x0d, 0x0c, 0xdf, 0xf2, - 0xc4, 0xfe, 0xf3, 0xa6, 0xb1, 0x32, 0xc4, 0xf6, 0xc1, 0x32, 0x5c, 0x67, 0xc3, 0x26, 0x41, 0x20, - 0x13, 0x50, 0x3c, 0xa0, 0xbd, 0x0c, 0x8b, 0x4c, 0x66, 0xa2, 0xe6, 0x99, 0xb4, 0x9a, 0x47, 0x52, - 0xf0, 0x25, 0x3c, 0x89, 0x98, 0xc0, 0x33, 0x2c, 0xef, 0x5f, 0xf2, 0x3c, 0xc1, 0x64, 0xcc, 0x72, - 0x28, 0x3f, 0x28, 0x7f, 0x0e, 0xec, 0x95, 0x36, 0xff, 0x76, 0x1c, 0xb0, 0x7a, 0x4e, 0xa8, 0xdf, - 0xb5, 0x0c, 0x8a, 0xbf, 0x85, 0x60, 0x86, 0x89, 0xc6, 0xcf, 0x0d, 0x3b, 0x96, 0xdc, 0x5f, 0x2b, - 0xd3, 0xbb, 0x08, 0x33, 0x69, 0xda, 0xca, 0x1b, 0x7f, 0xfd, 0xc7, 0xb7, 0x73, 0xcb, 0xf8, 0x30, - 0x7f, 0x21, 0xeb, 0x9e, 0x57, 0x5f, 0xab, 0x02, 0xfc, 0x16, 0x02, 0x2c, 0xea, 0x20, 0xe5, 0x0d, - 0x01, 0x9f, 0x19, 0x06, 0x71, 0xc0, 0x5b, 0x43, 0xe5, 0x39, 0x25, 0xab, 0xd4, 0x0d, 0xd7, 0xa7, - 0x2c, 0x87, 0xf0, 0x09, 0x1c, 0xc0, 0x2a, 0x07, 0x70, 0x02, 0x6b, 0x83, 0x00, 0x34, 0x1e, 0x31, - 0x8b, 0x3e, 0x6e, 0xd0, 0x48, 0xee, 0x3b, 0x08, 0x0a, 0xf7, 0xf9, 0x1d, 0x62, 0x84, 0x91, 0xb6, - 0xa6, 0x66, 0x24, 0x2e, 0x8e, 0xa3, 0xd5, 0x8e, 0x73, 0xa4, 0xcf, 0xe1, 0xa3, 0x12, 0x69, 0x10, - 0xfa, 0x94, 0xb4, 0x53, 0x80, 0xcf, 0x21, 0xfc, 0x2e, 0x82, 0xd9, 0xa8, 0x79, 0x8c, 0x4f, 0x0e, - 0x43, 0x99, 0x6a, 0x2e, 0x57, 0xa6, 0xd7, 0x89, 0xd5, 0x4e, 0x73, 0x8c, 0xc7, 0xb5, 0x81, 0xdb, - 0xb9, 0x9e, 0xea, 0xd3, 0xbe, 0x8d, 0x20, 0x7f, 0x9d, 0x8e, 0xf4, 0xb7, 0x29, 0x82, 0xeb, 0x33, - 0xe0, 0x80, 0xad, 0xc6, 0x3f, 0x42, 0xf0, 0xec, 0x75, 0x1a, 0x0e, 0x4e, 0x8f, 0xb8, 0x36, 0x3a, - 0x67, 0x09, 0xb7, 0x3b, 0x33, 0xc6, 0xcc, 0x38, 0x2f, 0x34, 0x38, 0xb2, 0xd3, 0xf8, 0x54, 0x96, - 0x13, 0x06, 0x7b, 0x8e, 0xf1, 0x50, 0xe0, 0xf8, 0x13, 0x82, 0x83, 0xbd, 0x6f, 0x85, 0x38, 0x9d, - 0x50, 0x07, 0x3e, 0x25, 0x56, 0x6e, 0x4f, 0x1a, 0x65, 0xd3, 0x4c, 0xb5, 0x4b, 0x1c, 0xf9, 0x4b, - 0xf8, 0xc5, 0x2c, 0xe4, 0x71, 0x27, 0xae, 0xf1, 0x48, 0x7e, 0x3e, 0xe6, 0xef, 0xda, 0x1c, 0xf6, - 0x9f, 0x11, 0x1c, 0x96, 0x7c, 0x37, 0x76, 0x88, 0x1f, 0x5e, 0xa1, 0xac, 0x86, 0x0e, 0xc6, 0xd2, - 0x67, 0xc2, 0xac, 0xa1, 0xca, 0xd3, 0xae, 0x72, 0x5d, 0x3e, 0x81, 0x5f, 0xd9, 0xb7, 0x2e, 0x06, - 0x63, 0x63, 0x0a, 0xd8, 0x6f, 0x20, 0x58, 0xb8, 0x4e, 0xc3, 0x5b, 0x71, 0x37, 0xf8, 0xe4, 0x58, - 0x2f, 0x4c, 0x95, 0x95, 0xba, 0xf2, 0x9c, 0x2e, 0x7f, 0x8a, 0x5d, 0x64, 0x8d, 0x83, 0x3b, 0x85, - 0x4f, 0x66, 0x81, 0x4b, 0x3a, 0xd0, 0xef, 0x20, 0x38, 0xa2, 0x82, 0x48, 0x5e, 0xe6, 0x3e, 0xb6, - 0xbf, 0xf7, 0x2e, 0xf1, 0x6a, 0x36, 0x02, 0x5d, 0x93, 0xa3, 0x3b, 0xab, 0x0d, 0x76, 0xe0, 0x76, - 0x1f, 0x8a, 0x75, 0xb4, 0x5a, 0x43, 0xf8, 0x77, 0x08, 0x66, 0xa3, 0x66, 0xec, 0x70, 0x1b, 0xa5, - 0x5e, 0x92, 0xa6, 0x19, 0x0d, 0xc4, 0x6e, 0x57, 0xce, 0x0d, 0x36, 0xa8, 0xba, 0x5e, 0xba, 0x6a, - 0x9d, 0x5b, 0x39, 0x1d, 0xc6, 0x7e, 0x89, 0x00, 0x92, 0x86, 0x32, 0x3e, 0x9d, 0xad, 0x87, 0xd2, - 0x74, 0xae, 0x4c, 0xb7, 0xa5, 0xac, 0xd5, 0xb9, 0x3e, 0xb5, 0x4a, 0x35, 0x33, 0x86, 0x78, 0xd4, - 0x58, 0x8f, 0x9a, 0xcf, 0x3f, 0x44, 0x50, 0xe0, 0x7d, 0x3c, 0x7c, 0x62, 0x18, 0x66, 0xb5, 0xcd, - 0x37, 0x4d, 0xd3, 0xbf, 0xc0, 0xa1, 0x56, 0x9b, 0x59, 0x81, 0x78, 0x1d, 0xad, 0xe2, 0x2e, 0xcc, - 0x46, 0x9d, 0xb3, 0xe1, 0xee, 0x91, 0xea, 0xac, 0x55, 0xaa, 0x19, 0x85, 0x41, 0xe4, 0xa8, 0x22, - 0x07, 0xac, 0x8e, 0xca, 0x01, 0x33, 0x2c, 0x4c, 0xe3, 0xe3, 0x59, 0x41, 0xfc, 0xff, 0x60, 0x98, - 0x33, 0x1c, 0xdd, 0x49, 0xad, 0x3a, 0x2a, 0x0f, 0x30, 0xeb, 0x7c, 0x07, 0xc1, 0xc1, 0xde, 0xe2, - 0x1a, 0x1f, 0xed, 0x89, 0x99, 0xea, 0x5d, 0xa3, 0x92, 0xb6, 0xe2, 0xb0, 0xc2, 0x5c, 0xfb, 0x24, - 0x47, 0xb1, 0x8e, 0x2f, 0x8e, 0x3c, 0x19, 0xb7, 0x65, 0xd4, 0x61, 0x8c, 0xd6, 0x92, 0xd7, 0xb1, - 0x5f, 0x21, 0x58, 0x90, 0x7c, 0xef, 0xfa, 0x94, 0x66, 0xc3, 0x9a, 0xde, 0x41, 0x60, 0xb2, 0xb4, - 0x97, 0x39, 0xfc, 0x8f, 0xe3, 0x0b, 0x63, 0xc2, 0x97, 0xb0, 0xd7, 0x42, 0x86, 0xf4, 0x0f, 0x08, - 0x0e, 0xdd, 0x8f, 0xfc, 0xfe, 0x03, 0xc2, 0xbf, 0xc1, 0xf1, 0xbf, 0x82, 0x5f, 0xca, 0xa8, 0xf3, - 0x46, 0xa9, 0x71, 0x0e, 0xe1, 0x9f, 0x23, 0x28, 0xca, 0x57, 0x15, 0x7c, 0x6a, 0xe8, 0xc1, 0x48, - 0xbf, 0xbb, 0x4c, 0xd3, 0x99, 0x45, 0x51, 0xa3, 0x9d, 0xc8, 0x4c, 0xa7, 0x42, 0x3e, 0x73, 0xe8, - 0xb7, 0x11, 0xe0, 0xf8, 0xce, 0x1c, 0xdf, 0xa2, 0xf1, 0x0b, 0x29, 0x51, 0x43, 0x1b, 0x33, 0x95, - 0x53, 0x23, 0xe7, 0xa5, 0x53, 0xe9, 0x6a, 0x66, 0x2a, 0x75, 0x63, 0xf9, 0x5f, 0x47, 0x50, 0xba, - 0x4e, 0xe3, 0x3b, 0x48, 0x86, 0x2d, 0xd3, 0x8f, 0x42, 0x95, 0xda, 0xe8, 0x89, 0x02, 0xd1, 0x59, - 0x8e, 0xe8, 0x05, 0x9c, 0x6d, 0x2a, 0x09, 0xe0, 0x7b, 0x08, 0x16, 0xef, 0xa8, 0x2e, 0x8a, 0xcf, - 0x8e, 0x92, 0x94, 0x8a, 0xe4, 0xe3, 0xe3, 0xfa, 0x28, 0xc7, 0xb5, 0xa6, 0x8d, 0x85, 0x6b, 0x5d, - 0xbc, 0xaf, 0x7c, 0x1f, 0x45, 0x97, 0xd8, 0x9e, 0x7e, 0xf6, 0xff, 0x6a, 0xb7, 0x8c, 0xb6, 0xb8, - 0x76, 0x81, 0xe3, 0xab, 0xe3, 0xb3, 0xe3, 0xe0, 0x6b, 0x88, 0x26, 0x37, 0xfe, 0x2e, 0x82, 0x43, - 0xfc, 0xad, 0x41, 0x65, 0xdc, 0x93, 0x62, 0x86, 0xbd, 0x4c, 0x8c, 0x91, 0x62, 0x44, 0xfc, 0xd1, - 0xf6, 0x05, 0x6a, 0x5d, 0xbe, 0x23, 0x7c, 0x03, 0xc1, 0x01, 0x99, 0xd4, 0xc4, 0xee, 0xae, 0x8d, - 0x32, 0xdc, 0x7e, 0x93, 0xa0, 0x70, 0xb7, 0xd5, 0xf1, 0xdc, 0xed, 0x5d, 0x04, 0x73, 0xa2, 0x9b, - 0x9f, 0x51, 0x2a, 0x28, 0xed, 0xfe, 0x4a, 0x4f, 0x8f, 0x43, 0x34, 0x83, 0xb5, 0xcf, 0x73, 0xb1, - 0xf7, 0x70, 0x23, 0x4b, 0xac, 0xe7, 0x9a, 0x41, 0xe3, 0x91, 0xe8, 0xc4, 0x3e, 0x6e, 0xd8, 0x6e, - 0x2b, 0x78, 0x4d, 0xc3, 0x99, 0x09, 0x91, 0xcd, 0x39, 0x87, 0x70, 0x08, 0xf3, 0xcc, 0x39, 0x78, - 0xe3, 0x04, 0x57, 0x7b, 0xda, 0x2c, 0x7d, 0x3d, 0x95, 0x4a, 0xa5, 0xaf, 0x11, 0x93, 0x64, 0x40, - 0x71, 0x8d, 0xc5, 0xcf, 0x67, 0x8a, 0xe5, 0x82, 0xde, 0x42, 0x70, 0x48, 0xf5, 0xf6, 0x48, 0xfc, - 0xd8, 0xbe, 0x9e, 0x85, 0x42, 0x14, 0xd5, 0x78, 0x75, 0x2c, 0x47, 0xe2, 0x70, 0x2e, 0x5f, 0xfb, - 0xe3, 0x93, 0x63, 0xe8, 0xbd, 0x27, 0xc7, 0xd0, 0xdf, 0x9f, 0x1c, 0x43, 0xaf, 0x5d, 0x1c, 0xef, - 0x3f, 0xc2, 0x86, 0x6d, 0x51, 0x27, 0x54, 0xd9, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x45, 0x63, - 0x3b, 0x00, 0x09, 0x2d, 0x00, 0x00, + // 2774 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x8f, 0x1b, 0x49, + 0x15, 0xa7, 0xec, 0xf1, 0x8c, 0xe7, 0x79, 0x26, 0x93, 0xd4, 0x26, 0x83, 0xd7, 0x99, 0x04, 0xa7, + 0xf3, 0xe5, 0x4c, 0x32, 0x76, 0x62, 0x02, 0xca, 0xce, 0x66, 0x81, 0x64, 0xf2, 0x35, 0x30, 0xf9, + 0xa0, 0x27, 0x21, 0x68, 0x39, 0x40, 0x6d, 0x77, 0x8d, 0xa7, 0x19, 0xbb, 0xbb, 0xd3, 0xdd, 0x76, + 0x18, 0x85, 0x5c, 0x16, 0xed, 0x05, 0xad, 0x40, 0xc0, 0x1e, 0x10, 0x42, 0x80, 0x76, 0xb5, 0x12, + 0x42, 0x20, 0x2e, 0x08, 0x21, 0x21, 0x24, 0x38, 0x2c, 0x82, 0x03, 0xd2, 0x0a, 0xfe, 0x01, 0x14, + 0x21, 0x8e, 0x70, 0xd9, 0x33, 0x42, 0x55, 0x5d, 0xd5, 0x5d, 0xed, 0x8f, 0xb6, 0x07, 0x1b, 0x6d, + 0x6e, 0xfd, 0xca, 0x55, 0xef, 0xfd, 0xde, 0xab, 0x57, 0xef, 0xbd, 0x7a, 0x65, 0x38, 0xe1, 0x53, + 0xaf, 0x43, 0xbd, 0x1a, 0x71, 0xdd, 0xa6, 0x65, 0x90, 0xc0, 0x72, 0x6c, 0xf5, 0xbb, 0xea, 0x7a, + 0x4e, 0xe0, 0xe0, 0x82, 0x32, 0x54, 0x5a, 0x6a, 0x38, 0x4e, 0xa3, 0x49, 0x6b, 0xc4, 0xb5, 0x6a, + 0xc4, 0xb6, 0x9d, 0x80, 0x0f, 0xfb, 0xe1, 0xd4, 0x92, 0xb6, 0x73, 0xc9, 0xaf, 0x5a, 0x0e, 0xff, + 0xd5, 0x70, 0x3c, 0x5a, 0xeb, 0x5c, 0xa8, 0x35, 0xa8, 0x4d, 0x3d, 0x12, 0x50, 0x53, 0xcc, 0xb9, + 0x18, 0xcf, 0x69, 0x11, 0x63, 0xdb, 0xb2, 0xa9, 0xb7, 0x5b, 0x73, 0x77, 0x1a, 0x6c, 0xc0, 0xaf, + 0xb5, 0x68, 0x40, 0xfa, 0xad, 0xda, 0x68, 0x58, 0xc1, 0x76, 0xfb, 0xb5, 0xaa, 0xe1, 0xb4, 0x6a, + 0xc4, 0x6b, 0x38, 0xae, 0xe7, 0x7c, 0x95, 0x7f, 0xac, 0x18, 0x66, 0xad, 0x53, 0x8f, 0x19, 0xa8, + 0xba, 0x74, 0x2e, 0x90, 0xa6, 0xbb, 0x4d, 0x7a, 0xb9, 0x5d, 0x1f, 0xc2, 0xcd, 0xa3, 0xae, 0x23, + 0x6c, 0xc3, 0x3f, 0xad, 0xc0, 0xf1, 0x76, 0x95, 0xcf, 0x90, 0x8d, 0xf6, 0x01, 0x82, 0xfd, 0x57, + 0x62, 0x79, 0x9f, 0x6f, 0x53, 0x6f, 0x17, 0x63, 0x98, 0xb2, 0x49, 0x8b, 0x16, 0x51, 0x19, 0x55, + 0x66, 0x75, 0xfe, 0x8d, 0x8b, 0x30, 0xe3, 0xd1, 0x2d, 0x8f, 0xfa, 0xdb, 0xc5, 0x0c, 0x1f, 0x96, + 0x24, 0x2e, 0x41, 0x9e, 0x09, 0xa7, 0x46, 0xe0, 0x17, 0xb3, 0xe5, 0x6c, 0x65, 0x56, 0x8f, 0x68, + 0x5c, 0x81, 0x05, 0x8f, 0xfa, 0x4e, 0xdb, 0x33, 0xe8, 0x17, 0xa8, 0xe7, 0x5b, 0x8e, 0x5d, 0x9c, + 0xe2, 0xab, 0xbb, 0x87, 0x19, 0x17, 0x9f, 0x36, 0xa9, 0x11, 0x38, 0x5e, 0x31, 0xc7, 0xa7, 0x44, + 0x34, 0xc3, 0xc3, 0x80, 0x17, 0xa7, 0x43, 0x3c, 0xec, 0x1b, 0x6b, 0x30, 0x47, 0x5c, 0xf7, 0x0e, + 0x69, 0x51, 0xdf, 0x25, 0x06, 0x2d, 0xce, 0xf0, 0xdf, 0x12, 0x63, 0x0c, 0xb3, 0x40, 0x52, 0xcc, + 0x73, 0x60, 0x92, 0xd4, 0xd6, 0x60, 0xf6, 0x8e, 0x63, 0xd2, 0xc1, 0xea, 0x76, 0xb3, 0xcf, 0xf4, + 0xb2, 0xd7, 0xde, 0x43, 0x70, 0x48, 0xa7, 0x1d, 0x8b, 0xe1, 0xbf, 0x4d, 0x03, 0x62, 0x92, 0x80, + 0x74, 0x73, 0xcc, 0x44, 0x1c, 0x4b, 0x90, 0xf7, 0xc4, 0xe4, 0x62, 0x86, 0x8f, 0x47, 0x74, 0x8f, + 0xb4, 0x6c, 0xba, 0x32, 0xa1, 0x09, 0x25, 0x89, 0xcb, 0x50, 0x08, 0x6d, 0xb9, 0x6e, 0x9b, 0xf4, + 0x6b, 0xdc, 0x7a, 0x39, 0x5d, 0x1d, 0xc2, 0x4b, 0x30, 0xdb, 0x09, 0xed, 0xbc, 0x6e, 0x72, 0x2b, + 0xe6, 0xf4, 0x78, 0x40, 0xfb, 0x27, 0x82, 0xa3, 0x8a, 0x0f, 0xe8, 0x62, 0x67, 0xae, 0x77, 0xa8, + 0x1d, 0xf8, 0x83, 0x15, 0x3a, 0x07, 0x07, 0xe4, 0x26, 0x76, 0xdb, 0xa9, 0xf7, 0x07, 0xa6, 0xa2, + 0x3a, 0x28, 0x55, 0x54, 0xc7, 0x98, 0x22, 0x92, 0x7e, 0xb0, 0x7e, 0x4d, 0xa8, 0xa9, 0x0e, 0xf5, + 0x18, 0x2a, 0x97, 0x6e, 0xa8, 0xe9, 0x84, 0xa1, 0xb4, 0xf7, 0x11, 0x14, 0x15, 0x45, 0x6f, 0x13, + 0xdb, 0xda, 0xa2, 0x7e, 0x30, 0xea, 0x9e, 0xa1, 0x09, 0xee, 0x59, 0x05, 0x16, 0x42, 0xad, 0xee, + 0xb1, 0xf3, 0xc8, 0xe2, 0x4f, 0x31, 0x57, 0xce, 0x56, 0xb2, 0x7a, 0xf7, 0x30, 0xdb, 0x3b, 0x29, + 0xd3, 0x2f, 0x4e, 0x73, 0x37, 0x8e, 0x07, 0xb4, 0x63, 0x30, 0x7b, 0xc3, 0x6a, 0xd2, 0xb5, 0xed, + 0xb6, 0xbd, 0x83, 0x0f, 0x42, 0xce, 0x60, 0x1f, 0x5c, 0x87, 0x39, 0x3d, 0x24, 0xb4, 0xef, 0x20, + 0x38, 0x36, 0x48, 0xeb, 0x87, 0x56, 0xb0, 0xcd, 0xd6, 0xfb, 0x83, 0xd4, 0x37, 0xb6, 0xa9, 0xb1, + 0xe3, 0xb7, 0x5b, 0xd2, 0x65, 0x25, 0x3d, 0x9e, 0xfa, 0xda, 0xcf, 0x10, 0x54, 0x86, 0x62, 0x7a, + 0xe8, 0x11, 0xd7, 0xa5, 0x1e, 0xbe, 0x01, 0xb9, 0x47, 0xec, 0x07, 0x7e, 0x40, 0x0b, 0xf5, 0x6a, + 0x55, 0x0d, 0xf0, 0x43, 0xb9, 0xdc, 0xfa, 0x88, 0x1e, 0x2e, 0xc7, 0x55, 0x69, 0x9e, 0x0c, 0xe7, + 0xb3, 0x98, 0xe0, 0x13, 0x59, 0x91, 0xcd, 0xe7, 0xd3, 0xae, 0x4e, 0xc3, 0x94, 0x4b, 0xbc, 0x40, + 0x3b, 0x04, 0x2f, 0x24, 0x8f, 0x87, 0xeb, 0xd8, 0x3e, 0xd5, 0x7e, 0x9b, 0xf4, 0xa6, 0x35, 0x8f, + 0x92, 0x80, 0xea, 0xf4, 0x51, 0x9b, 0xfa, 0x01, 0xde, 0x01, 0x35, 0xe7, 0x70, 0xab, 0x16, 0xea, + 0xeb, 0xd5, 0x38, 0x68, 0x57, 0x65, 0xd0, 0xe6, 0x1f, 0x5f, 0x36, 0xcc, 0x6a, 0xa7, 0x5e, 0x75, + 0x77, 0x1a, 0x55, 0x96, 0x02, 0x12, 0xc8, 0x64, 0x0a, 0x50, 0x55, 0xd5, 0x55, 0xee, 0x78, 0x11, + 0xa6, 0xdb, 0xae, 0x4f, 0xbd, 0x80, 0x6b, 0x96, 0xd7, 0x05, 0xc5, 0xf6, 0xaf, 0x43, 0x9a, 0x96, + 0x49, 0x82, 0x70, 0x7f, 0xf2, 0x7a, 0x44, 0x6b, 0xbf, 0x4b, 0xa2, 0x7f, 0xe0, 0x9a, 0x1f, 0x16, + 0x7a, 0x15, 0x65, 0x26, 0x89, 0x52, 0xf5, 0xa0, 0x6c, 0xd2, 0x83, 0x7e, 0x95, 0xc4, 0x7f, 0x8d, + 0x36, 0x69, 0x8c, 0xbf, 0x9f, 0x33, 0x17, 0x61, 0xc6, 0x20, 0xbe, 0x41, 0x4c, 0x29, 0x45, 0x92, + 0x2c, 0x90, 0xb9, 0x9e, 0xe3, 0x92, 0x06, 0xe7, 0x74, 0xcf, 0x69, 0x5a, 0xc6, 0xae, 0x10, 0xd7, + 0xfb, 0x43, 0x8f, 0xe3, 0x4f, 0xa5, 0x3b, 0x7e, 0x2e, 0x09, 0xfb, 0x38, 0x14, 0x36, 0x77, 0x6d, + 0xe3, 0xae, 0x1b, 0x1e, 0xee, 0x83, 0x90, 0xb3, 0x02, 0xda, 0xf2, 0x8b, 0x88, 0x1f, 0xec, 0x90, + 0xd0, 0xfe, 0x93, 0x83, 0x45, 0x45, 0x37, 0xb6, 0x20, 0x4d, 0xb3, 0xb4, 0x28, 0xb5, 0x08, 0xd3, + 0xa6, 0xb7, 0xab, 0xb7, 0x6d, 0xe1, 0x00, 0x82, 0x62, 0x82, 0x5d, 0xaf, 0x6d, 0x87, 0xf0, 0xf3, + 0x7a, 0x48, 0xe0, 0x2d, 0xc8, 0xfb, 0x01, 0xab, 0x32, 0x1a, 0xbb, 0x1c, 0x78, 0xa1, 0xfe, 0xd9, + 0xf1, 0x36, 0x9d, 0x41, 0xdf, 0x14, 0x1c, 0xf5, 0x88, 0x37, 0x7e, 0xc4, 0x62, 0x5a, 0x18, 0xe8, + 0xfc, 0xe2, 0x4c, 0x39, 0x5b, 0x29, 0xd4, 0x37, 0xc7, 0x17, 0x74, 0xd7, 0x65, 0x15, 0x92, 0x92, + 0xc1, 0xf4, 0x58, 0x0a, 0x0b, 0xa3, 0x2d, 0x11, 0x1f, 0x7c, 0x51, 0x0d, 0xc4, 0x03, 0xf8, 0x8b, + 0x90, 0xb3, 0xec, 0x2d, 0xc7, 0x2f, 0xce, 0x72, 0x30, 0x57, 0xc7, 0x03, 0xb3, 0x6e, 0x6f, 0x39, + 0x7a, 0xc8, 0x10, 0x3f, 0x82, 0x79, 0x8f, 0x06, 0xde, 0xae, 0xb4, 0x42, 0x11, 0xb8, 0x5d, 0x3f, + 0x37, 0x9e, 0x04, 0x5d, 0x65, 0xa9, 0x27, 0x25, 0xe0, 0x55, 0x28, 0xf8, 0xb1, 0x8f, 0x15, 0x0b, + 0x5c, 0x60, 0x31, 0xc1, 0x48, 0xf1, 0x41, 0x5d, 0x9d, 0xdc, 0xe3, 0xdd, 0x73, 0xe9, 0xde, 0x3d, + 0x3f, 0x34, 0xab, 0xed, 0x1b, 0x21, 0xab, 0x2d, 0x74, 0x67, 0xb5, 0x7f, 0x23, 0x58, 0xea, 0x09, + 0x4e, 0x9b, 0x2e, 0x4d, 0x3d, 0x06, 0x04, 0xa6, 0x7c, 0x97, 0x1a, 0x3c, 0x53, 0x15, 0xea, 0xb7, + 0x27, 0x16, 0xad, 0xb8, 0x5c, 0xce, 0x3a, 0x2d, 0xa0, 0x8e, 0x19, 0x17, 0x7e, 0x8c, 0xe0, 0xa3, + 0x8a, 0xcc, 0x7b, 0x24, 0x30, 0xb6, 0xd3, 0x94, 0x65, 0xe7, 0x97, 0xcd, 0x11, 0x79, 0x39, 0x24, + 0x98, 0x55, 0xf9, 0xc7, 0xfd, 0x5d, 0x97, 0x01, 0x64, 0xbf, 0xc4, 0x03, 0x63, 0x16, 0x4f, 0x3f, + 0x47, 0x50, 0x52, 0x63, 0xb8, 0xd3, 0x6c, 0xbe, 0x46, 0x8c, 0x9d, 0x34, 0x90, 0xfb, 0x20, 0x63, + 0x99, 0x1c, 0x61, 0x56, 0xcf, 0x58, 0xe6, 0x1e, 0x83, 0x51, 0x37, 0xdc, 0xe9, 0x74, 0xb8, 0x33, + 0x49, 0xb8, 0x1f, 0x74, 0xc1, 0x95, 0x21, 0x21, 0x05, 0xee, 0x12, 0xcc, 0xda, 0x5d, 0x85, 0x6c, + 0x3c, 0xd0, 0xa7, 0x80, 0xcd, 0xf4, 0x14, 0xb0, 0x45, 0x98, 0xe9, 0x44, 0xd7, 0x1c, 0xf6, 0xb3, + 0x24, 0x99, 0x8a, 0x0d, 0xcf, 0x69, 0xbb, 0xc2, 0xe8, 0x21, 0xc1, 0x50, 0xec, 0x58, 0x36, 0x2b, + 0xc9, 0x39, 0x0a, 0xf6, 0xbd, 0xf7, 0x8b, 0x4d, 0x42, 0xed, 0x5f, 0x64, 0xe0, 0x63, 0x7d, 0xd4, + 0x1e, 0xea, 0x4f, 0xcf, 0x87, 0xee, 0x91, 0x57, 0xcf, 0x0c, 0xf4, 0xea, 0xfc, 0x30, 0xaf, 0x9e, + 0x4d, 0xb7, 0x17, 0x24, 0xed, 0xf5, 0xd3, 0x0c, 0x94, 0xfb, 0xd8, 0x6b, 0x78, 0x39, 0xf1, 0xdc, + 0x18, 0x6c, 0xcb, 0xf1, 0x84, 0x97, 0xe4, 0xf5, 0x90, 0x60, 0xe7, 0xcc, 0xf1, 0xdc, 0x6d, 0x62, + 0x73, 0xef, 0xc8, 0xeb, 0x82, 0x1a, 0xd3, 0x54, 0xdf, 0xcc, 0x40, 0x51, 0xda, 0xe7, 0x8a, 0xc1, + 0xad, 0xd5, 0xb6, 0x9f, 0x7f, 0x13, 0x2d, 0xc2, 0x34, 0xe1, 0x68, 0x85, 0x53, 0x09, 0xaa, 0xc7, + 0x18, 0xf9, 0x74, 0x63, 0xcc, 0x26, 0x8d, 0xf1, 0x06, 0x82, 0xc3, 0x49, 0x63, 0xf8, 0x1b, 0x96, + 0x1f, 0xc8, 0xcb, 0x01, 0xde, 0x82, 0x99, 0x50, 0x4e, 0x58, 0xda, 0x15, 0xea, 0x1b, 0xe3, 0x26, + 0xfc, 0x84, 0xe1, 0x25, 0x73, 0xed, 0x25, 0x38, 0xdc, 0x37, 0xca, 0x09, 0x18, 0x25, 0xc8, 0xcb, + 0x22, 0x47, 0x6c, 0x4d, 0x44, 0x6b, 0x6f, 0x4c, 0x25, 0x53, 0x8e, 0x63, 0x6e, 0x38, 0x8d, 0x94, + 0xfb, 0x7e, 0xfa, 0x76, 0x32, 0x53, 0x39, 0xa6, 0x72, 0xb5, 0x97, 0x24, 0x5b, 0x67, 0x38, 0x76, + 0x40, 0x2c, 0x9b, 0x7a, 0x22, 0x2b, 0xc6, 0x03, 0x6c, 0x1b, 0x7c, 0xcb, 0x36, 0xe8, 0x26, 0x35, + 0x1c, 0xdb, 0xf4, 0xf9, 0x7e, 0x66, 0xf5, 0xc4, 0x18, 0xbe, 0x05, 0xb3, 0x9c, 0xbe, 0x6f, 0xb5, + 0xc2, 0x34, 0x50, 0xa8, 0x2f, 0x57, 0xc3, 0x1e, 0x5c, 0x55, 0xed, 0xc1, 0xc5, 0x36, 0x6c, 0xd1, + 0x80, 0x54, 0x3b, 0x17, 0xaa, 0x6c, 0x85, 0x1e, 0x2f, 0x66, 0x58, 0x02, 0x62, 0x35, 0x37, 0x2c, + 0x9b, 0x17, 0x9e, 0x4c, 0x54, 0x3c, 0xc0, 0x5c, 0x65, 0xcb, 0x69, 0x36, 0x9d, 0xc7, 0xf2, 0xdc, + 0x84, 0x14, 0x5b, 0xd5, 0xb6, 0x03, 0xab, 0xc9, 0xe5, 0x87, 0x8e, 0x10, 0x0f, 0xf0, 0x55, 0x56, + 0x33, 0xa0, 0x9e, 0x38, 0x30, 0x82, 0x8a, 0x9c, 0xb1, 0x10, 0xb6, 0x95, 0xe4, 0x79, 0x0d, 0xdd, + 0x76, 0x4e, 0x75, 0xdb, 0xee, 0xa3, 0x30, 0xdf, 0xa7, 0x37, 0xc2, 0xbb, 0x6c, 0xb4, 0x63, 0x39, + 0x6d, 0x56, 0x53, 0xf1, 0xd2, 0x43, 0xd2, 0x3d, 0xae, 0xbc, 0x90, 0xee, 0xca, 0xfb, 0x93, 0xae, + 0xfc, 0x7b, 0x04, 0xf9, 0x0d, 0xa7, 0x71, 0xdd, 0x0e, 0xbc, 0x5d, 0x7e, 0x4b, 0x72, 0xec, 0x80, + 0xda, 0xd2, 0x5f, 0x24, 0xc9, 0x36, 0x21, 0xb0, 0x5a, 0x74, 0x33, 0x20, 0x2d, 0x57, 0xd4, 0x58, + 0x7b, 0xda, 0x84, 0x68, 0x31, 0x33, 0x4c, 0x93, 0xf8, 0x01, 0x3f, 0xf1, 0x79, 0x9d, 0x7f, 0x33, + 0x15, 0xa2, 0x09, 0x9b, 0x81, 0x27, 0x8e, 0x7b, 0x62, 0x4c, 0x75, 0xb1, 0x5c, 0x88, 0x4d, 0x90, + 0x5a, 0x0b, 0x5e, 0x8c, 0x8a, 0xff, 0xfb, 0xd4, 0x6b, 0x59, 0x36, 0x49, 0x8f, 0xde, 0x23, 0xb4, + 0xf7, 0x52, 0xee, 0x9e, 0x4e, 0xe2, 0xd0, 0xb1, 0x5a, 0xfa, 0xa1, 0x65, 0x9b, 0xce, 0xe3, 0x94, + 0xc3, 0x33, 0x9e, 0xc0, 0xbf, 0x26, 0x3b, 0x74, 0x8a, 0xc4, 0xe8, 0xa4, 0xdf, 0x82, 0x79, 0x16, + 0x13, 0x3a, 0x54, 0xfc, 0x20, 0xc2, 0x8e, 0x36, 0xa8, 0x59, 0x12, 0xf3, 0xd0, 0x93, 0x0b, 0xf1, + 0x06, 0x2c, 0x10, 0xdf, 0xb7, 0x1a, 0x36, 0x35, 0x25, 0xaf, 0xcc, 0xc8, 0xbc, 0xba, 0x97, 0x86, + 0xd7, 0x6e, 0x3e, 0x43, 0xec, 0xb7, 0x24, 0xb5, 0x6f, 0x20, 0x38, 0xd4, 0x97, 0x49, 0x74, 0x72, + 0x90, 0x12, 0xc6, 0x4b, 0x90, 0xf7, 0x8d, 0x6d, 0x6a, 0xb6, 0x9b, 0x54, 0xf6, 0xa2, 0x24, 0xcd, + 0x7e, 0x33, 0xdb, 0xe1, 0xee, 0x8b, 0x34, 0x12, 0xd1, 0xf8, 0x28, 0x40, 0x8b, 0xd8, 0x6d, 0xd2, + 0xe4, 0x10, 0xa6, 0x38, 0x04, 0x65, 0x44, 0x5b, 0x82, 0x52, 0x3f, 0xd7, 0x11, 0x3d, 0x9e, 0x7f, + 0x21, 0xd8, 0x27, 0x83, 0xaa, 0xd8, 0xdd, 0x0a, 0x2c, 0x28, 0x66, 0xb8, 0x13, 0x6f, 0x74, 0xf7, + 0xf0, 0x90, 0x80, 0x29, 0xbd, 0x24, 0x9b, 0x6c, 0xb2, 0x77, 0x12, 0x6d, 0xf2, 0x91, 0xf3, 0x1d, + 0x9a, 0x50, 0xfd, 0xf8, 0x75, 0x28, 0xde, 0x26, 0x36, 0x69, 0x50, 0x33, 0x52, 0x3b, 0x72, 0xb1, + 0xaf, 0xa8, 0xcd, 0x8a, 0xb1, 0x5b, 0x03, 0x51, 0xa9, 0x65, 0x6d, 0x6d, 0xc9, 0xc6, 0x87, 0x07, + 0xf9, 0x0d, 0xcb, 0xde, 0x61, 0xf7, 0x67, 0xa6, 0x71, 0x60, 0x05, 0x4d, 0x69, 0xdd, 0x90, 0xc0, + 0xfb, 0x21, 0xdb, 0xf6, 0x9a, 0xc2, 0x03, 0xd8, 0x27, 0x2e, 0x43, 0xc1, 0xa4, 0xbe, 0xe1, 0x59, + 0xae, 0xd8, 0x7f, 0xde, 0x34, 0x56, 0x86, 0xd8, 0x3e, 0x58, 0x86, 0x63, 0xaf, 0x35, 0x89, 0xef, + 0xcb, 0x04, 0x14, 0x0d, 0x68, 0x97, 0x61, 0x9e, 0xc9, 0x8c, 0xd5, 0x3c, 0x9b, 0x54, 0xf3, 0x50, + 0x02, 0xbe, 0x84, 0x27, 0x11, 0x13, 0x78, 0x81, 0xe5, 0xfd, 0x2b, 0xae, 0x2b, 0x98, 0x8c, 0x58, + 0x0e, 0x65, 0xfb, 0xe5, 0xcf, 0xbe, 0xbd, 0xd2, 0xfa, 0x3b, 0x27, 0x01, 0xab, 0xe7, 0x84, 0x7a, + 0x1d, 0xcb, 0xa0, 0xf8, 0xbb, 0x08, 0xa6, 0x98, 0x68, 0x7c, 0x64, 0xd0, 0xb1, 0xe4, 0xfe, 0x5a, + 0x9a, 0xdc, 0x45, 0x98, 0x49, 0xd3, 0x96, 0x5e, 0xff, 0xdb, 0x3f, 0xbe, 0x97, 0x59, 0xc4, 0x07, + 0xf9, 0x0b, 0x59, 0xe7, 0x82, 0xfa, 0x5a, 0xe5, 0xe3, 0x37, 0x11, 0x60, 0x51, 0x07, 0x29, 0x6f, + 0x08, 0xf8, 0xec, 0x20, 0x88, 0x7d, 0xde, 0x1a, 0x4a, 0x47, 0x94, 0xac, 0x52, 0x35, 0x1c, 0x8f, + 0xb2, 0x1c, 0xc2, 0x27, 0x70, 0x00, 0xcb, 0x1c, 0xc0, 0x09, 0xac, 0xf5, 0x03, 0x50, 0x7b, 0xc2, + 0x2c, 0xfa, 0xb4, 0x46, 0x43, 0xb9, 0x6f, 0x23, 0xc8, 0x3d, 0xe4, 0x77, 0x88, 0x21, 0x46, 0xda, + 0x9c, 0x98, 0x91, 0xb8, 0x38, 0x8e, 0x56, 0x3b, 0xce, 0x91, 0x1e, 0xc1, 0x87, 0x25, 0x52, 0x3f, + 0xf0, 0x28, 0x69, 0x25, 0x00, 0x9f, 0x47, 0xf8, 0x5d, 0x04, 0xd3, 0x61, 0xf3, 0x18, 0x9f, 0x1c, + 0x84, 0x32, 0xd1, 0x5c, 0x2e, 0x4d, 0xae, 0x13, 0xab, 0x9d, 0xe1, 0x18, 0x8f, 0x6b, 0x7d, 0xb7, + 0x73, 0x35, 0xd1, 0xa7, 0x7d, 0x0b, 0x41, 0xf6, 0x26, 0x1d, 0xea, 0x6f, 0x13, 0x04, 0xd7, 0x63, + 0xc0, 0x3e, 0x5b, 0x8d, 0xdf, 0x41, 0xf0, 0xe2, 0x4d, 0x1a, 0xf4, 0x4f, 0x8f, 0xb8, 0x32, 0x3c, + 0x67, 0x09, 0xb7, 0x3b, 0x3b, 0xc2, 0xcc, 0x28, 0x2f, 0xd4, 0x38, 0xb2, 0x33, 0xf8, 0x74, 0x9a, + 0x13, 0xfa, 0xbb, 0xb6, 0xf1, 0x58, 0xe0, 0xf8, 0x33, 0x82, 0xfd, 0xdd, 0x6f, 0x85, 0x38, 0x99, + 0x50, 0xfb, 0x3e, 0x25, 0x96, 0xee, 0x8c, 0x1b, 0x65, 0x93, 0x4c, 0xb5, 0x2b, 0x1c, 0xf9, 0xcb, + 0xf8, 0xa5, 0x34, 0xe4, 0x51, 0x27, 0xae, 0xf6, 0x44, 0x7e, 0x3e, 0xe5, 0xef, 0xda, 0x1c, 0xf6, + 0x5f, 0x10, 0x1c, 0x94, 0x7c, 0xd7, 0xb6, 0x89, 0x17, 0x5c, 0xa3, 0xac, 0x86, 0xf6, 0x47, 0xd2, + 0x67, 0xcc, 0xac, 0xa1, 0xca, 0xd3, 0xae, 0x73, 0x5d, 0x3e, 0x8d, 0x5f, 0xd9, 0xb3, 0x2e, 0x06, + 0x63, 0x63, 0x0a, 0xd8, 0xef, 0x21, 0xd8, 0x77, 0x93, 0x06, 0x77, 0xd7, 0xd6, 0xf7, 0xb4, 0x33, + 0x63, 0x3a, 0xba, 0x22, 0x4e, 0xbb, 0xc6, 0x15, 0xf9, 0x14, 0xbe, 0xbc, 0x67, 0x45, 0x1c, 0xc3, + 0x8a, 0xf6, 0xe5, 0x75, 0x04, 0x73, 0x37, 0x69, 0x70, 0x3b, 0xea, 0x6a, 0x9f, 0x1c, 0xe9, 0xa5, + 0xac, 0xb4, 0x54, 0x55, 0xfe, 0x16, 0x20, 0x7f, 0x8a, 0x5c, 0x7d, 0x85, 0x63, 0x3b, 0x8d, 0x4f, + 0xa6, 0x61, 0x8b, 0x3b, 0xe9, 0x6f, 0x23, 0x38, 0xa4, 0x82, 0x88, 0x5f, 0x18, 0x3f, 0xb1, 0xb7, + 0x77, 0x3b, 0xf1, 0xfa, 0x37, 0x04, 0x5d, 0x9d, 0xa3, 0x3b, 0xa7, 0xf5, 0x3f, 0x88, 0xad, 0x1e, + 0x14, 0xab, 0x68, 0xb9, 0x82, 0xf0, 0x1f, 0x10, 0x4c, 0x87, 0x4d, 0xe5, 0xc1, 0x36, 0x4a, 0xbc, + 0x88, 0x4d, 0x32, 0xaa, 0x09, 0xaf, 0x2d, 0x9d, 0xef, 0x6f, 0x50, 0x75, 0xbd, 0xdc, 0xda, 0x2a, + 0xb7, 0x72, 0x32, 0x1c, 0xff, 0x1a, 0x01, 0xc4, 0x8d, 0x71, 0x7c, 0x26, 0x5d, 0x0f, 0xa5, 0x79, + 0x5e, 0x9a, 0x6c, 0x6b, 0x5c, 0xab, 0x72, 0x7d, 0x2a, 0xa5, 0x72, 0x6a, 0x2c, 0x74, 0xa9, 0xb1, + 0x1a, 0x36, 0xd1, 0x7f, 0x82, 0x20, 0xc7, 0xfb, 0x91, 0xf8, 0xc4, 0x20, 0xcc, 0x6a, 0xbb, 0x72, + 0x92, 0xa6, 0x3f, 0xc5, 0xa1, 0x96, 0xeb, 0x69, 0x09, 0x65, 0x15, 0x2d, 0xe3, 0x0e, 0x4c, 0x87, + 0x1d, 0xc0, 0xc1, 0xee, 0x91, 0xe8, 0x10, 0x96, 0xca, 0x29, 0x05, 0x4e, 0xe8, 0xa8, 0x22, 0x97, + 0x2d, 0x0f, 0xcb, 0x65, 0x53, 0x2c, 0xdd, 0xe0, 0xe3, 0x69, 0xc9, 0xe8, 0xff, 0x60, 0x98, 0xb3, + 0x1c, 0xdd, 0x49, 0xad, 0x3c, 0x2c, 0x9f, 0x31, 0xeb, 0x7c, 0x1f, 0xc1, 0xfe, 0xee, 0x4b, 0x02, + 0x3e, 0xdc, 0x15, 0x31, 0xd5, 0x3b, 0x53, 0x29, 0x69, 0xc5, 0x41, 0x17, 0x0c, 0xed, 0x33, 0x1c, + 0xc5, 0x2a, 0xbe, 0x34, 0xf4, 0x64, 0xdc, 0x91, 0x51, 0x87, 0x31, 0x5a, 0x89, 0x5f, 0xf9, 0x7e, + 0x83, 0x60, 0x4e, 0xf2, 0xbd, 0xef, 0x51, 0x9a, 0x0e, 0x6b, 0x72, 0x07, 0x81, 0xc9, 0xd2, 0x2e, + 0x73, 0xf8, 0x9f, 0xc4, 0x17, 0x47, 0x84, 0x2f, 0x61, 0xaf, 0x04, 0x0c, 0xe9, 0x1f, 0x11, 0x1c, + 0x78, 0x18, 0xfa, 0xfd, 0x87, 0x84, 0x7f, 0x8d, 0xe3, 0x7f, 0x05, 0xbf, 0x9c, 0x52, 0xaf, 0x0e, + 0x53, 0xe3, 0x3c, 0xc2, 0xbf, 0x44, 0x90, 0x97, 0xaf, 0x43, 0xf8, 0xf4, 0xc0, 0x83, 0x91, 0x7c, + 0x3f, 0x9a, 0xa4, 0x33, 0x8b, 0xe2, 0x4c, 0x3b, 0x91, 0x9a, 0x4d, 0x85, 0x7c, 0xe6, 0xd0, 0x6f, + 0x21, 0xc0, 0xd1, 0xdd, 0x3f, 0xea, 0x06, 0xe0, 0x53, 0x09, 0x51, 0x03, 0x1b, 0x4c, 0xa5, 0xd3, + 0x43, 0xe7, 0x25, 0x53, 0xe9, 0x72, 0x6a, 0x2a, 0x75, 0x22, 0xf9, 0xdf, 0x42, 0x50, 0xb8, 0x49, + 0xa3, 0xbb, 0x54, 0x8a, 0x2d, 0x93, 0x8f, 0x5b, 0xa5, 0xca, 0xf0, 0x89, 0x02, 0xd1, 0x39, 0x8e, + 0xe8, 0x14, 0x4e, 0x37, 0x95, 0x04, 0xf0, 0x43, 0x04, 0xf3, 0xf7, 0x54, 0x17, 0xc5, 0xe7, 0x86, + 0x49, 0x4a, 0x44, 0xf2, 0xd1, 0x71, 0x7d, 0x9c, 0xe3, 0x5a, 0xd1, 0x46, 0xc2, 0xb5, 0x2a, 0xde, + 0x89, 0x7e, 0x84, 0xc2, 0xcb, 0x78, 0x57, 0x5f, 0xfe, 0x7f, 0xb5, 0x5b, 0x4a, 0x7b, 0x5f, 0xbb, + 0xc8, 0xf1, 0x55, 0xf1, 0xb9, 0x51, 0xf0, 0xd5, 0x44, 0xb3, 0x1e, 0xff, 0x00, 0xc1, 0x01, 0xfe, + 0x66, 0xa2, 0x32, 0xee, 0x4a, 0x31, 0x83, 0x5e, 0x58, 0x46, 0x48, 0x31, 0x22, 0xfe, 0x68, 0x7b, + 0x02, 0xb5, 0x2a, 0xdf, 0x43, 0xbe, 0x8d, 0x60, 0x9f, 0x4c, 0x6a, 0x62, 0x77, 0x57, 0x86, 0x19, + 0x6e, 0xaf, 0x49, 0x50, 0xb8, 0xdb, 0xf2, 0x68, 0xee, 0xf6, 0x2e, 0x82, 0x19, 0xf1, 0x2a, 0x91, + 0x52, 0x2a, 0x28, 0xcf, 0x16, 0xa5, 0xae, 0x5e, 0x8d, 0x68, 0x6a, 0x6b, 0x5f, 0xe2, 0x62, 0x1f, + 0xe0, 0x5a, 0x9a, 0x58, 0xd7, 0x31, 0xfd, 0xda, 0x13, 0xd1, 0x51, 0x7e, 0x5a, 0x6b, 0x3a, 0x0d, + 0xff, 0x55, 0x0d, 0xa7, 0x26, 0x44, 0x36, 0xe7, 0x3c, 0xc2, 0x01, 0xcc, 0x32, 0xe7, 0xe0, 0x0d, + 0x20, 0x5c, 0xee, 0x6a, 0x17, 0xf5, 0xf4, 0x86, 0x4a, 0xa5, 0x9e, 0x86, 0x52, 0x9c, 0x01, 0xc5, + 0x75, 0x1c, 0x1f, 0x4b, 0x15, 0xcb, 0x05, 0xbd, 0x89, 0xe0, 0x80, 0xea, 0xed, 0xa1, 0xf8, 0x91, + 0x7d, 0x3d, 0x0d, 0x85, 0x28, 0xaa, 0xf1, 0xf2, 0x48, 0x8e, 0xc4, 0xe1, 0x5c, 0xbd, 0xf1, 0xa7, + 0x67, 0x47, 0xd1, 0xfb, 0xcf, 0x8e, 0xa2, 0xbf, 0x3f, 0x3b, 0x8a, 0x5e, 0xbd, 0x34, 0xda, 0x7f, + 0x9d, 0x8d, 0xa6, 0x45, 0xed, 0x40, 0x65, 0xff, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x38, 0x08, + 0xac, 0xf6, 0xd1, 0x2d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3045,6 +3047,8 @@ type ApplicationServiceClient interface { RevisionMetadata(ctx context.Context, in *RevisionMetadataQuery, opts ...grpc.CallOption) (*v1alpha1.RevisionMetadata, error) // Get the chart metadata (description, maintainers, home) for a specific revision of the application RevisionChartDetails(ctx context.Context, in *RevisionMetadataQuery, opts ...grpc.CallOption) (*v1alpha1.ChartDetails, error) + // Get the chart metadata (description, maintainers, home) for a specific revision of the application + GetOCIMetadata(ctx context.Context, in *RevisionMetadataQuery, opts ...grpc.CallOption) (*v1alpha1.OCIMetadata, error) // GetManifests returns application manifests GetManifests(ctx context.Context, in *ApplicationManifestQuery, opts ...grpc.CallOption) (*apiclient.ManifestResponse, error) // GetManifestsWithFiles returns application manifests using provided files to generate them @@ -3190,6 +3194,15 @@ func (c *applicationServiceClient) RevisionChartDetails(ctx context.Context, in return out, nil } +func (c *applicationServiceClient) GetOCIMetadata(ctx context.Context, in *RevisionMetadataQuery, opts ...grpc.CallOption) (*v1alpha1.OCIMetadata, error) { + out := new(v1alpha1.OCIMetadata) + err := c.cc.Invoke(ctx, "/application.ApplicationService/GetOCIMetadata", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *applicationServiceClient) GetManifests(ctx context.Context, in *ApplicationManifestQuery, opts ...grpc.CallOption) (*apiclient.ManifestResponse, error) { out := new(apiclient.ManifestResponse) err := c.cc.Invoke(ctx, "/application.ApplicationService/GetManifests", in, out, opts...) @@ -3459,6 +3472,8 @@ type ApplicationServiceServer interface { RevisionMetadata(context.Context, *RevisionMetadataQuery) (*v1alpha1.RevisionMetadata, error) // Get the chart metadata (description, maintainers, home) for a specific revision of the application RevisionChartDetails(context.Context, *RevisionMetadataQuery) (*v1alpha1.ChartDetails, error) + // Get the chart metadata (description, maintainers, home) for a specific revision of the application + GetOCIMetadata(context.Context, *RevisionMetadataQuery) (*v1alpha1.OCIMetadata, error) // GetManifests returns application manifests GetManifests(context.Context, *ApplicationManifestQuery) (*apiclient.ManifestResponse, error) // GetManifestsWithFiles returns application manifests using provided files to generate them @@ -3529,6 +3544,9 @@ func (*UnimplementedApplicationServiceServer) RevisionMetadata(ctx context.Conte func (*UnimplementedApplicationServiceServer) RevisionChartDetails(ctx context.Context, req *RevisionMetadataQuery) (*v1alpha1.ChartDetails, error) { return nil, status.Errorf(codes.Unimplemented, "method RevisionChartDetails not implemented") } +func (*UnimplementedApplicationServiceServer) GetOCIMetadata(ctx context.Context, req *RevisionMetadataQuery) (*v1alpha1.OCIMetadata, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetOCIMetadata not implemented") +} func (*UnimplementedApplicationServiceServer) GetManifests(ctx context.Context, req *ApplicationManifestQuery) (*apiclient.ManifestResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetManifests not implemented") } @@ -3741,6 +3759,24 @@ func _ApplicationService_RevisionChartDetails_Handler(srv interface{}, ctx conte return interceptor(ctx, in, info, handler) } +func _ApplicationService_GetOCIMetadata_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RevisionMetadataQuery) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ApplicationServiceServer).GetOCIMetadata(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/application.ApplicationService/GetOCIMetadata", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ApplicationServiceServer).GetOCIMetadata(ctx, req.(*RevisionMetadataQuery)) + } + return interceptor(ctx, in, info, handler) +} + func _ApplicationService_GetManifests_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ApplicationManifestQuery) if err := dec(in); err != nil { @@ -4147,6 +4183,10 @@ var _ApplicationService_serviceDesc = grpc.ServiceDesc{ MethodName: "RevisionChartDetails", Handler: _ApplicationService_RevisionChartDetails_Handler, }, + { + MethodName: "GetOCIMetadata", + Handler: _ApplicationService_GetOCIMetadata_Handler, + }, { MethodName: "GetManifests", Handler: _ApplicationService_GetManifests_Handler, diff --git a/pkg/apiclient/application/application.pb.gw.go b/pkg/apiclient/application/application.pb.gw.go index ed6064cadb9a2c..f5c1d70abaf37d 100644 --- a/pkg/apiclient/application/application.pb.gw.go +++ b/pkg/apiclient/application/application.pb.gw.go @@ -553,6 +553,100 @@ func local_request_ApplicationService_RevisionChartDetails_0(ctx context.Context } +var ( + filter_ApplicationService_GetOCIMetadata_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0, "revision": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} +) + +func request_ApplicationService_GetOCIMetadata_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq RevisionMetadataQuery + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") + } + + protoReq.Name, err = runtime.StringP(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) + } + + val, ok = pathParams["revision"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "revision") + } + + protoReq.Revision, err = runtime.StringP(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "revision", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ApplicationService_GetOCIMetadata_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.GetOCIMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_ApplicationService_GetOCIMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server ApplicationServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq RevisionMetadataQuery + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") + } + + protoReq.Name, err = runtime.StringP(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) + } + + val, ok = pathParams["revision"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "revision") + } + + protoReq.Revision, err = runtime.StringP(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "revision", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ApplicationService_GetOCIMetadata_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.GetOCIMetadata(ctx, &protoReq) + return msg, metadata, err + +} + var ( filter_ApplicationService_GetManifests_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) @@ -2202,6 +2296,29 @@ func RegisterApplicationServiceHandlerServer(ctx context.Context, mux *runtime.S }) + mux.Handle("GET", pattern_ApplicationService_GetOCIMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_ApplicationService_GetOCIMetadata_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_ApplicationService_GetOCIMetadata_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_ApplicationService_GetManifests_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -2822,6 +2939,26 @@ func RegisterApplicationServiceHandlerClient(ctx context.Context, mux *runtime.S }) + mux.Handle("GET", pattern_ApplicationService_GetOCIMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_ApplicationService_GetOCIMetadata_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_ApplicationService_GetOCIMetadata_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_ApplicationService_GetManifests_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -3262,6 +3399,8 @@ var ( pattern_ApplicationService_RevisionChartDetails_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "applications", "name", "revisions", "revision", "chartdetails"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_ApplicationService_GetOCIMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "applications", "name", "revisions", "revision", "ocimetadata"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_ApplicationService_GetManifests_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "name", "manifests"}, "", runtime.AssumeColonVerbOpt(true))) pattern_ApplicationService_GetManifestsWithFiles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "applications", "manifestsWithFiles"}, "", runtime.AssumeColonVerbOpt(true))) @@ -3322,6 +3461,8 @@ var ( forward_ApplicationService_RevisionChartDetails_0 = runtime.ForwardResponseMessage + forward_ApplicationService_GetOCIMetadata_0 = runtime.ForwardResponseMessage + forward_ApplicationService_GetManifests_0 = runtime.ForwardResponseMessage forward_ApplicationService_GetManifestsWithFiles_0 = runtime.ForwardResponseMessage diff --git a/pkg/apis/application/v1alpha1/generated.proto b/pkg/apis/application/v1alpha1/generated.proto index 3b59dd52ef5d08..f3b3603bd774cd 100644 --- a/pkg/apis/application/v1alpha1/generated.proto +++ b/pkg/apis/application/v1alpha1/generated.proto @@ -1268,6 +1268,23 @@ message NestedMergeGenerator { repeated string mergeKeys = 2; } +// OCIMetadata contains metadata for a specific revision in an OCI repository +message OCIMetadata { + optional string createdAt = 1; + + optional string authors = 2; + + optional string imageUrl = 3; + + optional string docsUrl = 4; + + optional string sourceUrl = 5; + + optional string version = 6; + + optional string description = 7; +} + // Operation contains information about a requested or running operation message Operation { // Sync contains parameters for the operation diff --git a/pkg/apis/application/v1alpha1/openapi_generated.go b/pkg/apis/application/v1alpha1/openapi_generated.go index d753489cac3414..eea832b384daae 100644 --- a/pkg/apis/application/v1alpha1/openapi_generated.go +++ b/pkg/apis/application/v1alpha1/openapi_generated.go @@ -105,6 +105,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.MergeGenerator": schema_pkg_apis_application_v1alpha1_MergeGenerator(ref), "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.NestedMatrixGenerator": schema_pkg_apis_application_v1alpha1_NestedMatrixGenerator(ref), "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.NestedMergeGenerator": schema_pkg_apis_application_v1alpha1_NestedMergeGenerator(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OCIMetadata": schema_pkg_apis_application_v1alpha1_OCIMetadata(ref), "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Operation": schema_pkg_apis_application_v1alpha1_Operation(ref), "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationInitiator": schema_pkg_apis_application_v1alpha1_OperationInitiator(ref), "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationState": schema_pkg_apis_application_v1alpha1_OperationState(ref), @@ -4594,6 +4595,61 @@ func schema_pkg_apis_application_v1alpha1_NestedMergeGenerator(ref common.Refere } } +func schema_pkg_apis_application_v1alpha1_OCIMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "OCIMetadata contains metadata for a specific revision in an OCI repository", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "createdAt": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "authors": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "imageUrl": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "docsUrl": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "sourceUrl": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "version": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "description": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + } +} + func schema_pkg_apis_application_v1alpha1_Operation(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go index 134ad276abf8c2..3e3cb535d86c98 100644 --- a/pkg/apis/application/v1alpha1/types.go +++ b/pkg/apis/application/v1alpha1/types.go @@ -1388,6 +1388,17 @@ type RevisionMetadata struct { SignatureInfo string `json:"signatureInfo,omitempty" protobuf:"bytes,5,opt,name=signatureInfo"` } +// OCIMetadata contains metadata for a specific revision in an OCI repository +type OCIMetadata struct { + CreatedAt string `json:"createdAt,omitempty" protobuf:"bytes,1,opt,name=createdAt"` + Authors string `json:"authors,omitempty" protobuf:"bytes,2,opt,name=authors"` + ImageURL string `json:"imageUrl,omitempty" protobuf:"bytes,3,opt,name=imageUrl"` + DocsURL string `json:"docsUrl,omitempty" protobuf:"bytes,4,opt,name=docsUrl"` + SourceURL string `json:"sourceUrl,omitempty" protobuf:"bytes,5,opt,name=sourceUrl"` + Version string `json:"version,omitempty" protobuf:"bytes,6,opt,name=version"` + Description string `json:"description,omitempty" protobuf:"bytes,7,opt,name=description"` +} + // ChartDetails contains helm chart metadata for a specific version type ChartDetails struct { Description string `json:"description,omitempty" protobuf:"bytes,1,opt,name=description"` diff --git a/reposerver/apiclient/mocks/RepoServerServiceClient.go b/reposerver/apiclient/mocks/RepoServerServiceClient.go index 76801cb1fb1b36..a29e10483b9e98 100644 --- a/reposerver/apiclient/mocks/RepoServerServiceClient.go +++ b/reposerver/apiclient/mocks/RepoServerServiceClient.go @@ -243,8 +243,8 @@ func (_m *RepoServerServiceClient) GetHelmCharts(ctx context.Context, in *apicli return r0, r1 } -// GetOciMetadata provides a mock function with given fields: ctx, in, opts -func (_m *RepoServerServiceClient) GetOciMetadata(ctx context.Context, in *apiclient.RepoServerRevisionChartDetailsRequest, opts ...grpc.CallOption) (*v1alpha1.ChartDetails, error) { +// GetOCIMetadata provides a mock function with given fields: ctx, in, opts +func (_m *RepoServerServiceClient) GetOCIMetadata(ctx context.Context, in *apiclient.RepoServerRevisionChartDetailsRequest, opts ...grpc.CallOption) (*v1alpha1.OCIMetadata, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -255,19 +255,19 @@ func (_m *RepoServerServiceClient) GetOciMetadata(ctx context.Context, in *apicl ret := _m.Called(_ca...) if len(ret) == 0 { - panic("no return value specified for GetOciMetadata") + panic("no return value specified for GetOCIMetadata") } - var r0 *v1alpha1.ChartDetails + var r0 *v1alpha1.OCIMetadata var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *apiclient.RepoServerRevisionChartDetailsRequest, ...grpc.CallOption) (*v1alpha1.ChartDetails, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *apiclient.RepoServerRevisionChartDetailsRequest, ...grpc.CallOption) (*v1alpha1.OCIMetadata, error)); ok { return rf(ctx, in, opts...) } - if rf, ok := ret.Get(0).(func(context.Context, *apiclient.RepoServerRevisionChartDetailsRequest, ...grpc.CallOption) *v1alpha1.ChartDetails); ok { + if rf, ok := ret.Get(0).(func(context.Context, *apiclient.RepoServerRevisionChartDetailsRequest, ...grpc.CallOption) *v1alpha1.OCIMetadata); ok { r0 = rf(ctx, in, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1alpha1.ChartDetails) + r0 = ret.Get(0).(*v1alpha1.OCIMetadata) } } diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go index b6fec59f8e3a87..79fca51abba65a 100644 --- a/reposerver/repository/repository.go +++ b/reposerver/repository/repository.go @@ -2363,9 +2363,28 @@ func (s *Service) GetRevisionMetadata(ctx context.Context, q *apiclient.RepoServ return metadata, nil } -func (s *Service) GetOciMetadata(ctx context.Context, q *apiclient.RepoServerRevisionChartDetailsRequest) (*v1alpha1.ChartDetails, error) { - // TODO: Create a real implementation of OCI metadata!!! - return s.GetRevisionChartDetails(ctx, q) +func (s *Service) GetOCIMetadata(ctx context.Context, q *apiclient.RepoServerRevisionChartDetailsRequest) (*v1alpha1.OCIMetadata, error) { + client, err := s.newOCIClient(q.Repo.Repo, q.Repo.GetOCICreds(), q.Repo.Proxy, q.Repo.NoProxy) + if err != nil { + return nil, err + } + + metadata, err := client.DigestMetadata(ctx, q.Revision, q.Repo.Project) + if err != nil { + return nil, err + } + + a := metadata.Annotations + + return &v1alpha1.OCIMetadata{ + CreatedAt: a["org.opencontainers.image.created"], + Authors: a["org.opencontainers.image.authors"], + ImageURL: a["org.opencontainers.image.url"], + DocsURL: a["org.opencontainers.image.documentation"], + SourceURL: a["org.opencontainers.image.source"], + Version: a["org.opencontainers.image.version"], + Description: a["org.opencontainers.image.description"], + }, nil } // GetRevisionChartDetails returns the helm chart details of a given version diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto index cd1611f9ca74de..cd399e6d15984a 100644 --- a/reposerver/repository/repository.proto +++ b/reposerver/repository/repository.proto @@ -327,8 +327,8 @@ service RepoServerService { rpc GetRevisionMetadata(RepoServerRevisionMetadataRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RevisionMetadata) { } - // Get the meta-data (author, date, tags, message) for a specific revision of the OCI image // TODO: Actually use real OCI metadata for this!!! - rpc GetOciMetadata(RepoServerRevisionChartDetailsRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ChartDetails) { + // Get the meta-data (author, date, tags, message) for a specific revision of the OCI image + rpc GetOCIMetadata(RepoServerRevisionChartDetailsRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.OCIMetadata) { } // Get the chart details (author, date, tags, message) for a specific revision of the repo diff --git a/server/application/application.go b/server/application/application.go index 76ea8bb36ad037..139a9b4b9c49b6 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -1547,6 +1547,34 @@ func (s *Server) RevisionChartDetails(ctx context.Context, q *application.Revisi }) } +func (s *Server) GetOCIMetadata(ctx context.Context, q *application.RevisionMetadataQuery) (*appv1.OCIMetadata, error) { + a, proj, err := s.getApplicationEnforceRBACInformer(ctx, rbacpolicy.ActionGet, q.GetProject(), q.GetAppNamespace(), q.GetName()) + if err != nil { + return nil, err + } + + source, err := getAppSourceBySourceIndexAndVersionId(a, q.SourceIndex, q.VersionId) + if err != nil { + return nil, fmt.Errorf("error getting app source by source index and version ID: %w", err) + } + + repo, err := s.db.GetRepository(ctx, source.RepoURL, proj.Name) + if err != nil { + return nil, fmt.Errorf("error getting repository by URL: %w", err) + } + conn, repoClient, err := s.repoClientset.NewRepoServerClient() + if err != nil { + return nil, fmt.Errorf("error creating repo server client: %w", err) + } + defer ioutil.Close(conn) + + return repoClient.GetOCIMetadata(ctx, &apiclient.RepoServerRevisionChartDetailsRequest{ + Repo: repo, + Name: source.Chart, + Revision: q.GetRevision(), + }) +} + // getAppSourceBySourceIndexAndVersionId returns the source for a specific source index and version ID. Source index and // version ID are optional. If the source index is not specified, it defaults to 0. If the version ID is not specified, // we use the source(s) currently configured for the app. If the version ID is specified, we find the source for that diff --git a/server/application/application.proto b/server/application/application.proto index 945c0c417c65c8..e45a6b5f36853c 100644 --- a/server/application/application.proto +++ b/server/application/application.proto @@ -360,6 +360,11 @@ service ApplicationService { option (google.api.http).get = "/api/v1/applications/{name}/revisions/{revision}/chartdetails"; } + // Get the chart metadata (description, maintainers, home) for a specific revision of the application + rpc GetOCIMetadata (RevisionMetadataQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.OCIMetadata) { + option (google.api.http).get = "/api/v1/applications/{name}/revisions/{revision}/ocimetadata"; + } + // GetManifests returns application manifests rpc GetManifests (ApplicationManifestQuery) returns (repository.ManifestResponse) { option (google.api.http).get = "/api/v1/applications/{name}/manifests"; diff --git a/util/oci/client.go b/util/oci/client.go index 11283755a58a49..f0a9146ff4a242 100644 --- a/util/oci/client.go +++ b/util/oci/client.go @@ -10,7 +10,9 @@ import ( "io" "math" "net/http" + "oras.land/oras-go/v2/content/oci" "os" + "path/filepath" "strings" "time" @@ -47,6 +49,7 @@ type Client interface { GetTags(ctx context.Context, noCache bool) (*TagsList, error) ResolveDigest(ctx context.Context, revision string) (string, error) ResolveRevision(ctx context.Context, revision string, noCache bool) (string, error) + DigestMetadata(ctx context.Context, digest, project string) (*v1.Descriptor, error) CleanCache(revision string, project string) error Extract(ctx context.Context, revision string, project string, manifestMaxExtractedSize int64, disableManifestMaxExtractedSize bool) (string, argoio.Closer, error) TestRepo(ctx context.Context) (bool, error) @@ -151,43 +154,16 @@ func (c *nativeOCIClient) Extract(ctx context.Context, digest string, project st c.repoLock.Lock(cachedPath) defer c.repoLock.Unlock(cachedPath) - exists, err := fileExist(cachedPath) + exists, err := fileExists(cachedPath) if err != nil { return "", nil, err } if !exists { - tempDir, err := files.CreateTempDir(os.TempDir()) - if err != nil { - return "", nil, err - } - defer os.RemoveAll(tempDir) - - store, err := newTarFileStore(tempDir, cachedPath) + err := saveCompressedImageToPath(ctx, digest, c.repo, cachedPath) if err != nil { return "", nil, err } - - // Copy remote repo at the given digest to the scratch dir. - _, err = oras.Copy(ctx, c.repo, digest, store, digest, oras.DefaultCopyOptions) - if err != nil { - return "", nil, err - } - } - - manifestsDir, err := files.CreateTempDir(os.TempDir()) - if err != nil { - return manifestsDir, nil, err - } - - closer, err := file.New(manifestsDir) - if err != nil { - return manifestsDir, closer, err - } - - gzippedFile, err := os.Open(cachedPath) - if err != nil { - return "", nil, err } maxSize := manifestMaxExtractedSize @@ -195,13 +171,12 @@ func (c *nativeOCIClient) Extract(ctx context.Context, digest string, project st maxSize = math.MaxInt64 } - err = files.Untgz(manifestsDir, gzippedFile, maxSize, false) + manifestsDir, err := extractContentToManifestsDir(ctx, cachedPath, digest, maxSize) if err != nil { - return "", nil, err + return manifestsDir, nil, err } return manifestsDir, argoio.NewCloser(func() error { - closer.Close() return os.RemoveAll(manifestsDir) }), nil } @@ -231,6 +206,24 @@ func (c *nativeOCIClient) ResolveDigest(ctx context.Context, revision string) (s return descriptor.Digest.String(), nil } +func (c *nativeOCIClient) DigestMetadata(ctx context.Context, digest, project string) (*v1.Descriptor, error) { + path, err := c.getCachedPath(digest, project) + if err != nil { + return nil, err + } + + f, err := oci.NewFromTar(ctx, path) + if err != nil { + return nil, err + } + + metadata, err := f.Resolve(ctx, digest) + if err != nil { + return nil, err + } + return &metadata, nil +} + func (c *nativeOCIClient) ResolveRevision(ctx context.Context, revision string, noCache bool) (string, error) { constraints, err := semver.NewConstraint(revision) if err == nil { @@ -320,7 +313,7 @@ func newTLSConfig(creds Creds) (*tls.Config, error) { return tlsConfig, nil } -func fileExist(filePath string) (bool, error) { +func fileExists(filePath string) (bool, error) { if _, err := os.Stat(filePath); err != nil { if os.IsNotExist(err) { return false, nil @@ -331,38 +324,125 @@ func fileExist(filePath string) (bool, error) { return true, nil } -type tarFileStore struct { +type compressedLayerExtracterStore struct { *file.Store - dest string tempDir string + dest string + maxSize int64 } -func newTarFileStore(tempDir, dest string) (*tarFileStore, error) { +func newTarFileStore(dest, tempDir string, maxSize int64) (*compressedLayerExtracterStore, error) { f, err := file.New(tempDir) if err != nil { return nil, err } - return &tarFileStore{f, dest, tempDir}, nil + return &compressedLayerExtracterStore{f, tempDir, dest, maxSize}, nil } -func (s *tarFileStore) Push(ctx context.Context, desc v1.Descriptor, content io.Reader) error { - if isTar(desc.MediaType) { - dest, err := os.Create(s.dest) +func (s *compressedLayerExtracterStore) Push(ctx context.Context, desc v1.Descriptor, content io.Reader) error { + if isCompressedLayer(desc.MediaType) { + tempDir, err := files.CreateTempDir(os.TempDir()) if err != nil { return err } - defer dest.Close() + defer os.RemoveAll(tempDir) - _, err = io.Copy(dest, content) + err = files.Untgz(tempDir, content, s.maxSize, false) + if err != nil { + return err + } + + err = os.Remove(s.dest) + if err != nil { + return err + } + + // Helm charts are extracted into a single directory - we want the contents within that directory. + if desc.MediaType == "application/vnd.cncf.helm.chart.content.v1.tar+gzip" { + infos, err := os.ReadDir(tempDir) + if err != nil { + return err + } + + if len(infos) != 1 { + return fmt.Errorf("expected 1 file, found %v", len(infos)) + } + + return os.Rename(filepath.Join(tempDir, infos[0].Name()), s.dest) + } + + // For any other OCI content, we assume that this should be rendered as-is + return os.Rename(tempDir, s.dest) + } + + return s.Store.Push(ctx, desc, content) +} + +func isCompressedLayer(mediaType string) bool { + return strings.HasSuffix(mediaType, "tar+gzip") +} + +func createTarFile(from, to string) error { + f, err := os.Create(to) + if err != nil { return err } + defer f.Close() - err := s.Store.Push(ctx, desc, content) + _, err = files.Tar(from, nil, nil, f) + if err != nil { + _ = os.RemoveAll(to) + } return err } -func isTar(mediaType string) bool { - return strings.HasSuffix(mediaType, "tar+gzip") - // return mediaType == "application/vnd.oci.image.layer.v1.tar+gzip" +func saveCompressedImageToPath(ctx context.Context, digest string, repo *remote.Repository, cachedPath string) error { + tempDir, err := files.CreateTempDir(os.TempDir()) + if err != nil { + return err + } + defer os.RemoveAll(tempDir) + + store, err := oci.New(tempDir) + if err != nil { + return err + } + + // Copy remote repo at the given digest to the scratch dir. + _, err = oras.Copy(ctx, repo, digest, store, digest, oras.DefaultCopyOptions) + if err != nil { + return err + } + + // Save contents to tar file + return createTarFile(tempDir, cachedPath) +} + +func extractContentToManifestsDir(ctx context.Context, cachedPath, digest string, maxSize int64) (string, error) { + manifestsDir, err := files.CreateTempDir(os.TempDir()) + if err != nil { + return manifestsDir, err + } + + ociReadOnlyStore, err := oci.NewFromTar(ctx, cachedPath) + if err != nil { + return manifestsDir, err + } + + tempDir, err := files.CreateTempDir(os.TempDir()) + if err != nil { + return manifestsDir, err + } + defer os.RemoveAll(tempDir) + + fs, err := newTarFileStore(manifestsDir, tempDir, maxSize) + if err != nil { + return manifestsDir, err + } + defer fs.Close() + + // copy the whole artifact, here customFileStore.Push will be called + _, err = oras.Copy(ctx, ociReadOnlyStore, digest, fs, digest, oras.DefaultCopyOptions) + return manifestsDir, err }