From e1470ed9deee88602c5ce9483b8aabc2fd814a5f Mon Sep 17 00:00:00 2001 From: sethiyash Date: Fri, 5 Jan 2024 16:49:33 +0530 Subject: [PATCH] using existing skip tls flag available Signed-off-by: sethiyash --- config/config/crds.yml | 9 - pkg/apis/kappctrl/v1alpha1/generated.pb.go | 354 ++++++++---------- pkg/apis/kappctrl/v1alpha1/generated.proto | 4 - pkg/apis/kappctrl/v1alpha1/types_fetch.go | 3 - pkg/apiserver/openapi/zz_generated.openapi.go | 7 - pkg/fetch/vendir.go | 36 +- pkg/fetch/vendir_test.go | 46 ++- 7 files changed, 220 insertions(+), 239 deletions(-) diff --git a/config/config/crds.yml b/config/config/crds.yml index 6ed88be13a..38e4f04245 100644 --- a/config/config/crds.yml +++ b/config/config/crds.yml @@ -209,9 +209,6 @@ spec: git: description: Uses git to clone repository properties: - dangerousSkipTLSVerify: - description: Skip TLS verification (optional) - type: boolean lfsSkipSmudge: description: Skip lfs download (optional) type: boolean @@ -828,9 +825,6 @@ spec: git: description: Uses git to clone repository properties: - dangerousSkipTLSVerify: - description: Skip TLS verification (optional) - type: boolean lfsSkipSmudge: description: Skip lfs download (optional) type: boolean @@ -1653,9 +1647,6 @@ spec: git: description: Uses git to clone repository containing package list properties: - dangerousSkipTLSVerify: - description: Skip TLS verification (optional) - type: boolean lfsSkipSmudge: description: Skip lfs download (optional) type: boolean diff --git a/pkg/apis/kappctrl/v1alpha1/generated.pb.go b/pkg/apis/kappctrl/v1alpha1/generated.pb.go index 7a25b6a7c5..772f7cff0d 100644 --- a/pkg/apis/kappctrl/v1alpha1/generated.pb.go +++ b/pkg/apis/kappctrl/v1alpha1/generated.pb.go @@ -1113,169 +1113,167 @@ func init() { } var fileDescriptor_e972ccf085273df7 = []byte{ - // 2591 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7, - 0xf5, 0xf7, 0x8a, 0x94, 0x28, 0x3e, 0x7d, 0x58, 0x1e, 0x5b, 0x09, 0xff, 0xfa, 0xd7, 0xa2, 0xb1, - 0x01, 0x02, 0x1b, 0xad, 0x49, 0x58, 0x70, 0x5c, 0xa3, 0x05, 0x0a, 0x88, 0x92, 0x25, 0xcb, 0xb2, - 0x6c, 0x62, 0x28, 0xab, 0x71, 0xda, 0xc4, 0x59, 0x2d, 0x47, 0xe4, 0x96, 0xcb, 0xdd, 0xed, 0xee, - 0x2c, 0x2d, 0x06, 0x29, 0xd0, 0xa6, 0x45, 0x91, 0x36, 0x05, 0x6a, 0x14, 0x48, 0x5a, 0xb4, 0x40, - 0x2f, 0x01, 0x7a, 0x2f, 0xda, 0x63, 0x2f, 0x45, 0x2f, 0xbe, 0x14, 0x08, 0x90, 0x4b, 0x7a, 0x61, - 0x6b, 0xf6, 0xd4, 0x63, 0x91, 0x5b, 0x4e, 0xc5, 0x7c, 0xec, 0x17, 0x49, 0x99, 0x2a, 0xa0, 0x75, - 0x1c, 0xa0, 0xb7, 0xdd, 0x37, 0x6f, 0xde, 0xef, 0xcd, 0x9b, 0x37, 0xef, 0xbd, 0x79, 0xbb, 0x70, - 0xbf, 0x61, 0xd0, 0xa6, 0xbf, 0x5f, 0xd2, 0xed, 0x76, 0xb9, 0xd3, 0x7e, 0xa8, 0xb9, 0xe4, 0x32, - 0xd5, 0xac, 0xb7, 0xfc, 0xb2, 0xae, 0xb9, 0x1d, 0x62, 0x5e, 0x6e, 0x69, 0x8e, 0x73, 0x59, 0xb7, - 0x2d, 0xea, 0xda, 0xa6, 0x49, 0xdc, 0xb2, 0xd3, 0x6a, 0x94, 0x35, 0xc7, 0xf0, 0xca, 0x6c, 0x40, - 0xa7, 0xae, 0x59, 0xee, 0x5c, 0xd1, 0x4c, 0xa7, 0xa9, 0x5d, 0x29, 0x37, 0x88, 0x45, 0x5c, 0x8d, - 0x92, 0x7a, 0xc9, 0x71, 0x6d, 0x6a, 0xa3, 0xad, 0x48, 0x74, 0x49, 0x88, 0x7e, 0xc0, 0x45, 0x97, - 0x84, 0xe8, 0x07, 0x4c, 0xc2, 0x83, 0x48, 0x74, 0xc9, 0x69, 0x35, 0x4a, 0x4c, 0x74, 0x29, 0x10, - 0x5d, 0x0a, 0x44, 0x2f, 0x5d, 0x8e, 0x69, 0xd9, 0xb0, 0x1b, 0x76, 0x99, 0x23, 0xec, 0xfb, 0x07, - 0xfc, 0x8d, 0xbf, 0xf0, 0x27, 0x81, 0xbc, 0x84, 0xc7, 0x2c, 0xaa, 0x43, 0xac, 0xba, 0x21, 0xd6, - 0x22, 0x1f, 0x3b, 0xc4, 0xf5, 0x0c, 0xdb, 0xf2, 0x8e, 0x5c, 0xcd, 0xd2, 0xd5, 0xd6, 0x75, 0xaf, - 0x64, 0xd8, 0x6c, 0xf1, 0x6d, 0x4d, 0x6f, 0x1a, 0x16, 0x71, 0xbb, 0x91, 0x35, 0xda, 0x84, 0x6a, - 0xe5, 0xce, 0xf0, 0xac, 0xf2, 0x51, 0xb3, 0x5c, 0xdf, 0xa2, 0x46, 0x9b, 0x0c, 0x4d, 0xb8, 0x36, - 0x6e, 0x82, 0xa7, 0x37, 0x49, 0x5b, 0x1b, 0x9c, 0xa7, 0x7e, 0xaa, 0x00, 0xac, 0x3a, 0xce, 0x9a, - 0xe9, 0x7b, 0x94, 0xb8, 0xa8, 0x0c, 0x79, 0x4b, 0x6b, 0x13, 0xcf, 0xd1, 0x74, 0x52, 0x50, 0x2e, - 0x28, 0x17, 0xf3, 0x95, 0x33, 0x8f, 0x7b, 0xc5, 0x53, 0xfd, 0x5e, 0x31, 0x7f, 0x27, 0x18, 0xc0, - 0x11, 0x0f, 0xfa, 0x83, 0x02, 0x67, 0x5b, 0xfe, 0x3e, 0xd1, 0x6d, 0xeb, 0xc0, 0x68, 0xd4, 0x88, - 0xee, 0x12, 0x8a, 0xc9, 0x41, 0x61, 0xe2, 0x82, 0x72, 0x71, 0x66, 0xa5, 0x59, 0x3a, 0xb1, 0xbd, - 0x2c, 0x45, 0x5a, 0x6e, 0x0f, 0xe3, 0x55, 0x5e, 0xec, 0xf7, 0x8a, 0x67, 0x47, 0x0c, 0xe0, 0x51, - 0xda, 0xa9, 0x6f, 0xc2, 0xf9, 0xa7, 0x8a, 0x43, 0x17, 0x20, 0xcb, 0xd6, 0x28, 0x4d, 0x30, 0x2b, - 0x4d, 0x90, 0x65, 0x26, 0xc0, 0x7c, 0x04, 0x9d, 0x87, 0x4c, 0x8b, 0x74, 0xf9, 0x3a, 0xf3, 0x95, - 0x19, 0xc9, 0x90, 0xd9, 0x26, 0x5d, 0xcc, 0xe8, 0xea, 0x0f, 0x15, 0xc8, 0xaf, 0x3a, 0xce, 0x3a, - 0x71, 0x4c, 0xbb, 0x8b, 0x3a, 0x90, 0x65, 0x0b, 0xe2, 0xe2, 0x66, 0x56, 0x5e, 0x3d, 0x59, 0xab, - 0x08, 0x8c, 0x6d, 0xcd, 0x71, 0x2a, 0xd3, 0x4c, 0x49, 0xf6, 0x84, 0x39, 0x9e, 0xfa, 0x41, 0x06, - 0xe6, 0x12, 0x1c, 0xe8, 0x65, 0x98, 0x32, 0x2c, 0x6a, 0xdf, 0xf1, 0xe4, 0xd2, 0xe6, 0xa5, 0xe6, - 0x53, 0x5b, 0x9c, 0x8a, 0xe5, 0x28, 0x2a, 0xc2, 0x64, 0x5b, 0x73, 0xee, 0x78, 0x85, 0x89, 0x0b, - 0x99, 0x8b, 0xf9, 0x4a, 0xbe, 0xdf, 0x2b, 0x4e, 0xee, 0x30, 0x02, 0x16, 0x74, 0x54, 0x02, 0x70, - 0xb5, 0x87, 0x77, 0x1d, 0xca, 0xdc, 0xbf, 0x90, 0xe1, 0x5c, 0xf3, 0xfd, 0x5e, 0x11, 0x70, 0x48, - 0xc5, 0x31, 0x0e, 0xf4, 0x63, 0x05, 0x72, 0x86, 0xe5, 0x39, 0x44, 0xa7, 0x85, 0x2c, 0x37, 0xc3, - 0x83, 0xb4, 0xcc, 0xb0, 0x25, 0x60, 0x2a, 0x33, 0xfd, 0x5e, 0x31, 0x27, 0x5f, 0x70, 0x00, 0x8e, - 0xde, 0x51, 0x60, 0xaa, 0x4e, 0x4c, 0x42, 0x49, 0x61, 0x92, 0xeb, 0xf1, 0x46, 0x5a, 0x7a, 0xac, - 0x73, 0x94, 0x0a, 0x30, 0xf3, 0x8a, 0x67, 0x2c, 0x91, 0xd5, 0x1b, 0x70, 0x76, 0x04, 0xeb, 0x80, - 0x51, 0x95, 0x71, 0x46, 0x55, 0x37, 0xe0, 0xdc, 0xa8, 0x95, 0xff, 0xd7, 0x72, 0xfe, 0x38, 0x05, - 0xd3, 0xab, 0x8e, 0xb3, 0x41, 0xa8, 0xde, 0x44, 0xdf, 0x63, 0x2e, 0x62, 0x1a, 0x16, 0x91, 0xee, - 0x7a, 0xff, 0x64, 0xed, 0xc3, 0x41, 0xb6, 0x38, 0x80, 0x30, 0x8d, 0x78, 0xc6, 0x12, 0x14, 0x75, - 0x61, 0xd2, 0x68, 0x6b, 0x0d, 0x22, 0x43, 0xc8, 0xab, 0x69, 0xa0, 0x33, 0xf9, 0xc2, 0xa7, 0xf9, - 0x23, 0x16, 0x88, 0xc8, 0x87, 0x6c, 0x93, 0x52, 0xa7, 0x90, 0xe1, 0xc8, 0xdf, 0x4c, 0x01, 0xf9, - 0xe6, 0xee, 0x6e, 0x55, 0x9c, 0x52, 0xf6, 0x84, 0x39, 0x1c, 0xfa, 0x2e, 0x64, 0x1a, 0x46, 0x70, - 0x2a, 0xf6, 0x52, 0x40, 0xdd, 0x34, 0x68, 0x25, 0xc7, 0xc2, 0xd3, 0xa6, 0x41, 0x31, 0xc3, 0x42, - 0x3f, 0x51, 0x20, 0xdf, 0x24, 0x66, 0x7b, 0xad, 0xa9, 0xb9, 0x54, 0x9e, 0x83, 0x6f, 0xa7, 0xb1, - 0xde, 0x00, 0xa3, 0x32, 0xc7, 0x52, 0x48, 0xf8, 0x8a, 0x23, 0x74, 0xf4, 0xbe, 0x02, 0xb3, 0x46, - 0xbb, 0xe1, 0xb4, 0x1a, 0x15, 0xdf, 0xaa, 0x9b, 0xa4, 0x30, 0x95, 0x46, 0x78, 0x90, 0x1b, 0x1f, - 0xc1, 0x54, 0x16, 0xfa, 0xbd, 0xe2, 0x6c, 0x9c, 0x82, 0x13, 0x6a, 0xb0, 0x1c, 0xe0, 0x68, 0xb4, - 0x59, 0xc8, 0x25, 0x73, 0x40, 0x55, 0xa3, 0x4d, 0xcc, 0x47, 0xd4, 0x0f, 0xb3, 0x30, 0x13, 0xb3, - 0x31, 0xcb, 0x09, 0xbe, 0x6b, 0xca, 0xc8, 0x1a, 0xe6, 0x84, 0x7b, 0xf8, 0x36, 0x66, 0x74, 0x36, - 0xec, 0xca, 0xd4, 0x18, 0x1b, 0x66, 0x49, 0x8a, 0xd1, 0xd1, 0x4f, 0x15, 0x98, 0x75, 0xc9, 0x41, - 0x8d, 0x98, 0x44, 0x67, 0xc7, 0x52, 0xda, 0x61, 0x77, 0x9c, 0x1d, 0x44, 0x29, 0xc2, 0x97, 0x2f, - 0x1f, 0x83, 0xaa, 0x24, 0x32, 0xc0, 0x9e, 0xa0, 0x84, 0xb2, 0xc5, 0xe2, 0x71, 0x0c, 0x0d, 0x27, - 0xb0, 0xd1, 0xbb, 0x0a, 0xe4, 0xbd, 0x30, 0x9b, 0x8b, 0x03, 0xf1, 0xad, 0x14, 0x76, 0xe4, 0xb6, - 0xad, 0x6b, 0x26, 0x4b, 0xe0, 0xdc, 0x3f, 0xa2, 0xb4, 0x1d, 0x81, 0xa3, 0x4b, 0x90, 0xf3, 0xfc, - 0x7d, 0x66, 0x76, 0x7e, 0x44, 0xf2, 0x95, 0xd3, 0xd2, 0x74, 0xb9, 0x9a, 0x20, 0xe3, 0x60, 0x1c, - 0x7d, 0x1d, 0xe6, 0xcc, 0x03, 0xaf, 0xd6, 0x32, 0x9c, 0x5a, 0xdb, 0xaf, 0x37, 0x44, 0x84, 0x9f, - 0xae, 0x2c, 0xca, 0x09, 0x73, 0xb7, 0x37, 0x6a, 0xd1, 0x20, 0x4e, 0xf2, 0xa2, 0x3d, 0x78, 0xa1, - 0xae, 0x59, 0x0d, 0xe2, 0xda, 0x3e, 0x27, 0xef, 0xde, 0xae, 0xed, 0x11, 0xd7, 0x38, 0xe8, 0x72, - 0x0f, 0x98, 0xae, 0x2c, 0x4b, 0x29, 0x2f, 0xac, 0x8f, 0xe4, 0xc2, 0x47, 0xcc, 0x56, 0xdf, 0x9b, - 0x80, 0xd9, 0xf8, 0xf9, 0x1f, 0xe7, 0x26, 0x2f, 0xc3, 0x94, 0xd7, 0xd4, 0x56, 0x5e, 0xb9, 0x26, - 0x3d, 0x25, 0x4c, 0xd1, 0xb5, 0x9b, 0xab, 0x2b, 0xaf, 0x5c, 0xc3, 0x72, 0xf4, 0x8b, 0xb9, 0x45, - 0xac, 0xe0, 0x3c, 0x33, 0x14, 0x1d, 0x8e, 0x51, 0x6f, 0x5d, 0x82, 0x9c, 0x74, 0x6b, 0x69, 0x96, - 0x10, 0x42, 0xfa, 0x36, 0x0e, 0xc6, 0xd1, 0x23, 0x05, 0xc0, 0x25, 0x8e, 0xed, 0x19, 0xd4, 0x76, - 0xbb, 0xd2, 0x32, 0x6f, 0xa6, 0x19, 0xdd, 0x30, 0x71, 0x6c, 0x99, 0x60, 0x43, 0x5c, 0x1c, 0xd3, - 0x41, 0xfd, 0xb3, 0x02, 0x8b, 0x23, 0x67, 0x8d, 0x73, 0x86, 0xe4, 0x26, 0x4f, 0x7c, 0x8e, 0x9b, - 0xac, 0xfe, 0x7b, 0x82, 0x17, 0x93, 0x51, 0x06, 0x1d, 0xa7, 0x3b, 0x0b, 0x68, 0x54, 0x6b, 0x44, - 0x01, 0x2d, 0x9b, 0x76, 0x40, 0xdb, 0x8d, 0xa1, 0xe1, 0x04, 0xf6, 0x73, 0x64, 0xc8, 0xf8, 0x69, - 0xc9, 0x8c, 0x39, 0x2d, 0x1f, 0x4f, 0xf0, 0x0a, 0x6f, 0x28, 0x79, 0xa1, 0x97, 0x82, 0x2a, 0x49, - 0x18, 0x7f, 0x4e, 0x4a, 0x48, 0xd6, 0x33, 0x43, 0x1b, 0x90, 0xf9, 0xdf, 0x06, 0x30, 0x4f, 0xfe, - 0xd7, 0x04, 0xcc, 0x27, 0x2b, 0x51, 0x56, 0x10, 0x4d, 0xb2, 0x9c, 0x2e, 0xaa, 0xe5, 0x99, 0x95, - 0x7a, 0x6a, 0x45, 0x6f, 0x89, 0x6d, 0xac, 0x77, 0xc3, 0xa2, 0x6e, 0x37, 0xda, 0x36, 0x4e, 0xc3, - 0x42, 0x03, 0x16, 0xbf, 0xf2, 0xfc, 0x69, 0xc3, 0xb5, 0xdb, 0xfc, 0x02, 0x96, 0x52, 0x35, 0xc4, - 0xf5, 0xa9, 0xd9, 0xbe, 0xab, 0x93, 0xe8, 0x9a, 0x5f, 0x0d, 0x90, 0x71, 0xa4, 0xc4, 0xd2, 0x75, - 0x80, 0x48, 0x6d, 0xb4, 0x20, 0xee, 0xbe, 0xdc, 0xf5, 0xf8, 0x75, 0x17, 0x9d, 0x83, 0xc9, 0x8e, - 0x66, 0xfa, 0xa2, 0x68, 0xcf, 0x63, 0xf1, 0xf2, 0xb5, 0x89, 0xeb, 0x8a, 0xfa, 0x97, 0xb8, 0x07, - 0xc7, 0x00, 0xd1, 0xcf, 0x13, 0xfe, 0x20, 0xae, 0x1a, 0xfb, 0x29, 0xaf, 0xf2, 0xe9, 0xe7, 0xf2, - 0x57, 0x0a, 0xcc, 0x8a, 0x46, 0xc0, 0x8e, 0xe6, 0x44, 0x4e, 0xfa, 0x2c, 0x94, 0xe2, 0x87, 0x67, - 0x2d, 0x86, 0x8d, 0x13, 0x9a, 0xa8, 0x87, 0xf0, 0xe2, 0x11, 0x53, 0x59, 0xcd, 0x53, 0x37, 0x5c, - 0xa2, 0xb3, 0x3c, 0xc3, 0x63, 0x8a, 0x48, 0x8f, 0x61, 0xcd, 0xb3, 0x1e, 0x1f, 0xc4, 0x49, 0xde, - 0xf1, 0x79, 0x57, 0xbd, 0x0a, 0x0b, 0x83, 0x27, 0xeb, 0x18, 0xb3, 0xde, 0xc9, 0x41, 0x6e, 0xd5, - 0x71, 0x6a, 0x0e, 0xd1, 0xd1, 0x2d, 0x40, 0x1e, 0x71, 0x3b, 0x86, 0x4e, 0x56, 0x75, 0xdd, 0xf6, - 0x2d, 0x7a, 0x27, 0x9a, 0xbb, 0x24, 0xe7, 0xa2, 0xda, 0x10, 0x07, 0x1e, 0x31, 0x0b, 0xbd, 0x0d, - 0x39, 0x5d, 0x74, 0x6d, 0xe4, 0xe6, 0xdc, 0x4b, 0xa5, 0xc3, 0x24, 0x5a, 0x07, 0xf2, 0x05, 0x07, - 0x90, 0xe8, 0x10, 0x26, 0x0f, 0x98, 0x21, 0x78, 0xbb, 0x63, 0x66, 0xa5, 0x96, 0x82, 0x63, 0x44, - 0x21, 0x81, 0xbf, 0x62, 0x01, 0x88, 0x7e, 0xa4, 0xc0, 0x34, 0x25, 0x6d, 0xc7, 0xd4, 0x28, 0x29, - 0x64, 0x39, 0xfa, 0x09, 0x5f, 0x14, 0x77, 0xa5, 0xf4, 0xca, 0x82, 0x54, 0x60, 0x3a, 0xa0, 0xe0, - 0x10, 0x19, 0xbd, 0x0d, 0x53, 0x75, 0xde, 0x6c, 0x28, 0x4c, 0x72, 0x1d, 0x76, 0xd3, 0x68, 0x9d, - 0x44, 0x05, 0xaf, 0x78, 0xc7, 0x12, 0x93, 0x15, 0xc6, 0x8e, 0xe6, 0x7b, 0xa4, 0xce, 0x6f, 0x46, - 0xd3, 0x11, 0x5f, 0x95, 0x53, 0xb1, 0x1c, 0x45, 0x5f, 0x81, 0x69, 0x5d, 0xb3, 0x74, 0x62, 0x92, - 0xba, 0x2c, 0xdd, 0xc3, 0x35, 0xad, 0x49, 0x3a, 0x0e, 0x39, 0xd0, 0x1b, 0x00, 0x5e, 0xd7, 0xd2, - 0xab, 0xc4, 0x35, 0xec, 0x7a, 0x61, 0x9a, 0x7b, 0x55, 0xa9, 0x24, 0xda, 0xa9, 0xa5, 0x78, 0x3b, - 0x35, 0x52, 0xbe, 0x4d, 0xa8, 0x56, 0xea, 0x5c, 0x29, 0xad, 0xfb, 0xae, 0xc6, 0x73, 0x1f, 0x2f, - 0xfd, 0x6a, 0xa1, 0x14, 0x1c, 0x93, 0x88, 0x56, 0x00, 0x2c, 0xdb, 0x96, 0x1d, 0x9e, 0x42, 0x9e, - 0xeb, 0x83, 0xa4, 0x3e, 0x70, 0x27, 0x1c, 0xc1, 0x31, 0x2e, 0xb4, 0x0e, 0x0b, 0x75, 0x72, 0xa0, - 0xf9, 0x26, 0x0d, 0x9b, 0xae, 0x05, 0xe0, 0x07, 0xa6, 0x20, 0x67, 0x2e, 0xac, 0x0f, 0x8c, 0xe3, - 0xa1, 0x19, 0xea, 0x6f, 0x73, 0xfc, 0x7a, 0x1a, 0xec, 0x23, 0xa2, 0x90, 0xe9, 0x52, 0x9a, 0x4e, - 0x57, 0x27, 0x00, 0xb9, 0x4f, 0x65, 0xab, 0xe1, 0x3e, 0xa5, 0x98, 0xc1, 0xa1, 0x43, 0xc8, 0xb6, - 0xf6, 0xcd, 0xba, 0x3c, 0xaf, 0xaf, 0xa5, 0x03, 0xbb, 0xbd, 0x6f, 0xd6, 0x65, 0xf7, 0x73, 0xdf, - 0xac, 0x63, 0x8e, 0xc8, 0xe3, 0x79, 0x93, 0x98, 0xed, 0x80, 0x49, 0x96, 0x3f, 0xfb, 0xe9, 0xa8, - 0x70, 0x33, 0x86, 0x24, 0xe2, 0x79, 0x9c, 0x82, 0x13, 0x9a, 0xa0, 0x9f, 0x29, 0x90, 0x6f, 0xf9, - 0x1e, 0xb5, 0xdb, 0xc6, 0x5b, 0x24, 0x9d, 0x7e, 0x68, 0x68, 0x9a, 0x00, 0x46, 0x64, 0xbe, 0xf0, - 0x15, 0x47, 0x0a, 0xb0, 0xf0, 0x92, 0xfb, 0x8e, 0x67, 0x5b, 0x16, 0x09, 0x9a, 0x41, 0xaf, 0xa7, - 0xa3, 0xcc, 0x2d, 0x01, 0x22, 0xe2, 0xab, 0x7c, 0xc1, 0x01, 0x34, 0x73, 0x15, 0xcf, 0x76, 0x3c, - 0xd9, 0xf8, 0x48, 0xc9, 0x55, 0x6a, 0xb6, 0xe3, 0x09, 0x57, 0x61, 0x4f, 0x98, 0x23, 0xb2, 0xa3, - 0xa1, 0xfb, 0x84, 0x47, 0x8b, 0xd4, 0x8e, 0xc6, 0x9a, 0x4f, 0xc4, 0xd1, 0x58, 0xf3, 0x09, 0x66, - 0x70, 0xac, 0xba, 0x9f, 0x4f, 0x32, 0xa0, 0x62, 0xbc, 0x0c, 0x95, 0x7d, 0xf7, 0x44, 0x71, 0xf8, - 0x81, 0x02, 0xc0, 0xab, 0xab, 0x78, 0x75, 0x98, 0x92, 0x4b, 0xef, 0x71, 0x1c, 0x59, 0x20, 0x86, - 0x31, 0x6b, 0x2f, 0x44, 0xc7, 0x31, 0x4d, 0xd0, 0x2a, 0x9c, 0x36, 0x2c, 0xc7, 0xa7, 0x37, 0x0e, - 0x1d, 0x97, 0x78, 0x5e, 0x70, 0xdd, 0xc8, 0x57, 0x5e, 0x94, 0x13, 0x4f, 0x6f, 0x25, 0x87, 0xf1, - 0x20, 0x3f, 0x0b, 0x7b, 0xb6, 0x4f, 0x93, 0x32, 0xb2, 0xc9, 0xb0, 0x77, 0x77, 0x60, 0x1c, 0x0f, - 0xcd, 0x50, 0xff, 0x96, 0xe5, 0xc5, 0xd2, 0xa8, 0x73, 0x79, 0x8c, 0x3e, 0x43, 0xe2, 0x0b, 0xd8, - 0xc4, 0x31, 0xbe, 0x80, 0x05, 0x6d, 0xc2, 0xcc, 0x51, 0x6d, 0xc2, 0xc1, 0x2d, 0xcb, 0x3e, 0x37, - 0x5b, 0xf6, 0x4b, 0x05, 0xce, 0xb4, 0xfc, 0x7d, 0xe2, 0x5a, 0x84, 0x12, 0x4f, 0xde, 0xe8, 0x64, - 0x00, 0xc0, 0x27, 0xa8, 0x9f, 0x94, 0x5c, 0x59, 0xec, 0xf7, 0x8a, 0x67, 0xb6, 0x07, 0x01, 0xf1, - 0xb0, 0x0e, 0xe8, 0x7d, 0x05, 0xe6, 0x23, 0xea, 0x6a, 0x75, 0x2b, 0x08, 0x0a, 0x27, 0x79, 0x36, - 0xb7, 0x13, 0x00, 0x15, 0xd4, 0xef, 0x15, 0xe7, 0x93, 0x34, 0x3c, 0xa0, 0x84, 0x7a, 0x0e, 0xd0, - 0x70, 0x34, 0x53, 0x57, 0xe0, 0xf4, 0x40, 0x2e, 0x1a, 0x7b, 0x8e, 0xd5, 0x17, 0xf8, 0xb5, 0x68, - 0x28, 0x48, 0xab, 0xbf, 0x9b, 0x48, 0x08, 0x63, 0x31, 0x0a, 0x1d, 0x42, 0xc6, 0x69, 0x04, 0x5f, - 0x0f, 0x5f, 0x4f, 0x2f, 0x2c, 0x56, 0x37, 0xab, 0x22, 0x42, 0x55, 0x37, 0xab, 0x98, 0x41, 0x46, - 0xcb, 0x98, 0x38, 0x22, 0x1c, 0x1d, 0x42, 0x46, 0x6b, 0x04, 0x99, 0x35, 0x45, 0xd5, 0x56, 0x1b, - 0x32, 0x78, 0xae, 0x36, 0x08, 0x66, 0x90, 0xea, 0xc7, 0x4a, 0x62, 0x2f, 0x24, 0x13, 0xfa, 0x93, - 0x02, 0xe7, 0x1c, 0xd7, 0xe8, 0x30, 0xa3, 0x92, 0xae, 0x57, 0x1b, 0xb8, 0x61, 0x5a, 0x29, 0x5a, - 0x6f, 0x04, 0x6a, 0xa5, 0xd0, 0xef, 0x15, 0xcf, 0x8d, 0x1a, 0xc1, 0x23, 0xb5, 0x1c, 0xb5, 0xaa, - 0xea, 0x66, 0xf5, 0x8b, 0xbe, 0xaa, 0x4d, 0x78, 0xe9, 0x18, 0x62, 0x8f, 0x71, 0xaf, 0xfc, 0xbd, - 0x02, 0x5f, 0x1a, 0x8a, 0x76, 0xeb, 0xf6, 0x43, 0xeb, 0xa1, 0xe6, 0xd6, 0x57, 0xab, 0x5b, 0xe8, - 0x91, 0x02, 0x93, 0x06, 0x25, 0xed, 0xa0, 0x8f, 0xd3, 0x4a, 0x33, 0xcc, 0xc6, 0x80, 0xb7, 0x28, - 0x69, 0xc7, 0xba, 0x70, 0x4c, 0x03, 0x2c, 0x14, 0x51, 0xff, 0x9a, 0x85, 0x0b, 0xe3, 0xa6, 0x1e, - 0x2f, 0x31, 0x1d, 0x18, 0xc4, 0xac, 0xc7, 0xee, 0xf8, 0x61, 0x62, 0xda, 0x08, 0x06, 0x70, 0xc4, - 0x73, 0x44, 0x74, 0xcf, 0x3c, 0x07, 0xd1, 0xfd, 0x43, 0x05, 0x16, 0x99, 0x9c, 0xb5, 0x50, 0x7e, - 0xa0, 0x5d, 0x36, 0x35, 0xed, 0xfe, 0xaf, 0xdf, 0x2b, 0x2e, 0x6e, 0x8f, 0x02, 0xc5, 0xa3, 0x75, - 0x19, 0x95, 0x83, 0x26, 0x9f, 0x87, 0x1c, 0xf4, 0x5e, 0xb2, 0xbe, 0x89, 0x67, 0x7c, 0xf4, 0x8b, - 0x11, 0x4d, 0x35, 0x92, 0x7e, 0xa5, 0xf1, 0xf4, 0xbe, 0xda, 0x6f, 0x46, 0xf7, 0xd5, 0x9e, 0x91, - 0x5e, 0x63, 0x5a, 0x6b, 0xc7, 0xa8, 0xdf, 0x7e, 0xad, 0xc0, 0x4c, 0x3d, 0x3a, 0xaf, 0xd2, 0x49, - 0x1b, 0xcf, 0x28, 0xb2, 0x54, 0x4e, 0xf7, 0x7b, 0xc5, 0x99, 0x18, 0x01, 0xc7, 0x95, 0x51, 0xbf, - 0x01, 0x4b, 0x47, 0x2f, 0xfe, 0x18, 0x11, 0xf5, 0xd3, 0x4c, 0xe2, 0x0e, 0x72, 0x9f, 0x52, 0x54, - 0x83, 0x45, 0xa3, 0x61, 0xd9, 0x2e, 0xb9, 0x67, 0xb5, 0x2c, 0xfb, 0xa1, 0xb5, 0x66, 0xb7, 0xdb, - 0xc4, 0xa2, 0xe2, 0x97, 0xa1, 0xe9, 0xca, 0x79, 0x29, 0x65, 0x71, 0x6b, 0x14, 0x13, 0x1e, 0x3d, - 0x97, 0x7f, 0xd5, 0xa4, 0xae, 0xa1, 0x53, 0xbe, 0xfb, 0xb1, 0xe6, 0x4d, 0x8d, 0x53, 0xb1, 0x1c, - 0x8d, 0xfd, 0x7d, 0x92, 0xf9, 0x3c, 0xfe, 0x3e, 0x09, 0x0b, 0x9e, 0xec, 0x11, 0x05, 0xcf, 0x97, - 0x59, 0x18, 0x36, 0xc9, 0x8e, 0xe6, 0xb6, 0x3c, 0xde, 0x05, 0xcb, 0x0b, 0xcf, 0xdf, 0x08, 0x88, - 0x38, 0x1a, 0x1f, 0xac, 0xfc, 0xa7, 0x9e, 0x97, 0xca, 0x5f, 0xfd, 0xbb, 0x02, 0xf9, 0x35, 0xdb, - 0xaa, 0x1b, 0xfc, 0xd3, 0xcc, 0x15, 0xc8, 0xd2, 0xae, 0x13, 0x78, 0x49, 0xb0, 0xbf, 0xd9, 0xdd, - 0xae, 0x43, 0x3e, 0xeb, 0x15, 0xe7, 0x42, 0x46, 0x46, 0xc0, 0x9c, 0x15, 0xdd, 0x66, 0xdb, 0xa9, - 0x51, 0xdf, 0x93, 0xa9, 0xe8, 0x6a, 0xb4, 0x9d, 0x8c, 0xfa, 0x59, 0xaf, 0xa8, 0x46, 0x7f, 0x24, - 0x96, 0x75, 0xdb, 0x25, 0xe5, 0xce, 0x95, 0x52, 0x28, 0x49, 0x70, 0x61, 0x29, 0x83, 0x39, 0x87, - 0x4b, 0x34, 0x2f, 0xbc, 0x32, 0x86, 0xce, 0x81, 0x39, 0x15, 0xcb, 0x51, 0x74, 0x09, 0x72, 0x6d, - 0xe2, 0x79, 0xac, 0xe2, 0x1c, 0xf8, 0xce, 0xbc, 0x23, 0xc8, 0x38, 0x18, 0x57, 0x7f, 0x90, 0x81, - 0xb9, 0x4d, 0x62, 0x11, 0xd7, 0xd0, 0x05, 0x18, 0xba, 0x05, 0xc8, 0xde, 0xf7, 0x88, 0xdb, 0x21, - 0xf5, 0x4d, 0xf1, 0x17, 0x24, 0xcb, 0x38, 0x6c, 0xcd, 0x99, 0xa8, 0x0f, 0x7d, 0x77, 0x88, 0x03, - 0x8f, 0x98, 0x85, 0xde, 0x55, 0x00, 0xf4, 0x60, 0x31, 0x9e, 0xbc, 0x85, 0x9f, 0x64, 0x37, 0x34, - 0xb4, 0x54, 0xb4, 0x95, 0x21, 0xc9, 0xc3, 0x31, 0x6c, 0xb4, 0x03, 0x67, 0x0f, 0x5c, 0x83, 0x58, - 0x75, 0xb3, 0xbb, 0x4e, 0x3c, 0xdd, 0x35, 0x1c, 0x1a, 0xdd, 0xbd, 0xff, 0x5f, 0x4e, 0x3e, 0xbb, - 0x31, 0xcc, 0x82, 0x47, 0xcd, 0x63, 0x56, 0xf2, 0x3d, 0x72, 0xe0, 0x9b, 0x37, 0x5c, 0xd7, 0x76, - 0x77, 0x12, 0xd6, 0x0e, 0xad, 0x74, 0x6f, 0x88, 0x03, 0x8f, 0x98, 0xa5, 0x6e, 0xc1, 0x40, 0x2e, - 0x43, 0x5f, 0x85, 0xb9, 0x86, 0x6b, 0xfb, 0x8e, 0xcc, 0xb1, 0xc1, 0xf5, 0xe8, 0x4c, 0xbf, 0x57, - 0x9c, 0xdb, 0x8c, 0x0f, 0xe0, 0x24, 0x9f, 0x7a, 0x15, 0x82, 0xef, 0xfc, 0xf1, 0x3f, 0x01, 0x94, - 0xa7, 0xff, 0x09, 0x50, 0xb1, 0x1f, 0x3f, 0x59, 0x3e, 0xf5, 0xd1, 0x93, 0xe5, 0x53, 0x9f, 0x3c, - 0x59, 0x3e, 0xf5, 0xfd, 0xfe, 0xb2, 0xf2, 0xb8, 0xbf, 0xac, 0x7c, 0xd4, 0x5f, 0x56, 0x3e, 0xe9, - 0x2f, 0x2b, 0xff, 0xe8, 0x2f, 0x2b, 0x8f, 0xfe, 0xb9, 0x7c, 0xea, 0xb5, 0xad, 0x13, 0xfb, 0x97, - 0xf9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xaf, 0x9e, 0xd8, 0x17, 0x2d, 0x00, 0x00, + // 2558 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x5d, 0x8c, 0x1b, 0x57, + 0x15, 0xce, 0xac, 0xbd, 0xeb, 0xf5, 0xd9, 0x9f, 0x6c, 0x6e, 0xb2, 0xd4, 0x2c, 0x74, 0x1d, 0x4d, + 0xa5, 0xaa, 0x11, 0xc4, 0x56, 0x56, 0x69, 0x88, 0x40, 0x42, 0x5a, 0xef, 0x66, 0x37, 0x9b, 0xcd, + 0x26, 0xd6, 0xf5, 0x26, 0x34, 0x85, 0x36, 0x1d, 0x8f, 0xef, 0xda, 0x83, 0xc7, 0x33, 0xc3, 0xcc, + 0x1d, 0x67, 0x5d, 0x15, 0x09, 0x0a, 0x42, 0x85, 0x22, 0x11, 0x21, 0xb5, 0x20, 0x90, 0x78, 0x41, + 0xe2, 0x1d, 0xc1, 0x23, 0x2f, 0x88, 0x97, 0x48, 0x08, 0xa9, 0x52, 0x5f, 0xca, 0x8b, 0x21, 0xe6, + 0x89, 0x47, 0xd4, 0xb7, 0x3e, 0xa1, 0xfb, 0x33, 0x7f, 0xb6, 0x37, 0x5e, 0xa4, 0x9d, 0x34, 0x95, + 0x78, 0x9b, 0x39, 0xe7, 0xdc, 0xf3, 0x9d, 0x7b, 0xee, 0xbd, 0xe7, 0x9c, 0x7b, 0x66, 0xe0, 0x5e, + 0xd3, 0xa0, 0x2d, 0xbf, 0x5e, 0xd2, 0xed, 0x4e, 0xb9, 0xdb, 0x79, 0xa0, 0xb9, 0xe4, 0x22, 0xd5, + 0xac, 0x37, 0xfd, 0xb2, 0xae, 0xb9, 0x5d, 0x62, 0x5e, 0x6c, 0x6b, 0x8e, 0x73, 0x51, 0xb7, 0x2d, + 0xea, 0xda, 0xa6, 0x49, 0xdc, 0xb2, 0xd3, 0x6e, 0x96, 0x35, 0xc7, 0xf0, 0xca, 0x8c, 0xa1, 0x53, + 0xd7, 0x2c, 0x77, 0x2f, 0x69, 0xa6, 0xd3, 0xd2, 0x2e, 0x95, 0x9b, 0xc4, 0x22, 0xae, 0x46, 0x49, + 0xa3, 0xe4, 0xb8, 0x36, 0xb5, 0xd1, 0x4e, 0xa4, 0xba, 0x24, 0x54, 0xdf, 0xe7, 0xaa, 0x4b, 0x42, + 0xf5, 0x7d, 0xa6, 0xe1, 0x7e, 0xa4, 0xba, 0xe4, 0xb4, 0x9b, 0x25, 0xa6, 0xba, 0x14, 0xa8, 0x2e, + 0x05, 0xaa, 0x57, 0x2e, 0xc6, 0xac, 0x6c, 0xda, 0x4d, 0xbb, 0xcc, 0x11, 0xea, 0xfe, 0x01, 0x7f, + 0xe3, 0x2f, 0xfc, 0x49, 0x20, 0xaf, 0xe0, 0x09, 0x93, 0xea, 0x12, 0xab, 0x61, 0x88, 0xb9, 0xc8, + 0xc7, 0x2e, 0x71, 0x3d, 0xc3, 0xb6, 0xbc, 0x23, 0x67, 0xb3, 0x72, 0xb9, 0x7d, 0xd5, 0x2b, 0x19, + 0x36, 0x9b, 0x7c, 0x47, 0xd3, 0x5b, 0x86, 0x45, 0xdc, 0x5e, 0xe4, 0x8d, 0x0e, 0xa1, 0x5a, 0xb9, + 0x3b, 0x3a, 0xaa, 0x7c, 0xd4, 0x28, 0xd7, 0xb7, 0xa8, 0xd1, 0x21, 0x23, 0x03, 0xae, 0x4c, 0x1a, + 0xe0, 0xe9, 0x2d, 0xd2, 0xd1, 0x86, 0xc7, 0xa9, 0x1f, 0x2b, 0x00, 0xeb, 0x8e, 0xb3, 0x61, 0xfa, + 0x1e, 0x25, 0x2e, 0x2a, 0x43, 0xde, 0xd2, 0x3a, 0xc4, 0x73, 0x34, 0x9d, 0x14, 0x94, 0xf3, 0xca, + 0x4b, 0xf9, 0xca, 0x99, 0x47, 0xfd, 0xe2, 0xa9, 0x41, 0xbf, 0x98, 0xbf, 0x15, 0x30, 0x70, 0x24, + 0x83, 0xfe, 0xa0, 0xc0, 0xd9, 0xb6, 0x5f, 0x27, 0xba, 0x6d, 0x1d, 0x18, 0xcd, 0x1a, 0xd1, 0x5d, + 0x42, 0x31, 0x39, 0x28, 0x4c, 0x9d, 0x57, 0x5e, 0x9a, 0x5b, 0x6b, 0x95, 0x4e, 0x6c, 0x2d, 0x4b, + 0x91, 0x95, 0xbb, 0xa3, 0x78, 0x95, 0xe7, 0x06, 0xfd, 0xe2, 0xd9, 0x31, 0x0c, 0x3c, 0xce, 0x3a, + 0xf5, 0x0d, 0x78, 0xfe, 0x89, 0xea, 0xd0, 0x79, 0xc8, 0xb2, 0x39, 0x4a, 0x17, 0xcc, 0x4b, 0x17, + 0x64, 0x99, 0x0b, 0x30, 0xe7, 0xa0, 0xe7, 0x21, 0xd3, 0x26, 0x3d, 0x3e, 0xcf, 0x7c, 0x65, 0x4e, + 0x0a, 0x64, 0x76, 0x49, 0x0f, 0x33, 0xba, 0xfa, 0x03, 0x05, 0xf2, 0xeb, 0x8e, 0xb3, 0x49, 0x1c, + 0xd3, 0xee, 0xa1, 0x2e, 0x64, 0xd9, 0x84, 0xb8, 0xba, 0xb9, 0xb5, 0x57, 0x4e, 0xd6, 0x2b, 0x02, + 0x63, 0x57, 0x73, 0x9c, 0xca, 0x2c, 0x33, 0x92, 0x3d, 0x61, 0x8e, 0xa7, 0xbe, 0x9f, 0x81, 0x85, + 0x84, 0x04, 0x7a, 0x11, 0x66, 0x0c, 0x8b, 0xda, 0xb7, 0x3c, 0x39, 0xb5, 0x45, 0x69, 0xf9, 0xcc, + 0x0e, 0xa7, 0x62, 0xc9, 0x45, 0x45, 0x98, 0xee, 0x68, 0xce, 0x2d, 0xaf, 0x30, 0x75, 0x3e, 0xf3, + 0x52, 0xbe, 0x92, 0x1f, 0xf4, 0x8b, 0xd3, 0x7b, 0x8c, 0x80, 0x05, 0x1d, 0x95, 0x00, 0x5c, 0xed, + 0xc1, 0x6d, 0x87, 0xb2, 0xed, 0x5f, 0xc8, 0x70, 0xa9, 0xc5, 0x41, 0xbf, 0x08, 0x38, 0xa4, 0xe2, + 0x98, 0x04, 0xfa, 0x91, 0x02, 0x39, 0xc3, 0xf2, 0x1c, 0xa2, 0xd3, 0x42, 0x96, 0xbb, 0xe1, 0x7e, + 0x5a, 0x6e, 0xd8, 0x11, 0x30, 0x95, 0xb9, 0x41, 0xbf, 0x98, 0x93, 0x2f, 0x38, 0x00, 0x47, 0x6f, + 0x2b, 0x30, 0xd3, 0x20, 0x26, 0xa1, 0xa4, 0x30, 0xcd, 0xed, 0x78, 0x3d, 0x2d, 0x3b, 0x36, 0x39, + 0x4a, 0x05, 0x98, 0x7b, 0xc5, 0x33, 0x96, 0xc8, 0xea, 0x35, 0x38, 0x3b, 0x46, 0x74, 0xc8, 0xa9, + 0xca, 0x24, 0xa7, 0xaa, 0x5b, 0x70, 0x6e, 0xdc, 0xcc, 0xff, 0x67, 0x3d, 0x7f, 0x9c, 0x81, 0xd9, + 0x75, 0xc7, 0xd9, 0x22, 0x54, 0x6f, 0xa1, 0xef, 0xb2, 0x2d, 0x62, 0x1a, 0x16, 0x91, 0xdb, 0xf5, + 0xde, 0xc9, 0xfa, 0x87, 0x83, 0xec, 0x70, 0x00, 0xe1, 0x1a, 0xf1, 0x8c, 0x25, 0x28, 0xea, 0xc1, + 0xb4, 0xd1, 0xd1, 0x9a, 0x44, 0x86, 0x90, 0x57, 0xd2, 0x40, 0x67, 0xfa, 0xc5, 0x9e, 0xe6, 0x8f, + 0x58, 0x20, 0x22, 0x1f, 0xb2, 0x2d, 0x4a, 0x9d, 0x42, 0x86, 0x23, 0x7f, 0x23, 0x05, 0xe4, 0xeb, + 0xfb, 0xfb, 0x55, 0x71, 0x4a, 0xd9, 0x13, 0xe6, 0x70, 0xe8, 0x3b, 0x90, 0x69, 0x1a, 0xc1, 0xa9, + 0xb8, 0x9b, 0x02, 0xea, 0xb6, 0x41, 0x2b, 0x39, 0x16, 0x9e, 0xb6, 0x0d, 0x8a, 0x19, 0x16, 0xfa, + 0xb1, 0x02, 0xf9, 0x16, 0x31, 0x3b, 0x1b, 0x2d, 0xcd, 0xa5, 0xf2, 0x1c, 0x7c, 0x2b, 0x8d, 0xf9, + 0x06, 0x18, 0x95, 0x05, 0x96, 0x42, 0xc2, 0x57, 0x1c, 0xa1, 0xa3, 0xf7, 0x14, 0x98, 0x37, 0x3a, + 0x4d, 0xa7, 0xdd, 0xac, 0xf8, 0x56, 0xc3, 0x24, 0x85, 0x99, 0x34, 0xc2, 0x83, 0x5c, 0xf8, 0x08, + 0xa6, 0xb2, 0x34, 0xe8, 0x17, 0xe7, 0xe3, 0x14, 0x9c, 0x30, 0x83, 0xe5, 0x00, 0x47, 0xa3, 0xad, + 0x42, 0x2e, 0x99, 0x03, 0xaa, 0x1a, 0x6d, 0x61, 0xce, 0x51, 0xff, 0x9a, 0x81, 0xb9, 0x98, 0x8f, + 0x59, 0x4e, 0xf0, 0x5d, 0x53, 0x46, 0xd6, 0x30, 0x27, 0xdc, 0xc1, 0x37, 0x31, 0xa3, 0x33, 0xb6, + 0x2b, 0x53, 0x63, 0x8c, 0xcd, 0x92, 0x14, 0xa3, 0xa3, 0x9f, 0x28, 0x30, 0xef, 0x92, 0x83, 0x1a, + 0x31, 0x89, 0xce, 0x8e, 0xa5, 0xf4, 0xc3, 0xfe, 0x24, 0x3f, 0x88, 0x52, 0x84, 0x4f, 0x5f, 0x3e, + 0x06, 0x55, 0x49, 0xe4, 0x80, 0xbb, 0x82, 0x12, 0xea, 0x16, 0x93, 0xc7, 0x31, 0x34, 0x9c, 0xc0, + 0x46, 0xef, 0x28, 0x90, 0xf7, 0xc2, 0x6c, 0x2e, 0x0e, 0xc4, 0x37, 0x53, 0x58, 0x91, 0x9b, 0xb6, + 0xae, 0x99, 0x2c, 0x81, 0xf3, 0xfd, 0x11, 0xa5, 0xed, 0x08, 0x1c, 0x5d, 0x80, 0x9c, 0xe7, 0xd7, + 0x99, 0xdb, 0xf9, 0x11, 0xc9, 0x57, 0x4e, 0x4b, 0xd7, 0xe5, 0x6a, 0x82, 0x8c, 0x03, 0x3e, 0xfa, + 0x1a, 0x2c, 0x98, 0x07, 0x5e, 0xad, 0x6d, 0x38, 0xb5, 0x8e, 0xdf, 0x68, 0x8a, 0x08, 0x3f, 0x5b, + 0x59, 0x96, 0x03, 0x16, 0x6e, 0x6e, 0xd5, 0x22, 0x26, 0x4e, 0xca, 0xaa, 0xef, 0x4e, 0xc1, 0x7c, + 0xfc, 0x9c, 0x4e, 0x5a, 0xce, 0x17, 0x61, 0xc6, 0x6b, 0x69, 0x6b, 0x2f, 0x5f, 0x91, 0x2b, 0x1a, + 0xa6, 0xd2, 0xda, 0xf5, 0xf5, 0xb5, 0x97, 0xaf, 0x60, 0xc9, 0xfd, 0x6c, 0xba, 0x92, 0x15, 0x86, + 0x67, 0x46, 0x4e, 0xf1, 0x31, 0xea, 0xa2, 0x0b, 0x90, 0x93, 0xdb, 0x4f, 0xba, 0x25, 0x84, 0x90, + 0x7b, 0x10, 0x07, 0x7c, 0xf4, 0x50, 0x01, 0x70, 0x89, 0x63, 0x7b, 0x06, 0xb5, 0xdd, 0x9e, 0xf4, + 0xcc, 0x1b, 0x69, 0x46, 0x21, 0x4c, 0x1c, 0x5b, 0x26, 0xc2, 0x10, 0x17, 0xc7, 0x6c, 0x50, 0xff, + 0xac, 0xc0, 0xf2, 0xd8, 0x51, 0x93, 0x36, 0x43, 0x72, 0x91, 0xa7, 0x3e, 0xc5, 0x45, 0x56, 0xff, + 0x33, 0xc5, 0x8b, 0xbe, 0x28, 0xd3, 0x4d, 0xb2, 0x9d, 0x05, 0x1e, 0xaa, 0x35, 0xa3, 0xc0, 0x93, + 0x4d, 0x3b, 0xf0, 0xec, 0xc7, 0xd0, 0x70, 0x02, 0xfb, 0x19, 0x72, 0x64, 0xfc, 0xb4, 0x64, 0x26, + 0x9c, 0x96, 0x0f, 0xa7, 0x78, 0x25, 0x36, 0x92, 0x64, 0xd0, 0x0b, 0x41, 0x35, 0x23, 0x9c, 0xbf, + 0x20, 0x35, 0x24, 0xeb, 0x8e, 0x91, 0x05, 0xc8, 0xfc, 0x7f, 0x01, 0xd8, 0x4e, 0xfe, 0xf7, 0x14, + 0x2c, 0x26, 0x2b, 0x46, 0x56, 0xb8, 0x4c, 0xb3, 0xdc, 0x2b, 0xaa, 0xda, 0xb9, 0xb5, 0x46, 0x6a, + 0xc5, 0x69, 0x89, 0x2d, 0xac, 0x77, 0xcd, 0xa2, 0x6e, 0x2f, 0x5a, 0x36, 0x4e, 0xc3, 0xc2, 0x02, + 0x16, 0xbf, 0xf2, 0xfc, 0x69, 0xcb, 0xb5, 0x3b, 0xfc, 0xa2, 0x94, 0x52, 0xd5, 0xc2, 0xed, 0xa9, + 0xd9, 0xbe, 0xab, 0x93, 0xe8, 0x3a, 0x5e, 0x0d, 0x90, 0x71, 0x64, 0xc4, 0xca, 0x55, 0x80, 0xc8, + 0x6c, 0xb4, 0x24, 0xee, 0xa8, 0x7c, 0xeb, 0xf1, 0x6b, 0x29, 0x3a, 0x07, 0xd3, 0x5d, 0xcd, 0xf4, + 0x45, 0x71, 0x9d, 0xc7, 0xe2, 0xe5, 0xab, 0x53, 0x57, 0x15, 0xf5, 0x2f, 0xf1, 0x1d, 0x1c, 0x03, + 0x44, 0x3f, 0x4b, 0xec, 0x07, 0x71, 0x25, 0xa8, 0xa7, 0x3c, 0xcb, 0x27, 0x9f, 0xcb, 0x5f, 0x2a, + 0x30, 0x2f, 0x2e, 0xec, 0x7b, 0x9a, 0x13, 0x6d, 0xd2, 0xa7, 0x61, 0x14, 0x3f, 0x3c, 0x1b, 0x31, + 0x6c, 0x9c, 0xb0, 0x44, 0x3d, 0x84, 0xe7, 0x8e, 0x18, 0xca, 0x6a, 0x93, 0x86, 0xe1, 0x12, 0x9d, + 0xe5, 0x19, 0x1e, 0x53, 0x44, 0x7a, 0x0c, 0x6b, 0x93, 0xcd, 0x38, 0x13, 0x27, 0x65, 0x27, 0xe7, + 0x5d, 0xf5, 0x32, 0x2c, 0x0d, 0x9f, 0xac, 0x63, 0x8c, 0x7a, 0x3b, 0x07, 0xb9, 0x75, 0xc7, 0xa9, + 0x39, 0x44, 0x47, 0x37, 0x00, 0x79, 0xc4, 0xed, 0x1a, 0x3a, 0x59, 0xd7, 0x75, 0xdb, 0xb7, 0xe8, + 0xad, 0x68, 0xec, 0x8a, 0x1c, 0x8b, 0x6a, 0x23, 0x12, 0x78, 0xcc, 0x28, 0xf4, 0x16, 0xe4, 0x74, + 0xd1, 0x5d, 0x91, 0x8b, 0x73, 0x27, 0x95, 0x4e, 0x90, 0xb8, 0xe2, 0xcb, 0x17, 0x1c, 0x40, 0xa2, + 0x43, 0x98, 0x3e, 0x60, 0x8e, 0xe0, 0x6d, 0x89, 0xb9, 0xb5, 0x5a, 0x0a, 0x1b, 0x23, 0x0a, 0x09, + 0xfc, 0x15, 0x0b, 0x40, 0xf4, 0x43, 0x05, 0x66, 0x29, 0xe9, 0x38, 0xa6, 0x46, 0x49, 0x21, 0xcb, + 0xd1, 0x4f, 0xf8, 0x42, 0xb7, 0x2f, 0xb5, 0x57, 0x96, 0xa4, 0x01, 0xb3, 0x01, 0x05, 0x87, 0xc8, + 0xe8, 0x2d, 0x98, 0x69, 0xf0, 0xa6, 0x40, 0x61, 0x9a, 0xdb, 0xb0, 0x9f, 0x46, 0x8b, 0x23, 0x2a, + 0x78, 0xc5, 0x3b, 0x96, 0x98, 0xac, 0x30, 0x76, 0x34, 0xdf, 0x23, 0x0d, 0x7e, 0x83, 0x99, 0x8d, + 0xe4, 0xaa, 0x9c, 0x8a, 0x25, 0x17, 0x7d, 0x19, 0x66, 0x75, 0xcd, 0xd2, 0x89, 0x49, 0x1a, 0xfc, + 0x92, 0x35, 0x1b, 0xcd, 0x69, 0x43, 0xd2, 0x71, 0x28, 0x81, 0x5e, 0x07, 0xf0, 0x7a, 0x96, 0x5e, + 0x25, 0xae, 0x61, 0x37, 0x0a, 0xb3, 0x7c, 0x57, 0x95, 0x4a, 0xa2, 0xed, 0x59, 0x8a, 0xb7, 0x3d, + 0x23, 0xe3, 0x3b, 0x84, 0x6a, 0xa5, 0xee, 0xa5, 0xd2, 0xa6, 0xef, 0x6a, 0x3c, 0xf7, 0xf1, 0xd2, + 0xaf, 0x16, 0x6a, 0xc1, 0x31, 0x8d, 0x68, 0x0d, 0xc0, 0xb2, 0x6d, 0xd9, 0x89, 0x29, 0xe4, 0xb9, + 0x3d, 0x48, 0xda, 0x03, 0xb7, 0x42, 0x0e, 0x8e, 0x49, 0xa1, 0x4d, 0x58, 0x6a, 0x90, 0x03, 0xcd, + 0x37, 0x69, 0xd8, 0x1c, 0x2d, 0x00, 0x3f, 0x30, 0x05, 0x39, 0x72, 0x69, 0x73, 0x88, 0x8f, 0x47, + 0x46, 0xa8, 0xbf, 0xc9, 0xf1, 0x6b, 0x64, 0xb0, 0x8e, 0x88, 0x42, 0xa6, 0x47, 0x69, 0x3a, 0xdd, + 0x97, 0x00, 0xe4, 0x1e, 0x95, 0x2d, 0x81, 0x7b, 0x94, 0x62, 0x06, 0x87, 0x0e, 0x21, 0xdb, 0xae, + 0x9b, 0x0d, 0x79, 0x5e, 0x5f, 0x4d, 0x07, 0x76, 0xb7, 0x6e, 0x36, 0x64, 0x97, 0xb2, 0x6e, 0x36, + 0x30, 0x47, 0xe4, 0xf1, 0xbc, 0x45, 0xcc, 0x4e, 0x20, 0x24, 0xcb, 0x9f, 0x7a, 0x3a, 0x26, 0x5c, + 0x8f, 0x21, 0x89, 0x78, 0x1e, 0xa7, 0xe0, 0x84, 0x25, 0xe8, 0xa7, 0x0a, 0xe4, 0xdb, 0xbe, 0x47, + 0xed, 0x8e, 0xf1, 0x26, 0x49, 0xa7, 0x6f, 0x19, 0xba, 0x26, 0x80, 0x11, 0x99, 0x2f, 0x7c, 0xc5, + 0x91, 0x01, 0x2c, 0xbc, 0xe4, 0xbe, 0xed, 0xd9, 0x96, 0x45, 0x82, 0xa6, 0xcd, 0x6b, 0xe9, 0x18, + 0x73, 0x43, 0x80, 0x88, 0xf8, 0x2a, 0x5f, 0x70, 0x00, 0xcd, 0xb6, 0x8a, 0x67, 0x3b, 0x9e, 0x6c, + 0x50, 0xa4, 0xb4, 0x55, 0x6a, 0xb6, 0xe3, 0x89, 0xad, 0xc2, 0x9e, 0x30, 0x47, 0x64, 0x47, 0x43, + 0xf7, 0x09, 0x8f, 0x16, 0xa9, 0x1d, 0x8d, 0x0d, 0x9f, 0x88, 0xa3, 0xb1, 0xe1, 0x13, 0xcc, 0xe0, + 0x58, 0x75, 0xbf, 0x98, 0x14, 0x40, 0xc5, 0x78, 0x19, 0x2a, 0xfb, 0xe3, 0x89, 0xe2, 0xf0, 0x7d, + 0x05, 0x80, 0x57, 0x57, 0xf1, 0xea, 0x30, 0xa5, 0x2d, 0x7d, 0x97, 0xe3, 0xc8, 0x02, 0x31, 0x8c, + 0x59, 0x77, 0x43, 0x74, 0x1c, 0xb3, 0x04, 0xad, 0xc3, 0x69, 0xc3, 0x72, 0x7c, 0x7a, 0xed, 0xd0, + 0x71, 0x89, 0xe7, 0x05, 0xd7, 0x8d, 0x7c, 0xe5, 0x39, 0x39, 0xf0, 0xf4, 0x4e, 0x92, 0x8d, 0x87, + 0xe5, 0x59, 0xd8, 0xb3, 0x7d, 0x9a, 0xd4, 0x91, 0x4d, 0x86, 0xbd, 0xdb, 0x43, 0x7c, 0x3c, 0x32, + 0x42, 0xfd, 0x7b, 0x96, 0x17, 0x4b, 0xe3, 0xce, 0xe5, 0x31, 0xfa, 0x0c, 0x89, 0x2f, 0x55, 0x53, + 0xc7, 0xf8, 0x52, 0x15, 0xb4, 0xf3, 0x32, 0x47, 0xb5, 0xf3, 0x86, 0x97, 0x2c, 0xfb, 0xcc, 0x2c, + 0xd9, 0x2f, 0x14, 0x38, 0xd3, 0xf6, 0xeb, 0xc4, 0xb5, 0x08, 0x25, 0x9e, 0xbc, 0xd1, 0xc9, 0x00, + 0x80, 0x4f, 0xd0, 0x3e, 0xa9, 0xb9, 0xb2, 0x3c, 0xe8, 0x17, 0xcf, 0xec, 0x0e, 0x03, 0xe2, 0x51, + 0x1b, 0xd0, 0x7b, 0x0a, 0x2c, 0x46, 0xd4, 0xf5, 0xea, 0x4e, 0x10, 0x14, 0x4e, 0xf2, 0x6c, 0xee, + 0x26, 0x00, 0x2a, 0x68, 0xd0, 0x2f, 0x2e, 0x26, 0x69, 0x78, 0xc8, 0x08, 0xf5, 0x1c, 0xa0, 0xd1, + 0x68, 0xa6, 0xae, 0xc1, 0xe9, 0xa1, 0x5c, 0x34, 0xf1, 0x1c, 0xab, 0x9f, 0xe3, 0xd7, 0xa2, 0x91, + 0x20, 0xad, 0xfe, 0x6e, 0x2a, 0xa1, 0x8c, 0xc5, 0x28, 0x74, 0x08, 0x19, 0xa7, 0x19, 0x7c, 0xe5, + 0x7b, 0x2d, 0xbd, 0xb0, 0x58, 0xdd, 0xae, 0x8a, 0x08, 0x55, 0xdd, 0xae, 0x62, 0x06, 0x19, 0x4d, + 0x63, 0xea, 0x88, 0x70, 0x74, 0x08, 0x19, 0xad, 0x19, 0x64, 0xd6, 0x14, 0x4d, 0x5b, 0x6f, 0xca, + 0xe0, 0xb9, 0xde, 0x24, 0x98, 0x41, 0xaa, 0x1f, 0x2a, 0x89, 0xb5, 0x90, 0x42, 0xe8, 0x4f, 0x0a, + 0x9c, 0x73, 0x5c, 0xa3, 0xcb, 0x9c, 0x4a, 0x7a, 0x5e, 0x6d, 0xe8, 0x86, 0x69, 0xa5, 0xe8, 0xbd, + 0x31, 0xa8, 0x95, 0xc2, 0xa0, 0x5f, 0x3c, 0x37, 0x8e, 0x83, 0xc7, 0x5a, 0x39, 0x6e, 0x56, 0xd5, + 0xed, 0xea, 0x67, 0x7d, 0x56, 0xdb, 0xf0, 0xc2, 0x31, 0xd4, 0x1e, 0xe3, 0x5e, 0xf9, 0x7b, 0x05, + 0xbe, 0x38, 0x12, 0xed, 0x36, 0xed, 0x07, 0xd6, 0x03, 0xcd, 0x6d, 0xac, 0x57, 0x77, 0xd0, 0x43, + 0x05, 0xa6, 0x0d, 0x4a, 0x3a, 0x41, 0x1f, 0xa7, 0x9d, 0x66, 0x98, 0x8d, 0x01, 0xef, 0x50, 0xd2, + 0x89, 0x75, 0xe1, 0x98, 0x05, 0x58, 0x18, 0xa2, 0xfe, 0x2d, 0x0b, 0xe7, 0x27, 0x0d, 0x3d, 0x5e, + 0x62, 0x3a, 0x30, 0x88, 0xd9, 0x88, 0xdd, 0xf1, 0xc3, 0xc4, 0xb4, 0x15, 0x30, 0x70, 0x24, 0x73, + 0x44, 0x74, 0xcf, 0x3c, 0x03, 0xd1, 0xfd, 0xb7, 0x0a, 0x2c, 0x33, 0x3d, 0x1b, 0xa1, 0xfe, 0xc0, + 0xba, 0x6c, 0x6a, 0xd6, 0x7d, 0x7e, 0xd0, 0x2f, 0x2e, 0xef, 0x8e, 0x03, 0xc5, 0xe3, 0x6d, 0x19, + 0x97, 0x83, 0xa6, 0x9f, 0x85, 0x1c, 0xf4, 0x6e, 0xb2, 0xbe, 0x89, 0x67, 0x7c, 0xf4, 0xf3, 0x31, + 0x4d, 0x35, 0x92, 0x7e, 0xa5, 0xf1, 0xe4, 0xbe, 0xda, 0xaf, 0xc7, 0xf7, 0xd5, 0x9e, 0x92, 0x5d, + 0x13, 0x5a, 0x6b, 0xc7, 0xa8, 0xdf, 0x7e, 0xa5, 0xc0, 0x5c, 0x23, 0x3a, 0xaf, 0x72, 0x93, 0x36, + 0x9f, 0x52, 0x64, 0xa9, 0x9c, 0x1e, 0xf4, 0x8b, 0x73, 0x31, 0x02, 0x8e, 0x1b, 0xa3, 0x7e, 0x1d, + 0x56, 0x8e, 0x9e, 0xfc, 0x31, 0x22, 0xea, 0xc7, 0x99, 0xc4, 0x1d, 0xe4, 0x1e, 0xa5, 0xa8, 0x06, + 0xcb, 0x46, 0xd3, 0xb2, 0x5d, 0x72, 0xc7, 0x6a, 0x5b, 0xf6, 0x03, 0x6b, 0xc3, 0xee, 0x74, 0x88, + 0x45, 0xc5, 0xaf, 0x3d, 0xb3, 0x95, 0xe7, 0xa5, 0x96, 0xe5, 0x9d, 0x71, 0x42, 0x78, 0xfc, 0x58, + 0xfe, 0x55, 0x93, 0xba, 0x86, 0x4e, 0xf9, 0xea, 0xc7, 0x9a, 0x37, 0x35, 0x4e, 0xc5, 0x92, 0x1b, + 0xfb, 0x4b, 0x24, 0xf3, 0x69, 0xfc, 0x25, 0x12, 0x16, 0x3c, 0xd9, 0x23, 0x0a, 0x9e, 0x2f, 0xb1, + 0x30, 0x6c, 0x92, 0x3d, 0xcd, 0x6d, 0x7b, 0xbc, 0x0b, 0x96, 0x17, 0x3b, 0x7f, 0x2b, 0x20, 0xe2, + 0x88, 0x3f, 0x5c, 0xf9, 0xcf, 0x3c, 0x2b, 0x95, 0xbf, 0xfa, 0x0f, 0x05, 0xf2, 0x1b, 0xb6, 0xd5, + 0x30, 0xf8, 0xa7, 0x99, 0x4b, 0x90, 0xa5, 0x3d, 0x27, 0xd8, 0x25, 0xc1, 0xfa, 0x66, 0xf7, 0x7b, + 0x0e, 0xf9, 0xa4, 0x5f, 0x5c, 0x08, 0x05, 0x19, 0x01, 0x73, 0x51, 0x74, 0x93, 0x2d, 0xa7, 0x46, + 0x7d, 0x4f, 0xa6, 0xa2, 0xcb, 0xd1, 0x72, 0x32, 0xea, 0x27, 0xfd, 0xa2, 0x1a, 0xfd, 0x39, 0x58, + 0xd6, 0x6d, 0x97, 0x94, 0xbb, 0x97, 0x4a, 0xa1, 0x26, 0x21, 0x85, 0xa5, 0x0e, 0xb6, 0x39, 0x5c, + 0xa2, 0x79, 0xe1, 0x95, 0x31, 0xdc, 0x1c, 0x98, 0x53, 0xb1, 0xe4, 0xa2, 0x0b, 0x90, 0xeb, 0x10, + 0xcf, 0x63, 0x15, 0xe7, 0xd0, 0x77, 0xe6, 0x3d, 0x41, 0xc6, 0x01, 0x5f, 0xfd, 0x7e, 0x06, 0x16, + 0xb6, 0x89, 0x45, 0x5c, 0x43, 0x17, 0x60, 0xe8, 0x06, 0x20, 0xbb, 0xee, 0x11, 0xb7, 0x4b, 0x1a, + 0xdb, 0xe2, 0x6f, 0x45, 0x96, 0x71, 0xd8, 0x9c, 0x33, 0x51, 0x1f, 0xfa, 0xf6, 0x88, 0x04, 0x1e, + 0x33, 0x0a, 0xbd, 0xa3, 0x00, 0xe8, 0xc1, 0x64, 0x3c, 0x79, 0x0b, 0x3f, 0xc9, 0x6e, 0x68, 0xe8, + 0xa9, 0x68, 0x29, 0x43, 0x92, 0x87, 0x63, 0xd8, 0x68, 0x0f, 0xce, 0x1e, 0xb8, 0x06, 0xb1, 0x1a, + 0x66, 0x6f, 0x93, 0x78, 0xba, 0x6b, 0x38, 0x34, 0xba, 0x7b, 0x7f, 0x41, 0x0e, 0x3e, 0xbb, 0x35, + 0x2a, 0x82, 0xc7, 0x8d, 0x63, 0x5e, 0xf2, 0x3d, 0x72, 0xe0, 0x9b, 0xd7, 0x5c, 0xd7, 0x76, 0xf7, + 0x12, 0xde, 0x0e, 0xbd, 0x74, 0x67, 0x44, 0x02, 0x8f, 0x19, 0xa5, 0xee, 0xc0, 0x50, 0x2e, 0x43, + 0x5f, 0x81, 0x85, 0xa6, 0x6b, 0xfb, 0x8e, 0xcc, 0xb1, 0xc1, 0xf5, 0xe8, 0xcc, 0xa0, 0x5f, 0x5c, + 0xd8, 0x8e, 0x33, 0x70, 0x52, 0x4e, 0xbd, 0x0c, 0xc1, 0x77, 0xfe, 0xf8, 0x9f, 0x00, 0xca, 0x93, + 0xff, 0x04, 0xa8, 0xd8, 0x8f, 0x1e, 0xaf, 0x9e, 0xfa, 0xe0, 0xf1, 0xea, 0xa9, 0x8f, 0x1e, 0xaf, + 0x9e, 0xfa, 0xde, 0x60, 0x55, 0x79, 0x34, 0x58, 0x55, 0x3e, 0x18, 0xac, 0x2a, 0x1f, 0x0d, 0x56, + 0x95, 0x7f, 0x0e, 0x56, 0x95, 0x87, 0xff, 0x5a, 0x3d, 0xf5, 0xea, 0xce, 0x89, 0xfd, 0x73, 0xfc, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xaf, 0xd1, 0x04, 0xbf, 0x2c, 0x00, 0x00, } func (m *AppCluster) Marshal() (dAtA []byte, err error) { @@ -1640,14 +1638,6 @@ func (m *AppFetchGit) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - i-- - if m.DangerousSkipTLSVerify { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 if m.RefSelection != nil { { size, err := m.RefSelection.MarshalToSizedBuffer(dAtA[:i]) @@ -3308,7 +3298,6 @@ func (m *AppFetchGit) Size() (n int) { l = m.RefSelection.Size() n += 1 + l + sovGenerated(uint64(l)) } - n += 2 return n } @@ -3962,7 +3951,6 @@ func (this *AppFetchGit) String() string { `SubPath:` + fmt.Sprintf("%v", this.SubPath) + `,`, `LFSSkipSmudge:` + fmt.Sprintf("%v", this.LFSSkipSmudge) + `,`, `RefSelection:` + strings.Replace(fmt.Sprintf("%v", this.RefSelection), "VersionSelection", "v1alpha1.VersionSelection", 1) + `,`, - `DangerousSkipTLSVerify:` + fmt.Sprintf("%v", this.DangerousSkipTLSVerify) + `,`, `}`, }, "") return s @@ -5590,26 +5578,6 @@ func (m *AppFetchGit) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DangerousSkipTLSVerify", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DangerousSkipTLSVerify = bool(v != 0) default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/pkg/apis/kappctrl/v1alpha1/generated.proto b/pkg/apis/kappctrl/v1alpha1/generated.proto index 6a2fafc5e8..4e1461e8fa 100644 --- a/pkg/apis/kappctrl/v1alpha1/generated.proto +++ b/pkg/apis/kappctrl/v1alpha1/generated.proto @@ -123,10 +123,6 @@ message AppFetchGit { // Skip lfs download (optional) // +optional optional bool lfsSkipSmudge = 5; - - // Skip TLS verification (optional) - // +optional - optional bool dangerousSkipTLSVerify = 7; } // +k8s:openapi-gen=true diff --git a/pkg/apis/kappctrl/v1alpha1/types_fetch.go b/pkg/apis/kappctrl/v1alpha1/types_fetch.go index 0ba58fadd7..2a598a09b0 100644 --- a/pkg/apis/kappctrl/v1alpha1/types_fetch.go +++ b/pkg/apis/kappctrl/v1alpha1/types_fetch.go @@ -106,9 +106,6 @@ type AppFetchGit struct { // Skip lfs download (optional) // +optional LFSSkipSmudge bool `json:"lfsSkipSmudge,omitempty" protobuf:"varint,5,opt,name=lfsSkipSmudge"` - // Skip TLS verification (optional) - // +optional - DangerousSkipTLSVerify bool `json:"dangerousSkipTLSVerify,omitempty" protobuf:"varint,7,opt,name=dangerousSkipTLSVerify"` } // +k8s:openapi-gen=true diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go index 8852fe5ffa..78c4d08d10 100644 --- a/pkg/apiserver/openapi/zz_generated.openapi.go +++ b/pkg/apiserver/openapi/zz_generated.openapi.go @@ -629,13 +629,6 @@ func schema_pkg_apis_kappctrl_v1alpha1_AppFetchGit(ref common.ReferenceCallback) Format: "", }, }, - "dangerousSkipTLSVerify": { - SchemaProps: spec.SchemaProps{ - Description: "Skip TLS verification (optional)", - Type: []string{"boolean"}, - Format: "", - }, - }, }, }, }, diff --git a/pkg/fetch/vendir.go b/pkg/fetch/vendir.go index 058e19ae24..471ea405f6 100644 --- a/pkg/fetch/vendir.go +++ b/pkg/fetch/vendir.go @@ -7,6 +7,7 @@ import ( "bytes" "context" "fmt" + "net/url" "os" goexec "os/exec" "path/filepath" @@ -122,7 +123,7 @@ func (v *Vendir) imageConf(image v1alpha1.AppFetchImage) vendirconf.DirectoryCon URL: image.URL, TagSelection: image.TagSelection, SecretRef: v.localRefConf(image.SecretRef), - DangerousSkipTLSVerify: v.shouldSkipTLSVerify(image.URL), + DangerousSkipTLSVerify: v.shouldSkipTLSVerify(image.URL, false), }, } } @@ -134,7 +135,7 @@ func (v *Vendir) imgpkgBundleConf(imgpkgBundle v1alpha1.AppFetchImgpkgBundle) ve Image: imgpkgBundle.Image, TagSelection: imgpkgBundle.TagSelection, SecretRef: v.localRefConf(imgpkgBundle.SecretRef), - DangerousSkipTLSVerify: v.shouldSkipTLSVerify(imgpkgBundle.Image), + DangerousSkipTLSVerify: v.shouldSkipTLSVerify(imgpkgBundle.Image, false), }, } } @@ -161,7 +162,7 @@ func (v *Vendir) gitConf(git v1alpha1.AppFetchGit) vendirconf.DirectoryContents Ref: git.Ref, SecretRef: v.localRefConf(git.SecretRef), LFSSkipSmudge: git.LFSSkipSmudge, - DangerousSkipTLSVerify: git.DangerousSkipTLSVerify, + DangerousSkipTLSVerify: v.shouldSkipTLSVerify(git.URL, true), }, } } @@ -377,11 +378,9 @@ func (v *Vendir) configMapBytes(configMapRef vendirconf.DirectoryContentsLocalRe return kyaml.Marshal(configMap) } -// This function only works on image refs. If in the future we decide to -// expand this option to other fetch options, we will need to add hostname -// extraction for those -func (v *Vendir) shouldSkipTLSVerify(url string) bool { - return v.opts.SkipTLSConfig.ShouldSkipTLSForAuthority(ExtractImageRegistry(url)) +// This function works on image refs and hostname extraction using isGitURL flag +func (v *Vendir) shouldSkipTLSVerify(url string, isGitURL bool) bool { + return v.opts.SkipTLSConfig.ShouldSkipTLSForAuthority(ExtractHost(url, isGitURL)) } // Run executes vendir command based on given configuration. @@ -411,8 +410,8 @@ func (v *Vendir) ClearCache(cacheID string) error { return os.RemoveAll(filepath.Join(v.opts.BaseCacheFolder, cacheID)) } -// ExtractImageRegistry returns the registry portion of a Docker image reference -func ExtractImageRegistry(name string) string { +// extractImageRegistry returns the registry portion of a Docker image reference +func extractImageRegistry(name string) string { parts := strings.SplitN(name, "/", 2) var registry string if len(parts) == 2 && (strings.ContainsRune(parts[0], '.') || strings.ContainsRune(parts[0], ':')) { @@ -422,3 +421,20 @@ func ExtractImageRegistry(name string) string { } return registry } + +// extractGitHostname extracts the hostname from the git URL. +func extractGitHostname(input string) string { + u, err := url.Parse(input) + if err != nil { + return "github.com" + } + return u.Hostname() +} + +// ExtractHost return registry for Docker Image and Host for git url +func ExtractHost(input string, isGitURL bool) string { + if !isGitURL { + extractImageRegistry(input) + } + return extractGitHostname(input) +} diff --git a/pkg/fetch/vendir_test.go b/pkg/fetch/vendir_test.go index ce03fe5554..7a8903fcbf 100644 --- a/pkg/fetch/vendir_test.go +++ b/pkg/fetch/vendir_test.go @@ -58,32 +58,52 @@ func Test_AddDir_skipsTLS(t *testing.T) { } } -func TestExtractImageRegistry(t *testing.T) { +func TestExtractHost(t *testing.T) { tests := []struct { - name string - want string + name string + isGitURL bool + want string }{ { - name: "ubuntu:latest", - want: "index.docker.io", + name: "ubuntu:latest", + isGitURL: false, + want: "index.docker.io", }, { - name: "foo/bar:v1.2.3", - want: "index.docker.io", + name: "foo/bar:v1.2.3", + isGitURL: false, + want: "index.docker.io", }, { - name: "ghcr.io/foo/bar:foo", - want: "ghcr.io", + name: "ghcr.io/foo/bar:foo", + isGitURL: false, + want: "ghcr.io", }, { - name: "foo.domain:5426/foo/bar@sha256:blah", - want: "foo.domain:5426", + name: "foo.domain:5426/foo/bar@sha256:blah", + isGitURL: false, + want: "foo.domain:5426", + }, + { + name: "https://github.com/bitnami/charts/", + isGitURL: true, + want: "github.com", + }, + { + name: "http://github.com/bitnami/charts/", + isGitURL: true, + want: "github.com", + }, + { + name: "ssh://username@hostname.com:/path/to/repo.git", + isGitURL: true, + want: "hostname.com", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if got := fetch.ExtractImageRegistry(tt.name); got != tt.want { - t.Errorf("ExtractDockerImageRepo() = %v, want %v", got, tt.want) + if got := fetch.ExtractHost(tt.name, tt.isGitURL); got != tt.want { + t.Errorf("ExtractHost() = %v, want %v", got, tt.want) } }) }