From 63beae7648b22a94b011dc968380696135c96ba2 Mon Sep 17 00:00:00 2001 From: Nguyen Duy Phuong Date: Wed, 10 Apr 2024 22:58:12 +0700 Subject: [PATCH] patch promotion status with freight detail after git promote mechanism, add conventional method to add freight to promotion status Signed-off-by: Nguyen Duy Phuong --- api/v1alpha1/generated.pb.go | 441 +++++++++--------- api/v1alpha1/generated.proto | 4 +- api/v1alpha1/promotion_types.go | 11 +- api/v1alpha1/zz_generated.deepcopy.go | 4 +- .../crds/kargo.akuity.io_promotions.yaml | 4 +- .../crds/kargo.akuity.io_stages.yaml | 8 +- internal/controller/promotion/git.go | 2 +- internal/controller/promotions/promotions.go | 6 +- .../promotions.kargo.akuity.io_v1alpha1.json | 2 +- .../stages.kargo.akuity.io_v1alpha1.json | 4 +- ui/src/gen/v1alpha1/generated_pb.ts | 8 +- 11 files changed, 250 insertions(+), 244 deletions(-) diff --git a/api/v1alpha1/generated.pb.go b/api/v1alpha1/generated.pb.go index 0eb35d0d41..d2232ead99 100644 --- a/api/v1alpha1/generated.pb.go +++ b/api/v1alpha1/generated.pb.go @@ -1782,218 +1782,217 @@ func init() { } var fileDescriptor_e26b7f7bbc391025 = []byte{ - // 3362 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3b, 0x4b, 0x8c, 0x1c, 0x47, - 0xd9, 0xee, 0x99, 0xd9, 0xc7, 0x7c, 0xb3, 0xcf, 0xda, 0xb5, 0xb3, 0xd9, 0xfc, 0xde, 0xb5, 0xfa, - 0xcf, 0x1f, 0x25, 0x7f, 0x92, 0x19, 0x6c, 0x67, 0x13, 0xc7, 0x09, 0x09, 0x33, 0xeb, 0xd7, 0x26, - 0xb6, 0xb3, 0xd4, 0xae, 0x9d, 0x90, 0x87, 0xa0, 0x76, 0xa6, 0x3c, 0xd3, 0xd9, 0x99, 0xe9, 0x4e, - 0x57, 0xcf, 0x3a, 0x4b, 0x10, 0x10, 0x20, 0x22, 0x17, 0x02, 0x12, 0x97, 0xc0, 0x05, 0x09, 0x21, - 0x10, 0x07, 0xb8, 0x71, 0x40, 0x1c, 0x90, 0x88, 0x90, 0x22, 0x0e, 0x28, 0xe2, 0x14, 0x09, 0xc9, - 0x4a, 0x96, 0x1b, 0x52, 0xe0, 0xc0, 0xcd, 0x12, 0x12, 0xaa, 0x47, 0x77, 0x57, 0xf7, 0xf4, 0xec, - 0x76, 0x4f, 0x6c, 0x2b, 0xdc, 0x66, 0xea, 0x7b, 0x55, 0x7d, 0xf5, 0xbd, 0xbb, 0x1b, 0x1e, 0x69, - 0x5a, 0x5e, 0xab, 0xb7, 0x55, 0xae, 0xdb, 0x9d, 0x0a, 0xd9, 0xee, 0x59, 0xde, 0x6e, 0x65, 0x9b, - 0xb8, 0x4d, 0xbb, 0x42, 0x1c, 0xab, 0xb2, 0x73, 0x9c, 0xb4, 0x9d, 0x16, 0x39, 0x5e, 0x69, 0xd2, - 0x2e, 0x75, 0x89, 0x47, 0x1b, 0x65, 0xc7, 0xb5, 0x3d, 0x1b, 0xdd, 0x1b, 0x52, 0x95, 0x25, 0x55, - 0x59, 0x50, 0x95, 0x89, 0x63, 0x95, 0x7d, 0xaa, 0xc5, 0x87, 0x35, 0xde, 0x4d, 0xbb, 0x69, 0x57, - 0x04, 0xf1, 0x56, 0xef, 0x9a, 0xf8, 0x27, 0xfe, 0x88, 0x5f, 0x92, 0xe9, 0xe2, 0x23, 0xdb, 0xa7, - 0x58, 0xd9, 0x12, 0x92, 0x3b, 0xa4, 0xde, 0xb2, 0xba, 0xd4, 0xdd, 0xad, 0x38, 0xdb, 0x4d, 0xbe, - 0xc0, 0x2a, 0x1d, 0xea, 0x91, 0xca, 0x4e, 0xdf, 0x56, 0x16, 0x2b, 0x83, 0xa8, 0xdc, 0x5e, 0xd7, - 0xb3, 0x3a, 0xb4, 0x8f, 0xe0, 0xd1, 0x83, 0x08, 0x58, 0xbd, 0x45, 0x3b, 0x24, 0x4e, 0x67, 0xbe, - 0x0c, 0x73, 0xd5, 0x2e, 0x69, 0xef, 0x32, 0x8b, 0xe1, 0x5e, 0xb7, 0xea, 0x36, 0x7b, 0x1d, 0xda, - 0xf5, 0xd0, 0x31, 0x28, 0x74, 0x49, 0x87, 0x2e, 0x18, 0xc7, 0x8c, 0xfb, 0x8b, 0xb5, 0x89, 0xf7, - 0x6f, 0x2c, 0x1f, 0xda, 0xbb, 0xb1, 0x5c, 0xb8, 0x4c, 0x3a, 0x14, 0x0b, 0x08, 0xfa, 0x5f, 0x18, - 0xd9, 0x21, 0xed, 0x1e, 0x5d, 0xc8, 0x09, 0x94, 0x49, 0x85, 0x32, 0x72, 0x95, 0x2f, 0x62, 0x09, - 0x33, 0xbf, 0x9d, 0x8f, 0xb0, 0xbf, 0x44, 0x3d, 0xd2, 0x20, 0x1e, 0x41, 0x1d, 0x18, 0x6d, 0x93, - 0x2d, 0xda, 0x66, 0x0b, 0xc6, 0xb1, 0xfc, 0xfd, 0xa5, 0x13, 0x67, 0xcb, 0x69, 0x54, 0x5f, 0x4e, - 0x60, 0x55, 0xbe, 0x28, 0xf8, 0x9c, 0xed, 0x7a, 0xee, 0x6e, 0x6d, 0x4a, 0x6d, 0x62, 0x54, 0x2e, - 0x62, 0x25, 0x04, 0xbd, 0x69, 0x40, 0x89, 0x74, 0xbb, 0xb6, 0x47, 0x3c, 0xcb, 0xee, 0xb2, 0x85, - 0x9c, 0x10, 0xfa, 0xcc, 0xf0, 0x42, 0xab, 0x21, 0x33, 0x29, 0x79, 0x4e, 0x49, 0x2e, 0x69, 0x10, - 0xac, 0xcb, 0x5c, 0x7c, 0x1c, 0x4a, 0xda, 0x56, 0xd1, 0x0c, 0xe4, 0xb7, 0xe9, 0xae, 0xd4, 0x2f, - 0xe6, 0x3f, 0xd1, 0x7c, 0x44, 0xa1, 0x4a, 0x83, 0xa7, 0x73, 0xa7, 0x8c, 0xc5, 0xa7, 0x60, 0x26, - 0x2e, 0x30, 0x0b, 0xbd, 0xf9, 0x8e, 0x01, 0xf3, 0xda, 0x29, 0x30, 0xbd, 0x46, 0x5d, 0xda, 0xad, - 0x53, 0x54, 0x81, 0x22, 0xbf, 0x4b, 0xe6, 0x90, 0xba, 0x7f, 0xd5, 0xb3, 0xea, 0x20, 0xc5, 0xcb, - 0x3e, 0x00, 0x87, 0x38, 0x81, 0x59, 0xe4, 0xf6, 0x33, 0x0b, 0xa7, 0x45, 0x18, 0x5d, 0xc8, 0x47, - 0xcd, 0x62, 0x9d, 0x2f, 0x62, 0x09, 0x33, 0x3f, 0x0f, 0x77, 0xfb, 0xfb, 0xd9, 0xa4, 0x1d, 0xa7, - 0x4d, 0x3c, 0x1a, 0x6e, 0xea, 0x40, 0xd3, 0x33, 0xa7, 0x61, 0xb2, 0xea, 0x38, 0xae, 0xbd, 0x43, - 0x1b, 0x1b, 0x1e, 0x69, 0x52, 0xf3, 0x5b, 0x06, 0x1c, 0xae, 0xba, 0x4d, 0x7b, 0xf5, 0x4c, 0xd5, - 0x71, 0x2e, 0x50, 0xd2, 0xf6, 0x5a, 0x1b, 0x1e, 0xf1, 0x7a, 0x0c, 0x3d, 0x05, 0xa3, 0x4c, 0xfc, - 0x52, 0xec, 0xee, 0xf3, 0x2d, 0x44, 0xc2, 0x6f, 0xde, 0x58, 0x9e, 0x4f, 0x20, 0xa4, 0x58, 0x51, - 0xa1, 0x07, 0x60, 0xac, 0x43, 0x19, 0x23, 0x4d, 0xff, 0xcc, 0xd3, 0x8a, 0xc1, 0xd8, 0x25, 0xb9, - 0x8c, 0x7d, 0xb8, 0xf9, 0xa7, 0x1c, 0x4c, 0x07, 0xbc, 0x94, 0xf8, 0xdb, 0xa0, 0xe0, 0x1e, 0x4c, - 0xb4, 0xb4, 0x13, 0x0a, 0x3d, 0x97, 0x4e, 0x3c, 0x91, 0xd2, 0x96, 0x93, 0x94, 0x54, 0x9b, 0x57, - 0x62, 0x26, 0xf4, 0x55, 0x1c, 0x11, 0x83, 0x3a, 0x00, 0x6c, 0xb7, 0x5b, 0x57, 0x42, 0x0b, 0x42, - 0xe8, 0xe3, 0x19, 0x85, 0x6e, 0x04, 0x0c, 0x6a, 0x48, 0x89, 0x84, 0x70, 0x0d, 0x6b, 0x02, 0xcc, - 0x5f, 0x1b, 0x30, 0x97, 0x40, 0x87, 0x9e, 0x8c, 0xdd, 0xe7, 0xbd, 0x7d, 0xf7, 0x89, 0xfa, 0xc8, - 0xc2, 0xdb, 0x7c, 0x08, 0xc6, 0x5d, 0xba, 0x63, 0x31, 0xcb, 0xee, 0x2a, 0x0d, 0xcf, 0x28, 0xfa, - 0x71, 0xac, 0xd6, 0x71, 0x80, 0x81, 0x1e, 0x84, 0xa2, 0xff, 0x9b, 0xab, 0x39, 0xcf, 0xcd, 0x99, - 0x5f, 0x9c, 0x8f, 0xca, 0x70, 0x08, 0x37, 0x3f, 0x31, 0xb4, 0xdb, 0xbf, 0xe2, 0x34, 0x88, 0x47, - 0xb9, 0xf1, 0x10, 0xc7, 0xb9, 0x1c, 0x1a, 0x73, 0x60, 0x3c, 0x55, 0xb9, 0x8c, 0x7d, 0x38, 0x3a, - 0x05, 0x13, 0xea, 0xa7, 0xb4, 0x15, 0xb9, 0xbb, 0xe0, 0x62, 0xaa, 0x1a, 0x0c, 0x47, 0x30, 0x51, - 0x0f, 0x26, 0x99, 0xdd, 0x73, 0xeb, 0x54, 0x0a, 0x95, 0x3b, 0x2d, 0x9d, 0x38, 0x95, 0xe5, 0x6e, - 0x36, 0x34, 0x06, 0xb5, 0xc3, 0x4a, 0xe8, 0xa4, 0xbe, 0xca, 0x70, 0x54, 0x8a, 0xf9, 0x1a, 0x80, - 0xa4, 0xbd, 0x40, 0xdb, 0x1d, 0x54, 0x87, 0x51, 0xab, 0x43, 0x9a, 0xd4, 0x8f, 0xe7, 0x99, 0xcc, - 0x91, 0x73, 0x58, 0xe3, 0xd4, 0x6a, 0x03, 0x41, 0x14, 0x17, 0x8b, 0x0c, 0x2b, 0xd6, 0xe6, 0xbb, - 0x81, 0x97, 0xc7, 0x28, 0x78, 0xd0, 0x11, 0x38, 0x4a, 0xcd, 0x41, 0xd0, 0x11, 0x38, 0x58, 0xc2, - 0xd0, 0x51, 0x19, 0x31, 0xa5, 0x66, 0x4b, 0x0a, 0x25, 0xff, 0x2c, 0xdd, 0x95, 0xe1, 0xf3, 0x09, - 0x3f, 0x7c, 0xca, 0xc0, 0xf5, 0x7f, 0x91, 0x7c, 0xc6, 0xe3, 0x84, 0x26, 0x50, 0xac, 0x6d, 0xee, - 0x3a, 0x41, 0x9e, 0x7b, 0xc3, 0xbf, 0xfc, 0x67, 0x7b, 0xcc, 0xb3, 0x3b, 0xd6, 0x57, 0x29, 0x6a, - 0xc5, 0x54, 0xf2, 0x85, 0x2c, 0x2a, 0x09, 0xd8, 0xa4, 0xd1, 0x8b, 0x0b, 0x8b, 0x83, 0xa9, 0xd2, - 0xe9, 0xa6, 0x02, 0xc5, 0x1e, 0xa3, 0x67, 0xac, 0x26, 0x65, 0x9e, 0xd0, 0xd0, 0x78, 0x18, 0xa7, - 0xae, 0xf8, 0x00, 0x1c, 0xe2, 0x98, 0x7f, 0xcf, 0x01, 0xea, 0xb7, 0x1d, 0x6e, 0xf1, 0x2e, 0x75, - 0xec, 0x2b, 0xf8, 0x62, 0xdc, 0xe2, 0xb1, 0x5c, 0xc6, 0x3e, 0x9c, 0xef, 0xab, 0xde, 0x22, 0xae, - 0x17, 0xaf, 0x1f, 0x56, 0xf9, 0x22, 0x96, 0x30, 0xb4, 0x0e, 0xf3, 0x3d, 0xc1, 0x79, 0x93, 0xb8, - 0x4d, 0xea, 0xf9, 0x9e, 0x27, 0xee, 0x68, 0xbc, 0xf6, 0x3f, 0x8a, 0x66, 0xfe, 0x4a, 0x02, 0x0e, - 0x4e, 0xa4, 0x44, 0x5b, 0x50, 0xdc, 0xf6, 0xd5, 0xa4, 0xc2, 0xd8, 0xca, 0x50, 0x37, 0x23, 0x63, - 0x41, 0xf0, 0x17, 0x87, 0x6c, 0xd1, 0x65, 0x28, 0xb4, 0x68, 0xbb, 0xb3, 0x30, 0x22, 0xd8, 0x7f, - 0x2e, 0xab, 0x2f, 0xd4, 0xc6, 0x79, 0xc8, 0xe7, 0xbf, 0xb0, 0xe0, 0x63, 0x7e, 0x03, 0xa4, 0x56, - 0xb2, 0xa8, 0xf7, 0xe0, 0x44, 0xf2, 0x00, 0x8c, 0xed, 0x50, 0x37, 0x50, 0xa7, 0xc6, 0xec, 0xaa, - 0x5c, 0xc6, 0x3e, 0xdc, 0xfc, 0xb9, 0x01, 0xb3, 0x62, 0x07, 0x1b, 0xbd, 0x2d, 0x56, 0x77, 0x2d, - 0x87, 0x17, 0x22, 0xb7, 0x76, 0x37, 0x67, 0x60, 0x86, 0xd1, 0xce, 0x0e, 0x75, 0x57, 0xed, 0x2e, - 0xf3, 0x5c, 0x62, 0x75, 0x3d, 0xb5, 0xad, 0x05, 0x85, 0x3d, 0xb3, 0x11, 0x83, 0xe3, 0x3e, 0x0a, - 0xf3, 0x67, 0x05, 0x18, 0x3b, 0xe7, 0x52, 0xab, 0xd9, 0xf2, 0xd0, 0x57, 0x60, 0xbc, 0xa3, 0xea, - 0x35, 0xb1, 0x3f, 0x7e, 0x13, 0xb2, 0x48, 0x2e, 0xeb, 0x45, 0x72, 0xd9, 0xd9, 0x6e, 0xf2, 0x05, - 0x56, 0xe6, 0xd8, 0xe5, 0x9d, 0xe3, 0xe5, 0xe7, 0xb6, 0x5e, 0xa5, 0x75, 0x8f, 0xd7, 0x7a, 0x61, - 0x9a, 0x0a, 0xd7, 0x70, 0xc0, 0x95, 0x9b, 0x30, 0x69, 0x5b, 0x84, 0x2d, 0x8c, 0x45, 0x4d, 0xb8, - 0xca, 0x17, 0xb1, 0x84, 0x71, 0xd7, 0xba, 0x4e, 0x5c, 0xda, 0xb2, 0x7b, 0x8c, 0x2e, 0x8c, 0x47, - 0x4b, 0x80, 0xe7, 0x7d, 0x00, 0x0e, 0x71, 0xd0, 0x8b, 0x30, 0x56, 0xb7, 0x3b, 0x1d, 0xcb, 0xf3, - 0x43, 0x79, 0x25, 0x9d, 0x01, 0x9d, 0xb7, 0xbc, 0x55, 0x41, 0x17, 0xde, 0x83, 0xfc, 0xcf, 0xb0, - 0xcf, 0x10, 0x6d, 0x04, 0x41, 0xa9, 0x20, 0x58, 0x3f, 0x98, 0x8e, 0xb5, 0x88, 0x15, 0x83, 0xe2, - 0x0f, 0x67, 0x2a, 0xbc, 0x95, 0x2d, 0x8c, 0x64, 0x61, 0x2a, 0x0c, 0x2a, 0x64, 0x2a, 0xfe, 0x32, - 0xac, 0x58, 0xa1, 0x97, 0x82, 0x44, 0x3f, 0x2a, 0xee, 0xee, 0x64, 0x3a, 0xa6, 0xea, 0xf2, 0x55, - 0x95, 0x31, 0x15, 0xad, 0x0e, 0xfc, 0x3a, 0xc0, 0xfc, 0xbd, 0x01, 0x25, 0x85, 0x79, 0xd1, 0x62, - 0x1e, 0x7a, 0xb9, 0xcf, 0x54, 0xca, 0xe9, 0x4c, 0x85, 0x53, 0x0b, 0x43, 0x09, 0xea, 0x08, 0x7f, - 0x45, 0x33, 0x13, 0x0c, 0x23, 0x96, 0x47, 0x3b, 0x7e, 0xdb, 0xf1, 0x70, 0xa6, 0x93, 0x68, 0x01, - 0x9b, 0xf3, 0xc0, 0x92, 0x95, 0xf9, 0x49, 0x01, 0x66, 0x14, 0x46, 0x86, 0xca, 0x39, 0x6a, 0x8c, - 0xa3, 0xd9, 0x8c, 0x31, 0x77, 0xfb, 0x8c, 0x31, 0x7f, 0x3b, 0x8c, 0xb1, 0x70, 0xeb, 0x8c, 0xf1, - 0x75, 0x98, 0xd9, 0xa1, 0xae, 0x75, 0xcd, 0xaa, 0x8b, 0x16, 0x6c, 0xad, 0x7b, 0xcd, 0x56, 0xc1, - 0xfd, 0xd1, 0x74, 0xec, 0xaf, 0xc6, 0xa8, 0x6b, 0xf3, 0x3c, 0xa0, 0xc5, 0x57, 0x71, 0x9f, 0x14, - 0xf4, 0x96, 0x01, 0x73, 0xfa, 0xe2, 0x05, 0x8b, 0x79, 0xb6, 0xbb, 0xbb, 0x30, 0x26, 0x0e, 0x37, - 0xac, 0xf4, 0x7b, 0xd4, 0x39, 0xe7, 0xae, 0xf6, 0xb3, 0xc6, 0x49, 0xf2, 0xcc, 0x7f, 0xe4, 0x61, - 0x32, 0xe2, 0x5b, 0xe8, 0x3a, 0x80, 0x44, 0xa4, 0x8d, 0xb5, 0xae, 0xaa, 0x71, 0x56, 0x87, 0x70, - 0x52, 0xb5, 0x3b, 0xce, 0x45, 0xb6, 0xd2, 0x41, 0xcc, 0x0d, 0x01, 0x58, 0x13, 0x85, 0xde, 0x80, - 0x12, 0x51, 0xdd, 0xdf, 0x39, 0xdb, 0x55, 0x66, 0x79, 0x66, 0x18, 0xc9, 0xd5, 0x90, 0x4d, 0xbc, - 0x8b, 0x0f, 0x21, 0x58, 0x97, 0xb6, 0xe8, 0xc2, 0x74, 0x6c, 0xbf, 0x09, 0x9d, 0xf8, 0x9a, 0xde, - 0x89, 0xa7, 0x0e, 0x5d, 0x3e, 0x5f, 0xd1, 0xd2, 0xea, 0xed, 0x3f, 0x83, 0x99, 0xf8, 0x4e, 0x6f, - 0x99, 0xd0, 0x48, 0x1f, 0xad, 0xcf, 0x0c, 0x7e, 0x93, 0x83, 0x62, 0xe0, 0xc4, 0x59, 0x52, 0xfd, - 0x22, 0xe4, 0xac, 0x86, 0x4a, 0xf4, 0xa0, 0xb0, 0x72, 0x6b, 0x67, 0x70, 0xce, 0x6a, 0xa0, 0xfb, - 0x60, 0x74, 0xcb, 0x25, 0xdd, 0x7a, 0x4b, 0xa5, 0xf6, 0xc0, 0xdf, 0x6a, 0x62, 0x15, 0x2b, 0x28, - 0x2f, 0xd5, 0x3d, 0xd2, 0x14, 0xe5, 0x99, 0x56, 0xaa, 0x6f, 0x92, 0x26, 0xe6, 0xeb, 0xe8, 0x3c, - 0xcc, 0xca, 0xde, 0x74, 0xb5, 0x45, 0xeb, 0xdb, 0x72, 0x8b, 0xc2, 0x1f, 0x8b, 0xb5, 0xbb, 0x15, - 0xf2, 0xec, 0x85, 0x38, 0x02, 0xee, 0xa7, 0xd1, 0xbb, 0xfb, 0xd1, 0xfd, 0xbb, 0x7b, 0xbe, 0x75, - 0xd2, 0xf3, 0x5a, 0xb6, 0xab, 0x92, 0x7d, 0xb0, 0xf5, 0xaa, 0x58, 0xc5, 0x0a, 0x6a, 0xce, 0xc1, - 0xec, 0x79, 0xcb, 0xbb, 0xd0, 0xdb, 0x5a, 0xef, 0xb5, 0xdb, 0x98, 0xbe, 0xd6, 0xe3, 0xd5, 0xf2, - 0x2f, 0x46, 0x60, 0xf2, 0xbc, 0xe5, 0x09, 0x5d, 0x65, 0x2e, 0x94, 0x37, 0xe0, 0xb0, 0xd5, 0x65, - 0xb4, 0xde, 0x73, 0xe9, 0xc6, 0xb6, 0xe5, 0x6c, 0x5e, 0xdc, 0x10, 0x96, 0xb2, 0xab, 0xea, 0xf4, - 0xa3, 0x8a, 0xf0, 0xf0, 0x5a, 0x12, 0x12, 0x4e, 0xa6, 0x45, 0x27, 0x00, 0x5c, 0x4a, 0x1a, 0x35, - 0xfd, 0x36, 0x02, 0xc7, 0xc3, 0x01, 0x04, 0x6b, 0x58, 0x68, 0x05, 0x4a, 0xd7, 0x5d, 0xcb, 0xa3, - 0x8a, 0x48, 0xde, 0x4e, 0xe0, 0x32, 0xcf, 0x87, 0x20, 0xac, 0xe3, 0xa1, 0x1d, 0x28, 0x39, 0xa1, - 0x2e, 0x54, 0xdc, 0x4c, 0x19, 0x29, 0x34, 0x25, 0xae, 0xbb, 0x76, 0xc7, 0xe6, 0x21, 0xe9, 0x12, - 0xad, 0xb7, 0x48, 0xd7, 0x62, 0x9d, 0xda, 0x34, 0x97, 0xab, 0xa1, 0x60, 0x5d, 0x10, 0x6a, 0xc2, - 0xa8, 0x4b, 0xbb, 0x0d, 0xea, 0xaa, 0x0a, 0x22, 0xa5, 0xc8, 0x67, 0xf9, 0x12, 0x16, 0x84, 0x09, - 0x22, 0x81, 0x5f, 0xb9, 0x84, 0x62, 0xc5, 0x1e, 0x75, 0xf5, 0x96, 0x62, 0x4c, 0xc8, 0xaa, 0xa6, - 0x94, 0xe5, 0x93, 0x25, 0x48, 0x1a, 0xdc, 0x5e, 0xbc, 0xa8, 0xda, 0x8b, 0x71, 0x21, 0xea, 0xc9, - 0x74, 0xa2, 0x78, 0x3b, 0x91, 0x20, 0x25, 0xde, 0x6a, 0xfc, 0xa1, 0x00, 0xd3, 0xe7, 0xad, 0xa1, - 0xeb, 0x7c, 0x0f, 0xee, 0x92, 0xd9, 0x7d, 0x83, 0xb6, 0x69, 0x9d, 0x53, 0x6f, 0x78, 0x2e, 0xf1, - 0x68, 0xd3, 0xef, 0xbb, 0x4f, 0x2b, 0xd2, 0xbb, 0x56, 0x93, 0xd1, 0x6e, 0x0e, 0x06, 0xe1, 0x41, - 0xac, 0x53, 0x87, 0x95, 0xa4, 0x1e, 0xa3, 0x90, 0xb5, 0xc7, 0xe0, 0x35, 0x14, 0x69, 0xb7, 0xed, - 0xeb, 0x9b, 0xa4, 0xc9, 0x54, 0xd4, 0x09, 0x6a, 0xa8, 0xaa, 0x0f, 0xc0, 0x21, 0x0e, 0x2a, 0x03, - 0x58, 0xcd, 0xae, 0xed, 0x52, 0x41, 0x31, 0x2a, 0x06, 0x49, 0x53, 0xdc, 0xcf, 0xd6, 0x82, 0x55, - 0xac, 0x61, 0x0c, 0x76, 0xf8, 0xb1, 0x4f, 0xe1, 0xf0, 0x8f, 0xc0, 0x84, 0xd5, 0xad, 0xb7, 0x7b, - 0x0d, 0xba, 0x4e, 0xbc, 0x16, 0x5b, 0x18, 0x17, 0xdb, 0x98, 0xd9, 0xbb, 0xb1, 0x3c, 0xb1, 0xa6, - 0xad, 0xe3, 0x08, 0x16, 0xa7, 0xa2, 0xaf, 0x6b, 0x54, 0xc5, 0x90, 0xea, 0xec, 0xeb, 0x3a, 0x95, - 0x8e, 0x65, 0xfe, 0xd9, 0x80, 0x51, 0x19, 0x7f, 0xd1, 0x4a, 0x6c, 0x5e, 0x77, 0xb4, 0x6f, 0x5e, - 0x57, 0x4a, 0x1a, 0xbb, 0x9a, 0x30, 0x6a, 0x31, 0xd6, 0xa3, 0xb2, 0xea, 0x2c, 0x4a, 0xb7, 0x5b, - 0x13, 0x2b, 0x58, 0x41, 0x90, 0x05, 0x40, 0xfc, 0x81, 0x9b, 0x5f, 0x42, 0xae, 0x64, 0x9d, 0x48, - 0xc6, 0xa6, 0x91, 0x01, 0x80, 0x61, 0x8d, 0xb9, 0xf9, 0x53, 0x03, 0xee, 0xe6, 0x4e, 0x22, 0xca, - 0xc2, 0x33, 0xd4, 0xe1, 0x7e, 0xdf, 0xad, 0xef, 0xaa, 0x58, 0x2e, 0x62, 0xa9, 0x63, 0x33, 0x4b, - 0x54, 0x66, 0x46, 0x3c, 0x96, 0xfa, 0x10, 0xac, 0x61, 0xa5, 0x68, 0x88, 0x2b, 0x50, 0x14, 0xd5, - 0x27, 0x57, 0xa9, 0xb2, 0xeb, 0xc0, 0xcc, 0x56, 0x7d, 0x00, 0x0e, 0x71, 0xcc, 0xbf, 0x18, 0x30, - 0x3d, 0xd4, 0x60, 0xec, 0x29, 0x98, 0x12, 0x79, 0x9f, 0x9d, 0xb3, 0xda, 0xe2, 0x06, 0xd5, 0xae, - 0x8e, 0x28, 0xec, 0xa9, 0xab, 0x11, 0x28, 0x8e, 0x61, 0xfb, 0x83, 0xb5, 0xfc, 0x41, 0x83, 0xb5, - 0xc2, 0x10, 0x83, 0xb5, 0x8f, 0x0c, 0x38, 0x92, 0x1c, 0xba, 0xd0, 0x2b, 0xb1, 0x01, 0xdb, 0x4a, - 0xfa, 0x40, 0x98, 0x62, 0xaa, 0xc6, 0xd3, 0x87, 0x6a, 0x24, 0x64, 0x85, 0xf9, 0x74, 0x7a, 0xf6, - 0x89, 0x66, 0x32, 0xa8, 0xb9, 0x30, 0x7f, 0x65, 0x80, 0xbc, 0x8f, 0x2c, 0x81, 0xf6, 0x04, 0x40, - 0x53, 0x15, 0x14, 0xf8, 0xa2, 0xba, 0xaf, 0xc0, 0xe6, 0xce, 0x07, 0x10, 0xac, 0x61, 0xf9, 0x55, - 0x55, 0x7e, 0x40, 0x55, 0x75, 0x1f, 0x8c, 0x36, 0xe4, 0x00, 0xb0, 0x10, 0x8d, 0xa2, 0x6a, 0xfa, - 0xa7, 0xa0, 0xe6, 0x3b, 0x05, 0x98, 0x15, 0xfb, 0x1d, 0x36, 0x49, 0x0c, 0xb3, 0x77, 0x07, 0x8e, - 0x88, 0x7b, 0xe9, 0xcf, 0x2b, 0xf2, 0x38, 0xa7, 0x14, 0xfd, 0x91, 0xb5, 0x44, 0xac, 0x9b, 0x03, - 0x21, 0x78, 0x00, 0xdf, 0xff, 0x96, 0x64, 0xf1, 0x10, 0x8c, 0x3b, 0x6d, 0xe2, 0x5d, 0xb3, 0xdd, - 0x8e, 0xaa, 0x4c, 0x83, 0x51, 0xc4, 0xba, 0x5a, 0xc7, 0x01, 0xc6, 0xe0, 0xd4, 0x32, 0x3e, 0x7c, - 0x6a, 0x31, 0xbb, 0x70, 0x44, 0x2b, 0x9a, 0x6e, 0xff, 0xec, 0xf9, 0x2d, 0x03, 0x8e, 0xee, 0x5b, - 0xa5, 0xa1, 0x46, 0x2c, 0x34, 0x3c, 0x99, 0xb9, 0xf4, 0x4b, 0x33, 0x77, 0x7f, 0xc7, 0x80, 0xf9, - 0xe1, 0x47, 0xee, 0xc7, 0xa0, 0xe0, 0x84, 0xb1, 0x36, 0xc8, 0x00, 0x22, 0xc2, 0x0a, 0x48, 0x54, - 0x31, 0xf9, 0x14, 0x8a, 0x79, 0xd3, 0x80, 0x7b, 0xf6, 0x29, 0x29, 0xd1, 0x56, 0x4c, 0x2d, 0xa7, - 0x33, 0x56, 0xa9, 0x69, 0x94, 0xf2, 0xa3, 0x1c, 0x8c, 0xad, 0xbb, 0xf6, 0xab, 0xb4, 0x7e, 0x27, - 0x26, 0xb0, 0xcf, 0x41, 0x81, 0x39, 0xb4, 0xae, 0x7a, 0xde, 0xe3, 0x29, 0x9b, 0x0a, 0xb9, 0xbd, - 0x0d, 0x87, 0xd6, 0x65, 0xfd, 0xcb, 0x7f, 0x61, 0xc1, 0x48, 0x1b, 0x3b, 0xe6, 0xb3, 0xb4, 0xd1, - 0x3e, 0xcb, 0x83, 0xc7, 0x8e, 0x0a, 0xf3, 0x33, 0x3b, 0x76, 0x54, 0xfb, 0x1b, 0x30, 0x76, 0xfc, - 0x5e, 0x78, 0x02, 0xae, 0x34, 0xf4, 0x75, 0x98, 0x75, 0x7c, 0x3b, 0x5b, 0xb7, 0xdb, 0x56, 0xdd, - 0xca, 0x9a, 0x8e, 0xd7, 0x23, 0xe4, 0xbb, 0x61, 0x03, 0xbf, 0x1e, 0xe7, 0x8b, 0xfb, 0x45, 0x99, - 0x36, 0x4c, 0x46, 0x54, 0x8f, 0x4e, 0xfa, 0xaf, 0x1f, 0x44, 0xcb, 0x4d, 0xf9, 0xfa, 0xc1, 0xcd, - 0x1b, 0xcb, 0x13, 0x0a, 0x5d, 0x7f, 0x1d, 0x21, 0xcb, 0x43, 0xfe, 0x9f, 0xe4, 0xa0, 0x18, 0xec, - 0xec, 0x0e, 0x18, 0xf8, 0x17, 0x23, 0x06, 0x7e, 0x32, 0xa3, 0x4e, 0x13, 0x4d, 0xfc, 0x95, 0x98, - 0x89, 0x67, 0xbd, 0xa8, 0x03, 0x8c, 0xfc, 0x9f, 0x86, 0xb8, 0x13, 0x89, 0x2b, 0x66, 0x98, 0x07, - 0x8f, 0xa5, 0x09, 0x8c, 0x5d, 0x93, 0x93, 0x39, 0x75, 0xd0, 0x47, 0x33, 0x8d, 0xf3, 0x82, 0x09, - 0x78, 0x78, 0x71, 0x3e, 0xc4, 0xe7, 0x8b, 0xbe, 0x74, 0x6b, 0x4e, 0x0d, 0x09, 0x27, 0x7e, 0x4f, - 0x3f, 0xf1, 0x1d, 0x70, 0xec, 0xcd, 0xa8, 0x63, 0x57, 0x32, 0x9e, 0x64, 0x80, 0x6b, 0x7f, 0x37, - 0x07, 0x73, 0xfd, 0x39, 0x83, 0x21, 0x06, 0x53, 0x4d, 0x7d, 0x74, 0xe5, 0xfb, 0xf7, 0xc9, 0xd4, - 0x0f, 0x02, 0x42, 0xda, 0xb0, 0xa5, 0x88, 0x2c, 0x33, 0x1c, 0x13, 0x81, 0xde, 0x80, 0x19, 0x12, - 0x7d, 0x99, 0xc2, 0x3f, 0x6d, 0xd6, 0x0e, 0x4f, 0x09, 0x0e, 0x6a, 0xb6, 0x18, 0x80, 0xe1, 0x3e, - 0x41, 0xe6, 0xdb, 0x06, 0x4c, 0xc7, 0xc2, 0x12, 0x4f, 0xe9, 0xcc, 0x4b, 0x48, 0xe9, 0x6a, 0x6e, - 0x2a, 0x60, 0x68, 0x1d, 0xe6, 0x49, 0xcf, 0xb3, 0x03, 0xda, 0xb3, 0x5d, 0xb2, 0xd5, 0xa6, 0x0d, - 0x55, 0xd4, 0x04, 0x4f, 0xab, 0xab, 0x09, 0x38, 0x38, 0x91, 0xd2, 0xfc, 0xb2, 0x66, 0x59, 0x22, - 0xe0, 0xa6, 0xda, 0xc7, 0x03, 0x51, 0x77, 0x2a, 0x0e, 0x76, 0x0b, 0xf3, 0xc7, 0x79, 0xed, 0xac, - 0x2a, 0x86, 0xae, 0x44, 0x63, 0xe8, 0x72, 0x3c, 0x86, 0x4e, 0x85, 0xca, 0x19, 0x2e, 0x8a, 0xa2, - 0xd7, 0x34, 0xff, 0xc8, 0x67, 0x79, 0x72, 0x10, 0xdb, 0x6a, 0xd9, 0x7f, 0x21, 0x4f, 0x8e, 0xef, - 0x03, 0xa7, 0xf1, 0x97, 0x35, 0xa7, 0xe9, 0xc1, 0xb4, 0x4c, 0x1f, 0xb4, 0xa1, 0x94, 0xa0, 0x9e, - 0xfe, 0x0f, 0x1b, 0x6a, 0xe6, 0xf6, 0x6e, 0x2c, 0x2b, 0xd5, 0x05, 0x2c, 0x71, 0x5c, 0xc6, 0xe2, - 0x13, 0x30, 0x19, 0xd9, 0x63, 0xa6, 0xf7, 0xf6, 0xbe, 0x06, 0x47, 0xf7, 0x1d, 0x80, 0xf2, 0x6a, - 0x45, 0x6e, 0x5e, 0x45, 0x99, 0xc7, 0x52, 0xfb, 0x64, 0x74, 0x40, 0x2d, 0xc3, 0x9a, 0x5c, 0xc6, - 0x8a, 0xa5, 0xf9, 0x6e, 0x0e, 0x66, 0xb8, 0x4f, 0x46, 0xda, 0xbc, 0x75, 0xc8, 0x37, 0x2d, 0x4f, - 0x89, 0x5b, 0x49, 0x2d, 0x4e, 0xe7, 0x51, 0x1b, 0xe3, 0x6d, 0x27, 0x0f, 0x00, 0x9c, 0x15, 0x7a, - 0xc1, 0x2f, 0x96, 0x73, 0x59, 0x8e, 0xd0, 0xd7, 0x80, 0xd6, 0x8a, 0x7d, 0x15, 0xf6, 0x0b, 0xfe, - 0x1b, 0x26, 0xf9, 0x2c, 0x9c, 0xfb, 0xde, 0x73, 0x90, 0x9c, 0xf5, 0xd7, 0x52, 0xcc, 0x1f, 0xe6, - 0x40, 0x7a, 0xdc, 0x1d, 0xa8, 0x00, 0x2e, 0x45, 0x2a, 0x80, 0x94, 0xc1, 0x5e, 0x6c, 0x2e, 0x31, - 0xfb, 0xc7, 0xf3, 0xe0, 0xf1, 0x2c, 0x0c, 0xf7, 0xcf, 0xfc, 0xbf, 0x33, 0xa0, 0x28, 0xf0, 0xee, - 0x40, 0x0e, 0x5c, 0x8f, 0xe6, 0xc0, 0x07, 0x33, 0x9c, 0x62, 0x40, 0xfe, 0xfb, 0x7e, 0x5e, 0xed, - 0x3e, 0x88, 0xb3, 0x2d, 0xe2, 0x36, 0x54, 0xcb, 0x1f, 0xc6, 0x59, 0xbe, 0x88, 0x25, 0x0c, 0xb5, - 0x61, 0x92, 0x69, 0x86, 0xc2, 0xd4, 0x39, 0x53, 0x66, 0x46, 0xdd, 0xc6, 0x58, 0x6d, 0x56, 0xbc, - 0x71, 0xa7, 0x2f, 0xe1, 0x28, 0x73, 0xf4, 0x1d, 0x03, 0xe6, 0x9c, 0xfe, 0x04, 0xad, 0x0c, 0xe3, - 0xf1, 0x8c, 0x01, 0x34, 0x64, 0x50, 0xbb, 0x6b, 0xef, 0xc6, 0x72, 0x52, 0xea, 0xc7, 0x49, 0xe2, - 0x50, 0x0b, 0x26, 0xf4, 0x07, 0xc4, 0xca, 0x8c, 0x4e, 0x64, 0x7f, 0x12, 0x2d, 0xc7, 0xc8, 0xfa, - 0x0a, 0x8e, 0x70, 0x36, 0xff, 0x38, 0x02, 0x25, 0xcd, 0xee, 0xd0, 0xf1, 0x68, 0x5e, 0xba, 0x27, - 0x9e, 0x97, 0x40, 0x20, 0x47, 0x72, 0x92, 0x0b, 0x53, 0xf5, 0x9e, 0xeb, 0xd2, 0xae, 0x77, 0xee, - 0x96, 0xd4, 0x97, 0x88, 0xd7, 0x2e, 0xab, 0x11, 0x8e, 0x38, 0x26, 0x81, 0x17, 0xb3, 0x2d, 0xf5, - 0x94, 0x3e, 0x9f, 0xe5, 0x29, 0xfd, 0xe0, 0x62, 0xd6, 0x7f, 0x32, 0xef, 0xf3, 0x45, 0xeb, 0x30, - 0x2a, 0x1f, 0x66, 0xaa, 0x67, 0x40, 0x0f, 0xa5, 0x9d, 0x4d, 0x72, 0x1a, 0x19, 0xec, 0xe5, 0x6f, - 0xac, 0xf8, 0xe8, 0xc9, 0xbb, 0x78, 0x40, 0xf2, 0x7e, 0x06, 0x90, 0xbd, 0xc5, 0xa8, 0xbb, 0x43, - 0x1b, 0xe7, 0xe5, 0xc7, 0x04, 0xdc, 0x0c, 0x46, 0x8f, 0x19, 0xf7, 0xe7, 0x6b, 0x8b, 0x8a, 0x0a, - 0x3d, 0xd7, 0x87, 0x81, 0x13, 0xa8, 0x50, 0x0f, 0x66, 0x94, 0xf6, 0x02, 0xfb, 0x53, 0x4f, 0xd0, - 0xb2, 0xb6, 0x3a, 0xe1, 0x5b, 0x15, 0xab, 0x31, 0x86, 0xb8, 0x4f, 0x04, 0x77, 0xdc, 0x36, 0xd1, - 0x32, 0xea, 0x02, 0x0c, 0x2f, 0x53, 0x38, 0xee, 0x45, 0x9d, 0x1b, 0x8e, 0x32, 0x37, 0x57, 0x60, - 0x56, 0x9a, 0xb1, 0x9e, 0x48, 0x0f, 0x7e, 0xcb, 0xfd, 0xb7, 0x06, 0x44, 0x03, 0x42, 0xf4, 0xed, - 0x1d, 0x23, 0xc5, 0xdb, 0x3b, 0xd7, 0x61, 0xaa, 0xe7, 0x30, 0xcf, 0xa5, 0xa4, 0x23, 0x76, 0xe0, - 0x87, 0xcb, 0xc7, 0xb2, 0x04, 0x7d, 0x3d, 0x15, 0x06, 0xf5, 0xfb, 0x95, 0x08, 0x5b, 0x1c, 0x13, - 0x63, 0xfe, 0x3b, 0x07, 0x11, 0xcf, 0x46, 0x6f, 0x1b, 0x30, 0x4b, 0x62, 0xaf, 0xfc, 0xfb, 0x9d, - 0xc4, 0xd3, 0xd9, 0xbe, 0xc3, 0xe8, 0xfb, 0x62, 0x20, 0x9c, 0x19, 0xc4, 0x51, 0x18, 0xee, 0x17, - 0x2a, 0xe2, 0x28, 0xe9, 0xff, 0xa6, 0x23, 0x5b, 0x1c, 0x4d, 0xf8, 0x28, 0x44, 0xc6, 0xd1, 0x04, - 0x00, 0x4e, 0x12, 0x87, 0x5e, 0x82, 0x02, 0x71, 0x9b, 0xfe, 0x83, 0xab, 0xec, 0x62, 0xfd, 0x4f, - 0x75, 0x42, 0xdb, 0xa9, 0xba, 0x4d, 0x86, 0x05, 0x53, 0xf3, 0xaf, 0x39, 0xe8, 0x7b, 0xbb, 0x48, - 0xbd, 0x99, 0x51, 0x48, 0x7c, 0x33, 0xe3, 0x79, 0x28, 0x32, 0x8f, 0xb8, 0xde, 0xa6, 0xd5, 0xa1, - 0xea, 0x11, 0xfd, 0xff, 0xa7, 0x4b, 0xd7, 0x9c, 0x42, 0x3e, 0xac, 0xde, 0xf0, 0x19, 0xe0, 0x90, - 0x17, 0x3a, 0x15, 0x0d, 0xda, 0x66, 0x3c, 0x68, 0xcf, 0xea, 0xdb, 0x1c, 0xb6, 0x9f, 0xe8, 0x40, - 0x49, 0x53, 0xb1, 0x4a, 0x49, 0xa7, 0x33, 0xab, 0x54, 0x0b, 0xbd, 0xf2, 0x53, 0x9e, 0x10, 0xa2, - 0xf3, 0x37, 0xa7, 0x61, 0x32, 0xf2, 0xb2, 0x8e, 0x98, 0x0a, 0x05, 0x0e, 0xf8, 0x59, 0x9d, 0x0a, - 0x05, 0x1b, 0xbc, 0x95, 0x53, 0xa1, 0x90, 0xe9, 0xfe, 0xb5, 0xe1, 0x7b, 0x06, 0x4c, 0x06, 0xb8, - 0x9f, 0xd9, 0x19, 0x49, 0xb0, 0xc3, 0x01, 0x35, 0xe2, 0x2f, 0xf5, 0x53, 0x44, 0xeb, 0xc4, 0xdc, - 0x3e, 0x75, 0x22, 0xeb, 0xaf, 0x13, 0x33, 0xd4, 0x05, 0xf1, 0x1e, 0x4c, 0xfb, 0x40, 0x63, 0x9f, - 0x72, 0xd1, 0xfc, 0x97, 0x01, 0xd3, 0xb1, 0xdb, 0xd1, 0x5d, 0x2a, 0x3f, 0x54, 0x96, 0x2f, 0x0c, - 0x95, 0xe5, 0x2d, 0x28, 0xf1, 0x8c, 0xe8, 0x97, 0x60, 0x23, 0x9f, 0x6e, 0xc4, 0xc7, 0x5d, 0xf3, - 0x62, 0xc8, 0x0e, 0xeb, 0xbc, 0x6b, 0xcf, 0xbc, 0xff, 0xf1, 0xd2, 0xa1, 0x0f, 0x3e, 0x5e, 0x3a, - 0xf4, 0xe1, 0xc7, 0x4b, 0x87, 0xbe, 0xb9, 0xb7, 0x64, 0xbc, 0xbf, 0xb7, 0x64, 0x7c, 0xb0, 0xb7, - 0x64, 0x7c, 0xb8, 0xb7, 0x64, 0x7c, 0xb4, 0xb7, 0x64, 0xfc, 0xe0, 0x6f, 0x4b, 0x87, 0x5e, 0xbc, - 0x37, 0xcd, 0xe7, 0xa1, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xde, 0xfa, 0x1e, 0xed, 0x45, 0x3a, - 0x00, 0x00, + // 3351 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3b, 0x4d, 0x6c, 0x1b, 0xd7, + 0x99, 0x1e, 0x92, 0xa2, 0xc4, 0x8f, 0xfa, 0x7d, 0x92, 0x1d, 0x45, 0x59, 0xcb, 0xc6, 0x6c, 0x36, + 0x48, 0x36, 0x09, 0xb9, 0xb6, 0xa3, 0xc4, 0x71, 0xb2, 0xc9, 0x92, 0xf2, 0x9f, 0x12, 0xdb, 0xd1, + 0x3e, 0xc9, 0x4e, 0x36, 0x3f, 0xd8, 0x7d, 0x22, 0x9f, 0xc9, 0x89, 0x48, 0xce, 0x64, 0xde, 0x50, + 0x8e, 0x36, 0x45, 0xdb, 0xa4, 0x0d, 0x9a, 0x4b, 0xd3, 0x02, 0xbd, 0xa4, 0xa7, 0x02, 0x45, 0xd1, + 0xa2, 0x87, 0xf6, 0xd6, 0x43, 0xd1, 0x43, 0x81, 0x06, 0x05, 0x82, 0x1e, 0x8a, 0xa0, 0xa7, 0x00, + 0x05, 0x8c, 0x44, 0xbd, 0x15, 0x48, 0x7b, 0xe8, 0xcd, 0x40, 0x81, 0xe2, 0xfd, 0xcc, 0xcc, 0x9b, + 0xe1, 0x50, 0x9a, 0x61, 0x6c, 0x23, 0xbd, 0x91, 0xef, 0xfb, 0x7b, 0xef, 0x7b, 0xdf, 0xff, 0xcc, + 0xc0, 0x63, 0x2d, 0xcb, 0x6b, 0xf7, 0xb7, 0x2a, 0x0d, 0xbb, 0x5b, 0x25, 0xdb, 0x7d, 0xcb, 0xdb, + 0xad, 0x6e, 0x13, 0xb7, 0x65, 0x57, 0x89, 0x63, 0x55, 0x77, 0x4e, 0x90, 0x8e, 0xd3, 0x26, 0x27, + 0xaa, 0x2d, 0xda, 0xa3, 0x2e, 0xf1, 0x68, 0xb3, 0xe2, 0xb8, 0xb6, 0x67, 0xa3, 0xfb, 0x43, 0xaa, + 0x8a, 0xa4, 0xaa, 0x08, 0xaa, 0x0a, 0x71, 0xac, 0x8a, 0x4f, 0xb5, 0xf4, 0xa8, 0xc6, 0xbb, 0x65, + 0xb7, 0xec, 0xaa, 0x20, 0xde, 0xea, 0x5f, 0x17, 0xff, 0xc4, 0x1f, 0xf1, 0x4b, 0x32, 0x5d, 0x7a, + 0x6c, 0xfb, 0x34, 0xab, 0x58, 0x42, 0x72, 0x97, 0x34, 0xda, 0x56, 0x8f, 0xba, 0xbb, 0x55, 0x67, + 0xbb, 0xc5, 0x17, 0x58, 0xb5, 0x4b, 0x3d, 0x52, 0xdd, 0x19, 0xd8, 0xca, 0x52, 0x75, 0x18, 0x95, + 0xdb, 0xef, 0x79, 0x56, 0x97, 0x0e, 0x10, 0x3c, 0x7e, 0x10, 0x01, 0x6b, 0xb4, 0x69, 0x97, 0xc4, + 0xe9, 0xcc, 0x57, 0x61, 0xbe, 0xd6, 0x23, 0x9d, 0x5d, 0x66, 0x31, 0xdc, 0xef, 0xd5, 0xdc, 0x56, + 0xbf, 0x4b, 0x7b, 0x1e, 0x3a, 0x0e, 0x85, 0x1e, 0xe9, 0xd2, 0x45, 0xe3, 0xb8, 0xf1, 0x60, 0xa9, + 0x3e, 0xf9, 0xd1, 0xcd, 0x63, 0x87, 0xf6, 0x6e, 0x1e, 0x2b, 0x5c, 0x21, 0x5d, 0x8a, 0x05, 0x04, + 0xfd, 0x2b, 0x8c, 0xed, 0x90, 0x4e, 0x9f, 0x2e, 0xe6, 0x04, 0xca, 0x94, 0x42, 0x19, 0xbb, 0xc6, + 0x17, 0xb1, 0x84, 0x99, 0xdf, 0xc8, 0x47, 0xd8, 0x5f, 0xa6, 0x1e, 0x69, 0x12, 0x8f, 0xa0, 0x2e, + 0x14, 0x3b, 0x64, 0x8b, 0x76, 0xd8, 0xa2, 0x71, 0x3c, 0xff, 0x60, 0xf9, 0xe4, 0xb9, 0x4a, 0x1a, + 0xd5, 0x57, 0x12, 0x58, 0x55, 0x2e, 0x09, 0x3e, 0xe7, 0x7a, 0x9e, 0xbb, 0x5b, 0x9f, 0x56, 0x9b, + 0x28, 0xca, 0x45, 0xac, 0x84, 0xa0, 0xb7, 0x0d, 0x28, 0x93, 0x5e, 0xcf, 0xf6, 0x88, 0x67, 0xd9, + 0x3d, 0xb6, 0x98, 0x13, 0x42, 0x9f, 0x1b, 0x5d, 0x68, 0x2d, 0x64, 0x26, 0x25, 0xcf, 0x2b, 0xc9, + 0x65, 0x0d, 0x82, 0x75, 0x99, 0x4b, 0x4f, 0x42, 0x59, 0xdb, 0x2a, 0x9a, 0x85, 0xfc, 0x36, 0xdd, + 0x95, 0xfa, 0xc5, 0xfc, 0x27, 0x5a, 0x88, 0x28, 0x54, 0x69, 0xf0, 0x4c, 0xee, 0xb4, 0xb1, 0xf4, + 0x0c, 0xcc, 0xc6, 0x05, 0x66, 0xa1, 0x37, 0xdf, 0x37, 0x60, 0x41, 0x3b, 0x05, 0xa6, 0xd7, 0xa9, + 0x4b, 0x7b, 0x0d, 0x8a, 0xaa, 0x50, 0xe2, 0x77, 0xc9, 0x1c, 0xd2, 0xf0, 0xaf, 0x7a, 0x4e, 0x1d, + 0xa4, 0x74, 0xc5, 0x07, 0xe0, 0x10, 0x27, 0x30, 0x8b, 0xdc, 0x7e, 0x66, 0xe1, 0xb4, 0x09, 0xa3, + 0x8b, 0xf9, 0xa8, 0x59, 0xac, 0xf3, 0x45, 0x2c, 0x61, 0xe6, 0x7f, 0xc2, 0xbd, 0xfe, 0x7e, 0x36, + 0x69, 0xd7, 0xe9, 0x10, 0x8f, 0x86, 0x9b, 0x3a, 0xd0, 0xf4, 0xcc, 0x19, 0x98, 0xaa, 0x39, 0x8e, + 0x6b, 0xef, 0xd0, 0xe6, 0x86, 0x47, 0x5a, 0xd4, 0x7c, 0xc7, 0x80, 0xc3, 0x35, 0xb7, 0x65, 0xaf, + 0x9e, 0xad, 0x39, 0xce, 0x45, 0x4a, 0x3a, 0x5e, 0x7b, 0xc3, 0x23, 0x5e, 0x9f, 0xa1, 0x67, 0xa0, + 0xc8, 0xc4, 0x2f, 0xc5, 0xee, 0x01, 0xdf, 0x42, 0x24, 0xfc, 0xd6, 0xcd, 0x63, 0x0b, 0x09, 0x84, + 0x14, 0x2b, 0x2a, 0xf4, 0x10, 0x8c, 0x77, 0x29, 0x63, 0xa4, 0xe5, 0x9f, 0x79, 0x46, 0x31, 0x18, + 0xbf, 0x2c, 0x97, 0xb1, 0x0f, 0x37, 0x7f, 0x97, 0x83, 0x99, 0x80, 0x97, 0x12, 0x7f, 0x07, 0x14, + 0xdc, 0x87, 0xc9, 0xb6, 0x76, 0x42, 0xa1, 0xe7, 0xf2, 0xc9, 0xa7, 0x52, 0xda, 0x72, 0x92, 0x92, + 0xea, 0x0b, 0x4a, 0xcc, 0xa4, 0xbe, 0x8a, 0x23, 0x62, 0x50, 0x17, 0x80, 0xed, 0xf6, 0x1a, 0x4a, + 0x68, 0x41, 0x08, 0x7d, 0x32, 0xa3, 0xd0, 0x8d, 0x80, 0x41, 0x1d, 0x29, 0x91, 0x10, 0xae, 0x61, + 0x4d, 0x80, 0xf9, 0x73, 0x03, 0xe6, 0x13, 0xe8, 0xd0, 0xd3, 0xb1, 0xfb, 0xbc, 0x7f, 0xe0, 0x3e, + 0xd1, 0x00, 0x59, 0x78, 0x9b, 0x8f, 0xc0, 0x84, 0x4b, 0x77, 0x2c, 0x66, 0xd9, 0x3d, 0xa5, 0xe1, + 0x59, 0x45, 0x3f, 0x81, 0xd5, 0x3a, 0x0e, 0x30, 0xd0, 0xc3, 0x50, 0xf2, 0x7f, 0x73, 0x35, 0xe7, + 0xb9, 0x39, 0xf3, 0x8b, 0xf3, 0x51, 0x19, 0x0e, 0xe1, 0xe6, 0xe7, 0x86, 0x76, 0xfb, 0x57, 0x9d, + 0x26, 0xf1, 0x28, 0x37, 0x1e, 0xe2, 0x38, 0x57, 0x42, 0x63, 0x0e, 0x8c, 0xa7, 0x26, 0x97, 0xb1, + 0x0f, 0x47, 0xa7, 0x61, 0x52, 0xfd, 0x94, 0xb6, 0x22, 0x77, 0x17, 0x5c, 0x4c, 0x4d, 0x83, 0xe1, + 0x08, 0x26, 0xea, 0xc3, 0x14, 0xb3, 0xfb, 0x6e, 0x83, 0x4a, 0xa1, 0x72, 0xa7, 0xe5, 0x93, 0xa7, + 0xb3, 0xdc, 0xcd, 0x86, 0xc6, 0xa0, 0x7e, 0x58, 0x09, 0x9d, 0xd2, 0x57, 0x19, 0x8e, 0x4a, 0x31, + 0xdf, 0x00, 0x90, 0xb4, 0x17, 0x69, 0xa7, 0x8b, 0x1a, 0x50, 0xb4, 0xba, 0xa4, 0x45, 0xfd, 0x78, + 0x9e, 0xc9, 0x1c, 0x39, 0x87, 0x35, 0x4e, 0xad, 0x36, 0x10, 0x44, 0x71, 0xb1, 0xc8, 0xb0, 0x62, + 0x6d, 0x7e, 0x10, 0x78, 0x79, 0x8c, 0x82, 0x07, 0x1d, 0x81, 0xa3, 0xd4, 0x1c, 0x04, 0x1d, 0x81, + 0x83, 0x25, 0x0c, 0x1d, 0x95, 0x11, 0x53, 0x6a, 0xb6, 0xac, 0x50, 0xf2, 0xcf, 0xd3, 0x5d, 0x19, + 0x3e, 0x9f, 0xf2, 0xc3, 0xa7, 0x0c, 0x5c, 0xff, 0x16, 0xc9, 0x67, 0x3c, 0x4e, 0x68, 0x02, 0xc5, + 0xda, 0xe6, 0xae, 0x13, 0xe4, 0xb9, 0xb7, 0xfc, 0xcb, 0x7f, 0xbe, 0xcf, 0x3c, 0xbb, 0x6b, 0xfd, + 0x3f, 0x45, 0xed, 0x98, 0x4a, 0xfe, 0x2b, 0x8b, 0x4a, 0x02, 0x36, 0x69, 0xf4, 0xe2, 0xc2, 0xd2, + 0x70, 0xaa, 0x74, 0xba, 0xa9, 0x42, 0xa9, 0xcf, 0xe8, 0x59, 0xab, 0x45, 0x99, 0x27, 0x34, 0x34, + 0x11, 0xc6, 0xa9, 0xab, 0x3e, 0x00, 0x87, 0x38, 0xe6, 0x9f, 0x73, 0x80, 0x06, 0x6d, 0x87, 0x5b, + 0xbc, 0x4b, 0x1d, 0xfb, 0x2a, 0xbe, 0x14, 0xb7, 0x78, 0x2c, 0x97, 0xb1, 0x0f, 0xe7, 0xfb, 0x6a, + 0xb4, 0x89, 0xeb, 0xc5, 0xeb, 0x87, 0x55, 0xbe, 0x88, 0x25, 0x0c, 0xad, 0xc3, 0x42, 0x5f, 0x70, + 0xde, 0x24, 0x6e, 0x8b, 0x7a, 0xbe, 0xe7, 0x89, 0x3b, 0x9a, 0xa8, 0xff, 0x8b, 0xa2, 0x59, 0xb8, + 0x9a, 0x80, 0x83, 0x13, 0x29, 0xd1, 0x16, 0x94, 0xb6, 0x7d, 0x35, 0xa9, 0x30, 0xb6, 0x32, 0xd2, + 0xcd, 0xc8, 0x58, 0x10, 0xfc, 0xc5, 0x21, 0x5b, 0x74, 0x05, 0x0a, 0x6d, 0xda, 0xe9, 0x2e, 0x8e, + 0x09, 0xf6, 0xff, 0x91, 0xd5, 0x17, 0xea, 0x13, 0x3c, 0xe4, 0xf3, 0x5f, 0x58, 0xf0, 0x31, 0xbf, + 0x06, 0x52, 0x2b, 0x59, 0xd4, 0x7b, 0x70, 0x22, 0x79, 0x08, 0xc6, 0x77, 0xa8, 0x1b, 0xa8, 0x53, + 0x63, 0x76, 0x4d, 0x2e, 0x63, 0x1f, 0x6e, 0xfe, 0xd8, 0x80, 0x39, 0xb1, 0x83, 0x8d, 0xfe, 0x16, + 0x6b, 0xb8, 0x96, 0xc3, 0x0b, 0x91, 0xdb, 0xbb, 0x9b, 0xb3, 0x30, 0xcb, 0x68, 0x77, 0x87, 0xba, + 0xab, 0x76, 0x8f, 0x79, 0x2e, 0xb1, 0x7a, 0x9e, 0xda, 0xd6, 0xa2, 0xc2, 0x9e, 0xdd, 0x88, 0xc1, + 0xf1, 0x00, 0x85, 0xf9, 0xa3, 0x02, 0x8c, 0x9f, 0x77, 0xa9, 0xd5, 0x6a, 0x7b, 0xe8, 0xff, 0x60, + 0xa2, 0xab, 0xea, 0x35, 0xb1, 0x3f, 0x7e, 0x13, 0xb2, 0x48, 0xae, 0xe8, 0x45, 0x72, 0xc5, 0xd9, + 0x6e, 0xf1, 0x05, 0x56, 0xe1, 0xd8, 0x95, 0x9d, 0x13, 0x95, 0x17, 0xb6, 0x5e, 0xa7, 0x0d, 0x8f, + 0xd7, 0x7a, 0x61, 0x9a, 0x0a, 0xd7, 0x70, 0xc0, 0x95, 0x9b, 0x30, 0xe9, 0x58, 0x84, 0x2d, 0x8e, + 0x47, 0x4d, 0xb8, 0xc6, 0x17, 0xb1, 0x84, 0x71, 0xd7, 0xba, 0x41, 0x5c, 0xda, 0xb6, 0xfb, 0x8c, + 0x2e, 0x4e, 0x44, 0x4b, 0x80, 0x17, 0x7d, 0x00, 0x0e, 0x71, 0xd0, 0xcb, 0x30, 0xde, 0xb0, 0xbb, + 0x5d, 0xcb, 0xf3, 0x43, 0x79, 0x35, 0x9d, 0x01, 0x5d, 0xb0, 0xbc, 0x55, 0x41, 0x17, 0xde, 0x83, + 0xfc, 0xcf, 0xb0, 0xcf, 0x10, 0x6d, 0x04, 0x41, 0xa9, 0x20, 0x58, 0x3f, 0x9c, 0x8e, 0xb5, 0x88, + 0x15, 0xc3, 0xe2, 0x0f, 0x67, 0x2a, 0xbc, 0x95, 0x2d, 0x8e, 0x65, 0x61, 0x2a, 0x0c, 0x2a, 0x64, + 0x2a, 0xfe, 0x32, 0xac, 0x58, 0xa1, 0x57, 0x82, 0x44, 0x5f, 0x14, 0x77, 0x77, 0x2a, 0x1d, 0x53, + 0x75, 0xf9, 0xaa, 0xca, 0x98, 0x8e, 0x56, 0x07, 0x7e, 0x1d, 0x60, 0xfe, 0xda, 0x80, 0xb2, 0xc2, + 0xbc, 0x64, 0x31, 0x0f, 0xbd, 0x3a, 0x60, 0x2a, 0x95, 0x74, 0xa6, 0xc2, 0xa9, 0x85, 0xa1, 0x04, + 0x75, 0x84, 0xbf, 0xa2, 0x99, 0x09, 0x86, 0x31, 0xcb, 0xa3, 0x5d, 0xbf, 0xed, 0x78, 0x34, 0xd3, + 0x49, 0xb4, 0x80, 0xcd, 0x79, 0x60, 0xc9, 0xca, 0xfc, 0xbc, 0x00, 0xb3, 0x0a, 0x23, 0x43, 0xe5, + 0x1c, 0x35, 0xc6, 0x62, 0x36, 0x63, 0xcc, 0xdd, 0x39, 0x63, 0xcc, 0xdf, 0x09, 0x63, 0x2c, 0xdc, + 0x3e, 0x63, 0x7c, 0x13, 0x66, 0x77, 0xa8, 0x6b, 0x5d, 0xb7, 0x1a, 0xa2, 0x05, 0x5b, 0xeb, 0x5d, + 0xb7, 0x55, 0x70, 0x7f, 0x3c, 0x1d, 0xfb, 0x6b, 0x31, 0xea, 0xfa, 0x02, 0x0f, 0x68, 0xf1, 0x55, + 0x3c, 0x20, 0x05, 0xbd, 0x6b, 0xc0, 0xbc, 0xbe, 0x78, 0xd1, 0x62, 0x9e, 0xed, 0xee, 0x2e, 0x8e, + 0x8b, 0xc3, 0x8d, 0x2a, 0xfd, 0x3e, 0x75, 0xce, 0xf9, 0x6b, 0x83, 0xac, 0x71, 0x92, 0x3c, 0xf3, + 0x2f, 0x79, 0x98, 0x8a, 0xf8, 0x16, 0xba, 0x01, 0x20, 0x11, 0x69, 0x73, 0xad, 0xa7, 0x6a, 0x9c, + 0xd5, 0x11, 0x9c, 0x54, 0xed, 0x8e, 0x73, 0x91, 0xad, 0x74, 0x10, 0x73, 0x43, 0x00, 0xd6, 0x44, + 0xa1, 0xb7, 0xa0, 0x4c, 0x54, 0xf7, 0x77, 0xde, 0x76, 0x95, 0x59, 0x9e, 0x1d, 0x45, 0x72, 0x2d, + 0x64, 0x13, 0xef, 0xe2, 0x43, 0x08, 0xd6, 0xa5, 0x2d, 0xb9, 0x30, 0x13, 0xdb, 0x6f, 0x42, 0x27, + 0xbe, 0xa6, 0x77, 0xe2, 0xa9, 0x43, 0x97, 0xcf, 0x57, 0xb4, 0xb4, 0x7a, 0xfb, 0xcf, 0x60, 0x36, + 0xbe, 0xd3, 0xdb, 0x26, 0x34, 0xd2, 0x47, 0xeb, 0x33, 0x83, 0x5f, 0xe4, 0xa0, 0x14, 0x38, 0x71, + 0x96, 0x54, 0xbf, 0x04, 0x39, 0xab, 0xa9, 0x12, 0x3d, 0x28, 0xac, 0xdc, 0xda, 0x59, 0x9c, 0xb3, + 0x9a, 0xe8, 0x01, 0x28, 0x6e, 0xb9, 0xa4, 0xd7, 0x68, 0xab, 0xd4, 0x1e, 0xf8, 0x5b, 0x5d, 0xac, + 0x62, 0x05, 0xe5, 0xa5, 0xba, 0x47, 0x5a, 0xa2, 0x3c, 0xd3, 0x4a, 0xf5, 0x4d, 0xd2, 0xc2, 0x7c, + 0x1d, 0x5d, 0x80, 0x39, 0xd9, 0x9b, 0xae, 0xb6, 0x69, 0x63, 0x5b, 0x6e, 0x51, 0xf8, 0x63, 0xa9, + 0x7e, 0xaf, 0x42, 0x9e, 0xbb, 0x18, 0x47, 0xc0, 0x83, 0x34, 0x7a, 0x77, 0x5f, 0xdc, 0xbf, 0xbb, + 0xe7, 0x5b, 0x27, 0x7d, 0xaf, 0x6d, 0xbb, 0x2a, 0xd9, 0x07, 0x5b, 0xaf, 0x89, 0x55, 0xac, 0xa0, + 0xe6, 0x3c, 0xcc, 0x5d, 0xb0, 0xbc, 0x8b, 0xfd, 0xad, 0xf5, 0x7e, 0xa7, 0x83, 0xe9, 0x1b, 0x7d, + 0x5e, 0x2d, 0xff, 0x64, 0x0c, 0xa6, 0x2e, 0x58, 0x9e, 0xd0, 0x55, 0xe6, 0x42, 0x79, 0x03, 0x0e, + 0x5b, 0x3d, 0x46, 0x1b, 0x7d, 0x97, 0x6e, 0x6c, 0x5b, 0xce, 0xe6, 0xa5, 0x0d, 0x61, 0x29, 0xbb, + 0xaa, 0x4e, 0x3f, 0xaa, 0x08, 0x0f, 0xaf, 0x25, 0x21, 0xe1, 0x64, 0x5a, 0x74, 0x12, 0xc0, 0xa5, + 0xa4, 0x59, 0xd7, 0x6f, 0x23, 0x70, 0x3c, 0x1c, 0x40, 0xb0, 0x86, 0x85, 0x56, 0xa0, 0x7c, 0xc3, + 0xb5, 0x3c, 0xaa, 0x88, 0xe4, 0xed, 0x04, 0x2e, 0xf3, 0x62, 0x08, 0xc2, 0x3a, 0x1e, 0xda, 0x81, + 0xb2, 0x13, 0xea, 0x42, 0xc5, 0xcd, 0x94, 0x91, 0x42, 0x53, 0xe2, 0xba, 0x6b, 0x77, 0x6d, 0x1e, + 0x92, 0x2e, 0xd3, 0x46, 0x9b, 0xf4, 0x2c, 0xd6, 0xad, 0xcf, 0x70, 0xb9, 0x1a, 0x0a, 0xd6, 0x05, + 0xa1, 0x16, 0x14, 0x5d, 0xda, 0x6b, 0x52, 0x57, 0x55, 0x10, 0x29, 0x45, 0x3e, 0xcf, 0x97, 0xb0, + 0x20, 0x4c, 0x10, 0x09, 0xfc, 0xca, 0x25, 0x14, 0x2b, 0xf6, 0xa8, 0xa7, 0xb7, 0x14, 0xe3, 0x42, + 0x56, 0x2d, 0xa5, 0x2c, 0x9f, 0x2c, 0x41, 0xd2, 0xf0, 0xf6, 0xe2, 0x65, 0xd5, 0x5e, 0x4c, 0x08, + 0x51, 0x4f, 0xa7, 0x13, 0xc5, 0xdb, 0x89, 0x04, 0x29, 0xf1, 0x56, 0xe3, 0x37, 0x05, 0x98, 0xb9, + 0x60, 0x8d, 0x5c, 0xe7, 0x7b, 0x70, 0x8f, 0xcc, 0xee, 0x1b, 0xb4, 0x43, 0x1b, 0x9c, 0x7a, 0xc3, + 0x73, 0x89, 0x47, 0x5b, 0x7e, 0xdf, 0x7d, 0x46, 0x91, 0xde, 0xb3, 0x9a, 0x8c, 0x76, 0x6b, 0x38, + 0x08, 0x0f, 0x63, 0x9d, 0x3a, 0xac, 0x24, 0xf5, 0x18, 0x85, 0xac, 0x3d, 0x06, 0xaf, 0xa1, 0x48, + 0xa7, 0x63, 0xdf, 0xd8, 0x24, 0x2d, 0xa6, 0xa2, 0x4e, 0x50, 0x43, 0xd5, 0x7c, 0x00, 0x0e, 0x71, + 0x50, 0x05, 0xc0, 0x6a, 0xf5, 0x6c, 0x97, 0x0a, 0x8a, 0xa2, 0x18, 0x24, 0x4d, 0x73, 0x3f, 0x5b, + 0x0b, 0x56, 0xb1, 0x86, 0x31, 0xdc, 0xe1, 0xc7, 0xbf, 0x80, 0xc3, 0x3f, 0x06, 0x93, 0x56, 0xaf, + 0xd1, 0xe9, 0x37, 0xe9, 0x3a, 0xf1, 0xda, 0x6c, 0x71, 0x42, 0x6c, 0x63, 0x76, 0xef, 0xe6, 0xb1, + 0xc9, 0x35, 0x6d, 0x1d, 0x47, 0xb0, 0x38, 0x15, 0x7d, 0x53, 0xa3, 0x2a, 0x85, 0x54, 0xe7, 0xde, + 0xd4, 0xa9, 0x74, 0x2c, 0xf3, 0xf7, 0x06, 0x14, 0x65, 0xfc, 0x45, 0x2b, 0xb1, 0x79, 0xdd, 0xd1, + 0x81, 0x79, 0x5d, 0x39, 0x69, 0xec, 0x6a, 0x42, 0xd1, 0x62, 0xac, 0x4f, 0x65, 0xd5, 0x59, 0x92, + 0x6e, 0xb7, 0x26, 0x56, 0xb0, 0x82, 0x20, 0x0b, 0x80, 0xf8, 0x03, 0x37, 0xbf, 0x84, 0x5c, 0xc9, + 0x3a, 0x91, 0x8c, 0x4d, 0x23, 0x03, 0x00, 0xc3, 0x1a, 0x73, 0xf3, 0x87, 0x06, 0xdc, 0xcb, 0x9d, + 0x44, 0x94, 0x85, 0x67, 0xa9, 0xc3, 0xfd, 0xbe, 0xd7, 0xd8, 0x55, 0xb1, 0x5c, 0xc4, 0x52, 0xc7, + 0x66, 0x96, 0xa8, 0xcc, 0x8c, 0x78, 0x2c, 0xf5, 0x21, 0x58, 0xc3, 0x4a, 0xd1, 0x10, 0x57, 0xa1, + 0x24, 0xaa, 0x4f, 0xae, 0x52, 0x65, 0xd7, 0x81, 0x99, 0xad, 0xfa, 0x00, 0x1c, 0xe2, 0x98, 0x7f, + 0x30, 0x60, 0x66, 0xa4, 0xc1, 0xd8, 0x33, 0x30, 0x2d, 0xf2, 0x3e, 0x3b, 0x6f, 0x75, 0xc4, 0x0d, + 0xaa, 0x5d, 0x1d, 0x51, 0xd8, 0xd3, 0xd7, 0x22, 0x50, 0x1c, 0xc3, 0xf6, 0x07, 0x6b, 0xf9, 0x83, + 0x06, 0x6b, 0x85, 0x11, 0x06, 0x6b, 0x9f, 0x1a, 0x70, 0x24, 0x39, 0x74, 0xa1, 0xd7, 0x62, 0x03, + 0xb6, 0x95, 0xf4, 0x81, 0x30, 0xc5, 0x54, 0x8d, 0xa7, 0x0f, 0xd5, 0x48, 0xc8, 0x0a, 0xf3, 0xd9, + 0xf4, 0xec, 0x13, 0xcd, 0x64, 0x58, 0x73, 0x61, 0xfe, 0xcc, 0x00, 0x79, 0x1f, 0x59, 0x02, 0xed, + 0x49, 0x80, 0x96, 0x2a, 0x28, 0xf0, 0x25, 0x75, 0x5f, 0x81, 0xcd, 0x5d, 0x08, 0x20, 0x58, 0xc3, + 0xf2, 0xab, 0xaa, 0xfc, 0x90, 0xaa, 0xea, 0x01, 0x28, 0x36, 0xe5, 0x00, 0xb0, 0x10, 0x8d, 0xa2, + 0x6a, 0xfa, 0xa7, 0xa0, 0xe6, 0xfb, 0x05, 0x98, 0x13, 0xfb, 0x1d, 0x35, 0x49, 0x8c, 0xb2, 0x77, + 0x07, 0x8e, 0x88, 0x7b, 0x19, 0xcc, 0x2b, 0xf2, 0x38, 0xa7, 0x15, 0xfd, 0x91, 0xb5, 0x44, 0xac, + 0x5b, 0x43, 0x21, 0x78, 0x08, 0xdf, 0x7f, 0x96, 0x64, 0xf1, 0x08, 0x4c, 0x38, 0x1d, 0xe2, 0x5d, + 0xb7, 0xdd, 0xae, 0xaa, 0x4c, 0x83, 0x51, 0xc4, 0xba, 0x5a, 0xc7, 0x01, 0xc6, 0xf0, 0xd4, 0x32, + 0x31, 0x7a, 0x6a, 0x31, 0x7b, 0x70, 0x44, 0x2b, 0x9a, 0xee, 0xfc, 0xec, 0xf9, 0x5d, 0x03, 0x8e, + 0xee, 0x5b, 0xa5, 0xa1, 0x66, 0x2c, 0x34, 0x3c, 0x9d, 0xb9, 0xf4, 0x4b, 0x33, 0x77, 0x7f, 0xdf, + 0x80, 0x85, 0xd1, 0x47, 0xee, 0xc7, 0xa1, 0xe0, 0x84, 0xb1, 0x36, 0xc8, 0x00, 0x22, 0xc2, 0x0a, + 0x48, 0x54, 0x31, 0xf9, 0x14, 0x8a, 0x79, 0xdb, 0x80, 0xfb, 0xf6, 0x29, 0x29, 0xd1, 0x56, 0x4c, + 0x2d, 0x67, 0x32, 0x56, 0xa9, 0x69, 0x94, 0xf2, 0xfd, 0x1c, 0x8c, 0xaf, 0xbb, 0xf6, 0xeb, 0xb4, + 0x71, 0x37, 0x26, 0xb0, 0x2f, 0x40, 0x81, 0x39, 0xb4, 0xa1, 0x7a, 0xde, 0x13, 0x29, 0x9b, 0x0a, + 0xb9, 0xbd, 0x0d, 0x87, 0x36, 0x64, 0xfd, 0xcb, 0x7f, 0x61, 0xc1, 0x48, 0x1b, 0x3b, 0xe6, 0xb3, + 0xb4, 0xd1, 0x3e, 0xcb, 0x83, 0xc7, 0x8e, 0x0a, 0xf3, 0x4b, 0x3b, 0x76, 0x54, 0xfb, 0x1b, 0x32, + 0x76, 0xfc, 0x76, 0x78, 0x02, 0xae, 0x34, 0xf4, 0x55, 0x98, 0x73, 0x7c, 0x3b, 0x5b, 0xb7, 0x3b, + 0x56, 0xc3, 0xca, 0x9a, 0x8e, 0xd7, 0x23, 0xe4, 0xbb, 0x61, 0x03, 0xbf, 0x1e, 0xe7, 0x8b, 0x07, + 0x45, 0x99, 0x36, 0x4c, 0x45, 0x54, 0x8f, 0x4e, 0xf9, 0xaf, 0x1f, 0x44, 0xcb, 0x4d, 0xf9, 0xfa, + 0xc1, 0xad, 0x9b, 0xc7, 0x26, 0x15, 0xba, 0xfe, 0x3a, 0x42, 0x96, 0x87, 0xfc, 0x3f, 0xc8, 0x41, + 0x29, 0xd8, 0xd9, 0x5d, 0x30, 0xf0, 0xff, 0x8e, 0x18, 0xf8, 0xa9, 0x8c, 0x3a, 0x4d, 0x34, 0xf1, + 0xd7, 0x62, 0x26, 0x9e, 0xf5, 0xa2, 0x0e, 0x30, 0xf2, 0xbf, 0x1a, 0xe2, 0x4e, 0x24, 0xae, 0x98, + 0x61, 0x1e, 0x3c, 0x96, 0x26, 0x30, 0x7e, 0x5d, 0x4e, 0xe6, 0xd4, 0x41, 0x1f, 0xcf, 0x34, 0xce, + 0x0b, 0x26, 0xe0, 0xe1, 0xc5, 0xf9, 0x10, 0x9f, 0x2f, 0xfa, 0x9f, 0xdb, 0x73, 0x6a, 0x48, 0x38, + 0xf1, 0x87, 0xfa, 0x89, 0xef, 0x82, 0x63, 0x6f, 0x46, 0x1d, 0xbb, 0x9a, 0xf1, 0x24, 0x43, 0x5c, + 0xfb, 0x5b, 0x39, 0x98, 0x1f, 0xcc, 0x19, 0x0c, 0x31, 0x98, 0x6e, 0xe9, 0xa3, 0x2b, 0xdf, 0xbf, + 0x4f, 0xa5, 0x7e, 0x10, 0x10, 0xd2, 0x86, 0x2d, 0x45, 0x64, 0x99, 0xe1, 0x98, 0x08, 0xf4, 0x16, + 0xcc, 0x92, 0xe8, 0xcb, 0x14, 0xfe, 0x69, 0xb3, 0x76, 0x78, 0x4a, 0x70, 0x50, 0xb3, 0xc5, 0x00, + 0x0c, 0x0f, 0x08, 0x32, 0xdf, 0x33, 0x60, 0x26, 0x16, 0x96, 0x78, 0x4a, 0x67, 0x5e, 0x42, 0x4a, + 0x57, 0x73, 0x53, 0x01, 0x43, 0xeb, 0xb0, 0x40, 0xfa, 0x9e, 0x1d, 0xd0, 0x9e, 0xeb, 0x91, 0xad, + 0x0e, 0x6d, 0xaa, 0xa2, 0x26, 0x78, 0x5a, 0x5d, 0x4b, 0xc0, 0xc1, 0x89, 0x94, 0xe6, 0xff, 0x6a, + 0x96, 0x25, 0x02, 0x6e, 0xaa, 0x7d, 0x3c, 0x14, 0x75, 0xa7, 0xd2, 0x70, 0xb7, 0x30, 0xdf, 0xc9, + 0x6b, 0x67, 0x55, 0x31, 0x74, 0x25, 0x1a, 0x43, 0x8f, 0xc5, 0x63, 0xe8, 0x74, 0xa8, 0x9c, 0xd1, + 0xa2, 0x28, 0x7a, 0x43, 0xf3, 0x8f, 0x7c, 0x96, 0x27, 0x07, 0xb1, 0xad, 0x56, 0xfc, 0x17, 0xf2, + 0xe4, 0xf8, 0x3e, 0x70, 0x1a, 0x7f, 0x59, 0x73, 0x9a, 0xd7, 0x42, 0x9d, 0x14, 0xbe, 0x50, 0x88, + 0x29, 0x27, 0xe9, 0x71, 0xe9, 0x29, 0x98, 0x8a, 0xec, 0x25, 0xd3, 0xfb, 0x79, 0x5f, 0x81, 0xa3, + 0xfb, 0x0e, 0x3a, 0x79, 0x55, 0x22, 0x37, 0xab, 0xa2, 0xc9, 0x13, 0xa9, 0x7d, 0x2f, 0x3a, 0x88, + 0x96, 0xe1, 0x4b, 0x2e, 0x63, 0xc5, 0xd2, 0xfc, 0x20, 0x07, 0xb3, 0xdc, 0xf7, 0x22, 0xed, 0xdc, + 0x3a, 0xe4, 0x5b, 0x96, 0xa7, 0xc4, 0xad, 0xa4, 0x16, 0xa7, 0xf3, 0xa8, 0x8f, 0xf3, 0xf6, 0x92, + 0x3b, 0x3a, 0x67, 0x85, 0x5e, 0xf2, 0x8b, 0xe2, 0x5c, 0x96, 0x23, 0x0c, 0x34, 0x9a, 0xf5, 0xd2, + 0x40, 0x25, 0xfd, 0x92, 0xff, 0x26, 0x49, 0x3e, 0x0b, 0xe7, 0x81, 0xf7, 0x19, 0x24, 0x67, 0xfd, + 0xf5, 0x13, 0xf3, 0x7b, 0x39, 0x90, 0x9e, 0x75, 0x17, 0x32, 0xfd, 0xe5, 0x48, 0xa6, 0x4f, 0x19, + 0xd4, 0xc5, 0xe6, 0x12, 0xb3, 0x7c, 0x3c, 0xdf, 0x9d, 0xc8, 0xc2, 0x70, 0xff, 0x0c, 0xff, 0x2b, + 0x03, 0x4a, 0x02, 0xef, 0x2e, 0xe4, 0xba, 0xf5, 0x68, 0xae, 0x7b, 0x38, 0xc3, 0x29, 0x86, 0xe4, + 0xb9, 0xef, 0xe4, 0xd5, 0xee, 0x83, 0x78, 0xda, 0x26, 0x6e, 0x53, 0xb5, 0xf6, 0x61, 0x3c, 0xe5, + 0x8b, 0x58, 0xc2, 0x50, 0x07, 0xa6, 0x98, 0x66, 0x28, 0x4c, 0x9d, 0x33, 0x65, 0x06, 0xd4, 0x6d, + 0x8c, 0xd5, 0xe7, 0xc4, 0x9b, 0x75, 0xfa, 0x12, 0x8e, 0x32, 0x47, 0xdf, 0x34, 0x60, 0xde, 0x19, + 0x4c, 0xc4, 0xca, 0x30, 0x9e, 0xcc, 0x18, 0x28, 0x43, 0x06, 0xf5, 0x7b, 0xf6, 0x6e, 0x1e, 0x4b, + 0x4a, 0xf1, 0x38, 0x49, 0x1c, 0x6a, 0xc3, 0xa4, 0xfe, 0x20, 0x58, 0x99, 0xd1, 0xc9, 0xec, 0x4f, + 0x9c, 0xe5, 0xb8, 0x58, 0x5f, 0xc1, 0x11, 0xce, 0xe6, 0x6f, 0xc7, 0xa0, 0xac, 0xd9, 0x1d, 0x3a, + 0x11, 0xcd, 0x3f, 0xf7, 0xc5, 0xf3, 0x0f, 0x08, 0xe4, 0x48, 0xee, 0x71, 0x61, 0xba, 0xd1, 0x77, + 0x5d, 0xda, 0xf3, 0xce, 0xdf, 0x96, 0x3a, 0x12, 0xf1, 0x1a, 0x65, 0x35, 0xc2, 0x11, 0xc7, 0x24, + 0xf0, 0xa2, 0xb5, 0xad, 0x9e, 0xc6, 0xe7, 0xb3, 0x3c, 0x8d, 0x1f, 0x5e, 0xb4, 0xfa, 0x4f, 0xe0, + 0x7d, 0xbe, 0x68, 0x1d, 0x8a, 0xf2, 0xa1, 0xa5, 0x7a, 0xd6, 0xf3, 0x48, 0xda, 0x19, 0x24, 0xa7, + 0x91, 0xc1, 0x5e, 0xfe, 0xc6, 0x8a, 0x8f, 0x9e, 0xa4, 0x4b, 0x07, 0x24, 0xe9, 0xe7, 0x00, 0xd9, + 0x5b, 0x8c, 0xba, 0x3b, 0xb4, 0x79, 0x41, 0x7e, 0x34, 0xc0, 0xcd, 0xa0, 0x78, 0xdc, 0x78, 0x30, + 0x5f, 0x5f, 0x52, 0x54, 0xe8, 0x85, 0x01, 0x0c, 0x9c, 0x40, 0x85, 0xfa, 0x30, 0xab, 0xb4, 0x17, + 0xd8, 0x9f, 0x7a, 0x52, 0x96, 0xb5, 0xa5, 0x09, 0xdf, 0x9e, 0x58, 0x8d, 0x31, 0xc4, 0x03, 0x22, + 0xb8, 0xe3, 0x76, 0x88, 0x96, 0x51, 0x17, 0x61, 0x74, 0x99, 0xc2, 0x71, 0x2f, 0xe9, 0xdc, 0x70, + 0x94, 0xb9, 0xb9, 0x02, 0x73, 0xd2, 0x8c, 0xf5, 0x44, 0x7a, 0xf0, 0xdb, 0xec, 0xbf, 0x34, 0x20, + 0x1a, 0x10, 0xa2, 0x6f, 0xe9, 0x18, 0x29, 0xde, 0xd2, 0xb9, 0x01, 0xd3, 0x7d, 0x87, 0x79, 0x2e, + 0x25, 0x5d, 0xb1, 0x03, 0x3f, 0x5c, 0x3e, 0x91, 0x25, 0xe8, 0xeb, 0xa9, 0x30, 0xa8, 0xd3, 0xaf, + 0x46, 0xd8, 0xe2, 0x98, 0x18, 0xf3, 0xef, 0x39, 0x88, 0x78, 0x36, 0x7a, 0xcf, 0x80, 0x39, 0x12, + 0x7b, 0xb5, 0xdf, 0xef, 0x18, 0x9e, 0xcd, 0xf6, 0xbd, 0xc5, 0xc0, 0x97, 0x01, 0xe1, 0x6c, 0x20, + 0x8e, 0xc2, 0xf0, 0xa0, 0x50, 0x11, 0x47, 0xc9, 0xe0, 0xb7, 0x1b, 0xd9, 0xe2, 0x68, 0xc2, 0xc7, + 0x1f, 0x32, 0x8e, 0x26, 0x00, 0x70, 0x92, 0x38, 0xf4, 0x0a, 0x14, 0x88, 0xdb, 0xf2, 0x1f, 0x50, + 0x65, 0x17, 0xeb, 0x7f, 0x92, 0x13, 0xda, 0x4e, 0xcd, 0x6d, 0x31, 0x2c, 0x98, 0x9a, 0x7f, 0xcc, + 0xc1, 0xc0, 0x5b, 0x44, 0xea, 0x0d, 0x8c, 0x42, 0xe2, 0x1b, 0x18, 0x2f, 0x42, 0x89, 0x79, 0xc4, + 0xf5, 0x36, 0xad, 0x2e, 0x55, 0x8f, 0xe2, 0xff, 0x3d, 0x5d, 0xba, 0xe6, 0x14, 0xf2, 0xa1, 0xf4, + 0x86, 0xcf, 0x00, 0x87, 0xbc, 0xd0, 0xe9, 0x68, 0xd0, 0x36, 0xe3, 0x41, 0x7b, 0x4e, 0xdf, 0xe6, + 0xa8, 0x7d, 0x43, 0x17, 0xca, 0x9a, 0x8a, 0x55, 0x4a, 0x3a, 0x93, 0x59, 0xa5, 0x5a, 0xe8, 0x95, + 0x9f, 0xec, 0x84, 0x10, 0x9d, 0xbf, 0x39, 0x03, 0x53, 0x91, 0x97, 0x72, 0xc4, 0xf4, 0x27, 0x70, + 0xc0, 0x2f, 0xeb, 0xf4, 0x27, 0xd8, 0xe0, 0xed, 0x9c, 0xfe, 0x84, 0x4c, 0xf7, 0xaf, 0x0d, 0x3f, + 0x34, 0x60, 0x2a, 0xc0, 0xfd, 0xd2, 0xce, 0x42, 0x82, 0x1d, 0x0e, 0xa9, 0x11, 0x7f, 0xaa, 0x9f, + 0x22, 0x5a, 0x27, 0xe6, 0xf6, 0xa9, 0x13, 0xd9, 0x60, 0x9d, 0x98, 0xa1, 0x2e, 0x88, 0xf7, 0x60, + 0xda, 0x87, 0x18, 0xfb, 0x94, 0x8b, 0xe6, 0xdf, 0x0c, 0x98, 0x89, 0xdd, 0x8e, 0xee, 0x52, 0xf9, + 0x91, 0xb2, 0x7c, 0x61, 0xa4, 0x2c, 0x6f, 0x41, 0x99, 0x67, 0x44, 0xbf, 0x04, 0x1b, 0xfb, 0x62, + 0xa3, 0x3c, 0xee, 0x9a, 0x97, 0x42, 0x76, 0x58, 0xe7, 0x5d, 0x7f, 0xee, 0xa3, 0xcf, 0x96, 0x0f, + 0x7d, 0xfc, 0xd9, 0xf2, 0xa1, 0x4f, 0x3e, 0x5b, 0x3e, 0xf4, 0xf5, 0xbd, 0x65, 0xe3, 0xa3, 0xbd, + 0x65, 0xe3, 0xe3, 0xbd, 0x65, 0xe3, 0x93, 0xbd, 0x65, 0xe3, 0xd3, 0xbd, 0x65, 0xe3, 0xbb, 0x7f, + 0x5a, 0x3e, 0xf4, 0xf2, 0xfd, 0x69, 0x3e, 0x03, 0xfd, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3f, + 0x46, 0x0b, 0xac, 0x2d, 0x3a, 0x00, 0x00, } func (m *AnalysisRunArgument) Marshal() (dAtA []byte, err error) { @@ -4146,9 +4145,9 @@ func (m *PromotionStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.PromotedFreight != nil { + if m.Freight != nil { { - size, err := m.PromotedFreight.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Freight.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5795,8 +5794,8 @@ func (m *PromotionStatus) Size() (n int) { n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize)) } } - if m.PromotedFreight != nil { - l = m.PromotedFreight.Size() + if m.Freight != nil { + l = m.Freight.Size() n += 1 + l + sovGenerated(uint64(l)) } return n @@ -6779,7 +6778,7 @@ func (this *PromotionStatus) String() string { `Phase:` + fmt.Sprintf("%v", this.Phase) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `Metadata:` + mapStringForMetadata + `,`, - `PromotedFreight:` + strings.Replace(this.PromotedFreight.String(), "FreightReference", "FreightReference", 1) + `,`, + `Freight:` + strings.Replace(this.Freight.String(), "FreightReference", "FreightReference", 1) + `,`, `}`, }, "") return s @@ -14064,7 +14063,7 @@ func (m *PromotionStatus) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PromotedFreight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Freight", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -14091,10 +14090,10 @@ func (m *PromotionStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.PromotedFreight == nil { - m.PromotedFreight = &FreightReference{} + if m.Freight == nil { + m.Freight = &FreightReference{} } - if err := m.PromotedFreight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Freight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/api/v1alpha1/generated.proto b/api/v1alpha1/generated.proto index 734ac66e43..9b6ebe3e33 100644 --- a/api/v1alpha1/generated.proto +++ b/api/v1alpha1/generated.proto @@ -893,8 +893,8 @@ message PromotionStatus { // (e.g. for display purposes, or internal bookkeeping) map metadata = 3; - // PromotedFreight is the detail of the piece of freight that was referenced by this promotion. - optional FreightReference promotedFreight = 4; + // Freight is the detail of the piece of freight that was referenced by this promotion. + optional FreightReference freight = 4; } // PullRequestPromotionMechanism describes how to generate a pull request against the write branch during promotion diff --git a/api/v1alpha1/promotion_types.go b/api/v1alpha1/promotion_types.go index be66046e53..574d907d39 100644 --- a/api/v1alpha1/promotion_types.go +++ b/api/v1alpha1/promotion_types.go @@ -96,8 +96,8 @@ type PromotionStatus struct { // Metadata holds arbitrary metadata set by promotion mechanisms // (e.g. for display purposes, or internal bookkeeping) Metadata map[string]string `json:"metadata,omitempty" protobuf:"bytes,3,rep,name=metadata" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - // PromotedFreight is the detail of the piece of freight that was referenced by this promotion. - PromotedFreight *FreightReference `json:"promotedFreight,omitempty" protobuf:"bytes,4,opt,name=promotedFreight"` + // Freight is the detail of the piece of freight that was referenced by this promotion. + Freight *FreightReference `json:"promotedFreight,omitempty" protobuf:"bytes,4,opt,name=freight"` } // WithPhase returns a copy of PromotionStatus with the given phase @@ -107,6 +107,13 @@ func (p *PromotionStatus) WithPhase(phase PromotionPhase) *PromotionStatus { return status } +// WithFreight returns a copy of PromotionStatus with the given freight +func (p *PromotionStatus) WithFreight(freight *FreightReference) *PromotionStatus { + status := p.DeepCopy() + status.Freight = freight + return status +} + // +kubebuilder:object:root=true // PromotionList contains a list of Promotion diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 854526c139..b503244e0f 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -994,8 +994,8 @@ func (in *PromotionStatus) DeepCopyInto(out *PromotionStatus) { (*out)[key] = val } } - if in.PromotedFreight != nil { - in, out := &in.PromotedFreight, &out.PromotedFreight + if in.Freight != nil { + in, out := &in.Freight, &out.Freight *out = new(FreightReference) (*in).DeepCopyInto(*out) } diff --git a/charts/kargo/resources/crds/kargo.akuity.io_promotions.yaml b/charts/kargo/resources/crds/kargo.akuity.io_promotions.yaml index c63c202baa..2c7863ce4d 100644 --- a/charts/kargo/resources/crds/kargo.akuity.io_promotions.yaml +++ b/charts/kargo/resources/crds/kargo.akuity.io_promotions.yaml @@ -104,8 +104,8 @@ spec: lifecycle. type: string promotedFreight: - description: PromotedFreight is the detail of the piece of freight - that was referenced by this promotion. + description: Freight is the detail of the piece of freight that was + referenced by this promotion. properties: charts: description: Charts describes specific versions of specific Helm diff --git a/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml b/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml index 3e2e81267d..7707d9a983 100644 --- a/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml +++ b/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml @@ -1001,8 +1001,8 @@ spec: is in its lifecycle. type: string promotedFreight: - description: PromotedFreight is the detail of the piece of - freight that was referenced by this promotion. + description: Freight is the detail of the piece of freight + that was referenced by this promotion. properties: charts: description: Charts describes specific versions of specific @@ -1724,8 +1724,8 @@ spec: is in its lifecycle. type: string promotedFreight: - description: PromotedFreight is the detail of the piece of - freight that was referenced by this promotion. + description: Freight is the detail of the piece of freight + that was referenced by this promotion. properties: charts: description: Charts describes specific versions of specific diff --git a/internal/controller/promotion/git.go b/internal/controller/promotion/git.go index 57111d1e42..a4b55f4937 100644 --- a/internal/controller/promotion/git.go +++ b/internal/controller/promotion/git.go @@ -119,7 +119,7 @@ func (g *gitMechanism) Promote( ); err != nil { return nil, newFreight, err } - newStatus = aggregateGitPromoStatus(newStatus, *otherStatus) + newStatus = aggregateGitPromoStatus(newStatus, *otherStatus).WithFreight(&newFreight) } logger.Debugf("done executing %s", g.name) diff --git a/internal/controller/promotions/promotions.go b/internal/controller/promotions/promotions.go index cfbecb13f9..5c1dc5cd7a 100644 --- a/internal/controller/promotions/promotions.go +++ b/internal/controller/promotions/promotions.go @@ -389,7 +389,7 @@ func (r *reconciler) promote( ) } if targetFreight == nil { - return nil, fmt.Errorf("freight %q not found in namespace %q", promo.Spec.Freight, promo.Namespace) + return nil, fmt.Errorf("Freight %q not found in namespace %q", promo.Spec.Freight, promo.Namespace) } upstreamStages := make([]string, len(stage.Spec.Subscriptions.UpstreamStages)) for i, upstreamStage := range stage.Spec.Subscriptions.UpstreamStages { @@ -423,10 +423,10 @@ func (r *reconciler) promote( } // record the freight reference to the promotion's status err = kubeclient.PatchStatus(ctx, r.kargoClient, &promo, func(status *kargoapi.PromotionStatus) { - status.PromotedFreight = &targetFreightRef + status.Freight = &targetFreightRef }) if err != nil { - return nil, err + logger.Errorf("Promotion status patch failed: %v", err) } newStatus, nextFreight, err := r.promoMechanisms.Promote(ctx, stage, &promo, targetFreightRef) diff --git a/ui/src/gen/schema/promotions.kargo.akuity.io_v1alpha1.json b/ui/src/gen/schema/promotions.kargo.akuity.io_v1alpha1.json index 04d48f592c..8a94bc3261 100644 --- a/ui/src/gen/schema/promotions.kargo.akuity.io_v1alpha1.json +++ b/ui/src/gen/schema/promotions.kargo.akuity.io_v1alpha1.json @@ -53,7 +53,7 @@ "type": "string" }, "promotedFreight": { - "description": "PromotedFreight is the detail of the piece of freight that was referenced by this promotion.", + "description": "Freight is the detail of the piece of freight that was referenced by this promotion.", "properties": { "charts": { "description": "Charts describes specific versions of specific Helm charts.", diff --git a/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json b/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json index 883875ef08..40d2410898 100644 --- a/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json +++ b/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json @@ -866,7 +866,7 @@ "type": "string" }, "promotedFreight": { - "description": "PromotedFreight is the detail of the piece of freight that was referenced by this promotion.", + "description": "Freight is the detail of the piece of freight that was referenced by this promotion.", "properties": { "charts": { "description": "Charts describes specific versions of specific Helm charts.", @@ -1568,7 +1568,7 @@ "type": "string" }, "promotedFreight": { - "description": "PromotedFreight is the detail of the piece of freight that was referenced by this promotion.", + "description": "Freight is the detail of the piece of freight that was referenced by this promotion.", "properties": { "charts": { "description": "Charts describes specific versions of specific Helm charts.", diff --git a/ui/src/gen/v1alpha1/generated_pb.ts b/ui/src/gen/v1alpha1/generated_pb.ts index b79e325e13..56ec0aa132 100644 --- a/ui/src/gen/v1alpha1/generated_pb.ts +++ b/ui/src/gen/v1alpha1/generated_pb.ts @@ -2874,11 +2874,11 @@ export class PromotionStatus extends Message { metadata: { [key: string]: string } = {}; /** - * PromotedFreight is the detail of the piece of freight that was referenced by this promotion. + * Freight is the detail of the piece of freight that was referenced by this promotion. * - * @generated from field: optional github.com.akuity.kargo.api.v1alpha1.FreightReference promotedFreight = 4; + * @generated from field: optional github.com.akuity.kargo.api.v1alpha1.FreightReference freight = 4; */ - promotedFreight?: FreightReference; + freight?: FreightReference; constructor(data?: PartialMessage) { super(); @@ -2891,7 +2891,7 @@ export class PromotionStatus extends Message { { no: 1, name: "phase", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true }, { no: 2, name: "message", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true }, { no: 3, name: "metadata", kind: "map", K: 9 /* ScalarType.STRING */, V: {kind: "scalar", T: 9 /* ScalarType.STRING */} }, - { no: 4, name: "promotedFreight", kind: "message", T: FreightReference, opt: true }, + { no: 4, name: "freight", kind: "message", T: FreightReference, opt: true }, ]); static fromBinary(bytes: Uint8Array, options?: Partial): PromotionStatus {