From c9c30969e20cd7dabc90b8e5de808b87527e9b8c Mon Sep 17 00:00:00 2001 From: Eugene Doudine Date: Sun, 21 Sep 2025 20:08:13 +0300 Subject: [PATCH 1/5] fix: restore GetChangeRevision API method Removal of GetChangeRevision API method broke ACR controller. Signed-off-by: Eugene Doudine --- pkg/apiclient/application/application.pb.go | 433 ++++++++++-------- .../application/application.pb.gw.go | 83 ++++ server/application/application.proto | 5 + 3 files changed, 325 insertions(+), 196 deletions(-) diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go index ae8e8843a0537..36bf6512593cd 100644 --- a/pkg/apiclient/application/application.pb.go +++ b/pkg/apiclient/application/application.pb.go @@ -10,6 +10,10 @@ package application import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + v1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" apiclient "github.com/argoproj/argo-cd/v3/reposerver/apiclient" github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" @@ -18,11 +22,8 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" v11 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -3390,199 +3391,201 @@ func init() { } var fileDescriptor_df6e82b174b5eaec = []byte{ - // 3072 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xcd, 0x8f, 0x1c, 0x47, - 0x15, 0xa7, 0x66, 0x76, 0x76, 0x67, 0xdf, 0xd8, 0x5e, 0xbb, 0x62, 0x2f, 0x9d, 0xf1, 0xc6, 0x6c, - 0xca, 0x5f, 0x93, 0xb5, 0x77, 0xc6, 0x9e, 0x18, 0x94, 0x6c, 0x12, 0x82, 0xb3, 0x76, 0x9c, 0x25, - 0x6b, 0xc7, 0xf4, 0x3a, 0x36, 0x0a, 0x07, 0xd2, 0xe9, 0xa9, 0x9d, 0x69, 0x76, 0xa6, 0xbb, 0x5d, - 0xdd, 0x33, 0x66, 0x15, 0x72, 0x09, 0x42, 0x42, 0x22, 0x0a, 0x02, 0x72, 0xe0, 0xc0, 0x97, 0x12, - 0x45, 0x42, 0x08, 0xc4, 0x05, 0x21, 0x24, 0x84, 0x04, 0x87, 0x20, 0x38, 0x44, 0x8a, 0xe0, 0x1f, - 0x40, 0x11, 0xe2, 0x48, 0x2e, 0x39, 0x23, 0x54, 0xd5, 0x55, 0xdd, 0xd5, 0xf3, 0xd1, 0x33, 0xcb, - 0x2c, 0x24, 0x12, 0xa7, 0xed, 0x57, 0x5d, 0xfd, 0xea, 0xf7, 0x5e, 0xbd, 0x7a, 0xef, 0xd5, 0x7b, - 0xb3, 0x70, 0x2a, 0xa0, 0xac, 0x47, 0x59, 0xcd, 0xf2, 0xfd, 0xb6, 0x63, 0x5b, 0xa1, 0xe3, 0xb9, - 0xfa, 0x73, 0xd5, 0x67, 0x5e, 0xe8, 0xe1, 0x92, 0x36, 0x54, 0x5e, 0x6a, 0x7a, 0x5e, 0xb3, 0x4d, - 0x6b, 0x96, 0xef, 0xd4, 0x2c, 0xd7, 0xf5, 0x42, 0x31, 0x1c, 0x44, 0x53, 0xcb, 0x64, 0xe7, 0x91, - 0xa0, 0xea, 0x78, 0xe2, 0xad, 0xed, 0x31, 0x5a, 0xeb, 0x5d, 0xac, 0x35, 0xa9, 0x4b, 0x99, 0x15, - 0xd2, 0x86, 0x9c, 0x73, 0x29, 0x99, 0xd3, 0xb1, 0xec, 0x96, 0xe3, 0x52, 0xb6, 0x5b, 0xf3, 0x77, - 0x9a, 0x7c, 0x20, 0xa8, 0x75, 0x68, 0x68, 0x0d, 0xfb, 0x6a, 0xb3, 0xe9, 0x84, 0xad, 0xee, 0x4b, - 0x55, 0xdb, 0xeb, 0xd4, 0x2c, 0xd6, 0xf4, 0x7c, 0xe6, 0x7d, 0x45, 0x3c, 0xac, 0xda, 0x8d, 0x5a, - 0xef, 0xe1, 0x84, 0x81, 0x2e, 0x4b, 0xef, 0xa2, 0xd5, 0xf6, 0x5b, 0xd6, 0x20, 0xb7, 0xab, 0x63, - 0xb8, 0x31, 0xea, 0x7b, 0x52, 0x37, 0xe2, 0xd1, 0x09, 0x3d, 0xb6, 0xab, 0x3d, 0x46, 0x6c, 0xc8, - 0x87, 0x08, 0x0e, 0x5f, 0x4e, 0xd6, 0xfb, 0x42, 0x97, 0xb2, 0x5d, 0x8c, 0x61, 0xc6, 0xb5, 0x3a, - 0xd4, 0x40, 0xcb, 0xa8, 0x32, 0x6f, 0x8a, 0x67, 0x6c, 0xc0, 0x1c, 0xa3, 0xdb, 0x8c, 0x06, 0x2d, - 0x23, 0x27, 0x86, 0x15, 0x89, 0xcb, 0x50, 0xe4, 0x8b, 0x53, 0x3b, 0x0c, 0x8c, 0xfc, 0x72, 0xbe, - 0x32, 0x6f, 0xc6, 0x34, 0xae, 0xc0, 0x02, 0xa3, 0x81, 0xd7, 0x65, 0x36, 0xbd, 0x4d, 0x59, 0xe0, - 0x78, 0xae, 0x31, 0x23, 0xbe, 0xee, 0x1f, 0xe6, 0x5c, 0x02, 0xda, 0xa6, 0x76, 0xe8, 0x31, 0xa3, - 0x20, 0xa6, 0xc4, 0x34, 0xc7, 0xc3, 0x81, 0x1b, 0xb3, 0x11, 0x1e, 0xfe, 0x8c, 0x09, 0x1c, 0xb0, - 0x7c, 0xff, 0x86, 0xd5, 0xa1, 0x81, 0x6f, 0xd9, 0xd4, 0x98, 0x13, 0xef, 0x52, 0x63, 0x1c, 0xb3, - 0x44, 0x62, 0x14, 0x05, 0x30, 0x45, 0x92, 0x75, 0x98, 0xbf, 0xe1, 0x35, 0xe8, 0x68, 0x71, 0xfb, - 0xd9, 0xe7, 0x06, 0xd9, 0x93, 0x77, 0x10, 0x1c, 0x33, 0x69, 0xcf, 0xe1, 0xf8, 0xaf, 0xd3, 0xd0, - 0x6a, 0x58, 0xa1, 0xd5, 0xcf, 0x31, 0x17, 0x73, 0x2c, 0x43, 0x91, 0xc9, 0xc9, 0x46, 0x4e, 0x8c, - 0xc7, 0xf4, 0xc0, 0x6a, 0xf9, 0x6c, 0x61, 0x22, 0x15, 0x2a, 0x12, 0x2f, 0x43, 0x29, 0xd2, 0xe5, - 0x86, 0xdb, 0xa0, 0x5f, 0x15, 0xda, 0x2b, 0x98, 0xfa, 0x10, 0x5e, 0x82, 0xf9, 0x5e, 0xa4, 0xe7, - 0x8d, 0x86, 0xd0, 0x62, 0xc1, 0x4c, 0x06, 0xc8, 0x3f, 0x10, 0x9c, 0xd0, 0x6c, 0xc0, 0x94, 0x3b, - 0x73, 0xb5, 0x47, 0xdd, 0x30, 0x18, 0x2d, 0xd0, 0x79, 0x38, 0xa2, 0x36, 0xb1, 0x5f, 0x4f, 0x83, - 0x2f, 0xb8, 0x88, 0xfa, 0xa0, 0x12, 0x51, 0x1f, 0xe3, 0x82, 0x28, 0xfa, 0xf9, 0x8d, 0x2b, 0x52, - 0x4c, 0x7d, 0x68, 0x40, 0x51, 0x85, 0x6c, 0x45, 0xcd, 0xa6, 0x14, 0x45, 0xde, 0x43, 0x60, 0x68, - 0x82, 0x5e, 0xb7, 0x5c, 0x67, 0x9b, 0x06, 0xe1, 0xa4, 0x7b, 0x86, 0xf6, 0x71, 0xcf, 0x2a, 0xb0, - 0x10, 0x49, 0x75, 0x93, 0x9f, 0x47, 0xee, 0x7f, 0x8c, 0xc2, 0x72, 0xbe, 0x92, 0x37, 0xfb, 0x87, - 0xf9, 0xde, 0xa9, 0x35, 0x03, 0x63, 0x56, 0x98, 0x71, 0x32, 0x40, 0x1e, 0x84, 0xf9, 0xa7, 0x9d, - 0x36, 0x5d, 0x6f, 0x75, 0xdd, 0x1d, 0x7c, 0x14, 0x0a, 0x36, 0x7f, 0x10, 0x32, 0x1c, 0x30, 0x23, - 0x82, 0x7c, 0x07, 0xc1, 0x83, 0xa3, 0xa4, 0xbe, 0xe3, 0x84, 0x2d, 0xfe, 0x7d, 0x30, 0x4a, 0x7c, - 0xbb, 0x45, 0xed, 0x9d, 0xa0, 0xdb, 0x51, 0x26, 0xab, 0xe8, 0xe9, 0xc4, 0x27, 0x3f, 0x43, 0x50, - 0x19, 0x8b, 0xe9, 0x0e, 0xb3, 0x7c, 0x9f, 0x32, 0xfc, 0x34, 0x14, 0xee, 0xf2, 0x17, 0xe2, 0x80, - 0x96, 0xea, 0xd5, 0xaa, 0xee, 0xe0, 0xc7, 0x72, 0x79, 0xe6, 0x13, 0x66, 0xf4, 0x39, 0xae, 0x2a, - 0xf5, 0xe4, 0x04, 0x9f, 0xc5, 0x14, 0x9f, 0x58, 0x8b, 0x7c, 0xbe, 0x98, 0xf6, 0xd4, 0x2c, 0xcc, - 0xf8, 0x16, 0x0b, 0xc9, 0x31, 0xb8, 0x2f, 0x7d, 0x3c, 0x7c, 0xcf, 0x0d, 0x28, 0x79, 0x16, 0x8e, - 0x6b, 0xc3, 0xb7, 0xad, 0xb6, 0xd3, 0xb0, 0x42, 0xaa, 0x5e, 0xf3, 0xcd, 0xa0, 0x8c, 0x79, 0x4c, - 0xba, 0x95, 0x88, 0xc0, 0x8b, 0x30, 0x4b, 0xdd, 0xd0, 0x09, 0x77, 0xa5, 0x3d, 0x49, 0x8a, 0xbc, - 0x08, 0x44, 0x5f, 0xc3, 0x6b, 0xb7, 0xbd, 0x6e, 0xc8, 0xff, 0xbc, 0x64, 0xd9, 0x3b, 0x31, 0x4f, - 0xee, 0x84, 0xa3, 0x57, 0x72, 0x9f, 0x14, 0xc9, 0x8f, 0x8e, 0x4b, 0xef, 0x99, 0xba, 0x83, 0xc9, - 0x9b, 0xfa, 0x10, 0xf9, 0x6d, 0xda, 0xf8, 0xd7, 0x19, 0x15, 0x68, 0xef, 0x76, 0x69, 0x10, 0xe2, - 0x1d, 0xd0, 0x43, 0xa4, 0x60, 0x5e, 0xaa, 0x6f, 0x54, 0x93, 0x18, 0x53, 0x55, 0x31, 0x46, 0x3c, - 0x7c, 0xd9, 0x6e, 0x54, 0x7b, 0x0f, 0x57, 0xfd, 0x9d, 0x66, 0x95, 0x47, 0xac, 0x94, 0x22, 0x55, - 0xc4, 0xd2, 0x77, 0xc6, 0xd4, 0xb9, 0x73, 0x1d, 0x74, 0xfd, 0x80, 0xb2, 0x50, 0xe8, 0xa0, 0x68, - 0x4a, 0x8a, 0x9b, 0x5b, 0x4f, 0x6a, 0x51, 0x98, 0x53, 0xd1, 0x8c, 0x69, 0xf2, 0xbb, 0x34, 0xfa, - 0xe7, 0xfd, 0xc6, 0x47, 0x85, 0x5e, 0x47, 0x99, 0x4b, 0xa3, 0xd4, 0x0d, 0x3e, 0x9f, 0x36, 0xf8, - 0x5f, 0xa5, 0xf1, 0x5f, 0xa1, 0x6d, 0x9a, 0xe0, 0x1f, 0x76, 0xf6, 0x0c, 0x98, 0xb3, 0xad, 0xc0, - 0xb6, 0x1a, 0x6a, 0x15, 0x45, 0x72, 0xbf, 0xeb, 0x33, 0xcf, 0xb7, 0x9a, 0x82, 0xd3, 0x4d, 0xaf, - 0xed, 0xd8, 0xbb, 0x72, 0xb9, 0xc1, 0x17, 0x03, 0xe7, 0x74, 0x26, 0xfb, 0x9c, 0x16, 0xd2, 0xb0, - 0x4f, 0x42, 0x69, 0x6b, 0xd7, 0xb5, 0x9f, 0xf3, 0x23, 0x5f, 0x74, 0x14, 0x0a, 0x4e, 0x48, 0x3b, - 0x81, 0x81, 0x84, 0x1f, 0x8a, 0x08, 0xf2, 0xaf, 0x02, 0x2c, 0x6a, 0xb2, 0xf1, 0x0f, 0xb2, 0x24, - 0xcb, 0x72, 0xaa, 0x8b, 0x30, 0xdb, 0x60, 0xbb, 0x66, 0xd7, 0x95, 0x06, 0x20, 0x29, 0xbe, 0xb0, - 0xcf, 0xba, 0x6e, 0x04, 0xbf, 0x68, 0x46, 0x04, 0xde, 0x86, 0x62, 0x10, 0xf2, 0xa4, 0xa8, 0xb9, - 0x2b, 0x80, 0x97, 0xea, 0x9f, 0x9f, 0x6e, 0xd3, 0x39, 0xf4, 0x2d, 0xc9, 0xd1, 0x8c, 0x79, 0xe3, - 0xbb, 0xdc, 0x05, 0x47, 0x7e, 0x39, 0x30, 0xe6, 0x96, 0xf3, 0x95, 0x52, 0x7d, 0x6b, 0xfa, 0x85, - 0x9e, 0xf3, 0x79, 0x42, 0xa7, 0x05, 0x5c, 0x33, 0x59, 0x85, 0x7b, 0xfd, 0x8e, 0x74, 0x67, 0x81, - 0x4c, 0x5e, 0x92, 0x01, 0xfc, 0x45, 0x28, 0x38, 0xee, 0xb6, 0x17, 0x18, 0xf3, 0x02, 0xcc, 0x53, - 0xd3, 0x81, 0xd9, 0x70, 0xb7, 0x3d, 0x33, 0x62, 0x88, 0xef, 0xc2, 0x41, 0x46, 0x43, 0xb6, 0xab, - 0xb4, 0x60, 0x80, 0xd0, 0xeb, 0xb3, 0xd3, 0xad, 0x60, 0xea, 0x2c, 0xcd, 0xf4, 0x0a, 0x78, 0x0d, - 0x4a, 0x41, 0x62, 0x63, 0x46, 0x49, 0x2c, 0x68, 0xa4, 0x18, 0x69, 0x36, 0x68, 0xea, 0x93, 0x07, - 0xac, 0xfb, 0x40, 0xb6, 0x75, 0x1f, 0x1c, 0x1b, 0x84, 0x0f, 0x4d, 0x10, 0x84, 0x17, 0xfa, 0x83, - 0xf0, 0x07, 0x08, 0x96, 0x06, 0x9c, 0xd3, 0x96, 0x4f, 0x33, 0x8f, 0x81, 0x05, 0x33, 0x81, 0x4f, - 0x6d, 0xe1, 0xaa, 0x4b, 0xf5, 0xeb, 0xfb, 0xe6, 0xad, 0xc4, 0xba, 0x82, 0x75, 0x96, 0x43, 0x9d, - 0xd2, 0x2f, 0xfc, 0x18, 0xc1, 0x27, 0xb5, 0x35, 0x6f, 0x5a, 0xa1, 0xdd, 0xca, 0x12, 0x96, 0x9f, - 0x5f, 0x3e, 0x47, 0xa6, 0x11, 0x11, 0xc1, 0xb5, 0x2a, 0x1e, 0x6e, 0xed, 0xfa, 0x1c, 0x20, 0x7f, - 0x93, 0x0c, 0x4c, 0x99, 0xeb, 0x7d, 0x2b, 0xbd, 0x27, 0x32, 0x3c, 0x8b, 0xd3, 0xf6, 0xbf, 0x0f, - 0x1a, 0xe4, 0xdd, 0x74, 0x0e, 0x36, 0x10, 0xdf, 0x47, 0x6b, 0x6e, 0x09, 0xe6, 0x5d, 0x2d, 0xbb, - 0x16, 0x3a, 0x8a, 0x07, 0x44, 0xc6, 0x1c, 0xf1, 0x92, 0x49, 0x75, 0x4e, 0x64, 0xcc, 0xc9, 0x10, - 0x5e, 0x81, 0xc3, 0x1a, 0xa9, 0xf6, 0x9a, 0x4f, 0x1b, 0x18, 0x17, 0xb7, 0x35, 0x89, 0x4c, 0x39, - 0xe8, 0x82, 0x48, 0x24, 0xfa, 0x87, 0xc9, 0xcf, 0x11, 0x94, 0xfb, 0xe4, 0x19, 0x27, 0xc8, 0x21, - 0xc8, 0x39, 0x0d, 0x99, 0x98, 0xe4, 0x9c, 0xc6, 0x1e, 0x5d, 0x7d, 0xbf, 0x31, 0xcc, 0x66, 0x1b, - 0xc3, 0x5c, 0xda, 0x18, 0x3e, 0xec, 0x83, 0xab, 0x1c, 0xee, 0xe4, 0x7a, 0x47, 0x69, 0xbd, 0x0f, - 0xde, 0x66, 0x72, 0x03, 0xb7, 0x19, 0x03, 0xe6, 0x7a, 0xf1, 0x9d, 0x57, 0x24, 0x6b, 0x92, 0xe4, - 0x22, 0x36, 0x99, 0xd7, 0xf5, 0xa5, 0x49, 0x47, 0x04, 0x47, 0xb1, 0xe3, 0xb8, 0xfc, 0x7e, 0x26, - 0x50, 0xf0, 0xe7, 0xbd, 0xdf, 0x72, 0x53, 0x62, 0xff, 0x22, 0x07, 0x9f, 0x1a, 0x22, 0xf6, 0xd8, - 0xd3, 0xfa, 0xf1, 0x90, 0x3d, 0xf6, 0x19, 0x73, 0x23, 0x7d, 0x46, 0x71, 0x9c, 0xcf, 0x98, 0xcf, - 0xd6, 0x17, 0xa4, 0xf5, 0xf5, 0x36, 0x82, 0x63, 0xeb, 0x2d, 0xcb, 0x6d, 0x52, 0x65, 0xe8, 0x4a, - 0x4b, 0x06, 0xcc, 0x49, 0x1e, 0x2a, 0xf1, 0x96, 0xe4, 0x18, 0x5d, 0x55, 0x60, 0xc1, 0xee, 0x32, - 0x46, 0xdd, 0xe4, 0x44, 0x45, 0x99, 0x5a, 0xff, 0x30, 0x3f, 0xa7, 0x3e, 0x8f, 0x28, 0x5e, 0x37, - 0x88, 0xa7, 0x46, 0x3e, 0x79, 0x60, 0x9c, 0x5c, 0x82, 0xc5, 0x7e, 0x98, 0xf2, 0x82, 0xa0, 0xe7, - 0x56, 0x28, 0x5d, 0x64, 0x20, 0x3f, 0xcd, 0xc1, 0xf2, 0x10, 0x6b, 0x18, 0x9f, 0x8a, 0x7e, 0x6c, - 0xcc, 0x61, 0xdb, 0x63, 0xf2, 0x0c, 0x14, 0xcd, 0x88, 0xe0, 0x5e, 0xc4, 0x63, 0x7e, 0xcb, 0x72, - 0x85, 0xed, 0x17, 0x4d, 0x49, 0x4d, 0x69, 0x08, 0x57, 0xc0, 0x50, 0xea, 0xb9, 0x6c, 0x47, 0x01, - 0x8e, 0x59, 0x1d, 0x1a, 0x52, 0x16, 0x8c, 0x0a, 0x6f, 0x3d, 0xab, 0xdd, 0x55, 0x0e, 0x3a, 0x22, - 0xc8, 0xeb, 0xb9, 0x7e, 0x36, 0x66, 0xd7, 0xfd, 0xf8, 0x2b, 0x7a, 0x11, 0x66, 0x2d, 0x81, 0x56, - 0x1e, 0x3c, 0x49, 0x0d, 0xa8, 0xb4, 0x98, 0xad, 0xd2, 0xf9, 0x94, 0x4a, 0xd7, 0x72, 0x06, 0x22, - 0x1f, 0xe4, 0xa0, 0x3c, 0x4a, 0x21, 0xb7, 0xeb, 0xff, 0x6f, 0x2a, 0xc1, 0x16, 0x18, 0x6c, 0x84, - 0x95, 0x19, 0x20, 0x12, 0xfb, 0xd3, 0xa9, 0x34, 0x63, 0x94, 0x49, 0x9a, 0x23, 0xd9, 0x90, 0x6f, - 0x20, 0x38, 0x9e, 0xfe, 0x2c, 0xd8, 0x74, 0x82, 0x30, 0xf6, 0x17, 0xdb, 0x30, 0x17, 0x89, 0x12, - 0x5d, 0xe9, 0x4a, 0xf5, 0xcd, 0x69, 0x13, 0xfd, 0xd4, 0xee, 0x2a, 0xe6, 0xe4, 0xd1, 0x54, 0xad, - 0x24, 0x89, 0xbf, 0x89, 0xdb, 0x52, 0x97, 0x1b, 0xe5, 0xb6, 0x14, 0x4d, 0xde, 0x9a, 0x49, 0xa7, - 0x9a, 0x5e, 0x63, 0xd3, 0x6b, 0x66, 0x94, 0x25, 0xb3, 0x2d, 0x86, 0xef, 0x86, 0xd7, 0xd0, 0x2a, - 0x90, 0x8a, 0xe4, 0xdf, 0xd9, 0x9e, 0x1b, 0x5a, 0x8e, 0x4b, 0x99, 0xf4, 0xbc, 0xc9, 0x00, 0xdf, - 0xe9, 0xc0, 0x71, 0x6d, 0xba, 0x45, 0x6d, 0xcf, 0x6d, 0x04, 0xc2, 0x64, 0xf2, 0x66, 0x6a, 0x0c, - 0x3f, 0x03, 0xf3, 0x82, 0xbe, 0xe5, 0x74, 0xa2, 0x04, 0xa5, 0x54, 0x5f, 0xa9, 0x46, 0xad, 0x82, - 0xaa, 0xde, 0x2a, 0x48, 0x74, 0xd8, 0xa1, 0xa1, 0x55, 0xed, 0x5d, 0xac, 0xf2, 0x2f, 0xcc, 0xe4, - 0x63, 0x8e, 0x25, 0xb4, 0x9c, 0xf6, 0xa6, 0xe3, 0x8a, 0x0b, 0x27, 0x5f, 0x2a, 0x19, 0xe0, 0xd6, - 0xb8, 0xcd, 0xf3, 0xb1, 0x7b, 0xca, 0xe7, 0x45, 0x14, 0xff, 0xaa, 0xeb, 0x86, 0x4e, 0x5b, 0xac, - 0x1f, 0xd9, 0x5a, 0x32, 0x20, 0xbe, 0x72, 0xda, 0x21, 0x65, 0xd2, 0xd9, 0x49, 0x2a, 0xb6, 0xf7, - 0x52, 0x54, 0xfd, 0x56, 0xbe, 0x36, 0x3a, 0x19, 0x07, 0xf4, 0x93, 0xd1, 0x7f, 0xda, 0x0e, 0x0e, - 0x29, 0xe1, 0x8a, 0x66, 0x40, 0x14, 0xae, 0x8c, 0x43, 0xd1, 0x95, 0x43, 0xd1, 0x03, 0xa7, 0x65, - 0x21, 0xfb, 0xb4, 0x1c, 0x4e, 0x9f, 0x16, 0x71, 0x23, 0x0e, 0xed, 0xd6, 0xba, 0x15, 0x50, 0xe3, - 0x88, 0x60, 0x9d, 0x0c, 0x90, 0xdf, 0x23, 0x28, 0x6e, 0x7a, 0xcd, 0xab, 0x6e, 0xc8, 0x76, 0x45, - 0xed, 0xc4, 0x73, 0x43, 0xea, 0xc6, 0x65, 0x32, 0x49, 0xf2, 0x2d, 0x0a, 0x9d, 0x0e, 0xdd, 0x0a, - 0xad, 0x8e, 0x2f, 0x6f, 0x5e, 0x7b, 0xda, 0xa2, 0xf8, 0x63, 0xae, 0xb6, 0xb6, 0x15, 0x84, 0xc2, - 0xe5, 0x14, 0x4d, 0xf1, 0xcc, 0x05, 0x8c, 0x27, 0x6c, 0x85, 0x4c, 0xfa, 0x9b, 0xd4, 0x98, 0x6e, - 0x80, 0x85, 0x08, 0x9b, 0x24, 0x49, 0x07, 0xee, 0x8f, 0x4b, 0x02, 0xb7, 0x28, 0xeb, 0x38, 0xae, - 0x95, 0x1d, 0x97, 0x27, 0xe8, 0x51, 0x64, 0x54, 0xa4, 0xbc, 0xd4, 0x91, 0xe4, 0x37, 0xec, 0x3b, - 0x8e, 0xdb, 0xf0, 0xee, 0x65, 0x1c, 0xad, 0xe9, 0x16, 0xfc, 0x4b, 0xba, 0xcd, 0xa0, 0xad, 0x18, - 0xfb, 0x81, 0x67, 0xe0, 0x20, 0xf7, 0x18, 0x3d, 0x2a, 0x5f, 0x48, 0xa7, 0x44, 0x46, 0x55, 0x7c, - 0x13, 0x1e, 0x66, 0xfa, 0x43, 0xbc, 0x09, 0x0b, 0x56, 0x10, 0x38, 0x4d, 0x97, 0x36, 0x14, 0xaf, - 0xdc, 0xc4, 0xbc, 0xfa, 0x3f, 0x8d, 0x8a, 0x71, 0x62, 0x86, 0xdc, 0x6f, 0x45, 0x92, 0xaf, 0x23, - 0x38, 0x36, 0x94, 0x49, 0x7c, 0xae, 0x90, 0x16, 0x47, 0xca, 0x50, 0x0c, 0xec, 0x16, 0x6d, 0x74, - 0xdb, 0x2a, 0x55, 0x88, 0x69, 0xfe, 0xae, 0xd1, 0x8d, 0x76, 0x5f, 0xc6, 0xb1, 0x98, 0xc6, 0x27, - 0x00, 0x3a, 0x96, 0xdb, 0xb5, 0xda, 0x02, 0xc2, 0x8c, 0x80, 0xa0, 0x8d, 0x90, 0x25, 0x28, 0x0f, - 0x33, 0x1d, 0x59, 0xa8, 0xfe, 0x27, 0x82, 0x43, 0xca, 0xe5, 0xca, 0xdd, 0xad, 0xc0, 0x82, 0xa6, - 0x06, 0x2d, 0xaf, 0xed, 0x1f, 0x1e, 0xe3, 0x4e, 0x95, 0x95, 0xe4, 0xd3, 0x9d, 0xc2, 0x5e, 0xaa, - 0xd7, 0x37, 0x71, 0xc0, 0x45, 0xfb, 0x74, 0xef, 0xf9, 0x1a, 0x18, 0xd7, 0x2d, 0xd7, 0x6a, 0xd2, - 0x46, 0x2c, 0x76, 0x6c, 0x62, 0x2f, 0xea, 0x25, 0xcc, 0xa9, 0x0b, 0x86, 0x71, 0x12, 0xed, 0x6c, - 0x6f, 0xab, 0x72, 0x28, 0x83, 0xe2, 0xa6, 0xe3, 0xee, 0x6c, 0xb8, 0xdb, 0x1e, 0x97, 0x38, 0x74, - 0xc2, 0xb6, 0xd2, 0x6e, 0x44, 0xe0, 0xc3, 0x90, 0xef, 0xb2, 0xb6, 0xb4, 0x00, 0xfe, 0xc8, 0xef, - 0xf1, 0x0d, 0x1a, 0xd8, 0xcc, 0xf1, 0xc3, 0xe4, 0x8e, 0xa0, 0x0f, 0xf1, 0x7d, 0x70, 0x6c, 0xcf, - 0x5d, 0x6f, 0x5b, 0x41, 0xa0, 0xc2, 0x53, 0x3c, 0x40, 0x1e, 0x87, 0x83, 0x7c, 0xcd, 0x44, 0xcc, - 0x73, 0x69, 0x31, 0x8f, 0xa5, 0xe0, 0x2b, 0x78, 0x0a, 0xb1, 0x05, 0xf7, 0xf1, 0xac, 0xe0, 0xb2, - 0xef, 0x4b, 0x26, 0x13, 0xa6, 0xa8, 0xf9, 0x61, 0xd1, 0x75, 0x68, 0xc3, 0xa7, 0xfe, 0xce, 0x19, - 0xc0, 0xfa, 0x39, 0xa1, 0xac, 0xe7, 0xd8, 0x14, 0x7f, 0x17, 0xc1, 0x0c, 0x5f, 0x1a, 0x3f, 0x30, - 0xea, 0x58, 0x0a, 0x7b, 0x2d, 0xef, 0x5f, 0x79, 0x8c, 0xaf, 0x46, 0x96, 0x5e, 0xfd, 0xeb, 0xdf, - 0xbf, 0x97, 0x5b, 0xc4, 0x47, 0x45, 0x9b, 0xbf, 0x77, 0x51, 0x6f, 0xb9, 0x07, 0xf8, 0x35, 0x04, - 0x58, 0x66, 0x49, 0x5a, 0x23, 0x14, 0x9f, 0x1b, 0x05, 0x71, 0x48, 0xc3, 0xb4, 0xfc, 0x80, 0x16, - 0x55, 0xaa, 0xb6, 0xc7, 0x28, 0x8f, 0x21, 0x62, 0x82, 0x00, 0xb0, 0x22, 0x00, 0x9c, 0xc2, 0x64, - 0x18, 0x80, 0xda, 0xcb, 0x5c, 0xa3, 0xaf, 0xd4, 0x68, 0xb4, 0xee, 0x9b, 0x08, 0x0a, 0x77, 0xc4, - 0xdd, 0x77, 0x8c, 0x92, 0xb6, 0xf6, 0x4d, 0x49, 0x62, 0x39, 0x81, 0x96, 0x9c, 0x14, 0x48, 0x1f, - 0xc0, 0xc7, 0x15, 0xd2, 0x20, 0x64, 0xd4, 0xea, 0xa4, 0x00, 0x5f, 0x40, 0xf8, 0x6d, 0x04, 0xb3, - 0x51, 0x4b, 0x09, 0x9f, 0x1e, 0x85, 0x32, 0xd5, 0x72, 0x2a, 0xef, 0x5f, 0xa9, 0x8d, 0x3c, 0x24, - 0x30, 0x9e, 0x24, 0x43, 0xb7, 0x73, 0x2d, 0xd5, 0xbd, 0x79, 0x03, 0x41, 0xfe, 0x1a, 0x1d, 0x6b, - 0x6f, 0xfb, 0x08, 0x6e, 0x40, 0x81, 0x43, 0xb6, 0x1a, 0xbf, 0x85, 0xe0, 0xfe, 0x6b, 0x34, 0x1c, - 0x1e, 0x1e, 0x71, 0x65, 0x7c, 0xcc, 0x92, 0x66, 0x77, 0x6e, 0x82, 0x99, 0x71, 0x5c, 0xa8, 0x09, - 0x64, 0x0f, 0xe1, 0xb3, 0x59, 0x46, 0x18, 0xec, 0xba, 0xf6, 0x3d, 0x89, 0xe3, 0xcf, 0x08, 0x0e, - 0xf7, 0xff, 0xe0, 0x01, 0x93, 0xbe, 0x3b, 0xca, 0x90, 0xdf, 0x43, 0x94, 0x6f, 0x4c, 0xeb, 0x65, - 0xd3, 0x4c, 0xc9, 0x65, 0x81, 0xfc, 0x31, 0xfc, 0x68, 0x16, 0xf2, 0xb8, 0x3e, 0x5f, 0x7b, 0x59, - 0x3d, 0xbe, 0x22, 0x7e, 0x9c, 0x23, 0x60, 0xbf, 0x8b, 0xe0, 0xa8, 0xe2, 0xbb, 0xde, 0xb2, 0x58, - 0x78, 0x85, 0xf2, 0x0c, 0x3b, 0x98, 0x48, 0x9e, 0x29, 0xa3, 0x86, 0xbe, 0x1e, 0xb9, 0x2a, 0x64, - 0x79, 0x12, 0x3f, 0xb1, 0x67, 0x59, 0x6c, 0xce, 0xa6, 0x21, 0x61, 0xbf, 0x83, 0xe0, 0xd0, 0x35, - 0x1a, 0x3e, 0xb7, 0xbe, 0xb1, 0xa7, 0x9d, 0x99, 0xd2, 0xd0, 0xb5, 0xe5, 0xc8, 0x15, 0x21, 0xc8, - 0x67, 0xf1, 0xe3, 0x7b, 0x16, 0xc4, 0xb3, 0x9d, 0x78, 0x5f, 0x5e, 0x45, 0x70, 0xe0, 0x1a, 0x0d, - 0xaf, 0xc7, 0xbd, 0xae, 0xd3, 0x13, 0xb5, 0xfb, 0xcb, 0x4b, 0x55, 0xed, 0xb7, 0x4d, 0xea, 0x55, - 0x6c, 0xea, 0xab, 0x02, 0xdb, 0x59, 0x7c, 0x3a, 0x0b, 0x5b, 0xd2, 0x5f, 0x7b, 0x13, 0xc1, 0x31, - 0x1d, 0x44, 0xf2, 0x33, 0x89, 0x4f, 0xef, 0xed, 0xc7, 0x07, 0xf2, 0x27, 0x0c, 0x63, 0xd0, 0xd5, - 0x05, 0xba, 0xf3, 0x64, 0xf8, 0x41, 0xec, 0x0c, 0xa0, 0x58, 0x43, 0x2b, 0x15, 0x84, 0xff, 0x80, - 0x60, 0x36, 0x6a, 0x35, 0x8d, 0xd6, 0x51, 0xaa, 0x4f, 0xbe, 0x9f, 0x5e, 0x4d, 0x5a, 0x6d, 0xf9, - 0xc2, 0x70, 0x85, 0xea, 0xdf, 0xab, 0xad, 0xad, 0x0a, 0x2d, 0xa7, 0xdd, 0xf1, 0xaf, 0x11, 0x40, - 0xd2, 0x2e, 0xc3, 0x0f, 0x65, 0xcb, 0xa1, 0xb5, 0xd4, 0xca, 0xfb, 0xdb, 0x30, 0x23, 0x55, 0x21, - 0x4f, 0xa5, 0xbc, 0x9c, 0xe9, 0x0b, 0x7d, 0x6a, 0xaf, 0x45, 0xad, 0xb5, 0x9f, 0x20, 0x28, 0x88, - 0x3a, 0x3a, 0x3e, 0x35, 0x0a, 0xb3, 0x5e, 0x66, 0xdf, 0x4f, 0xd5, 0x9f, 0x11, 0x50, 0x97, 0xeb, - 0x59, 0x01, 0x65, 0x0d, 0xad, 0xe0, 0x1e, 0xcc, 0x46, 0xb5, 0xdd, 0xd1, 0xe6, 0x91, 0xaa, 0xfd, - 0x96, 0x97, 0x33, 0x12, 0x9c, 0xc8, 0x50, 0x65, 0x2c, 0x5b, 0x19, 0x17, 0xcb, 0x66, 0x78, 0xb8, - 0xc1, 0x27, 0xb3, 0x82, 0xd1, 0x7f, 0x41, 0x31, 0xe7, 0x04, 0xba, 0xd3, 0x64, 0x79, 0x5c, 0x3c, - 0xe3, 0xda, 0xf9, 0x3e, 0x82, 0xc3, 0xfd, 0x97, 0x04, 0x7c, 0x7c, 0x68, 0xbd, 0x4d, 0xc6, 0xd6, - 0xb4, 0x16, 0x47, 0x5d, 0x30, 0xc8, 0xe7, 0x04, 0x8a, 0x35, 0xfc, 0xc8, 0xd8, 0x93, 0x71, 0x43, - 0x79, 0x1d, 0xce, 0x68, 0x35, 0xe9, 0xfd, 0xff, 0x06, 0xc1, 0x01, 0xc5, 0xf7, 0x16, 0xa3, 0x34, - 0x1b, 0xd6, 0xfe, 0x1d, 0x04, 0xbe, 0x16, 0x79, 0x5c, 0xc0, 0xff, 0x0c, 0xbe, 0x34, 0x21, 0x7c, - 0x05, 0x7b, 0x35, 0xe4, 0x48, 0xff, 0x88, 0xe0, 0xc8, 0x9d, 0xc8, 0xee, 0x3f, 0x22, 0xfc, 0xeb, - 0x02, 0xff, 0x13, 0xf8, 0xb1, 0x8c, 0x7c, 0x75, 0x9c, 0x18, 0x17, 0x10, 0xfe, 0x25, 0x82, 0xa2, - 0xea, 0x6a, 0xe2, 0xb3, 0x23, 0x0f, 0x46, 0xba, 0xef, 0xb9, 0x9f, 0xc6, 0x2c, 0x93, 0x33, 0x72, - 0x2a, 0x33, 0x9a, 0xca, 0xf5, 0xb9, 0x41, 0xbf, 0x81, 0x00, 0xc7, 0x77, 0xff, 0xb8, 0x1a, 0x80, - 0xcf, 0xa4, 0x96, 0x1a, 0x59, 0x60, 0x2a, 0x9f, 0x1d, 0x3b, 0x2f, 0x1d, 0x4a, 0x57, 0x32, 0x43, - 0xa9, 0x17, 0xaf, 0xff, 0x3a, 0x82, 0xd2, 0x35, 0x1a, 0xdf, 0xa5, 0x32, 0x74, 0x99, 0x6e, 0xca, - 0x96, 0x2b, 0xe3, 0x27, 0x4a, 0x44, 0xe7, 0x05, 0xa2, 0x33, 0x38, 0x5b, 0x55, 0x0a, 0xc0, 0x0f, - 0x10, 0x1c, 0xbc, 0xa9, 0x9b, 0x28, 0x3e, 0x3f, 0x6e, 0xa5, 0x94, 0x27, 0x9f, 0x1c, 0xd7, 0xc3, - 0x02, 0xd7, 0x2a, 0x99, 0x08, 0xd7, 0x9a, 0xec, 0x6f, 0xfe, 0x08, 0x45, 0x97, 0xf1, 0xbe, 0xaa, - 0xfd, 0x7f, 0xaa, 0xb7, 0x8c, 0xe2, 0x3f, 0xb9, 0x24, 0xf0, 0x55, 0xf1, 0xf9, 0x49, 0xf0, 0xd5, - 0x64, 0x29, 0x1f, 0xff, 0x10, 0xc1, 0x11, 0xd1, 0xb6, 0xd1, 0x19, 0xe3, 0xac, 0x4e, 0x45, 0xd2, - 0xe4, 0x99, 0x20, 0xc4, 0x3c, 0x19, 0xf9, 0x1f, 0xb2, 0x27, 0x50, 0x6b, 0xb2, 0x21, 0xf3, 0xcd, - 0x1c, 0xe2, 0xfb, 0x7b, 0xdf, 0x00, 0xbe, 0xdb, 0xf5, 0x3e, 0x05, 0x8e, 0x6e, 0x43, 0x4d, 0x80, - 0x71, 0x4d, 0x60, 0xbc, 0x44, 0x6a, 0x7b, 0xc1, 0x58, 0xeb, 0xd5, 0xf9, 0x31, 0xfd, 0x36, 0x82, - 0x43, 0x2a, 0xec, 0x4a, 0xfb, 0x5b, 0x1d, 0xb7, 0xb5, 0x7b, 0x0d, 0xd3, 0xf2, 0x40, 0xac, 0x4c, - 0x76, 0x20, 0xde, 0x46, 0x30, 0x27, 0xbb, 0x2a, 0x19, 0xc9, 0x8c, 0xd6, 0x76, 0x29, 0xf7, 0x55, - 0x93, 0x64, 0xd9, 0x9d, 0x7c, 0x49, 0x2c, 0xfb, 0x3c, 0xce, 0x54, 0x8b, 0xef, 0x35, 0x82, 0xda, - 0xcb, 0xb2, 0xe6, 0xfd, 0x4a, 0xad, 0xed, 0x35, 0x83, 0x17, 0x08, 0xce, 0x0c, 0xd9, 0x7c, 0xce, - 0x05, 0x84, 0x43, 0x98, 0xe7, 0xe6, 0x2b, 0x4a, 0x54, 0x78, 0xb9, 0xaf, 0xa0, 0x35, 0x50, 0xbd, - 0x2a, 0x97, 0x07, 0x4a, 0x5e, 0x49, 0x8c, 0x96, 0x05, 0x03, 0xfc, 0x60, 0xe6, 0xb2, 0x62, 0xa1, - 0xd7, 0x10, 0x1c, 0xd1, 0xcf, 0x63, 0xb4, 0xfc, 0xc4, 0xa7, 0x31, 0x0b, 0x85, 0x4c, 0xfb, 0xf1, - 0xca, 0x44, 0x66, 0x24, 0xe0, 0x3c, 0xf5, 0xf4, 0x9f, 0xde, 0x3f, 0x81, 0xde, 0x7b, 0xff, 0x04, - 0xfa, 0xdb, 0xfb, 0x27, 0xd0, 0x0b, 0x8f, 0x4c, 0xf6, 0x2f, 0x25, 0x76, 0xdb, 0xa1, 0x6e, 0xa8, - 0xb3, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xd1, 0x3b, 0x5f, 0x38, 0x33, 0x00, 0x00, + // 3102 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xcf, 0x8f, 0x1c, 0x47, + 0xf5, 0xff, 0xd6, 0xcc, 0xce, 0xee, 0xec, 0x1b, 0xdb, 0x6b, 0x57, 0xec, 0xfd, 0x76, 0xc6, 0x1b, + 0xb3, 0x29, 0xdb, 0xf1, 0x64, 0x6d, 0xcf, 0xd8, 0x13, 0x83, 0x92, 0x4d, 0x42, 0x70, 0xd6, 0xce, + 0x66, 0xc9, 0xda, 0x31, 0xbd, 0x8e, 0x8d, 0xc2, 0x81, 0x74, 0x7a, 0x6a, 0x67, 0x9a, 0x9d, 0xe9, + 0x6e, 0x57, 0xf7, 0x8c, 0x59, 0x85, 0x5c, 0x82, 0x90, 0x22, 0x11, 0x05, 0x01, 0x39, 0x70, 0xe0, + 0x97, 0x12, 0x45, 0x42, 0x08, 0xc4, 0x05, 0x21, 0x24, 0x84, 0x04, 0x87, 0x20, 0x38, 0x44, 0x8a, + 0xe0, 0x1f, 0x40, 0x11, 0xe2, 0x48, 0x2e, 0x39, 0x23, 0x54, 0xd5, 0x55, 0xdd, 0xd5, 0xf3, 0xa3, + 0x67, 0x96, 0x59, 0x88, 0x25, 0x4e, 0xdb, 0xaf, 0xba, 0xfa, 0xd5, 0xe7, 0xbd, 0x7a, 0xf5, 0xde, + 0xab, 0xf7, 0x66, 0xe1, 0x54, 0x40, 0x59, 0x8f, 0xb2, 0x9a, 0xe5, 0xfb, 0x6d, 0xc7, 0xb6, 0x42, + 0xc7, 0x73, 0xf5, 0xe7, 0xaa, 0xcf, 0xbc, 0xd0, 0xc3, 0x25, 0x6d, 0xa8, 0xbc, 0xd4, 0xf4, 0xbc, + 0x66, 0x9b, 0xd6, 0x2c, 0xdf, 0xa9, 0x59, 0xae, 0xeb, 0x85, 0x62, 0x38, 0x88, 0xa6, 0x96, 0xc9, + 0xce, 0xa3, 0x41, 0xd5, 0xf1, 0xc4, 0x5b, 0xdb, 0x63, 0xb4, 0xd6, 0xbb, 0x58, 0x6b, 0x52, 0x97, + 0x32, 0x2b, 0xa4, 0x0d, 0x39, 0xe7, 0x52, 0x32, 0xa7, 0x63, 0xd9, 0x2d, 0xc7, 0xa5, 0x6c, 0xb7, + 0xe6, 0xef, 0x34, 0xf9, 0x40, 0x50, 0xeb, 0xd0, 0xd0, 0x1a, 0xf6, 0xd5, 0x66, 0xd3, 0x09, 0x5b, + 0xdd, 0x97, 0xab, 0xb6, 0xd7, 0xa9, 0x59, 0xac, 0xe9, 0xf9, 0xcc, 0xfb, 0x8a, 0x78, 0x38, 0x6f, + 0x37, 0x6a, 0xbd, 0x47, 0x12, 0x06, 0xba, 0x2c, 0xbd, 0x8b, 0x56, 0xdb, 0x6f, 0x59, 0x83, 0xdc, + 0xae, 0x8e, 0xe1, 0xc6, 0xa8, 0xef, 0x49, 0xdd, 0x88, 0x47, 0x27, 0xf4, 0xd8, 0xae, 0xf6, 0x18, + 0xb1, 0x21, 0x1f, 0x23, 0x38, 0x7c, 0x39, 0x59, 0xef, 0x0b, 0x5d, 0xca, 0x76, 0x31, 0x86, 0x19, + 0xd7, 0xea, 0x50, 0x03, 0x2d, 0xa3, 0xca, 0xbc, 0x29, 0x9e, 0xb1, 0x01, 0x73, 0x8c, 0x6e, 0x33, + 0x1a, 0xb4, 0x8c, 0x9c, 0x18, 0x56, 0x24, 0x2e, 0x43, 0x91, 0x2f, 0x4e, 0xed, 0x30, 0x30, 0xf2, + 0xcb, 0xf9, 0xca, 0xbc, 0x19, 0xd3, 0xb8, 0x02, 0x0b, 0x8c, 0x06, 0x5e, 0x97, 0xd9, 0xf4, 0x16, + 0x65, 0x81, 0xe3, 0xb9, 0xc6, 0x8c, 0xf8, 0xba, 0x7f, 0x98, 0x73, 0x09, 0x68, 0x9b, 0xda, 0xa1, + 0xc7, 0x8c, 0x82, 0x98, 0x12, 0xd3, 0x1c, 0x0f, 0x07, 0x6e, 0xcc, 0x46, 0x78, 0xf8, 0x33, 0x26, + 0x70, 0xc0, 0xf2, 0xfd, 0xeb, 0x56, 0x87, 0x06, 0xbe, 0x65, 0x53, 0x63, 0x4e, 0xbc, 0x4b, 0x8d, + 0x71, 0xcc, 0x12, 0x89, 0x51, 0x14, 0xc0, 0x14, 0x49, 0xd6, 0x60, 0xfe, 0xba, 0xd7, 0xa0, 0xa3, + 0xc5, 0xed, 0x67, 0x9f, 0x1b, 0x64, 0x4f, 0xde, 0x43, 0x70, 0xcc, 0xa4, 0x3d, 0x87, 0xe3, 0xbf, + 0x46, 0x43, 0xab, 0x61, 0x85, 0x56, 0x3f, 0xc7, 0x5c, 0xcc, 0xb1, 0x0c, 0x45, 0x26, 0x27, 0x1b, + 0x39, 0x31, 0x1e, 0xd3, 0x03, 0xab, 0xe5, 0xb3, 0x85, 0x89, 0x54, 0xa8, 0x48, 0xbc, 0x0c, 0xa5, + 0x48, 0x97, 0x1b, 0x6e, 0x83, 0x7e, 0x55, 0x68, 0xaf, 0x60, 0xea, 0x43, 0x78, 0x09, 0xe6, 0x7b, + 0x91, 0x9e, 0x37, 0x1a, 0x42, 0x8b, 0x05, 0x33, 0x19, 0x20, 0x7f, 0x47, 0x70, 0x42, 0xb3, 0x01, + 0x53, 0xee, 0xcc, 0xd5, 0x1e, 0x75, 0xc3, 0x60, 0xb4, 0x40, 0xe7, 0xe0, 0x88, 0xda, 0xc4, 0x7e, + 0x3d, 0x0d, 0xbe, 0xe0, 0x22, 0xea, 0x83, 0x4a, 0x44, 0x7d, 0x8c, 0x0b, 0xa2, 0xe8, 0x17, 0x36, + 0xae, 0x48, 0x31, 0xf5, 0xa1, 0x01, 0x45, 0x15, 0xb2, 0x15, 0x35, 0x9b, 0x52, 0x14, 0xf9, 0x00, + 0x81, 0xa1, 0x09, 0x7a, 0xcd, 0x72, 0x9d, 0x6d, 0x1a, 0x84, 0x93, 0xee, 0x19, 0xda, 0xc7, 0x3d, + 0xab, 0xc0, 0x42, 0x24, 0xd5, 0x0d, 0x7e, 0x1e, 0xb9, 0xff, 0x31, 0x0a, 0xcb, 0xf9, 0x4a, 0xde, + 0xec, 0x1f, 0xe6, 0x7b, 0xa7, 0xd6, 0x0c, 0x8c, 0x59, 0x61, 0xc6, 0xc9, 0x00, 0x79, 0x10, 0xe6, + 0x9f, 0x71, 0xda, 0x74, 0xad, 0xd5, 0x75, 0x77, 0xf0, 0x51, 0x28, 0xd8, 0xfc, 0x41, 0xc8, 0x70, + 0xc0, 0x8c, 0x08, 0xf2, 0x6d, 0x04, 0x0f, 0x8e, 0x92, 0xfa, 0xb6, 0x13, 0xb6, 0xf8, 0xf7, 0xc1, + 0x28, 0xf1, 0xed, 0x16, 0xb5, 0x77, 0x82, 0x6e, 0x47, 0x99, 0xac, 0xa2, 0xa7, 0x13, 0x9f, 0xfc, + 0x14, 0x41, 0x65, 0x2c, 0xa6, 0xdb, 0xcc, 0xf2, 0x7d, 0xca, 0xf0, 0x33, 0x50, 0xb8, 0xc3, 0x5f, + 0x88, 0x03, 0x5a, 0xaa, 0x57, 0xab, 0xba, 0x83, 0x1f, 0xcb, 0xe5, 0xd9, 0xff, 0x33, 0xa3, 0xcf, + 0x71, 0x55, 0xa9, 0x27, 0x27, 0xf8, 0x2c, 0xa6, 0xf8, 0xc4, 0x5a, 0xe4, 0xf3, 0xc5, 0xb4, 0xa7, + 0x67, 0x61, 0xc6, 0xb7, 0x58, 0x48, 0x8e, 0xc1, 0x7d, 0xe9, 0xe3, 0xe1, 0x7b, 0x6e, 0x40, 0xc9, + 0x73, 0x70, 0x5c, 0x1b, 0xbe, 0x65, 0xb5, 0x9d, 0x86, 0x15, 0x52, 0xf5, 0x9a, 0x6f, 0x06, 0x65, + 0xcc, 0x63, 0xd2, 0xad, 0x44, 0x04, 0x5e, 0x84, 0x59, 0xea, 0x86, 0x4e, 0xb8, 0x2b, 0xed, 0x49, + 0x52, 0xe4, 0x25, 0x20, 0xfa, 0x1a, 0x5e, 0xbb, 0xed, 0x75, 0x43, 0xfe, 0xe7, 0x65, 0xcb, 0xde, + 0x89, 0x79, 0x72, 0x27, 0x1c, 0xbd, 0x92, 0xfb, 0xa4, 0x48, 0x7e, 0x74, 0x5c, 0x7a, 0xd7, 0xd4, + 0x1d, 0x4c, 0xde, 0xd4, 0x87, 0xc8, 0x6f, 0xd2, 0xc6, 0xbf, 0xc6, 0xa8, 0x40, 0x7b, 0xa7, 0x4b, + 0x83, 0x10, 0xef, 0x80, 0x1e, 0x22, 0x05, 0xf3, 0x52, 0x7d, 0xa3, 0x9a, 0xc4, 0x98, 0xaa, 0x8a, + 0x31, 0xe2, 0xe1, 0xcb, 0x76, 0xa3, 0xda, 0x7b, 0xa4, 0xea, 0xef, 0x34, 0xab, 0x3c, 0x62, 0xa5, + 0x14, 0xa9, 0x22, 0x96, 0xbe, 0x33, 0xa6, 0xce, 0x9d, 0xeb, 0xa0, 0xeb, 0x07, 0x94, 0x85, 0x42, + 0x07, 0x45, 0x53, 0x52, 0xdc, 0xdc, 0x7a, 0x52, 0x8b, 0xc2, 0x9c, 0x8a, 0x66, 0x4c, 0x93, 0xdf, + 0xa6, 0xd1, 0xbf, 0xe0, 0x37, 0x3e, 0x29, 0xf4, 0x3a, 0xca, 0x5c, 0x1a, 0xa5, 0x6e, 0xf0, 0xf9, + 0xb4, 0xc1, 0xff, 0x32, 0x8d, 0xff, 0x0a, 0x6d, 0xd3, 0x04, 0xff, 0xb0, 0xb3, 0x67, 0xc0, 0x9c, + 0x6d, 0x05, 0xb6, 0xd5, 0x50, 0xab, 0x28, 0x92, 0xfb, 0x5d, 0x9f, 0x79, 0xbe, 0xd5, 0x14, 0x9c, + 0x6e, 0x78, 0x6d, 0xc7, 0xde, 0x95, 0xcb, 0x0d, 0xbe, 0x18, 0x38, 0xa7, 0x33, 0xd9, 0xe7, 0xb4, + 0x90, 0x86, 0x7d, 0x12, 0x4a, 0x5b, 0xbb, 0xae, 0xfd, 0xbc, 0x1f, 0xf9, 0xa2, 0xa3, 0x50, 0x70, + 0x42, 0xda, 0x09, 0x0c, 0x24, 0xfc, 0x50, 0x44, 0x90, 0x7f, 0x16, 0x60, 0x51, 0x93, 0x8d, 0x7f, + 0x90, 0x25, 0x59, 0x96, 0x53, 0x5d, 0x84, 0xd9, 0x06, 0xdb, 0x35, 0xbb, 0xae, 0x34, 0x00, 0x49, + 0xf1, 0x85, 0x7d, 0xd6, 0x75, 0x23, 0xf8, 0x45, 0x33, 0x22, 0xf0, 0x36, 0x14, 0x83, 0x90, 0x27, + 0x45, 0xcd, 0x5d, 0x01, 0xbc, 0x54, 0xff, 0xfc, 0x74, 0x9b, 0xce, 0xa1, 0x6f, 0x49, 0x8e, 0x66, + 0xcc, 0x1b, 0xdf, 0xe1, 0x2e, 0x38, 0xf2, 0xcb, 0x81, 0x31, 0xb7, 0x9c, 0xaf, 0x94, 0xea, 0x5b, + 0xd3, 0x2f, 0xf4, 0xbc, 0xcf, 0x13, 0x3a, 0x2d, 0xe0, 0x9a, 0xc9, 0x2a, 0xdc, 0xeb, 0x77, 0xa4, + 0x3b, 0x0b, 0x64, 0xf2, 0x92, 0x0c, 0xe0, 0x2f, 0x42, 0xc1, 0x71, 0xb7, 0xbd, 0xc0, 0x98, 0x17, + 0x60, 0x9e, 0x9e, 0x0e, 0xcc, 0x86, 0xbb, 0xed, 0x99, 0x11, 0x43, 0x7c, 0x07, 0x0e, 0x32, 0x1a, + 0xb2, 0x5d, 0xa5, 0x05, 0x03, 0x84, 0x5e, 0x9f, 0x9b, 0x6e, 0x05, 0x53, 0x67, 0x69, 0xa6, 0x57, + 0xc0, 0xab, 0x50, 0x0a, 0x12, 0x1b, 0x33, 0x4a, 0x62, 0x41, 0x23, 0xc5, 0x48, 0xb3, 0x41, 0x53, + 0x9f, 0x3c, 0x60, 0xdd, 0x07, 0xb2, 0xad, 0xfb, 0xe0, 0xd8, 0x20, 0x7c, 0x68, 0x82, 0x20, 0xbc, + 0xd0, 0x1f, 0x84, 0x3f, 0x42, 0xb0, 0x34, 0xe0, 0x9c, 0xb6, 0x7c, 0x9a, 0x79, 0x0c, 0x2c, 0x98, + 0x09, 0x7c, 0x6a, 0x0b, 0x57, 0x5d, 0xaa, 0x5f, 0xdb, 0x37, 0x6f, 0x25, 0xd6, 0x15, 0xac, 0xb3, + 0x1c, 0xea, 0x94, 0x7e, 0xe1, 0x47, 0x08, 0xfe, 0x5f, 0x5b, 0xf3, 0x86, 0x15, 0xda, 0xad, 0x2c, + 0x61, 0xf9, 0xf9, 0xe5, 0x73, 0x64, 0x1a, 0x11, 0x11, 0x5c, 0xab, 0xe2, 0xe1, 0xe6, 0xae, 0xcf, + 0x01, 0xf2, 0x37, 0xc9, 0xc0, 0x94, 0xb9, 0xde, 0x37, 0xd3, 0x7b, 0x22, 0xc3, 0xb3, 0x38, 0x6d, + 0xff, 0xfd, 0xa0, 0x41, 0xde, 0x4f, 0xe7, 0x60, 0x03, 0xf1, 0x7d, 0xb4, 0xe6, 0x96, 0x60, 0xde, + 0xd5, 0xb2, 0x6b, 0xa1, 0xa3, 0x78, 0x40, 0x64, 0xcc, 0x11, 0x2f, 0x99, 0x54, 0xe7, 0x44, 0xc6, + 0x9c, 0x0c, 0xe1, 0x15, 0x38, 0xac, 0x91, 0x6a, 0xaf, 0xf9, 0xb4, 0x81, 0x71, 0x71, 0x5b, 0x93, + 0xc8, 0x94, 0x83, 0x2e, 0x88, 0x44, 0xa2, 0x7f, 0x98, 0xfc, 0x0c, 0x41, 0xb9, 0x4f, 0x9e, 0x71, + 0x82, 0x1c, 0x82, 0x9c, 0xd3, 0x90, 0x89, 0x49, 0xce, 0x69, 0xec, 0xd1, 0xd5, 0xf7, 0x1b, 0xc3, + 0x6c, 0xb6, 0x31, 0xcc, 0xa5, 0x8d, 0xe1, 0xe3, 0x3e, 0xb8, 0xca, 0xe1, 0x4e, 0xae, 0x77, 0x94, + 0xd6, 0xfb, 0xe0, 0x6d, 0x26, 0x37, 0x70, 0x9b, 0x31, 0x60, 0xae, 0x17, 0xdf, 0x79, 0x45, 0xb2, + 0x26, 0x49, 0x2e, 0x62, 0x93, 0x79, 0x5d, 0x5f, 0x9a, 0x74, 0x44, 0x70, 0x14, 0x3b, 0x8e, 0xcb, + 0xef, 0x67, 0x02, 0x05, 0x7f, 0xde, 0xfb, 0x2d, 0x37, 0x25, 0xf6, 0xcf, 0x73, 0xf0, 0xa9, 0x21, + 0x62, 0x8f, 0x3d, 0xad, 0xf7, 0x86, 0xec, 0xb1, 0xcf, 0x98, 0x1b, 0xe9, 0x33, 0x8a, 0xe3, 0x7c, + 0xc6, 0x7c, 0xb6, 0xbe, 0x20, 0xad, 0xaf, 0x77, 0x11, 0x1c, 0x5b, 0x6b, 0x59, 0x6e, 0x93, 0x2a, + 0x43, 0x57, 0x5a, 0x32, 0x60, 0x4e, 0xf2, 0x50, 0x89, 0xb7, 0x24, 0xc7, 0xe8, 0xaa, 0x02, 0x0b, + 0x76, 0x97, 0x31, 0xea, 0x26, 0x27, 0x2a, 0xca, 0xd4, 0xfa, 0x87, 0xf9, 0x39, 0xf5, 0x79, 0x44, + 0xf1, 0xba, 0x41, 0x3c, 0x35, 0xf2, 0xc9, 0x03, 0xe3, 0xe4, 0x12, 0x2c, 0xf6, 0xc3, 0x94, 0x17, + 0x04, 0x3d, 0xb7, 0x42, 0xe9, 0x22, 0x03, 0xf9, 0x49, 0x0e, 0x96, 0x87, 0x58, 0xc3, 0xf8, 0x54, + 0xf4, 0x9e, 0x31, 0x87, 0x6d, 0x8f, 0xc9, 0x33, 0x50, 0x34, 0x23, 0x82, 0x7b, 0x11, 0x8f, 0xf9, + 0x2d, 0xcb, 0x15, 0xb6, 0x5f, 0x34, 0x25, 0x35, 0xa5, 0x21, 0x5c, 0x01, 0x43, 0xa9, 0xe7, 0xb2, + 0x1d, 0x05, 0x38, 0x66, 0x75, 0x68, 0x48, 0x59, 0x30, 0x2a, 0xbc, 0xf5, 0xac, 0x76, 0x57, 0x39, + 0xe8, 0x88, 0x20, 0x6f, 0xe6, 0xfa, 0xd9, 0x98, 0x5d, 0xf7, 0xde, 0x57, 0xf4, 0x22, 0xcc, 0x5a, + 0x02, 0xad, 0x3c, 0x78, 0x92, 0x1a, 0x50, 0x69, 0x31, 0x5b, 0xa5, 0xf3, 0x29, 0x95, 0xae, 0xe6, + 0x0c, 0x44, 0x3e, 0xca, 0x41, 0x79, 0x94, 0x42, 0x6e, 0xd5, 0xff, 0xd7, 0x54, 0x82, 0x2d, 0x30, + 0xd8, 0x08, 0x2b, 0x33, 0x40, 0x24, 0xf6, 0xa7, 0x53, 0x69, 0xc6, 0x28, 0x93, 0x34, 0x47, 0xb2, + 0x21, 0xdf, 0x40, 0x70, 0x3c, 0xfd, 0x59, 0xb0, 0xe9, 0x04, 0x61, 0xec, 0x2f, 0xb6, 0x61, 0x2e, + 0x12, 0x25, 0xba, 0xd2, 0x95, 0xea, 0x9b, 0xd3, 0x26, 0xfa, 0xa9, 0xdd, 0x55, 0xcc, 0xc9, 0x63, + 0xa9, 0x5a, 0x49, 0x12, 0x7f, 0x13, 0xb7, 0xa5, 0x2e, 0x37, 0xca, 0x6d, 0x29, 0x9a, 0xbc, 0x33, + 0x93, 0x4e, 0x35, 0xbd, 0xc6, 0xa6, 0xd7, 0xcc, 0x28, 0x4b, 0x66, 0x5b, 0x0c, 0xdf, 0x0d, 0xaf, + 0xa1, 0x55, 0x20, 0x15, 0xc9, 0xbf, 0xb3, 0x3d, 0x37, 0xb4, 0x1c, 0x97, 0x32, 0xe9, 0x79, 0x93, + 0x01, 0xbe, 0xd3, 0x81, 0xe3, 0xda, 0x74, 0x8b, 0xda, 0x9e, 0xdb, 0x08, 0x84, 0xc9, 0xe4, 0xcd, + 0xd4, 0x18, 0x7e, 0x16, 0xe6, 0x05, 0x7d, 0xd3, 0xe9, 0x44, 0x09, 0x4a, 0xa9, 0xbe, 0x52, 0x8d, + 0x5a, 0x05, 0x55, 0xbd, 0x55, 0x90, 0xe8, 0xb0, 0x43, 0x43, 0xab, 0xda, 0xbb, 0x58, 0xe5, 0x5f, + 0x98, 0xc9, 0xc7, 0x1c, 0x4b, 0x68, 0x39, 0xed, 0x4d, 0xc7, 0x15, 0x17, 0x4e, 0xbe, 0x54, 0x32, + 0xc0, 0xad, 0x71, 0x9b, 0xe7, 0x63, 0x77, 0x95, 0xcf, 0x8b, 0x28, 0xfe, 0x55, 0xd7, 0x0d, 0x9d, + 0xb6, 0x58, 0x3f, 0xb2, 0xb5, 0x64, 0x40, 0x7c, 0xe5, 0xb4, 0x43, 0xca, 0xa4, 0xb3, 0x93, 0x54, + 0x6c, 0xef, 0xa5, 0xa8, 0xfa, 0xad, 0x7c, 0x6d, 0x74, 0x32, 0x0e, 0xe8, 0x27, 0xa3, 0xff, 0xb4, + 0x1d, 0x1c, 0x52, 0xc2, 0x15, 0xcd, 0x80, 0x28, 0x5c, 0x19, 0x87, 0xa2, 0x2b, 0x87, 0xa2, 0x07, + 0x4e, 0xcb, 0x42, 0xf6, 0x69, 0x39, 0x9c, 0x3e, 0x2d, 0xe2, 0x46, 0x1c, 0xda, 0xad, 0x35, 0x2b, + 0xa0, 0xc6, 0x11, 0xc1, 0x3a, 0x19, 0x20, 0xbf, 0x43, 0x50, 0xdc, 0xf4, 0x9a, 0x57, 0xdd, 0x90, + 0xed, 0x8a, 0xda, 0x89, 0xe7, 0x86, 0xd4, 0x8d, 0xcb, 0x64, 0x92, 0xe4, 0x5b, 0x14, 0x3a, 0x1d, + 0xba, 0x15, 0x5a, 0x1d, 0x5f, 0xde, 0xbc, 0xf6, 0xb4, 0x45, 0xf1, 0xc7, 0x5c, 0x6d, 0x6d, 0x2b, + 0x08, 0x85, 0xcb, 0x29, 0x9a, 0xe2, 0x99, 0x0b, 0x18, 0x4f, 0xd8, 0x0a, 0x99, 0xf4, 0x37, 0xa9, + 0x31, 0xdd, 0x00, 0x0b, 0x11, 0x36, 0x49, 0x92, 0x0e, 0xdc, 0x1f, 0x97, 0x04, 0x6e, 0x52, 0xd6, + 0x71, 0x5c, 0x2b, 0x3b, 0x2e, 0x4f, 0xd0, 0xa3, 0xc8, 0xa8, 0x48, 0x79, 0xa9, 0x23, 0xc9, 0x6f, + 0xd8, 0xb7, 0x1d, 0xb7, 0xe1, 0xdd, 0xcd, 0x38, 0x5a, 0xd3, 0x2d, 0xf8, 0xe7, 0x74, 0x9b, 0x41, + 0x5b, 0x31, 0xf6, 0x03, 0xcf, 0xc2, 0x41, 0xee, 0x31, 0x7a, 0x54, 0xbe, 0x90, 0x4e, 0x89, 0x8c, + 0xaa, 0xf8, 0x26, 0x3c, 0xcc, 0xf4, 0x87, 0x78, 0x13, 0x16, 0xac, 0x20, 0x70, 0x9a, 0x2e, 0x6d, + 0x28, 0x5e, 0xb9, 0x89, 0x79, 0xf5, 0x7f, 0x1a, 0x15, 0xe3, 0xc4, 0x0c, 0xb9, 0xdf, 0x8a, 0x24, + 0x5f, 0x47, 0x70, 0x6c, 0x28, 0x93, 0xf8, 0x5c, 0x21, 0x2d, 0x8e, 0x94, 0xa1, 0x18, 0xd8, 0x2d, + 0xda, 0xe8, 0xb6, 0x55, 0xaa, 0x10, 0xd3, 0xfc, 0x5d, 0xa3, 0x1b, 0xed, 0xbe, 0x8c, 0x63, 0x31, + 0x8d, 0x4f, 0x00, 0x74, 0x2c, 0xb7, 0x6b, 0xb5, 0x05, 0x84, 0x19, 0x01, 0x41, 0x1b, 0x21, 0x4b, + 0x50, 0x1e, 0x66, 0x3a, 0xb2, 0x50, 0xfd, 0x0f, 0x04, 0x87, 0x94, 0xcb, 0x95, 0xbb, 0x5b, 0x81, + 0x05, 0x4d, 0x0d, 0x5a, 0x5e, 0xdb, 0x3f, 0x3c, 0xc6, 0x9d, 0x2a, 0x2b, 0xc9, 0xa7, 0x3b, 0x85, + 0xbd, 0x54, 0xaf, 0x6f, 0xe2, 0x80, 0x8b, 0xf6, 0xe9, 0xde, 0xf3, 0x35, 0x30, 0xae, 0x59, 0xae, + 0xd5, 0xa4, 0x8d, 0x58, 0xec, 0xd8, 0xc4, 0x5e, 0xd2, 0x4b, 0x98, 0x53, 0x17, 0x0c, 0xe3, 0x24, + 0xda, 0xd9, 0xde, 0x56, 0xe5, 0x50, 0x06, 0xc5, 0x4d, 0xc7, 0xdd, 0xd9, 0x70, 0xb7, 0x3d, 0x2e, + 0x71, 0xe8, 0x84, 0x6d, 0xa5, 0xdd, 0x88, 0xc0, 0x87, 0x21, 0xdf, 0x65, 0x6d, 0x69, 0x01, 0xfc, + 0x91, 0xdf, 0xe3, 0x1b, 0x34, 0xb0, 0x99, 0xe3, 0x87, 0xc9, 0x1d, 0x41, 0x1f, 0xe2, 0xfb, 0xe0, + 0xd8, 0x9e, 0xbb, 0xd6, 0xb6, 0x82, 0x40, 0x85, 0xa7, 0x78, 0x80, 0x3c, 0x01, 0x07, 0xf9, 0x9a, + 0x89, 0x98, 0x67, 0xd3, 0x62, 0x1e, 0x4b, 0xc1, 0x57, 0xf0, 0x14, 0x62, 0x0b, 0xee, 0xe3, 0x59, + 0xc1, 0x65, 0xdf, 0x97, 0x4c, 0x26, 0x4c, 0x51, 0xf3, 0xc3, 0xa2, 0xeb, 0xd0, 0x86, 0x4f, 0xfd, + 0x83, 0x33, 0x80, 0xf5, 0x73, 0x42, 0x59, 0xcf, 0xb1, 0x29, 0xfe, 0x0e, 0x82, 0x19, 0xbe, 0x34, + 0x7e, 0x60, 0xd4, 0xb1, 0x14, 0xf6, 0x5a, 0xde, 0xbf, 0xf2, 0x18, 0x5f, 0x8d, 0x2c, 0xbd, 0xf6, + 0x97, 0xbf, 0x7d, 0x37, 0xb7, 0x88, 0x8f, 0x8a, 0x36, 0x7f, 0xef, 0xa2, 0xde, 0x72, 0x0f, 0xf0, + 0x1b, 0x08, 0xb0, 0xcc, 0x92, 0xb4, 0x46, 0x28, 0x3e, 0x3b, 0x0a, 0xe2, 0x90, 0x86, 0x69, 0xf9, + 0x01, 0x2d, 0xaa, 0x54, 0x6d, 0x8f, 0x51, 0x1e, 0x43, 0xc4, 0x04, 0x01, 0x60, 0x45, 0x00, 0x38, + 0x85, 0xc9, 0x30, 0x00, 0xb5, 0x57, 0xb8, 0x46, 0x5f, 0xad, 0xd1, 0x68, 0xdd, 0xb7, 0x11, 0x14, + 0x6e, 0x8b, 0xbb, 0xef, 0x18, 0x25, 0x6d, 0xed, 0x9b, 0x92, 0xc4, 0x72, 0x02, 0x2d, 0x39, 0x29, + 0x90, 0x3e, 0x80, 0x8f, 0x2b, 0xa4, 0x41, 0xc8, 0xa8, 0xd5, 0x49, 0x01, 0xbe, 0x80, 0xf0, 0xbb, + 0x08, 0x66, 0xa3, 0x96, 0x12, 0x3e, 0x3d, 0x0a, 0x65, 0xaa, 0xe5, 0x54, 0xde, 0xbf, 0x52, 0x1b, + 0x79, 0x58, 0x60, 0x3c, 0x49, 0x86, 0x6e, 0xe7, 0x6a, 0xaa, 0x7b, 0xf3, 0x16, 0x82, 0xfc, 0x3a, + 0x1d, 0x6b, 0x6f, 0xfb, 0x08, 0x6e, 0x40, 0x81, 0x43, 0xb6, 0x1a, 0xbf, 0x83, 0xe0, 0xfe, 0x75, + 0x1a, 0x0e, 0x0f, 0x8f, 0xb8, 0x32, 0x3e, 0x66, 0x49, 0xb3, 0x3b, 0x3b, 0xc1, 0xcc, 0x38, 0x2e, + 0xd4, 0x04, 0xb2, 0x87, 0xf1, 0x99, 0x2c, 0x23, 0x0c, 0x76, 0x5d, 0xfb, 0xae, 0xc4, 0xf1, 0x27, + 0x04, 0x87, 0xfb, 0x7f, 0xf0, 0x80, 0x49, 0xdf, 0x1d, 0x65, 0xc8, 0xef, 0x21, 0xca, 0xd7, 0xa7, + 0xf5, 0xb2, 0x69, 0xa6, 0xe4, 0xb2, 0x40, 0xfe, 0x38, 0x7e, 0x2c, 0x0b, 0x79, 0x5c, 0x9f, 0xaf, + 0xbd, 0xa2, 0x1e, 0x5f, 0x15, 0x3f, 0xce, 0x11, 0xb0, 0xdf, 0x47, 0x70, 0x54, 0xf1, 0x5d, 0x6b, + 0x59, 0x2c, 0xbc, 0x42, 0x79, 0x86, 0x1d, 0x4c, 0x24, 0xcf, 0x94, 0x51, 0x43, 0x5f, 0x8f, 0x5c, + 0x15, 0xb2, 0x3c, 0x85, 0x9f, 0xdc, 0xb3, 0x2c, 0x36, 0x67, 0xd3, 0x90, 0xb0, 0xdf, 0x43, 0x70, + 0x68, 0x9d, 0x86, 0xcf, 0xaf, 0x6d, 0xec, 0x69, 0x67, 0xa6, 0x34, 0x74, 0x6d, 0x39, 0x72, 0x45, + 0x08, 0xf2, 0x59, 0xfc, 0xc4, 0x9e, 0x05, 0xf1, 0x6c, 0x27, 0xde, 0x97, 0xd7, 0x10, 0x1c, 0x58, + 0xa7, 0xe1, 0xb5, 0xb8, 0xd7, 0x75, 0x7a, 0xa2, 0x76, 0x7f, 0x79, 0xa9, 0xaa, 0xfd, 0xb6, 0x49, + 0xbd, 0x8a, 0x4d, 0xfd, 0xbc, 0xc0, 0x76, 0x06, 0x9f, 0xce, 0xc2, 0x96, 0xf4, 0xd7, 0xde, 0x46, + 0x70, 0x4c, 0x07, 0x91, 0xfc, 0x4c, 0xe2, 0xd3, 0x7b, 0xfb, 0xf1, 0x81, 0xfc, 0x09, 0xc3, 0x18, + 0x74, 0x75, 0x81, 0xee, 0x1c, 0x19, 0x7e, 0x10, 0x3b, 0x03, 0x28, 0x56, 0xd1, 0x4a, 0x05, 0xe1, + 0xdf, 0x23, 0x98, 0x8d, 0x5a, 0x4d, 0xa3, 0x75, 0x94, 0xea, 0x93, 0xef, 0xa7, 0x57, 0x93, 0x56, + 0x5b, 0xbe, 0x30, 0x5c, 0xa1, 0xfa, 0xf7, 0x6a, 0x6b, 0xab, 0x42, 0xcb, 0x69, 0x77, 0xfc, 0x2b, + 0x04, 0x90, 0xb4, 0xcb, 0xf0, 0xc3, 0xd9, 0x72, 0x68, 0x2d, 0xb5, 0xf2, 0xfe, 0x36, 0xcc, 0x48, + 0x55, 0xc8, 0x53, 0x29, 0x2f, 0x67, 0xfa, 0x42, 0x9f, 0xda, 0xab, 0x51, 0x6b, 0xed, 0xc7, 0x08, + 0x0a, 0xa2, 0x8e, 0x8e, 0x4f, 0x8d, 0xc2, 0xac, 0x97, 0xd9, 0xf7, 0x53, 0xf5, 0x0f, 0x09, 0xa8, + 0xcb, 0xf5, 0xac, 0x80, 0xb2, 0x8a, 0x56, 0x70, 0x0f, 0x66, 0xa3, 0xda, 0xee, 0x68, 0xf3, 0x48, + 0xd5, 0x7e, 0xcb, 0xcb, 0x19, 0x09, 0x4e, 0x64, 0xa8, 0x32, 0x96, 0xad, 0x8c, 0x8b, 0x65, 0x33, + 0x3c, 0xdc, 0xe0, 0x93, 0x59, 0xc1, 0xe8, 0x3f, 0xa0, 0x98, 0xb3, 0x02, 0xdd, 0x69, 0xb2, 0x3c, + 0x2e, 0x9e, 0x71, 0xed, 0x7c, 0x0f, 0xc1, 0xe1, 0xfe, 0x4b, 0x02, 0x3e, 0x3e, 0xb4, 0xde, 0x26, + 0x63, 0x6b, 0x5a, 0x8b, 0xa3, 0x2e, 0x18, 0xe4, 0x73, 0x02, 0xc5, 0x2a, 0x7e, 0x74, 0xec, 0xc9, + 0xb8, 0xae, 0xbc, 0x0e, 0x67, 0x74, 0x3e, 0xe9, 0xfd, 0xff, 0x1a, 0xc1, 0x01, 0xc5, 0xf7, 0x26, + 0xa3, 0x34, 0x1b, 0xd6, 0xfe, 0x1d, 0x04, 0xbe, 0x16, 0x79, 0x42, 0xc0, 0xff, 0x0c, 0xbe, 0x34, + 0x21, 0x7c, 0x05, 0xfb, 0x7c, 0xc8, 0x91, 0xfe, 0x01, 0xc1, 0x91, 0xdb, 0x91, 0xdd, 0x7f, 0x42, + 0xf8, 0xd7, 0x04, 0xfe, 0x27, 0xf1, 0xe3, 0x19, 0xf9, 0xea, 0x38, 0x31, 0x2e, 0x20, 0xfc, 0x0b, + 0x04, 0x45, 0xd5, 0xd5, 0xc4, 0x67, 0x46, 0x1e, 0x8c, 0x74, 0xdf, 0x73, 0x3f, 0x8d, 0x59, 0x26, + 0x67, 0xe4, 0x54, 0x66, 0x34, 0x95, 0xeb, 0x73, 0x83, 0x7e, 0x0b, 0x01, 0x8e, 0xef, 0xfe, 0x71, + 0x35, 0x00, 0x3f, 0x94, 0x5a, 0x6a, 0x64, 0x81, 0xa9, 0x7c, 0x66, 0xec, 0xbc, 0x74, 0x28, 0x5d, + 0xc9, 0x0c, 0xa5, 0x5e, 0xbc, 0xfe, 0x9b, 0x08, 0x4a, 0xeb, 0x34, 0xbe, 0x4b, 0x65, 0xe8, 0x32, + 0xdd, 0x94, 0x2d, 0x57, 0xc6, 0x4f, 0x94, 0x88, 0xce, 0x09, 0x44, 0x0f, 0xe1, 0x6c, 0x55, 0x29, + 0x00, 0xdf, 0x47, 0x70, 0xf0, 0x86, 0x6e, 0xa2, 0xf8, 0xdc, 0xb8, 0x95, 0x52, 0x9e, 0x7c, 0x72, + 0x5c, 0x8f, 0x08, 0x5c, 0xe7, 0xc9, 0x44, 0xb8, 0x56, 0x65, 0x7f, 0xf3, 0x87, 0x28, 0xba, 0x8c, + 0xf7, 0x55, 0xed, 0xff, 0x5d, 0xbd, 0x65, 0x14, 0xff, 0xc9, 0x25, 0x81, 0xaf, 0x8a, 0xcf, 0x4d, + 0x82, 0xaf, 0x26, 0x4b, 0xf9, 0xf8, 0x07, 0x08, 0x8e, 0x88, 0xb6, 0x8d, 0xce, 0x18, 0x67, 0x75, + 0x2a, 0x92, 0x26, 0xcf, 0x04, 0x21, 0xe6, 0xa9, 0xc8, 0xff, 0x90, 0x3d, 0x81, 0x5a, 0x95, 0x0d, + 0x99, 0xd7, 0x73, 0x88, 0xef, 0xef, 0x7d, 0x03, 0xf8, 0x6e, 0xd5, 0xfb, 0x14, 0x38, 0xba, 0x0d, + 0x35, 0x01, 0xc6, 0x55, 0x81, 0xf1, 0x12, 0xa9, 0xed, 0x05, 0x63, 0xad, 0x57, 0xe7, 0xc7, 0xf4, + 0x5b, 0x08, 0x0e, 0xa9, 0xb0, 0x2b, 0xed, 0xef, 0xfc, 0xb8, 0xad, 0xdd, 0x6b, 0x98, 0x96, 0x07, + 0x62, 0x65, 0xb2, 0x03, 0xf1, 0x2e, 0x82, 0x39, 0xd9, 0x55, 0xc9, 0x48, 0x66, 0xb4, 0xb6, 0x4b, + 0xb9, 0xaf, 0x9a, 0x24, 0xcb, 0xee, 0xe4, 0x4b, 0x62, 0xd9, 0x17, 0x70, 0xa6, 0x5a, 0x7c, 0xaf, + 0x11, 0xd4, 0x5e, 0x91, 0x35, 0xef, 0x57, 0x6b, 0x6d, 0xaf, 0x19, 0xbc, 0x48, 0x70, 0x66, 0xc8, + 0xe6, 0x73, 0x2e, 0x20, 0x1c, 0xc2, 0x3c, 0x37, 0x5f, 0x51, 0xa2, 0xc2, 0xcb, 0x7d, 0x05, 0xad, + 0x81, 0xea, 0x55, 0xb9, 0x3c, 0x50, 0xf2, 0x4a, 0x62, 0xb4, 0x2c, 0x18, 0xe0, 0x07, 0x33, 0x97, + 0x15, 0x0b, 0xbd, 0x81, 0xe0, 0x88, 0x7e, 0x1e, 0xa3, 0xe5, 0x27, 0x3e, 0x8d, 0x59, 0x28, 0x64, + 0xda, 0x8f, 0x57, 0x26, 0x32, 0xa3, 0x08, 0xce, 0xeb, 0x08, 0x8e, 0xac, 0xd3, 0x30, 0xdd, 0xfe, + 0xef, 0xbb, 0xe9, 0x0d, 0xfd, 0x09, 0x43, 0xf9, 0x64, 0xe6, 0x1c, 0x09, 0x29, 0xab, 0x2e, 0xc5, + 0xef, 0x9b, 0xda, 0x37, 0x4f, 0x3f, 0xf3, 0xc7, 0x0f, 0x4f, 0xa0, 0x0f, 0x3e, 0x3c, 0x81, 0xfe, + 0xfa, 0xe1, 0x09, 0xf4, 0xe2, 0xa3, 0x93, 0xfd, 0x77, 0x8b, 0xdd, 0x76, 0xa8, 0x1b, 0xea, 0x6c, + 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0x92, 0x89, 0xa1, 0xd6, 0xc3, 0x33, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3660,6 +3663,8 @@ type ApplicationServiceClient interface { ListLinks(ctx context.Context, in *ListAppLinksRequest, opts ...grpc.CallOption) (*LinksResponse, error) // ListResourceLinks returns the list of all resource deep links ListResourceLinks(ctx context.Context, in *ApplicationResourceRequest, opts ...grpc.CallOption) (*LinksResponse, error) + // pass change revision request to the repo-server, required for acr controller + GetChangeRevision(ctx context.Context, in *ChangeRevisionRequest, opts ...grpc.CallOption) (*ChangeRevisionResponse, error) } type applicationServiceClient struct { @@ -4035,6 +4040,15 @@ func (c *applicationServiceClient) ListResourceLinks(ctx context.Context, in *Ap return out, nil } +func (c *applicationServiceClient) GetChangeRevision(ctx context.Context, in *ChangeRevisionRequest, opts ...grpc.CallOption) (*ChangeRevisionResponse, error) { + out := new(ChangeRevisionResponse) + err := c.cc.Invoke(ctx, "/application.ApplicationService/GetChangeRevision", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ApplicationServiceServer is the server API for ApplicationService service. type ApplicationServiceServer interface { // List returns list of applications @@ -4100,6 +4114,8 @@ type ApplicationServiceServer interface { ListLinks(context.Context, *ListAppLinksRequest) (*LinksResponse, error) // ListResourceLinks returns the list of all resource deep links ListResourceLinks(context.Context, *ApplicationResourceRequest) (*LinksResponse, error) + // pass change revision request to the repo-server, required for acr controller + GetChangeRevision(context.Context, *ChangeRevisionRequest) (*ChangeRevisionResponse, error) } // UnimplementedApplicationServiceServer can be embedded to have forward compatible implementations. @@ -4196,6 +4212,9 @@ func (*UnimplementedApplicationServiceServer) ListLinks(ctx context.Context, req func (*UnimplementedApplicationServiceServer) ListResourceLinks(ctx context.Context, req *ApplicationResourceRequest) (*LinksResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListResourceLinks not implemented") } +func (*UnimplementedApplicationServiceServer) GetChangeRevision(ctx context.Context, req *ChangeRevisionRequest) (*ChangeRevisionResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetChangeRevision not implemented") +} func RegisterApplicationServiceServer(s *grpc.Server, srv ApplicationServiceServer) { s.RegisterService(&_ApplicationService_serviceDesc, srv) @@ -4758,6 +4777,24 @@ func _ApplicationService_ListResourceLinks_Handler(srv interface{}, ctx context. return interceptor(ctx, in, info, handler) } +func _ApplicationService_GetChangeRevision_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ChangeRevisionRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ApplicationServiceServer).GetChangeRevision(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/application.ApplicationService/GetChangeRevision", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ApplicationServiceServer).GetChangeRevision(ctx, req.(*ChangeRevisionRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _ApplicationService_serviceDesc = grpc.ServiceDesc{ ServiceName: "application.ApplicationService", HandlerType: (*ApplicationServiceServer)(nil), @@ -4866,6 +4903,10 @@ var _ApplicationService_serviceDesc = grpc.ServiceDesc{ MethodName: "ListResourceLinks", Handler: _ApplicationService_ListResourceLinks_Handler, }, + { + MethodName: "GetChangeRevision", + Handler: _ApplicationService_GetChangeRevision_Handler, + }, }, Streams: []grpc.StreamDesc{ { diff --git a/pkg/apiclient/application/application.pb.gw.go b/pkg/apiclient/application/application.pb.gw.go index 80c8dec506be6..61452d3b213c0 100644 --- a/pkg/apiclient/application/application.pb.gw.go +++ b/pkg/apiclient/application/application.pb.gw.go @@ -2192,6 +2192,42 @@ func local_request_ApplicationService_ListResourceLinks_0(ctx context.Context, m } +var ( + filter_ApplicationService_GetChangeRevision_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_ApplicationService_GetChangeRevision_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ChangeRevisionRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ApplicationService_GetChangeRevision_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.GetChangeRevision(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_ApplicationService_GetChangeRevision_0(ctx context.Context, marshaler runtime.Marshaler, server ApplicationServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ChangeRevisionRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ApplicationService_GetChangeRevision_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.GetChangeRevision(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterApplicationServiceHandlerServer registers the http handlers for service ApplicationService to "mux". // UnaryRPC :call ApplicationServiceServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -2831,6 +2867,29 @@ func RegisterApplicationServiceHandlerServer(ctx context.Context, mux *runtime.S }) + mux.Handle("GET", pattern_ApplicationService_GetChangeRevision_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_GetChangeRevision_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_GetChangeRevision_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -3492,6 +3551,26 @@ func RegisterApplicationServiceHandlerClient(ctx context.Context, mux *runtime.S }) + mux.Handle("GET", pattern_ApplicationService_GetChangeRevision_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_GetChangeRevision_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_GetChangeRevision_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -3557,6 +3636,8 @@ var ( pattern_ApplicationService_ListLinks_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", "links"}, "", runtime.AssumeColonVerbOpt(true))) pattern_ApplicationService_ListResourceLinks_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 2, 5}, []string{"api", "v1", "applications", "name", "resource", "links"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_ApplicationService_GetChangeRevision_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "application", "changeRevision"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( @@ -3621,4 +3702,6 @@ var ( forward_ApplicationService_ListLinks_0 = runtime.ForwardResponseMessage forward_ApplicationService_ListResourceLinks_0 = runtime.ForwardResponseMessage + + forward_ApplicationService_GetChangeRevision_0 = runtime.ForwardResponseMessage ) diff --git a/server/application/application.proto b/server/application/application.proto index 24dffca27bc62..c1449b5d8cc70 100644 --- a/server/application/application.proto +++ b/server/application/application.proto @@ -562,4 +562,9 @@ service ApplicationService { rpc ListResourceLinks(ApplicationResourceRequest) returns (LinksResponse) { option (google.api.http).get = "/api/v1/applications/{name}/resource/links"; } + + // pass change revision request to the repo-server, required for acr controller + rpc GetChangeRevision(ChangeRevisionRequest) returns (ChangeRevisionResponse) { + option (google.api.http).get = "/api/v1/application/changeRevision"; + } } \ No newline at end of file From a562cf8b49700581a765dc3aaf83b704d1f002e2 Mon Sep 17 00:00:00 2001 From: Eugene Doudine Date: Mon, 22 Sep 2025 18:12:19 +0300 Subject: [PATCH 2/5] fix: update swagger file with changeRevision method added Signed-off-by: Eugene Doudine --- assets/swagger.json | 53 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/assets/swagger.json b/assets/swagger.json index a5f1c192f42a6..8492f93da663f 100644 --- a/assets/swagger.json +++ b/assets/swagger.json @@ -218,6 +218,51 @@ } } }, + "/api/v1/application/changeRevision": { + "get": { + "tags": [ + "ApplicationService" + ], + "summary": "pass change revision request to the repo-server, required for acr controller", + "operationId": "ApplicationService_GetChangeRevision", + "parameters": [ + { + "type": "string", + "name": "appName", + "in": "query" + }, + { + "type": "string", + "name": "namespace", + "in": "query" + }, + { + "type": "string", + "name": "currentRevision", + "in": "query" + }, + { + "type": "string", + "name": "previousRevision", + "in": "query" + } + ], + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/applicationChangeRevisionResponse" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/runtimeError" + } + } + } + } + }, "/api/v1/applications": { "get": { "tags": [ @@ -5120,6 +5165,14 @@ } } }, + "applicationChangeRevisionResponse": { + "type": "object", + "properties": { + "revision": { + "type": "string" + } + } + }, "applicationFileChunk": { "type": "object", "properties": { From 7a6cc3d5a2d7a32abda20b125ef7d7c52966e2ae Mon Sep 17 00:00:00 2001 From: Eugene Doudine Date: Tue, 23 Sep 2025 16:40:53 +0300 Subject: [PATCH 3/5] fix: restore changed imports order Signed-off-by: Eugene Doudine --- pkg/apiclient/application/application.pb.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go index 36bf6512593cd..2638b216f76ea 100644 --- a/pkg/apiclient/application/application.pb.go +++ b/pkg/apiclient/application/application.pb.go @@ -10,10 +10,6 @@ package application import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - v1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" apiclient "github.com/argoproj/argo-cd/v3/reposerver/apiclient" github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" @@ -22,8 +18,11 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" v11 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. From db1b6f60f88e5fca6da4326cc5035007bee8595a Mon Sep 17 00:00:00 2001 From: Eugene Doudine Date: Thu, 25 Sep 2025 16:58:45 +0300 Subject: [PATCH 4/5] feat: support for monorepo-controller compatible annotations Signed-off-by: Eugene Doudine --- acr_controller/controller/controller.go | 6 +- acr_controller/server.go | 3 +- acr_controller/service/acr_service.go | 126 +++++++++++++----- acr_controller/service/acr_service_test.go | 6 +- .../application_change_revision_controller.go | 3 + 5 files changed, 104 insertions(+), 40 deletions(-) diff --git a/acr_controller/controller/controller.go b/acr_controller/controller/controller.go index b880b94f01243..dc08173cdd0a9 100644 --- a/acr_controller/controller/controller.go +++ b/acr_controller/controller/controller.go @@ -24,9 +24,10 @@ type ACRController interface { type applicationChangeRevisionController struct { appBroadcaster Broadcaster acrService service.ACRService + useAnnotations bool } -func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInformer, applicationServiceClient appclient.ApplicationClient, applicationClientset appclientset.Interface) ACRController { +func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInformer, applicationServiceClient appclient.ApplicationClient, applicationClientset appclientset.Interface, useAnnotations bool) ACRController { appBroadcaster := NewBroadcaster() _, err := appInformer.AddEventHandler(appBroadcaster) if err != nil { @@ -35,6 +36,7 @@ func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInforme return &applicationChangeRevisionController{ appBroadcaster: appBroadcaster, acrService: service.NewACRService(applicationClientset, applicationServiceClient), + useAnnotations: useAnnotations, } } @@ -46,7 +48,7 @@ func (c *applicationChangeRevisionController) Run(ctx context.Context) { return nil // ignore this event } - return c.acrService.ChangeRevision(ctx, &a) + return c.acrService.ChangeRevision(ctx, &a, c.useAnnotations) } // TODO: move to abstraction diff --git a/acr_controller/server.go b/acr_controller/server.go index 30d5000b116a6..59fe446d2f8b6 100644 --- a/acr_controller/server.go +++ b/acr_controller/server.go @@ -54,6 +54,7 @@ type ACRServerOpts struct { ApplicationNamespaces []string BaseHRef string RootPath string + DisableAnnotations bool } type handlerSwitcher struct { @@ -96,7 +97,7 @@ func (a *ACRServer) Init(ctx context.Context) { } func (a *ACRServer) RunController(ctx context.Context) { - controller := acr_controller.NewApplicationChangeRevisionController(a.appInformer, a.ApplicationServiceClient, a.applicationClientset) + controller := acr_controller.NewApplicationChangeRevisionController(a.appInformer, a.ApplicationServiceClient, a.applicationClientset, !a.DisableAnnotations) go controller.Run(ctx) } diff --git a/acr_controller/service/acr_service.go b/acr_controller/service/acr_service.go index bd4c7b60997f1..9a1a105543ee5 100644 --- a/acr_controller/service/acr_service.go +++ b/acr_controller/service/acr_service.go @@ -3,6 +3,7 @@ package service import ( "context" "encoding/json" + "fmt" "sync" log "github.com/sirupsen/logrus" @@ -16,8 +17,15 @@ import ( appclientset "github.com/argoproj/argo-cd/v3/pkg/client/clientset/versioned" ) +const ( + CHANGE_REVISION_ANN = "mrp-controller.argoproj.io/change-revision" + CHANGE_REVISIONS_ANN = "mrp-controller.argoproj.io/change-revisions" + GIT_REVISION_ANN = "mrp-controller.argoproj.io/git-revision" + GIT_REVISIONS_ANN = "mrp-controller.argoproj.io/git-revisions" +) + type ACRService interface { - ChangeRevision(ctx context.Context, application *application.Application) error + ChangeRevision(ctx context.Context, application *application.Application, useAnnotations bool) error } type acrService struct { @@ -55,7 +63,7 @@ func getChangeRevision(app *application.Application) string { return "" } -func (c *acrService) ChangeRevision(ctx context.Context, a *application.Application) error { +func (c *acrService) ChangeRevision(ctx context.Context, a *application.Application, useAnnotations bool) error { c.lock.Lock() defer c.lock.Unlock() @@ -73,36 +81,96 @@ func (c *acrService) ChangeRevision(ctx context.Context, a *application.Applicat return nil } - revision, err := c.calculateRevision(ctx, app) + currentRevision, previousRevision := c.getRevisions(ctx, a) + revision, err := c.calculateRevision(ctx, app, currentRevision, previousRevision) if err != nil { return err } + var revisions []string if revision == nil || *revision == "" { c.logger.Infof("Revision for application %s is empty", app.Name) - return nil + } else { + c.logger.Infof("Change revision for application %s is %s", app.Name, *revision) + revisions = []string{*revision} } - c.logger.Infof("Change revision for application %s is %s", app.Name, *revision) - app, err = c.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(ctx, app.Name, metav1.GetOptions{}) if err != nil { return err } - revisions := []string{*revision} + patchMap := make(map[string]any, 2) - if app.Status.OperationState != nil && app.Status.OperationState.Operation.Sync != nil { - c.logger.Infof("Patch operation status for application %s", app.Name) - return c.patchOperationSyncResultWithChangeRevision(ctx, app, revisions) + if len(revisions) > 0 { + if app.Status.OperationState != nil && app.Status.OperationState.Operation.Sync != nil { + c.logger.Infof("Patch operation status for application %s", app.Name) + patchMap = c.patchOperationSyncResultWithChangeRevision(ctx, app, revisions) + } else { + c.logger.Infof("Patch operation for application %s", app.Name) + patchMap = c.patchOperationWithChangeRevision(ctx, app, revisions) + } + } + if useAnnotations { + err = c.addAnnotationPatch(patchMap, app, *revision, revisions, currentRevision, []string{currentRevision}) + if err != nil { + return err + } } + if len(patchMap) > 0 { + c.logger.Infof("patching resource: %v", patchMap) + patch, err := json.Marshal(patchMap) + if err != nil { + return err + } + _, err = c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) + return err + } else { + c.logger.Infof("no patch needed") + return nil + } +} - c.logger.Infof("Patch operation for application %s", app.Name) - return c.patchOperationWithChangeRevision(ctx, app, revisions) +func addPatchIfNeeded(annotations map[string]string, currentAnnotations map[string]string, key string, val string) { + currentVal, ok := currentAnnotations[key] + if !ok || currentVal != val { + annotations[key] = val + } } -func (c *acrService) calculateRevision(ctx context.Context, a *application.Application) (*string, error) { - currentRevision, previousRevision := c.getRevisions(ctx, a) +func (c *acrService) addAnnotationPatch(m map[string]any, + a *application.Application, + changeRevision string, + changeRevisions []string, + gitRevision string, + gitRevisions []string) error { + c.logger.Infof("annotating application '%s', changeRevision=%s, changeRevisions=%v, gitRevision=%s, gitRevisions=%v", a.Name, changeRevision, changeRevisions, gitRevision, gitRevisions) + annotations := map[string]string{} + currentAnnotations := a.Annotations + + changeRevisionsJson, err := json.Marshal(changeRevisions) + if err != nil { + return fmt.Errorf("Failed to marshall changeRevisions %v: %v", changeRevisions, err) + } + gitRevisionsJson, err := json.Marshal(gitRevisions) + if err != nil { + return fmt.Errorf("Failed to marshall gitRevisions %v: %v", gitRevisions, err) + } + + addPatchIfNeeded(annotations, currentAnnotations, CHANGE_REVISION_ANN, changeRevision) + addPatchIfNeeded(annotations, currentAnnotations, CHANGE_REVISIONS_ANN, string(changeRevisionsJson)) + addPatchIfNeeded(annotations, currentAnnotations, GIT_REVISION_ANN, gitRevision) + addPatchIfNeeded(annotations, currentAnnotations, GIT_REVISIONS_ANN, string(gitRevisionsJson)) + + if len(annotations) == 0 { + c.logger.Info("no need to add annotations") + } + c.logger.Infof("added annotations to application %s patch: %v", a.Name, annotations) + m["metadata"] = map[string]any{"annotations": annotations} + return nil +} + +func (c *acrService) calculateRevision(ctx context.Context, a *application.Application, currentRevision string, previousRevision string) (*string, error) { c.logger.Infof("Calculate revision for application '%s', current revision '%s', previous revision '%s'", a.Name, currentRevision, previousRevision) changeRevisionResult, err := c.applicationServiceClient.GetChangeRevision(ctx, &appclient.ChangeRevisionRequest{ AppName: ptr.To(a.GetName()), @@ -116,33 +184,28 @@ func (c *acrService) calculateRevision(ctx context.Context, a *application.Appli return changeRevisionResult.Revision, nil } -func (c *acrService) patchOperationWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) error { +func (c *acrService) patchOperationWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) map[string]any { if len(revisions) == 1 { - patch, _ := json.Marshal(map[string]any{ + return map[string]any{ "operation": map[string]any{ "sync": map[string]any{ "changeRevision": revisions[0], }, }, - }) - _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) - return err + } } - - patch, _ := json.Marshal(map[string]any{ + return map[string]any{ "operation": map[string]any{ "sync": map[string]any{ "changeRevisions": revisions, }, }, - }) - _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) - return err + } } -func (c *acrService) patchOperationSyncResultWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) error { +func (c *acrService) patchOperationSyncResultWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) map[string]any { if len(revisions) == 1 { - patch, _ := json.Marshal(map[string]any{ + return map[string]any{ "status": map[string]any{ "operationState": map[string]any{ "operation": map[string]any{ @@ -152,12 +215,9 @@ func (c *acrService) patchOperationSyncResultWithChangeRevision(ctx context.Cont }, }, }, - }) - _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) - return err + } } - - patch, _ := json.Marshal(map[string]any{ + return map[string]any{ "status": map[string]any{ "operationState": map[string]any{ "operation": map[string]any{ @@ -167,9 +227,7 @@ func (c *acrService) patchOperationSyncResultWithChangeRevision(ctx context.Cont }, }, }, - }) - _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) - return err + } } func getCurrentRevisionFromOperation(a *application.Application) string { diff --git a/acr_controller/service/acr_service_test.go b/acr_controller/service/acr_service_test.go index f1a451a89f995..7b8718b5a8fda 100644 --- a/acr_controller/service/acr_service_test.go +++ b/acr_controller/service/acr_service_test.go @@ -274,7 +274,7 @@ func Test_ChangeRevision(r *testing.T) { acrService := newTestACRService(client) app := createTestApp(syncedAppWithHistory) - err := acrService.ChangeRevision(r.Context(), app) + err := acrService.ChangeRevision(r.Context(), app, false) require.NoError(t, err) app, err = acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) @@ -296,7 +296,7 @@ func Test_ChangeRevision(r *testing.T) { app := createTestApp(syncedAppWithHistory) - err := acrService.ChangeRevision(r.Context(), app) + err := acrService.ChangeRevision(r.Context(), app, false) require.NoError(t, err) app, err = acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) @@ -304,7 +304,7 @@ func Test_ChangeRevision(r *testing.T) { assert.Equal(t, "new-revision", app.Status.OperationState.Operation.Sync.ChangeRevision) - err = acrService.ChangeRevision(r.Context(), app) + err = acrService.ChangeRevision(r.Context(), app, false) require.NoError(t, err) diff --git a/cmd/application-change-revision-controller/commands/application_change_revision_controller.go b/cmd/application-change-revision-controller/commands/application_change_revision_controller.go index 9ee8e67a6f78b..28df2ed3da87a 100644 --- a/cmd/application-change-revision-controller/commands/application_change_revision_controller.go +++ b/cmd/application-change-revision-controller/commands/application_change_revision_controller.go @@ -61,6 +61,7 @@ func NewCommand() *cobra.Command { applicationNamespaces []string argocdToken string rootpath string + disableAnnotations bool ) command := &cobra.Command{ Use: cliName, @@ -114,6 +115,7 @@ func NewCommand() *cobra.Command { RedisClient: redisClient, ApplicationNamespaces: applicationNamespaces, ApplicationServiceClient: getApplicationClient(applicationServerAddress, argocdToken, rootpath), + DisableAnnotations: disableAnnotations, } log.Info("Starting change revision controller server") @@ -145,6 +147,7 @@ func NewCommand() *cobra.Command { command.Flags().IntVar(&listenPort, "port", common.DefaultPortACRServer, "Listen on given port") command.Flags().StringVar(&contentSecurityPolicy, "content-security-policy", env.StringFromEnv("ACR_CONTROLLER_CONTENT_SECURITY_POLICY", "frame-ancestors 'self';"), "Set Content-Security-Policy header in HTTP responses to `value`. To disable, set to \"\".") command.Flags().StringSliceVar(&applicationNamespaces, "application-namespaces", env.StringsFromEnv("ARGOCD_APPLICATION_NAMESPACES", []string{}, ","), "List of additional namespaces where application resources can be managed in") + command.Flags().BoolVar(&disableAnnotations, "disable-annotations", env.ParseBoolFromEnv("ACR_CONTROLLER_DISABLE_AMMOTATIONS", false), "Disable generating the monorepo-controller compatible annotations") cacheSrc = servercache.AddCacheFlagsToCmd(command, cacheutil.Options{ OnClientCreated: func(client *redis.Client) { redisClient = client From 4bead5085f3abccb7f41865b1bbe606064b1fbd7 Mon Sep 17 00:00:00 2001 From: Eugene Doudine Date: Sun, 28 Sep 2025 10:59:44 +0300 Subject: [PATCH 5/5] fix: lint messages were fixed Signed-off-by: Eugene Doudine --- acr_controller/service/acr_service.go | 33 ++++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/acr_controller/service/acr_service.go b/acr_controller/service/acr_service.go index 9a1a105543ee5..1130d37ff8076 100644 --- a/acr_controller/service/acr_service.go +++ b/acr_controller/service/acr_service.go @@ -105,10 +105,10 @@ func (c *acrService) ChangeRevision(ctx context.Context, a *application.Applicat if len(revisions) > 0 { if app.Status.OperationState != nil && app.Status.OperationState.Operation.Sync != nil { c.logger.Infof("Patch operation status for application %s", app.Name) - patchMap = c.patchOperationSyncResultWithChangeRevision(ctx, app, revisions) + patchMap = c.patchOperationSyncResultWithChangeRevision(revisions) } else { c.logger.Infof("Patch operation for application %s", app.Name) - patchMap = c.patchOperationWithChangeRevision(ctx, app, revisions) + patchMap = c.patchOperationWithChangeRevision(revisions) } } if useAnnotations { @@ -125,10 +125,9 @@ func (c *acrService) ChangeRevision(ctx context.Context, a *application.Applicat } _, err = c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) return err - } else { - c.logger.Infof("no patch needed") - return nil } + c.logger.Infof("no patch needed") + return nil } func addPatchIfNeeded(annotations map[string]string, currentAnnotations map[string]string, key string, val string) { @@ -143,30 +142,32 @@ func (c *acrService) addAnnotationPatch(m map[string]any, changeRevision string, changeRevisions []string, gitRevision string, - gitRevisions []string) error { + gitRevisions []string, +) error { c.logger.Infof("annotating application '%s', changeRevision=%s, changeRevisions=%v, gitRevision=%s, gitRevisions=%v", a.Name, changeRevision, changeRevisions, gitRevision, gitRevisions) annotations := map[string]string{} currentAnnotations := a.Annotations - changeRevisionsJson, err := json.Marshal(changeRevisions) + changeRevisionsJSON, err := json.Marshal(changeRevisions) if err != nil { - return fmt.Errorf("Failed to marshall changeRevisions %v: %v", changeRevisions, err) + return fmt.Errorf("failed to marshall changeRevisions %v: %w", changeRevisions, err) } - gitRevisionsJson, err := json.Marshal(gitRevisions) + gitRevisionsJSON, err := json.Marshal(gitRevisions) if err != nil { - return fmt.Errorf("Failed to marshall gitRevisions %v: %v", gitRevisions, err) + return fmt.Errorf("failed to marshall gitRevisions %v: %w", gitRevisions, err) } addPatchIfNeeded(annotations, currentAnnotations, CHANGE_REVISION_ANN, changeRevision) - addPatchIfNeeded(annotations, currentAnnotations, CHANGE_REVISIONS_ANN, string(changeRevisionsJson)) + addPatchIfNeeded(annotations, currentAnnotations, CHANGE_REVISIONS_ANN, string(changeRevisionsJSON)) addPatchIfNeeded(annotations, currentAnnotations, GIT_REVISION_ANN, gitRevision) - addPatchIfNeeded(annotations, currentAnnotations, GIT_REVISIONS_ANN, string(gitRevisionsJson)) + addPatchIfNeeded(annotations, currentAnnotations, GIT_REVISIONS_ANN, string(gitRevisionsJSON)) if len(annotations) == 0 { c.logger.Info("no need to add annotations") + } else { + c.logger.Infof("added annotations to application %s patch: %v", a.Name, annotations) + m["metadata"] = map[string]any{"annotations": annotations} } - c.logger.Infof("added annotations to application %s patch: %v", a.Name, annotations) - m["metadata"] = map[string]any{"annotations": annotations} return nil } @@ -184,7 +185,7 @@ func (c *acrService) calculateRevision(ctx context.Context, a *application.Appli return changeRevisionResult.Revision, nil } -func (c *acrService) patchOperationWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) map[string]any { +func (c *acrService) patchOperationWithChangeRevision(revisions []string) map[string]any { if len(revisions) == 1 { return map[string]any{ "operation": map[string]any{ @@ -203,7 +204,7 @@ func (c *acrService) patchOperationWithChangeRevision(ctx context.Context, a *ap } } -func (c *acrService) patchOperationSyncResultWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) map[string]any { +func (c *acrService) patchOperationSyncResultWithChangeRevision(revisions []string) map[string]any { if len(revisions) == 1 { return map[string]any{ "status": map[string]any{