diff --git a/go.mod b/go.mod index 34aed1713..f7e8e6061 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - github.com/vmware-tanzu/carvel-kapp-controller v0.50.2 + github.com/vmware-tanzu/carvel-kapp-controller v0.51.0 golang.org/x/net v0.25.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.30.0 @@ -33,6 +33,7 @@ require ( ) require ( + carvel.dev/vendir v0.40.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/go-logr/logr v1.4.1 // indirect @@ -51,14 +52,13 @@ require ( github.com/k14s/starlark-go v0.0.0-20200720175618-3a5c849cc368 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/vito/go-interact v1.0.1 // indirect - github.com/vmware-tanzu/carvel-vendir v0.36.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/term v0.20.0 // indirect diff --git a/go.sum b/go.sum index a18dd9961..478568fbf 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +carvel.dev/vendir v0.40.0 h1:JdhCp/EjAPGI8F5zoAVYwZHf1sPEFee19RpgGb3ciT8= +carvel.dev/vendir v0.40.0/go.mod h1:XPdluJu7322RZNx05AA4gYnV52aKywBdh7Ma12GuM2Q= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -210,8 +212,8 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= @@ -323,10 +325,8 @@ github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo= github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs= github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA= -github.com/vmware-tanzu/carvel-kapp-controller v0.50.2 h1:/0iDxqCzQIDLhasdnx2Hw+iW5VbL2OenfHESbWOZ5fE= -github.com/vmware-tanzu/carvel-kapp-controller v0.50.2/go.mod h1:dcE+zg3cMl6CWRWwA1K9I9x24wGF98wlsatz5UEfdFo= -github.com/vmware-tanzu/carvel-vendir v0.36.0 h1:F9FNk2YysC6DlUDP2Nl2ynsv6JH8S0FYT4OK6HrRco0= -github.com/vmware-tanzu/carvel-vendir v0.36.0/go.mod h1:rPGI/zItMK4QgLRpLix2aykoYufavHyKqqLTONXb2uE= +github.com/vmware-tanzu/carvel-kapp-controller v0.51.0 h1:lCCHy9n/AzWPtq5gqbINJHgmF32RCUkh9DbVQgx6HAs= +github.com/vmware-tanzu/carvel-kapp-controller v0.51.0/go.mod h1:go1MQz1D2kVgjaE2ZHtuHGECFk8EDLeXMpjmDNDzuJM= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/LICENSE b/vendor/carvel.dev/vendir/LICENSE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/LICENSE rename to vendor/carvel.dev/vendir/LICENSE diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/NOTICE b/vendor/carvel.dev/vendir/NOTICE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/NOTICE rename to vendor/carvel.dev/vendir/NOTICE diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/config.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/config.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/config.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/config.go diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go similarity index 78% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go index c67facc7c..56ab6b7dc 100644 --- a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go +++ b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto +// source: carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto package v1alpha1 @@ -24,12 +24,12 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *VersionSelection) Reset() { *m = VersionSelection{} } func (*VersionSelection) ProtoMessage() {} func (*VersionSelection) Descriptor() ([]byte, []int) { - return fileDescriptor_8d3ef80c738fc456, []int{0} + return fileDescriptor_f7fa722d77d11bd9, []int{0} } func (m *VersionSelection) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -57,7 +57,7 @@ var xxx_messageInfo_VersionSelection proto.InternalMessageInfo func (m *VersionSelectionSemver) Reset() { *m = VersionSelectionSemver{} } func (*VersionSelectionSemver) ProtoMessage() {} func (*VersionSelectionSemver) Descriptor() ([]byte, []int) { - return fileDescriptor_8d3ef80c738fc456, []int{1} + return fileDescriptor_f7fa722d77d11bd9, []int{1} } func (m *VersionSelectionSemver) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -85,7 +85,7 @@ var xxx_messageInfo_VersionSelectionSemver proto.InternalMessageInfo func (m *VersionSelectionSemverPrereleases) Reset() { *m = VersionSelectionSemverPrereleases{} } func (*VersionSelectionSemverPrereleases) ProtoMessage() {} func (*VersionSelectionSemverPrereleases) Descriptor() ([]byte, []int) { - return fileDescriptor_8d3ef80c738fc456, []int{2} + return fileDescriptor_f7fa722d77d11bd9, []int{2} } func (m *VersionSelectionSemverPrereleases) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -111,40 +111,38 @@ func (m *VersionSelectionSemverPrereleases) XXX_DiscardUnknown() { var xxx_messageInfo_VersionSelectionSemverPrereleases proto.InternalMessageInfo func init() { - proto.RegisterType((*VersionSelection)(nil), "github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection") - proto.RegisterType((*VersionSelectionSemver)(nil), "github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemver") - proto.RegisterType((*VersionSelectionSemverPrereleases)(nil), "github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemverPrereleases") + proto.RegisterType((*VersionSelection)(nil), "carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection") + proto.RegisterType((*VersionSelectionSemver)(nil), "carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemver") + proto.RegisterType((*VersionSelectionSemverPrereleases)(nil), "carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemverPrereleases") } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) -} - -var fileDescriptor_8d3ef80c738fc456 = []byte{ - // 354 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x8f, 0x31, 0x4b, 0xf3, 0x40, - 0x1c, 0xc6, 0x73, 0xef, 0x0b, 0xc5, 0x5e, 0x06, 0x25, 0x82, 0x14, 0x87, 0xab, 0x76, 0xea, 0xd2, - 0x0b, 0x15, 0xfc, 0x02, 0x71, 0x72, 0x93, 0x14, 0x3a, 0x74, 0x29, 0xd7, 0xf4, 0xdf, 0xf4, 0x68, - 0x7a, 0x17, 0x2e, 0xd7, 0x08, 0x0e, 0xe2, 0x47, 0x10, 0x27, 0x3f, 0x52, 0xc7, 0x8e, 0x9d, 0x8a, - 0x8d, 0x9b, 0x9f, 0x42, 0x7a, 0xd7, 0x92, 0x20, 0x82, 0x83, 0xb8, 0x3d, 0xf7, 0xbf, 0x87, 0xdf, - 0xf3, 0x3c, 0x38, 0x8c, 0xb9, 0x9e, 0x2e, 0x46, 0x34, 0x92, 0x73, 0x3f, 0x9f, 0xdf, 0x33, 0x05, - 0x1d, 0xcd, 0xc4, 0xc3, 0xc2, 0x8f, 0x98, 0xca, 0x21, 0xe9, 0xe4, 0x20, 0xc6, 0x5c, 0xf9, 0xe9, - 0x2c, 0xf6, 0xf7, 0x32, 0x07, 0x95, 0x71, 0x29, 0x32, 0x3f, 0xef, 0xb2, 0x24, 0x9d, 0xb2, 0xae, - 0x1f, 0x83, 0x00, 0xc5, 0x34, 0x8c, 0x69, 0xaa, 0xa4, 0x96, 0x5e, 0x50, 0x32, 0xa9, 0x65, 0x0e, - 0x0d, 0x93, 0x5a, 0xe6, 0xd0, 0x82, 0x68, 0x3a, 0x8b, 0xe9, 0x5e, 0x1e, 0x98, 0xf4, 0xc0, 0x3c, - 0xef, 0x54, 0x7a, 0xc5, 0x32, 0x96, 0xbe, 0x41, 0x8f, 0x16, 0x13, 0xf3, 0x32, 0x0f, 0xa3, 0x6c, - 0x64, 0xeb, 0x05, 0xe1, 0x93, 0xbe, 0x85, 0xf4, 0x20, 0x81, 0x48, 0x73, 0x29, 0xbc, 0x47, 0x5c, - 0xcb, 0x60, 0x9e, 0x83, 0x6a, 0xa0, 0x0b, 0xd4, 0x76, 0xaf, 0x06, 0xf4, 0xf7, 0xc5, 0xe8, 0xd7, - 0x94, 0x9e, 0x49, 0x08, 0x70, 0xb1, 0x69, 0xd6, 0xac, 0x0e, 0xf7, 0xa9, 0xad, 0x0f, 0x84, 0xcf, - 0xbe, 0xb7, 0x7b, 0xd7, 0xd8, 0x8d, 0xa4, 0xc8, 0xb4, 0x62, 0x5c, 0xe8, 0xcc, 0xf4, 0xab, 0x07, - 0xa7, 0xcb, 0x4d, 0xd3, 0x29, 0x36, 0x4d, 0xf7, 0xa6, 0xfc, 0x0a, 0xab, 0x3e, 0xef, 0x15, 0x61, - 0x37, 0x55, 0xa0, 0x20, 0x01, 0x96, 0x41, 0xd6, 0xf8, 0x67, 0x76, 0xc1, 0xdf, 0xed, 0xba, 0x2b, - 0xc3, 0x82, 0xe3, 0x5d, 0xb5, 0xca, 0x21, 0xac, 0x56, 0x69, 0xf5, 0xf1, 0xe5, 0x8f, 0x08, 0xaf, - 0x8b, 0x5d, 0x3e, 0x06, 0xa1, 0xf9, 0x84, 0x83, 0xda, 0xcd, 0xfe, 0xdf, 0xae, 0x5b, 0xee, 0x6d, - 0x79, 0x0e, 0xab, 0x9e, 0x80, 0x2e, 0xb7, 0xc4, 0x59, 0x6d, 0x89, 0xb3, 0xde, 0x12, 0xe7, 0xa9, - 0x20, 0x68, 0x59, 0x10, 0xb4, 0x2a, 0x08, 0x5a, 0x17, 0x04, 0xbd, 0x15, 0x04, 0x3d, 0xbf, 0x13, - 0x67, 0x70, 0x74, 0xd8, 0xf1, 0x19, 0x00, 0x00, 0xff, 0xff, 0x97, 0x30, 0x55, 0x40, 0xd1, 0x02, - 0x00, 0x00, + proto.RegisterFile("carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_f7fa722d77d11bd9) +} + +var fileDescriptor_f7fa722d77d11bd9 = []byte{ + // 333 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x8f, 0x31, 0x4b, 0xfb, 0x40, + 0x18, 0xc6, 0x73, 0xff, 0x3f, 0x14, 0x7b, 0x19, 0x94, 0x08, 0x52, 0x1c, 0xae, 0xda, 0xa9, 0x8b, + 0x17, 0x2a, 0xb8, 0x3a, 0x44, 0x10, 0xdc, 0x34, 0x85, 0x0e, 0x6e, 0x69, 0xf2, 0x36, 0x3d, 0x9b, + 0xde, 0x85, 0xbb, 0x6b, 0x46, 0x71, 0xf0, 0x03, 0xf8, 0xb1, 0x3a, 0x76, 0x92, 0x4e, 0xc5, 0x9e, + 0x5f, 0x44, 0x7a, 0x31, 0x24, 0x88, 0x20, 0x82, 0xdb, 0x73, 0xef, 0xbd, 0xcf, 0xef, 0x7d, 0x1e, + 0x7c, 0x19, 0x47, 0xb2, 0x80, 0x8c, 0x26, 0x50, 0xf8, 0x05, 0xf0, 0x84, 0x49, 0x3f, 0x9f, 0xa5, + 0x95, 0x2c, 0x40, 0x2a, 0x26, 0xb8, 0xf2, 0x8b, 0x41, 0x94, 0xe5, 0xd3, 0x68, 0xe0, 0xa7, 0xc0, + 0x41, 0x46, 0x1a, 0x12, 0x9a, 0x4b, 0xa1, 0x85, 0x47, 0x6b, 0x3f, 0x2d, 0x4d, 0x34, 0x9f, 0xa5, + 0x95, 0xac, 0xfc, 0xb4, 0xf2, 0x1f, 0x9f, 0xa5, 0x4c, 0x4f, 0x17, 0x63, 0x1a, 0x8b, 0xb9, 0x9f, + 0x8a, 0x54, 0xf8, 0x16, 0x33, 0x5e, 0x4c, 0xec, 0xcb, 0x3e, 0xac, 0x2a, 0xf1, 0xbd, 0x47, 0x7c, + 0x30, 0x2a, 0x19, 0x43, 0xc8, 0x20, 0xd6, 0x4c, 0x70, 0xef, 0x01, 0xb7, 0x14, 0xcc, 0x0b, 0x90, + 0x1d, 0x74, 0x82, 0xfa, 0xee, 0xf9, 0xf5, 0x2f, 0x33, 0xd0, 0xaf, 0xc4, 0xa1, 0xa5, 0x05, 0xd8, + 0x6c, 0xba, 0xad, 0x52, 0x87, 0x9f, 0x17, 0x7a, 0xaf, 0x08, 0x1f, 0x7d, 0xbf, 0xee, 0x5d, 0x60, + 0x37, 0x16, 0x5c, 0x69, 0x19, 0x31, 0xae, 0x95, 0xcd, 0xd2, 0x0e, 0x0e, 0x97, 0x9b, 0xae, 0x63, + 0x36, 0x5d, 0xf7, 0xaa, 0xfe, 0x0a, 0x9b, 0x7b, 0xde, 0x33, 0xc2, 0x6e, 0x2e, 0x41, 0x42, 0x06, + 0x91, 0x02, 0xd5, 0xf9, 0x67, 0x3b, 0xdc, 0xfd, 0x4d, 0x87, 0xdb, 0x1a, 0x1c, 0xec, 0xef, 0x62, + 0x34, 0x06, 0x61, 0xf3, 0x6c, 0x6f, 0x84, 0x4f, 0x7f, 0x44, 0x78, 0x03, 0xec, 0xb2, 0x04, 0xb8, + 0x66, 0x13, 0x06, 0x72, 0x57, 0xf1, 0x7f, 0xbf, 0x5d, 0x72, 0x6f, 0xea, 0x71, 0xd8, 0xdc, 0x09, + 0xe8, 0x72, 0x4b, 0x9c, 0xd5, 0x96, 0x38, 0xeb, 0x2d, 0x71, 0x9e, 0x0c, 0x41, 0x4b, 0x43, 0xd0, + 0xca, 0x10, 0xb4, 0x36, 0x04, 0xbd, 0x19, 0x82, 0x5e, 0xde, 0x89, 0x73, 0xbf, 0x57, 0xf5, 0xf8, + 0x08, 0x00, 0x00, 0xff, 0xff, 0xff, 0x5f, 0x50, 0x3c, 0x80, 0x02, 0x00, 0x00, } func (m *VersionSelection) Marshal() (dAtA []byte, err error) { @@ -424,10 +422,7 @@ func (m *VersionSelection) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthGenerated } if (iNdEx + skippy) > l { @@ -545,10 +540,7 @@ func (m *VersionSelectionSemver) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthGenerated } if (iNdEx + skippy) > l { @@ -630,10 +622,7 @@ func (m *VersionSelectionSemverPrereleases) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthGenerated } if (iNdEx + skippy) > l { @@ -651,6 +640,7 @@ func (m *VersionSelectionSemverPrereleases) Unmarshal(dAtA []byte) error { func skipGenerated(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -682,10 +672,8 @@ func skipGenerated(dAtA []byte) (n int, err error) { break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -706,55 +694,30 @@ func skipGenerated(dAtA []byte) (n int, err error) { return 0, ErrInvalidLengthGenerated } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthGenerated - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenerated - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipGenerated(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthGenerated - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupGenerated + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthGenerated + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGenerated = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowGenerated = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupGenerated = fmt.Errorf("proto: unexpected end of group") ) diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto similarity index 89% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto index c9b2f884c..537db467e 100644 --- a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto +++ b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto @@ -3,7 +3,7 @@ syntax = 'proto2'; -package github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1; +package carvel.dev.vendir.pkg.vendir.versions.v1alpha1; // Package-wide variables from generator "generated". option go_package = "v1alpha1"; diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go diff --git a/vendor/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go index d569c0c94..d0ea68f40 100644 --- a/vendor/github.com/mattn/go-isatty/isatty_bsd.go +++ b/vendor/github.com/mattn/go-isatty/isatty_bsd.go @@ -1,6 +1,7 @@ -//go:build (darwin || freebsd || openbsd || netbsd || dragonfly || hurd) && !appengine +//go:build (darwin || freebsd || openbsd || netbsd || dragonfly || hurd) && !appengine && !tinygo // +build darwin freebsd openbsd netbsd dragonfly hurd // +build !appengine +// +build !tinygo package isatty diff --git a/vendor/github.com/mattn/go-isatty/isatty_others.go b/vendor/github.com/mattn/go-isatty/isatty_others.go index 31503226f..7402e0618 100644 --- a/vendor/github.com/mattn/go-isatty/isatty_others.go +++ b/vendor/github.com/mattn/go-isatty/isatty_others.go @@ -1,5 +1,6 @@ -//go:build appengine || js || nacl || wasm -// +build appengine js nacl wasm +//go:build (appengine || js || nacl || tinygo || wasm) && !windows +// +build appengine js nacl tinygo wasm +// +build !windows package isatty diff --git a/vendor/github.com/mattn/go-isatty/isatty_tcgets.go b/vendor/github.com/mattn/go-isatty/isatty_tcgets.go index 67787657f..0337d8cf6 100644 --- a/vendor/github.com/mattn/go-isatty/isatty_tcgets.go +++ b/vendor/github.com/mattn/go-isatty/isatty_tcgets.go @@ -1,6 +1,7 @@ -//go:build (linux || aix || zos) && !appengine +//go:build (linux || aix || zos) && !appengine && !tinygo // +build linux aix zos // +build !appengine +// +build !tinygo package isatty diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go index fdbe08d07..ad1e884ca 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go index 772f7cff0..cb7a0d94e 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go @@ -6,11 +6,12 @@ package v1alpha1 import ( fmt "fmt" + v1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" + io "io" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - v1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" k8s_io_api_core_v1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -1113,167 +1114,169 @@ func init() { } var fileDescriptor_e972ccf085273df7 = []byte{ - // 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, + // 2587 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x5d, 0x6c, 0x1b, 0x59, + 0xf5, 0xef, 0xc4, 0x4e, 0x1c, 0x9f, 0x24, 0x6d, 0x7a, 0xdb, 0xfc, 0xeb, 0x7f, 0xa1, 0x71, 0x35, + 0x2b, 0xad, 0x5a, 0x41, 0x6d, 0x35, 0xea, 0x96, 0x0a, 0xa4, 0x15, 0x76, 0xd2, 0xa4, 0x69, 0x9a, + 0xd6, 0xba, 0x4e, 0xcb, 0x76, 0x61, 0xb7, 0x3b, 0x19, 0x5f, 0xdb, 0x83, 0xc7, 0x33, 0xc3, 0xcc, + 0x1d, 0x37, 0x5e, 0x2d, 0x12, 0x14, 0x84, 0x16, 0x2d, 0x12, 0x15, 0xd2, 0x2e, 0x08, 0x24, 0x5e, + 0x90, 0x78, 0x47, 0xf0, 0x88, 0x90, 0x10, 0x2f, 0x7d, 0x41, 0x5a, 0x69, 0x5f, 0x16, 0x09, 0x19, + 0x6a, 0x9e, 0x78, 0xde, 0xb7, 0x7d, 0x42, 0xf7, 0x63, 0xbe, 0x6c, 0xa7, 0x09, 0x52, 0xa6, 0xdb, + 0x15, 0x6f, 0x33, 0xe7, 0x9e, 0x7b, 0x7e, 0xe7, 0x9e, 0x7b, 0xee, 0x39, 0xe7, 0x9e, 0x19, 0xb8, + 0xdf, 0x32, 0x68, 0xdb, 0xdf, 0x2d, 0xe9, 0x76, 0xb7, 0xdc, 0xeb, 0x3e, 0xd4, 0x5c, 0x72, 0x89, + 0x6a, 0xd6, 0xdb, 0x7e, 0x59, 0xd7, 0xdc, 0x1e, 0x31, 0x2f, 0x75, 0x34, 0xc7, 0xb9, 0xa4, 0xdb, + 0x16, 0x75, 0x6d, 0xd3, 0x24, 0x6e, 0xd9, 0xe9, 0xb4, 0xca, 0x9a, 0x63, 0x78, 0x65, 0x36, 0xa0, + 0x53, 0xd7, 0x2c, 0xf7, 0x2e, 0x6b, 0xa6, 0xd3, 0xd6, 0x2e, 0x97, 0x5b, 0xc4, 0x22, 0xae, 0x46, + 0x49, 0xa3, 0xe4, 0xb8, 0x36, 0xb5, 0xd1, 0x66, 0x24, 0xba, 0x24, 0x44, 0x3f, 0xe0, 0xa2, 0x4b, + 0x42, 0xf4, 0x03, 0x26, 0xe1, 0x41, 0x24, 0xba, 0xe4, 0x74, 0x5a, 0x25, 0x26, 0xba, 0x14, 0x88, + 0x2e, 0x05, 0xa2, 0xcf, 0xbe, 0x2a, 0xa6, 0x94, 0x1a, 0xa4, 0x57, 0xee, 0x11, 0xab, 0x61, 0x08, + 0x45, 0xe4, 0x63, 0x8f, 0xb8, 0x9e, 0x61, 0x5b, 0xde, 0xbe, 0xaa, 0x9c, 0xbd, 0x14, 0x5b, 0x65, + 0xcb, 0x6e, 0xd9, 0x65, 0x4e, 0xde, 0xf5, 0x9b, 0xfc, 0x8d, 0xbf, 0xf0, 0x27, 0xc9, 0x7e, 0xa5, + 0x73, 0xcd, 0x2b, 0x19, 0x36, 0x5b, 0x68, 0x57, 0xd3, 0xdb, 0x86, 0x45, 0xdc, 0x7e, 0xb4, 0xf2, + 0x2e, 0xa1, 0x5a, 0xb9, 0x37, 0x0e, 0x52, 0xde, 0x6f, 0x96, 0xeb, 0x5b, 0xd4, 0xe8, 0x92, 0xb1, + 0x09, 0x57, 0x0f, 0x9a, 0xe0, 0xe9, 0x6d, 0xd2, 0xd5, 0x46, 0xe7, 0xa9, 0x9f, 0x28, 0x00, 0x15, + 0xc7, 0x59, 0x35, 0x7d, 0x8f, 0x12, 0x17, 0x95, 0x21, 0x6f, 0x69, 0x5d, 0xe2, 0x39, 0x9a, 0x4e, + 0x0a, 0xca, 0x79, 0xe5, 0x42, 0xbe, 0x7a, 0xf2, 0xc9, 0xa0, 0x78, 0x6c, 0x38, 0x28, 0xe6, 0x6f, + 0x07, 0x03, 0x38, 0xe2, 0x41, 0xbf, 0x57, 0xe0, 0x54, 0xc7, 0xdf, 0x25, 0xba, 0x6d, 0x35, 0x8d, + 0x56, 0x9d, 0xe8, 0x2e, 0xa1, 0x98, 0x34, 0x0b, 0x53, 0xe7, 0x95, 0x0b, 0x73, 0x2b, 0xed, 0xd2, + 0x91, 0xed, 0x5b, 0x29, 0xd2, 0x72, 0x6b, 0x1c, 0xaf, 0x7a, 0x66, 0x38, 0x28, 0x9e, 0x9a, 0x30, + 0x80, 0x27, 0x69, 0xa7, 0xbe, 0x05, 0xe7, 0x9e, 0x29, 0x0e, 0x9d, 0x87, 0x2c, 0x5b, 0xa3, 0x34, + 0xc1, 0xbc, 0x34, 0x41, 0x96, 0x99, 0x00, 0xf3, 0x11, 0x74, 0x0e, 0x32, 0x1d, 0xd2, 0xe7, 0xeb, + 0xcc, 0x57, 0xe7, 0x24, 0x43, 0x66, 0x8b, 0xf4, 0x31, 0xa3, 0xab, 0x3f, 0x50, 0x20, 0x5f, 0x71, + 0x9c, 0x35, 0xe2, 0x98, 0x76, 0x1f, 0xf5, 0x20, 0xcb, 0x16, 0xc4, 0xc5, 0xcd, 0xad, 0xbc, 0x76, + 0xb4, 0x56, 0x11, 0x18, 0x5b, 0x9a, 0xe3, 0x54, 0x67, 0x99, 0x92, 0xec, 0x09, 0x73, 0x3c, 0xf5, + 0x83, 0x0c, 0x2c, 0x24, 0x38, 0xd0, 0xcb, 0x30, 0x63, 0x58, 0xd4, 0xbe, 0xed, 0xc9, 0xa5, 0x1d, + 0x97, 0x9a, 0xcf, 0x6c, 0x72, 0x2a, 0x96, 0xa3, 0xa8, 0x08, 0xd3, 0x5d, 0xcd, 0xb9, 0xed, 0x15, + 0xa6, 0xce, 0x67, 0x2e, 0xe4, 0xab, 0xf9, 0xe1, 0xa0, 0x38, 0xbd, 0xcd, 0x08, 0x58, 0xd0, 0x51, + 0x09, 0xc0, 0xd5, 0x1e, 0xde, 0x71, 0x28, 0x3b, 0x2d, 0x85, 0x0c, 0xe7, 0x3a, 0x3e, 0x1c, 0x14, + 0x01, 0x87, 0x54, 0x1c, 0xe3, 0x40, 0x3f, 0x52, 0x20, 0x67, 0x58, 0x9e, 0x43, 0x74, 0x5a, 0xc8, + 0x72, 0x33, 0x3c, 0x48, 0xcb, 0x0c, 0x9b, 0x02, 0xa6, 0x3a, 0x37, 0x1c, 0x14, 0x73, 0xf2, 0x05, + 0x07, 0xe0, 0xe8, 0x91, 0x02, 0x33, 0x0d, 0x62, 0x12, 0x4a, 0x0a, 0xd3, 0x5c, 0x8f, 0x37, 0xd3, + 0xd2, 0x63, 0x8d, 0xa3, 0x54, 0x81, 0x99, 0x57, 0x3c, 0x63, 0x89, 0xac, 0x5e, 0x87, 0x53, 0x13, + 0x58, 0x47, 0x8c, 0xaa, 0x1c, 0x64, 0x54, 0x75, 0x1d, 0x4e, 0x4f, 0x5a, 0xf9, 0x7f, 0x2d, 0xe7, + 0x0f, 0x33, 0x30, 0x5b, 0x71, 0x9c, 0x75, 0x42, 0xf5, 0x36, 0xfa, 0x2e, 0x73, 0x11, 0xd3, 0xb0, + 0x88, 0x74, 0xd7, 0xfb, 0x47, 0x6b, 0x1f, 0x0e, 0xb2, 0xc9, 0x01, 0x84, 0x69, 0xc4, 0x33, 0x96, + 0xa0, 0xa8, 0x0f, 0xd3, 0x46, 0x57, 0x6b, 0x11, 0x19, 0x42, 0x5e, 0x4b, 0x03, 0x9d, 0xc9, 0x17, + 0x3e, 0xcd, 0x1f, 0xb1, 0x40, 0x44, 0x3e, 0x64, 0xdb, 0x94, 0x3a, 0x85, 0x0c, 0x47, 0xfe, 0x46, + 0x0a, 0xc8, 0x37, 0x76, 0x76, 0x6a, 0xe2, 0x94, 0xb2, 0x27, 0xcc, 0xe1, 0xd0, 0x77, 0x20, 0xd3, + 0x32, 0x82, 0x53, 0x71, 0x2f, 0x05, 0xd4, 0x0d, 0x83, 0x56, 0x73, 0x2c, 0x3c, 0x6d, 0x18, 0x14, + 0x33, 0x2c, 0xf4, 0x63, 0x05, 0xf2, 0x6d, 0x62, 0x76, 0x57, 0xdb, 0x9a, 0x4b, 0xe5, 0x39, 0xf8, + 0x56, 0x1a, 0xeb, 0x0d, 0x30, 0xaa, 0x0b, 0x2c, 0x85, 0x84, 0xaf, 0x38, 0x42, 0x47, 0xef, 0x2b, + 0x30, 0x6f, 0x74, 0x5b, 0x4e, 0xa7, 0x55, 0xf5, 0xad, 0x86, 0x49, 0x0a, 0x33, 0x69, 0x84, 0x07, + 0xb9, 0xf1, 0x11, 0x4c, 0x75, 0x71, 0x38, 0x28, 0xce, 0xc7, 0x29, 0x38, 0xa1, 0x06, 0xcb, 0x01, + 0x8e, 0x46, 0xdb, 0x85, 0x5c, 0x32, 0x07, 0xd4, 0x34, 0xda, 0xc6, 0x7c, 0x44, 0x7d, 0x94, 0x85, + 0xb9, 0x98, 0x8d, 0x59, 0x4e, 0xf0, 0x5d, 0x53, 0x46, 0xd6, 0x30, 0x27, 0xdc, 0xc5, 0xb7, 0x30, + 0xa3, 0xb3, 0x61, 0x57, 0xa6, 0xc6, 0xd8, 0x30, 0x4b, 0x52, 0x8c, 0x8e, 0x7a, 0x30, 0xef, 0x92, + 0x66, 0x9d, 0x98, 0x44, 0x67, 0xa7, 0x52, 0x9a, 0xe1, 0xeb, 0xa5, 0xa8, 0x5e, 0x29, 0x89, 0x22, + 0x85, 0xaf, 0x54, 0x3e, 0x06, 0xf5, 0x4a, 0xb4, 0xd6, 0x7b, 0x82, 0x12, 0xca, 0x11, 0xeb, 0xc4, + 0x31, 0xc9, 0x38, 0x81, 0x83, 0xde, 0x55, 0x20, 0xef, 0x85, 0x89, 0x5b, 0xf8, 0xfe, 0x37, 0x53, + 0x30, 0xfe, 0x2d, 0x5b, 0xd7, 0x4c, 0x96, 0xab, 0xb9, 0x2b, 0x44, 0x19, 0x3a, 0x02, 0x47, 0x17, + 0x21, 0xe7, 0xf9, 0xbb, 0xcc, 0xc2, 0xfc, 0x34, 0xe4, 0xab, 0x27, 0xa4, 0x95, 0x72, 0x75, 0x41, + 0xc6, 0xc1, 0x38, 0xfa, 0x1a, 0x2c, 0x98, 0x4d, 0xaf, 0xde, 0x31, 0x9c, 0x7a, 0xd7, 0x6f, 0xb4, + 0x44, 0x30, 0x9f, 0xad, 0x2e, 0xc9, 0x09, 0x0b, 0xb7, 0xd6, 0xeb, 0xd1, 0x20, 0x4e, 0xf2, 0xa2, + 0x9b, 0x80, 0x9a, 0xb6, 0xab, 0x13, 0x7e, 0x1c, 0x35, 0xcf, 0xd0, 0x2b, 0xbe, 0xdc, 0xe8, 0xd9, + 0xea, 0x59, 0x29, 0x01, 0xad, 0x8f, 0x71, 0xe0, 0x09, 0xb3, 0xd4, 0xf7, 0xa6, 0x60, 0x3e, 0x7e, + 0xbc, 0x0f, 0xf2, 0x82, 0x97, 0x61, 0xc6, 0x6b, 0x6b, 0x2b, 0xaf, 0x5c, 0x95, 0x8e, 0x10, 0x66, + 0xe0, 0xfa, 0x8d, 0xca, 0xca, 0x2b, 0x57, 0xb1, 0x1c, 0xfd, 0x7c, 0x6e, 0x0b, 0xab, 0x27, 0x4f, + 0x8e, 0x1d, 0xfe, 0x43, 0x94, 0x53, 0x17, 0x21, 0x27, 0x5d, 0x59, 0x9a, 0x25, 0x84, 0x90, 0xfe, + 0x8c, 0x83, 0x71, 0xf4, 0x58, 0x01, 0x70, 0x89, 0x63, 0x7b, 0x06, 0xb5, 0xdd, 0xbe, 0xb4, 0xcc, + 0x5b, 0x69, 0x06, 0x2f, 0x4c, 0x1c, 0x5b, 0xe6, 0xcf, 0x10, 0x17, 0xc7, 0x74, 0x50, 0xff, 0xac, + 0xc0, 0xd2, 0xc4, 0x59, 0x07, 0x39, 0x43, 0x72, 0x93, 0xa7, 0x3e, 0xc3, 0x4d, 0x56, 0xff, 0x3e, + 0xc5, 0x6b, 0xc5, 0x28, 0x41, 0x1e, 0xa4, 0x7b, 0x0f, 0xe6, 0xa9, 0xd6, 0x8a, 0xe2, 0x55, 0xf6, + 0x28, 0xe3, 0xd5, 0x4e, 0x4c, 0x32, 0x4e, 0xe0, 0xbc, 0x40, 0x36, 0x8b, 0x1f, 0x8c, 0xcc, 0x01, + 0x07, 0xe3, 0x4f, 0x53, 0xbc, 0x56, 0x1b, 0x4b, 0x43, 0xe8, 0xa5, 0xa0, 0xde, 0x11, 0x76, 0x5e, + 0x90, 0x12, 0x92, 0x95, 0xc9, 0xa8, 0xad, 0x33, 0xff, 0x73, 0xb6, 0x56, 0xff, 0x3d, 0x05, 0xc7, + 0x93, 0xe5, 0x23, 0xab, 0x62, 0xa6, 0x59, 0x22, 0x16, 0x25, 0xee, 0xdc, 0x4a, 0x23, 0xb5, 0x4a, + 0xb5, 0xc4, 0xf6, 0xd0, 0xbb, 0x6e, 0x51, 0xb7, 0x1f, 0xed, 0x10, 0xa7, 0x61, 0xa1, 0x01, 0x8b, + 0x4a, 0x79, 0xfe, 0xb4, 0xee, 0xda, 0x5d, 0x7e, 0x6b, 0x4a, 0xa9, 0x84, 0xe1, 0xfa, 0xd4, 0x6d, + 0xdf, 0xd5, 0x49, 0x74, 0x37, 0xaf, 0x05, 0xc8, 0x38, 0x52, 0xe2, 0xec, 0x35, 0x80, 0x48, 0x6d, + 0xb4, 0x28, 0x2e, 0xac, 0xdc, 0xcb, 0xf8, 0x1d, 0x15, 0x9d, 0x86, 0xe9, 0x9e, 0x66, 0xfa, 0xa2, + 0xd2, 0xce, 0x63, 0xf1, 0xf2, 0xd5, 0xa9, 0x6b, 0x8a, 0xfa, 0x97, 0xb8, 0xb3, 0xc6, 0x00, 0xd1, + 0x4f, 0x13, 0xfe, 0x20, 0xee, 0x07, 0xbb, 0x29, 0xaf, 0xf2, 0xd9, 0x47, 0xf0, 0x17, 0x0a, 0xcc, + 0x8b, 0xdb, 0xfb, 0xb6, 0xe6, 0x44, 0x4e, 0xfa, 0x3c, 0x94, 0xe2, 0x87, 0x67, 0x35, 0x86, 0x8d, + 0x13, 0x9a, 0xa8, 0x7b, 0x70, 0x66, 0x9f, 0xa9, 0xac, 0x7a, 0x69, 0x18, 0x2e, 0xd1, 0x59, 0xf6, + 0xe0, 0xe1, 0x43, 0x24, 0xbd, 0xb0, 0x7a, 0x59, 0x8b, 0x0f, 0xe2, 0x24, 0xef, 0xc1, 0xd9, 0x54, + 0xbd, 0x02, 0x8b, 0xa3, 0x27, 0xeb, 0x10, 0xb3, 0x1e, 0xe5, 0x20, 0x57, 0x71, 0x9c, 0xba, 0x43, + 0x74, 0x56, 0x21, 0x79, 0xc4, 0xed, 0x19, 0x3a, 0xa9, 0xe8, 0xba, 0xed, 0x5b, 0xf4, 0x76, 0x34, + 0x37, 0xac, 0x90, 0xea, 0x63, 0x1c, 0x78, 0xc2, 0x2c, 0xf4, 0x0e, 0xe4, 0x74, 0xd1, 0x6a, 0x91, + 0x9b, 0x73, 0x37, 0x95, 0xb6, 0x90, 0xb8, 0xef, 0xcb, 0x17, 0x1c, 0x40, 0xa2, 0x3d, 0x98, 0x6e, + 0x32, 0x43, 0xf0, 0x1e, 0xc5, 0xdc, 0x4a, 0x3d, 0x05, 0xc7, 0x88, 0x42, 0x02, 0x7f, 0xc5, 0x02, + 0x10, 0xfd, 0x50, 0x81, 0x59, 0x4a, 0xba, 0x8e, 0xa9, 0x51, 0x52, 0xc8, 0x72, 0xf4, 0x23, 0xbe, + 0xdd, 0xed, 0x48, 0xe9, 0xd5, 0x45, 0xa9, 0xc0, 0x6c, 0x40, 0xc1, 0x21, 0x32, 0x7a, 0x07, 0x66, + 0x1a, 0xbc, 0x43, 0x50, 0x98, 0xe6, 0x3a, 0xec, 0xa4, 0xd1, 0xef, 0x88, 0xca, 0x58, 0xf1, 0x8e, + 0x25, 0x26, 0x2b, 0x77, 0x1d, 0xcd, 0xf7, 0x48, 0x83, 0xdf, 0x67, 0x66, 0x23, 0xbe, 0x1a, 0xa7, + 0x62, 0x39, 0x8a, 0xbe, 0x0c, 0xb3, 0xba, 0x66, 0xe9, 0xc4, 0x24, 0x0d, 0x59, 0x88, 0x87, 0x6b, + 0x5a, 0x95, 0x74, 0x1c, 0x72, 0xa0, 0x37, 0x01, 0xbc, 0xbe, 0xa5, 0xd7, 0x88, 0x6b, 0xd8, 0x8d, + 0xc2, 0x2c, 0xf7, 0xaa, 0x52, 0x49, 0xf4, 0x40, 0x4b, 0xf1, 0x1e, 0x68, 0xa4, 0x7c, 0x97, 0x50, + 0xad, 0xd4, 0xbb, 0x5c, 0x5a, 0xf3, 0x5d, 0x8d, 0xe7, 0x3e, 0x5e, 0xd0, 0xd5, 0x43, 0x29, 0x38, + 0x26, 0x11, 0xad, 0x00, 0x58, 0xb6, 0x2d, 0xdb, 0x32, 0x85, 0x3c, 0xd7, 0x07, 0x49, 0x7d, 0xe0, + 0x76, 0x38, 0x82, 0x63, 0x5c, 0x68, 0x0d, 0x16, 0x1b, 0xa4, 0xa9, 0xf9, 0x26, 0x0d, 0x3b, 0xa5, + 0x05, 0xe0, 0x07, 0xa6, 0x20, 0x67, 0x2e, 0xae, 0x8d, 0x8c, 0xe3, 0xb1, 0x19, 0xea, 0xaf, 0x73, + 0xfc, 0x4e, 0x19, 0xec, 0x23, 0xa2, 0x90, 0xe9, 0x53, 0x9a, 0x4e, 0x2b, 0x26, 0x00, 0xb9, 0x4f, + 0x65, 0x7f, 0xe0, 0x3e, 0xa5, 0x98, 0xc1, 0xa1, 0x3d, 0xc8, 0x76, 0x76, 0xcd, 0x86, 0x3c, 0xaf, + 0xaf, 0xa7, 0x03, 0xbb, 0xb5, 0x6b, 0x36, 0x64, 0xcb, 0x72, 0xd7, 0x6c, 0x60, 0x8e, 0xc8, 0xe3, + 0x79, 0x9b, 0x98, 0xdd, 0x80, 0x49, 0x96, 0x3a, 0xbb, 0xe9, 0xa8, 0x70, 0x23, 0x86, 0x24, 0xe2, + 0x79, 0x9c, 0x82, 0x13, 0x9a, 0xa0, 0x9f, 0x28, 0x90, 0xef, 0xf8, 0x1e, 0xb5, 0xbb, 0xc6, 0xdb, + 0x24, 0x9d, 0x26, 0x66, 0x68, 0x9a, 0x00, 0x46, 0x64, 0xbe, 0xf0, 0x15, 0x47, 0x0a, 0xb0, 0xf0, + 0x92, 0xfb, 0xb6, 0x67, 0x5b, 0x16, 0x09, 0x3a, 0x38, 0x6f, 0xa4, 0xa3, 0xcc, 0x4d, 0x01, 0x22, + 0xe2, 0xab, 0x7c, 0xc1, 0x01, 0x34, 0x73, 0x15, 0xcf, 0x76, 0x3c, 0xd9, 0xae, 0x48, 0xc9, 0x55, + 0xea, 0xb6, 0xe3, 0x09, 0x57, 0x61, 0x4f, 0x98, 0x23, 0xb2, 0xa3, 0xa1, 0xfb, 0x84, 0x47, 0x8b, + 0xd4, 0x8e, 0xc6, 0xaa, 0x4f, 0xc4, 0xd1, 0x58, 0xf5, 0x09, 0x66, 0x70, 0xea, 0x47, 0xa2, 0x0e, + 0x8d, 0x31, 0xa0, 0x62, 0xbc, 0x0c, 0x95, 0xcd, 0xf2, 0x44, 0x71, 0xf8, 0x81, 0x02, 0xc0, 0xab, + 0xab, 0x78, 0x75, 0x98, 0x92, 0x4b, 0xdf, 0xe3, 0x38, 0xb2, 0x40, 0x0c, 0x63, 0xd6, 0xbd, 0x10, + 0x1d, 0xc7, 0x34, 0x41, 0x15, 0x38, 0x61, 0x58, 0x8e, 0x4f, 0xaf, 0xef, 0x39, 0x2e, 0xf1, 0xbc, + 0xe0, 0x6a, 0x91, 0xaf, 0x9e, 0x91, 0x13, 0x4f, 0x6c, 0x26, 0x87, 0xf1, 0x28, 0x3f, 0x0b, 0x7b, + 0xb6, 0x4f, 0x93, 0x32, 0xb2, 0xc9, 0xb0, 0x77, 0x67, 0x64, 0x1c, 0x8f, 0xcd, 0x50, 0xff, 0x96, + 0xe5, 0xc5, 0xd2, 0xa4, 0x73, 0x79, 0x88, 0xee, 0x41, 0xe2, 0xb3, 0xd5, 0xd4, 0x21, 0x3e, 0x5b, + 0x05, 0xbd, 0xbd, 0xcc, 0x7e, 0xbd, 0xbd, 0xd1, 0x2d, 0xcb, 0xbe, 0x30, 0x5b, 0xf6, 0x73, 0x05, + 0x4e, 0x76, 0xfc, 0x5d, 0xe2, 0x5a, 0x84, 0x12, 0x4f, 0xde, 0xe8, 0x64, 0x00, 0xc0, 0x47, 0xa8, + 0x9f, 0x94, 0x5c, 0x5d, 0x1a, 0x0e, 0x8a, 0x27, 0xb7, 0x46, 0x01, 0xf1, 0xb8, 0x0e, 0xe8, 0x7d, + 0x05, 0x8e, 0x47, 0xd4, 0x4a, 0x6d, 0x33, 0x08, 0x0a, 0x47, 0x79, 0x36, 0xb7, 0x12, 0x00, 0x55, + 0x34, 0x1c, 0x14, 0x8f, 0x27, 0x69, 0x78, 0x44, 0x09, 0xf5, 0x34, 0xa0, 0xf1, 0x68, 0xa6, 0xae, + 0xc0, 0x89, 0x91, 0x5c, 0x74, 0xe0, 0x39, 0x56, 0xff, 0x8f, 0x5f, 0x8b, 0xc6, 0x82, 0xb4, 0xfa, + 0xdb, 0xa9, 0x84, 0x30, 0x16, 0xa3, 0xd0, 0x1e, 0x64, 0x9c, 0x56, 0xf0, 0xc9, 0xef, 0x8d, 0xf4, + 0xc2, 0x62, 0x6d, 0xa3, 0x26, 0x22, 0x54, 0x6d, 0xa3, 0x86, 0x19, 0x64, 0xb4, 0x8c, 0xa9, 0x7d, + 0xc2, 0xd1, 0x1e, 0x64, 0xb4, 0x56, 0x90, 0x59, 0x53, 0x54, 0xad, 0xd2, 0x92, 0xc1, 0xb3, 0xd2, + 0x22, 0x98, 0x41, 0xaa, 0x1f, 0x29, 0x89, 0xbd, 0x90, 0x4c, 0xe8, 0x8f, 0x0a, 0x9c, 0x76, 0x5c, + 0xa3, 0xc7, 0x8c, 0x4a, 0xfa, 0x5e, 0x7d, 0xe4, 0x86, 0x69, 0xa5, 0x68, 0xbd, 0x09, 0xa8, 0xd5, + 0xc2, 0x70, 0x50, 0x3c, 0x3d, 0x69, 0x04, 0x4f, 0xd4, 0x72, 0xd2, 0xaa, 0x6a, 0x1b, 0xb5, 0xcf, + 0xfb, 0xaa, 0x36, 0xe0, 0xa5, 0x43, 0x88, 0x3d, 0xc4, 0xbd, 0xf2, 0x77, 0x0a, 0x7c, 0x71, 0x2c, + 0xda, 0xad, 0xd9, 0x0f, 0xad, 0x87, 0x9a, 0xdb, 0xa8, 0xd4, 0x36, 0xd1, 0x63, 0x05, 0xa6, 0x0d, + 0x4a, 0xba, 0x41, 0x1f, 0xa7, 0x93, 0x66, 0x98, 0x8d, 0x01, 0x6f, 0x52, 0xd2, 0x8d, 0x35, 0xdc, + 0x98, 0x06, 0x58, 0x28, 0xa2, 0xfe, 0x35, 0x0b, 0xe7, 0x0f, 0x9a, 0x7a, 0xb8, 0xc4, 0xd4, 0x34, + 0x88, 0xd9, 0x88, 0xdd, 0xf1, 0xc3, 0xc4, 0xb4, 0x1e, 0x0c, 0xe0, 0x88, 0x67, 0x9f, 0xe8, 0x9e, + 0x79, 0x01, 0xa2, 0xfb, 0x6f, 0x14, 0x58, 0x62, 0x72, 0x56, 0x43, 0xf9, 0x81, 0x76, 0xd9, 0xd4, + 0xb4, 0xfb, 0xff, 0xe1, 0xa0, 0xb8, 0xb4, 0x35, 0x09, 0x14, 0x4f, 0xd6, 0x65, 0x52, 0x0e, 0x9a, + 0x7e, 0x11, 0x72, 0xd0, 0x7b, 0xc9, 0xfa, 0x26, 0x9e, 0xf1, 0xd1, 0xcf, 0x26, 0x34, 0xd5, 0x48, + 0xfa, 0x95, 0xc6, 0xb3, 0xfb, 0x6a, 0xbf, 0x9a, 0xdc, 0x57, 0x7b, 0x4e, 0x7a, 0x1d, 0xd0, 0x5a, + 0x3b, 0x44, 0xfd, 0xf6, 0x4b, 0x05, 0xe6, 0x1a, 0xd1, 0x79, 0x95, 0x4e, 0xda, 0x7a, 0x4e, 0x91, + 0xa5, 0x7a, 0x62, 0x38, 0x28, 0xce, 0xc5, 0x08, 0x38, 0xae, 0x8c, 0xfa, 0x2a, 0x9c, 0xdd, 0x7f, + 0xf1, 0x87, 0x88, 0xa8, 0x9f, 0x64, 0x12, 0x77, 0x90, 0xfb, 0x94, 0xa2, 0x3a, 0x2c, 0x19, 0x2d, + 0xcb, 0x76, 0xc9, 0x5d, 0xab, 0x63, 0xd9, 0x0f, 0xad, 0x55, 0xbb, 0xdb, 0x25, 0x16, 0x15, 0xff, + 0xf9, 0xcc, 0x56, 0xcf, 0x49, 0x29, 0x4b, 0x9b, 0x93, 0x98, 0xf0, 0xe4, 0xb9, 0xfc, 0x5b, 0x25, + 0x75, 0x0d, 0x9d, 0xf2, 0xdd, 0x8f, 0x35, 0x6f, 0xea, 0x9c, 0x8a, 0xe5, 0x68, 0xec, 0x97, 0x91, + 0xcc, 0x67, 0xf1, 0xcb, 0x48, 0x58, 0xf0, 0x64, 0xf7, 0x29, 0x78, 0xbe, 0xc4, 0xc2, 0xb0, 0x49, + 0xb6, 0x35, 0xb7, 0xe3, 0xf1, 0x2e, 0x58, 0x5e, 0x78, 0xfe, 0x7a, 0x40, 0xc4, 0xd1, 0xf8, 0x68, + 0xe5, 0x3f, 0xf3, 0xa2, 0x54, 0xfe, 0xea, 0x3f, 0x14, 0xc8, 0xaf, 0xda, 0x56, 0xc3, 0xe0, 0x9f, + 0x66, 0x2e, 0x43, 0x96, 0xf6, 0x9d, 0xc0, 0x4b, 0x82, 0xfd, 0xcd, 0xee, 0xf4, 0x1d, 0xf2, 0xe9, + 0xa0, 0xb8, 0x10, 0x32, 0x32, 0x02, 0xe6, 0xac, 0xe8, 0x16, 0xdb, 0x4e, 0x8d, 0xfa, 0x9e, 0x4c, + 0x45, 0x57, 0xa2, 0xed, 0x64, 0xd4, 0x4f, 0x07, 0x45, 0x35, 0xfa, 0x8d, 0xb0, 0xac, 0xdb, 0x2e, + 0x29, 0xf7, 0x2e, 0x97, 0x42, 0x49, 0x82, 0x0b, 0x4b, 0x19, 0xcc, 0x39, 0x5c, 0xa2, 0x79, 0xe1, + 0x95, 0x31, 0x74, 0x0e, 0xcc, 0xa9, 0x58, 0x8e, 0xa2, 0x8b, 0x90, 0xeb, 0x12, 0xcf, 0x63, 0x15, + 0xe7, 0xc8, 0xd7, 0xe3, 0x6d, 0x41, 0xc6, 0xc1, 0xb8, 0xfa, 0xfd, 0x0c, 0x2c, 0x6c, 0x10, 0x8b, + 0xb8, 0x86, 0x2e, 0xc0, 0xd0, 0x4d, 0x40, 0xf6, 0xae, 0x47, 0xdc, 0x1e, 0x69, 0x6c, 0x88, 0x5f, + 0x17, 0x59, 0xc6, 0x61, 0x6b, 0xce, 0x44, 0x7d, 0xe8, 0x3b, 0x63, 0x1c, 0x78, 0xc2, 0x2c, 0xf4, + 0xae, 0x02, 0xa0, 0x07, 0x8b, 0xf1, 0xe4, 0x2d, 0xfc, 0x28, 0xbb, 0xa1, 0xa1, 0xa5, 0xa2, 0xad, + 0x0c, 0x49, 0x1e, 0x8e, 0x61, 0xa3, 0x6d, 0x38, 0xd5, 0x74, 0x0d, 0x62, 0x35, 0xcc, 0xfe, 0x1a, + 0xf1, 0x74, 0xd7, 0x70, 0x68, 0x74, 0xf7, 0xfe, 0x82, 0x9c, 0x7c, 0x6a, 0x7d, 0x9c, 0x05, 0x4f, + 0x9a, 0xc7, 0xac, 0xe4, 0x7b, 0xa4, 0xe9, 0x9b, 0xd7, 0x5d, 0xd7, 0x76, 0xb7, 0x13, 0xd6, 0x0e, + 0xad, 0x74, 0x77, 0x8c, 0x03, 0x4f, 0x98, 0xa5, 0x6e, 0xc2, 0x48, 0x2e, 0x43, 0x5f, 0x81, 0x85, + 0x96, 0x6b, 0xfb, 0x8e, 0xcc, 0xb1, 0xc1, 0xf5, 0xe8, 0xe4, 0x70, 0x50, 0x5c, 0xd8, 0x88, 0x0f, + 0xe0, 0x24, 0x9f, 0x7a, 0x05, 0x82, 0xaf, 0xf7, 0xf1, 0xef, 0xfb, 0xca, 0xb3, 0xbf, 0xef, 0x57, + 0xed, 0x27, 0x4f, 0x97, 0x8f, 0x7d, 0xf8, 0x74, 0xf9, 0xd8, 0xc7, 0x4f, 0x97, 0x8f, 0x7d, 0x6f, + 0xb8, 0xac, 0x3c, 0x19, 0x2e, 0x2b, 0x1f, 0x0e, 0x97, 0x95, 0x8f, 0x87, 0xcb, 0xca, 0x3f, 0x87, + 0xcb, 0xca, 0xe3, 0x7f, 0x2d, 0x1f, 0x7b, 0x7d, 0xf3, 0xc8, 0x7e, 0x36, 0xfe, 0x4f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x42, 0x66, 0x62, 0x39, 0xb8, 0x2c, 0x00, 0x00, } func (m *AppCluster) Marshal() (dAtA []byte, err error) { @@ -1638,6 +1641,14 @@ func (m *AppFetchGit) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i-- + if m.ForceHTTPBasicAuth { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x38 if m.RefSelection != nil { { size, err := m.RefSelection.MarshalToSizedBuffer(dAtA[:i]) @@ -3298,6 +3309,7 @@ func (m *AppFetchGit) Size() (n int) { l = m.RefSelection.Size() n += 1 + l + sovGenerated(uint64(l)) } + n += 2 return n } @@ -3951,6 +3963,7 @@ 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) + `,`, + `ForceHTTPBasicAuth:` + fmt.Sprintf("%v", this.ForceHTTPBasicAuth) + `,`, `}`, }, "") return s @@ -5578,6 +5591,26 @@ 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 ForceHTTPBasicAuth", 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.ForceHTTPBasicAuth = bool(v != 0) default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto index 4e1461e8f..61e8100a9 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto @@ -5,7 +5,7 @@ syntax = "proto2"; package github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1; -import "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto"; +import "carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; @@ -109,7 +109,7 @@ message AppFetchGit { // Specifies a strategy to resolve to an explicit ref (optional; v0.24.0+) // +optional - optional github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection refSelection = 6; + optional carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection refSelection = 6; // Secret with auth details. allowed keys: ssh-privatekey, ssh-knownhosts, username, password (optional) // (if ssh-knownhosts is not specified, git will not perform strict host checking) @@ -123,6 +123,10 @@ message AppFetchGit { // Skip lfs download (optional) // +optional optional bool lfsSkipSmudge = 5; + + // Force the usage of HTTP Basic Auth when Basic Auth is provided (optional) + // +optional + optional bool forceHTTPBasicAuth = 7; } // +k8s:openapi-gen=true @@ -178,7 +182,7 @@ message AppFetchImage { // Specifies a strategy to choose a tag (optional; v0.24.0+) // if specified, do not include a tag in url key // +optional - optional github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 4; + optional carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 4; // Secret may include one or more keys: username, password, token. // By default anonymous access is used for authentication. @@ -199,7 +203,7 @@ message AppFetchImgpkgBundle { // Specifies a strategy to choose a tag (optional; v0.24.0+) // if specified, do not include a tag in url key // +optional - optional github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 3; + optional carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 3; // Secret may include one or more keys: username, password, token. // By default anonymous access is used for authentication. diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go index ea53bdecc..b85712092 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go index bc97e8f65..71fc4bb2d 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go index dc89189e4..9c2fb5a60 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go index cee423eff..ff52e5f03 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go index 2a598a09b..f3a221a73 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go @@ -1,10 +1,10 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 import ( - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) // +k8s:openapi-gen=true @@ -106,6 +106,9 @@ type AppFetchGit struct { // Skip lfs download (optional) // +optional LFSSkipSmudge bool `json:"lfsSkipSmudge,omitempty" protobuf:"varint,5,opt,name=lfsSkipSmudge"` + // Force the usage of HTTP Basic Auth when Basic Auth is provided (optional) + // +optional + ForceHTTPBasicAuth bool `json:"forceHTTPBasicAuth,omitempty" protobuf:"varint,7,opt,name=forceHTTPBasicAuth"` } // +k8s:openapi-gen=true diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go index 1e9470d4d..09c7a0055 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 //nolint:revive // we're unlikely to write descriptive godoc comments in this file. diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go index b51afa929..478450469 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - versionsv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + versionsv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/doc.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/doc.go index 8b244e452..746048840 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/doc.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go index 0195b0840..d27d8edbe 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go @@ -1,11 +1,11 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 import ( + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go index c622b1491..0ef821c06 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/register.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/register.go index dd339fb05..d718b8db5 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/register.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go index a92b8c534..405ddc200 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go @@ -6,8 +6,8 @@ package v1alpha1 import ( + versionsv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - versionsv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 56c8e50a0..a439e6bed 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,6 @@ +# carvel.dev/vendir v0.40.0 +## explicit; go 1.21 +carvel.dev/vendir/pkg/vendir/versions/v1alpha1 # github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef ## explicit github.com/cppforlife/cobrautil @@ -118,7 +121,7 @@ github.com/mailru/easyjson/jwriter # github.com/mattn/go-colorable v0.1.13 ## explicit; go 1.15 github.com/mattn/go-colorable -# github.com/mattn/go-isatty v0.0.19 +# github.com/mattn/go-isatty v0.0.20 ## explicit; go 1.15 github.com/mattn/go-isatty # github.com/mitchellh/go-wordwrap v1.0.1 @@ -155,13 +158,10 @@ github.com/stretchr/testify/require # github.com/vito/go-interact v1.0.1 ## explicit; go 1.12 github.com/vito/go-interact/interact -# github.com/vmware-tanzu/carvel-kapp-controller v0.50.2 +# github.com/vmware-tanzu/carvel-kapp-controller v0.51.0 ## explicit; go 1.21 github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1 github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1 -# github.com/vmware-tanzu/carvel-vendir v0.36.0 -## explicit; go 1.21 -github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1 # golang.org/x/net v0.25.0 ## explicit; go 1.18 golang.org/x/net/context