From 52acf545f01d9b7f46e9685aaec06182d3f63e07 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Mon, 16 Mar 2026 11:14:28 +0600 Subject: [PATCH] Add helper methods Signed-off-by: Tamal Saha --- api/v1/helpers.go | 38 ++ go.mod | 10 +- go.sum | 16 +- vendor/filippo.io/edwards25519/extra.go | 1 + .../client-go/api/v1/certificates.go | 2 +- .../kmodules.xyz/client-go/api/v1/cluster.go | 43 +- .../client-go/api/v1/generated.pb.go | 419 ++++++++++++------ .../client-go/api/v1/generated.proto | 2 +- .../kmodules.xyz/client-go/api/v1/object.go | 8 +- .../client-go/api/v1/zz_generated.deepcopy.go | 6 +- .../client-go/core/v1/kubernetes.go | 14 +- .../kmodules.xyz/client-go/meta/conditions.go | 7 +- .../kmodules.xyz/client-go/meta/encoding.go | 2 +- vendor/kmodules.xyz/client-go/meta/lib.go | 19 +- vendor/modules.txt | 8 +- 15 files changed, 388 insertions(+), 207 deletions(-) diff --git a/api/v1/helpers.go b/api/v1/helpers.go index 5594eabf..e6a4a9ac 100644 --- a/api/v1/helpers.go +++ b/api/v1/helpers.go @@ -19,6 +19,7 @@ package v1 import ( "errors" "fmt" + "strconv" "kmodules.xyz/client-go/policy/secomp" appcatalog "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1" @@ -26,6 +27,7 @@ import ( "gomodules.xyz/pointer" core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" ) @@ -137,3 +139,39 @@ func (c *ConnectionSpec) ToAppBinding() (*appcatalog.AppBinding, error) { } return &app, nil } + +func (svc ServiceSpec) ObjectKey() types.NamespacedName { + return types.NamespacedName{ + Name: svc.Name, + Namespace: svc.Namespace, + } +} + +func (svc ServiceSpec) ToServiceReference() (*appcatalog.ServiceReference, error) { + ref := appcatalog.ServiceReference{ + Scheme: svc.Scheme, + Namespace: svc.Namespace, + Name: svc.Name, + Port: -1, + Path: svc.Path, + Query: svc.Query, + } + if port, ok := IsValidPort(svc.Port); ok { + ref.Port = int32(port) + } else { + return nil, fmt.Errorf("invalid service port: %q", svc.Port) + } + return &ref, nil +} + +// IsValidPort checks if a string is a valid port number (0-65535). +func IsValidPort(portStr string) (int, bool) { + port, err := strconv.Atoi(portStr) + if err != nil { + return -1, false + } + if port >= 0 && port <= 65535 { + return port, true + } + return -1, false +} diff --git a/go.mod b/go.mod index 708a7e69..d1948750 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module kmodules.xyz/monitoring-agent-api go 1.24.0 -toolchain go1.24.1 - require ( github.com/evanphx/json-patch v5.9.11+incompatible github.com/gobuffalo/flect v1.0.3 @@ -26,13 +24,13 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 - kmodules.xyz/client-go v0.34.2 - kmodules.xyz/custom-resources v0.32.3-0.20251226151909-e0c7e447f3de + kmodules.xyz/client-go v0.34.4 + kmodules.xyz/custom-resources v0.34.0 sigs.k8s.io/controller-runtime v0.22.4 ) require ( - filippo.io/edwards25519 v1.1.0 // indirect + filippo.io/edwards25519 v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.3.1 // indirect github.com/PuerkitoBio/purell v1.2.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -85,7 +83,7 @@ require ( golang.org/x/net v0.47.0 // indirect golang.org/x/oauth2 v0.31.0 // indirect golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.39.0 // indirect + golang.org/x/sys v0.40.0 // indirect golang.org/x/term v0.38.0 // indirect golang.org/x/text v0.32.0 // indirect golang.org/x/time v0.13.0 // indirect diff --git a/go.sum b/go.sum index 3d380ad8..10a8d9c7 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= -filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw= +filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4= github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/PuerkitoBio/purell v1.2.1 h1:QsZ4TjvwiMpat6gBCBxEQI0rcS9ehtkKtSpiUnd9N28= @@ -210,8 +210,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= -golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= +golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q= golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -277,10 +277,10 @@ k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzk k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= -kmodules.xyz/client-go v0.34.2 h1:2Cec+nyfj9kfbR+5KPK3AksxN6h4jSjhn/tw+Dhqggo= -kmodules.xyz/client-go v0.34.2/go.mod h1:kQRuGMxhb+B9rVdcfBzjK+PV7oBDo+SaDiQ66u1QG+4= -kmodules.xyz/custom-resources v0.32.3-0.20251226151909-e0c7e447f3de h1:4QiA9uZiJVp6YfrVeKukeMWVaHlS55rDBaHKWLqYGyU= -kmodules.xyz/custom-resources v0.32.3-0.20251226151909-e0c7e447f3de/go.mod h1:pcA/n/CnrycjKCRNtU9Z+l5svhzFncLY2Kn9pqeXDVs= +kmodules.xyz/client-go v0.34.4 h1:1WwI2iZYdGP8pD4j7dmNMDMsLha6JV4O08l/06LUtOU= +kmodules.xyz/client-go v0.34.4/go.mod h1:myCt7AfRao4PBdUtKXu01xxbqqmLZ5U8fW0LQDaifhQ= +kmodules.xyz/custom-resources v0.34.0 h1:ljkIYzIq0A3Awj87kkpuYqS9aifuyR3Hr9q2OVKoojM= +kmodules.xyz/custom-resources v0.34.0/go.mod h1:pcA/n/CnrycjKCRNtU9Z+l5svhzFncLY2Kn9pqeXDVs= sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A= sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= diff --git a/vendor/filippo.io/edwards25519/extra.go b/vendor/filippo.io/edwards25519/extra.go index d152d68f..ab2e44a5 100644 --- a/vendor/filippo.io/edwards25519/extra.go +++ b/vendor/filippo.io/edwards25519/extra.go @@ -265,6 +265,7 @@ func (v *Point) MultiScalarMult(scalars []*Scalar, points []*Point) *Point { tmp1 := &projP1xP1{} tmp2 := &projP2{} // Lookup-and-add the appropriate multiple of each input point + v.Set(NewIdentityPoint()) for j := range tables { tables[j].SelectInto(multiple, digits[j][63]) tmp1.Add(v, multiple) // tmp1 = v + x_(j,63)*Q in P1xP1 coords diff --git a/vendor/kmodules.xyz/client-go/api/v1/certificates.go b/vendor/kmodules.xyz/client-go/api/v1/certificates.go index a6ca4f77..530748f0 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/certificates.go +++ b/vendor/kmodules.xyz/client-go/api/v1/certificates.go @@ -261,7 +261,7 @@ func RemoveCertificate(certificates []CertificateSpec, alias string) []Certifica type stringSetMerger struct{} func (t stringSetMerger) Transformer(typ reflect.Type) func(dst, src reflect.Value) error { - if typ == reflect.TypeOf([]string{}) { + if typ == reflect.TypeFor[[]string]() { return func(dst, src reflect.Value) error { if dst.CanSet() { if dst.Len() <= 1 && src.Len() == 0 { diff --git a/vendor/kmodules.xyz/client-go/api/v1/cluster.go b/vendor/kmodules.xyz/client-go/api/v1/cluster.go index 3bafb821..68fe0211 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/cluster.go +++ b/vendor/kmodules.xyz/client-go/api/v1/cluster.go @@ -21,6 +21,7 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" + "encoding/json" "fmt" ) @@ -143,7 +144,43 @@ type ClusterClaimInfo struct { } type ClusterClaimFeatures struct { - EnabledFeatures []string `json:"enabledFeatures,omitempty" protobuf:"bytes,1,rep,name=enabledFeatures"` - ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty" protobuf:"bytes,2,rep,name=externallyManagedFeatures"` - DisabledFeatures []string `json:"disabledFeatures,omitempty" protobuf:"bytes,3,rep,name=disabledFeatures"` + EnabledFeatures map[string]string `json:"enabledFeatures,omitempty" protobuf:"bytes,1,opt,name=enabledFeatures"` + ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty" protobuf:"bytes,2,opt,name=externallyManagedFeatures"` + DisabledFeatures []string `json:"disabledFeatures,omitempty" protobuf:"bytes,3,opt,name=disabledFeatures"` +} + +func (f *ClusterClaimFeatures) UnmarshalJSON(data []byte) error { + aux := &struct { + EnabledFeatures any `json:"enabledFeatures,omitempty"` + ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty"` + DisabledFeatures []string `json:"disabledFeatures,omitempty"` + }{} + + if err := json.Unmarshal(data, aux); err != nil { + return err + } + + f.EnabledFeatures = toStringMap(aux.EnabledFeatures) + f.ExternallyManagedFeatures = aux.ExternallyManagedFeatures + f.DisabledFeatures = aux.DisabledFeatures + return nil +} + +func toStringMap(v any) map[string]string { + result := make(map[string]string) + switch val := v.(type) { + case []any: + for _, item := range val { + if str, ok := item.(string); ok { + result[str] = "" + } + } + case map[string]any: + for k, item := range val { + if str, ok := item.(string); ok { + result[k] = str + } + } + } + return result } diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go index 9f04f8cb..b70728ac 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -28,6 +28,7 @@ import ( strings "strings" proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" v1 "k8s.io/api/core/v1" k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v11 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -660,6 +661,7 @@ func init() { proto.RegisterType((*CertificatePrivateKey)(nil), "kmodules.xyz.client_go.api.v1.CertificatePrivateKey") proto.RegisterType((*CertificateSpec)(nil), "kmodules.xyz.client_go.api.v1.CertificateSpec") proto.RegisterType((*ClusterClaimFeatures)(nil), "kmodules.xyz.client_go.api.v1.ClusterClaimFeatures") + proto.RegisterMapType((map[string]string)(nil), "kmodules.xyz.client_go.api.v1.ClusterClaimFeatures.EnabledFeaturesEntry") proto.RegisterType((*ClusterClaimInfo)(nil), "kmodules.xyz.client_go.api.v1.ClusterClaimInfo") proto.RegisterType((*ClusterInfo)(nil), "kmodules.xyz.client_go.api.v1.ClusterInfo") proto.RegisterType((*ClusterMetadata)(nil), "kmodules.xyz.client_go.api.v1.ClusterMetadata") @@ -685,138 +687,141 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 2092 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x1c, 0x49, - 0x15, 0x77, 0x67, 0xc6, 0xf1, 0xcc, 0x1b, 0x3b, 0x93, 0x54, 0x8c, 0x32, 0x09, 0x1b, 0x4f, 0xe8, - 0x88, 0x28, 0x81, 0x4d, 0x1b, 0x47, 0x09, 0x2c, 0x2b, 0x10, 0x78, 0x66, 0x9c, 0x64, 0x76, 0xed, - 0x78, 0xa8, 0x71, 0xd8, 0xd5, 0x2e, 0x62, 0x55, 0xee, 0x2e, 0x8f, 0x0b, 0xf7, 0x74, 0xb7, 0xaa, - 0xba, 0x67, 0xd7, 0x7b, 0x5a, 0x6e, 0x70, 0x5b, 0x6e, 0x1c, 0x37, 0x12, 0x1f, 0x01, 0x09, 0xf1, - 0x09, 0xc8, 0x31, 0x5c, 0xd0, 0x4a, 0xa0, 0x11, 0x19, 0xae, 0x88, 0x0b, 0x20, 0x81, 0x4f, 0xa8, - 0xaa, 0xab, 0xff, 0x4c, 0x7b, 0xbc, 0xf6, 0xc2, 0x72, 0x9b, 0x79, 0xef, 0xf7, 0x7e, 0xf5, 0xaa, - 0xea, 0xd5, 0xfb, 0xd3, 0x70, 0xf7, 0x60, 0xe8, 0x3b, 0x91, 0x4b, 0x85, 0xf5, 0xc1, 0xe1, 0x87, - 0xab, 0xb6, 0xcb, 0xa8, 0x17, 0xde, 0x1d, 0xf8, 0xab, 0x24, 0x60, 0xab, 0xa3, 0xb5, 0xd5, 0x01, - 0xf5, 0x28, 0x27, 0x21, 0x75, 0xac, 0x80, 0xfb, 0xa1, 0x8f, 0xae, 0xe7, 0xe1, 0x56, 0x0c, 0x7f, - 0x6f, 0xe0, 0x5b, 0x24, 0x60, 0xd6, 0x68, 0xed, 0xda, 0xdd, 0x01, 0x0b, 0xf7, 0xa3, 0x5d, 0xcb, - 0xf6, 0x87, 0xab, 0x03, 0x7f, 0xe0, 0xaf, 0x2a, 0xab, 0xdd, 0x68, 0x4f, 0xfd, 0x53, 0x7f, 0xd4, - 0xaf, 0x98, 0xed, 0x9a, 0x79, 0xf0, 0x9a, 0xb0, 0x58, 0xbc, 0x98, 0xed, 0x73, 0x3a, 0x63, 0xc5, - 0x6b, 0xf7, 0x33, 0xcc, 0x90, 0xd8, 0xfb, 0xcc, 0xa3, 0xfc, 0x70, 0x35, 0x38, 0x18, 0x48, 0x81, - 0x58, 0x1d, 0xd2, 0x90, 0xcc, 0xb0, 0x32, 0x7f, 0x63, 0x40, 0xbd, 0xbd, 0xde, 0xeb, 0xb6, 0xdd, - 0x48, 0x84, 0x94, 0x77, 0xbd, 0x3d, 0x1f, 0x7d, 0x07, 0x2a, 0x01, 0xf7, 0x47, 0xcc, 0xa1, 0xbc, - 0x61, 0xdc, 0x30, 0x6e, 0x57, 0x5b, 0x37, 0x9e, 0x8f, 0x9b, 0x73, 0x93, 0x71, 0xb3, 0xd2, 0xd3, - 0xf2, 0xa3, 0x71, 0x73, 0x51, 0x9a, 0x25, 0xff, 0x71, 0x6a, 0x81, 0x56, 0xa1, 0xea, 0x91, 0x21, - 0x15, 0x01, 0xb1, 0x69, 0xe3, 0x9c, 0x32, 0xbf, 0xa4, 0xcd, 0xab, 0x4f, 0x12, 0x05, 0xce, 0x30, - 0xe8, 0x01, 0xd4, 0xec, 0x78, 0x75, 0xa9, 0x6e, 0x94, 0x94, 0xc9, 0x65, 0x6d, 0x52, 0x6b, 0x67, - 0x2a, 0x9c, 0xc7, 0x99, 0xef, 0xc2, 0x97, 0xda, 0x94, 0x87, 0x6c, 0x8f, 0xd9, 0x24, 0xa4, 0x3d, - 0xce, 0x46, 0x24, 0xa4, 0x6f, 0xd2, 0x43, 0xd4, 0x82, 0x0a, 0xf5, 0x6c, 0xdf, 0x61, 0xde, 0x40, - 0xbb, 0x7f, 0x2b, 0x71, 0x7f, 0x43, 0xcb, 0x8f, 0xc6, 0x4d, 0x94, 0x59, 0x24, 0x52, 0x9c, 0xda, - 0x99, 0x7f, 0x9f, 0x87, 0x7a, 0x8e, 0xbd, 0x1f, 0x50, 0x1b, 0xdd, 0x84, 0x79, 0xe2, 0x32, 0x22, - 0x34, 0xe9, 0x92, 0x26, 0x9d, 0x5f, 0x97, 0x42, 0x1c, 0xeb, 0xd0, 0x3b, 0x50, 0x65, 0x42, 0x44, - 0x94, 0x63, 0xba, 0xa7, 0x76, 0x5f, 0xbb, 0x77, 0xd7, 0x8a, 0x6f, 0x46, 0xdd, 0xbd, 0xbc, 0x3d, - 0x6b, 0xb4, 0x66, 0xed, 0x1c, 0x06, 0xd4, 0xd9, 0xf4, 0x6d, 0xe2, 0x6e, 0xef, 0xfe, 0x84, 0xda, - 0x21, 0xa6, 0x7b, 0x94, 0x53, 0xcf, 0xa6, 0xad, 0x25, 0x79, 0x50, 0xdd, 0x84, 0x03, 0x67, 0x74, - 0xe8, 0x1e, 0x80, 0xa0, 0x36, 0xa7, 0x61, 0xee, 0x9c, 0x90, 0xf6, 0x02, 0xfa, 0xa9, 0x06, 0xe7, - 0x50, 0xe8, 0x07, 0xb0, 0x20, 0x22, 0xb5, 0x42, 0xa3, 0xac, 0xbc, 0xf9, 0x9a, 0xf5, 0x99, 0x91, - 0x69, 0xbd, 0xfd, 0xe0, 0x1b, 0xdf, 0xee, 0xc7, 0x16, 0xad, 0xda, 0x64, 0xdc, 0x5c, 0xd0, 0x7f, - 0x70, 0xc2, 0x83, 0xde, 0x86, 0x8a, 0x13, 0x71, 0x12, 0x32, 0xdf, 0x6b, 0xcc, 0x2b, 0x4e, 0x2b, - 0xb7, 0xc3, 0x34, 0xf6, 0xac, 0xe0, 0x60, 0x20, 0x05, 0xc2, 0x92, 0xb1, 0x27, 0xa9, 0x3b, 0xda, - 0xaa, 0xb5, 0x28, 0xef, 0x22, 0xf9, 0x87, 0x53, 0x36, 0x44, 0xa0, 0xc6, 0xa9, 0x47, 0xdf, 0x6f, - 0xd1, 0x3d, 0x9f, 0xd3, 0xc6, 0xf9, 0xff, 0x8a, 0xbc, 0x2e, 0xa3, 0x06, 0x67, 0x34, 0x38, 0xcf, - 0x89, 0x6e, 0x43, 0xc5, 0xf1, 0x84, 0x8a, 0xc3, 0xc6, 0xc2, 0x8d, 0xd2, 0xed, 0xaa, 0x76, 0xe6, - 0x49, 0x5f, 0xc9, 0x70, 0xaa, 0x45, 0x6b, 0x50, 0x63, 0xc1, 0xba, 0xe3, 0x70, 0x2a, 0x04, 0x15, - 0x8d, 0x8a, 0x02, 0x2b, 0xf2, 0x6e, 0x2f, 0x15, 0xe3, 0x3c, 0x06, 0xbd, 0x02, 0xe5, 0x88, 0x33, - 0xd1, 0xa8, 0x2a, 0x6c, 0x65, 0x32, 0x6e, 0x96, 0x9f, 0xe2, 0xae, 0xc0, 0x4a, 0x8a, 0x5e, 0x87, - 0x0b, 0x74, 0x48, 0x98, 0x9b, 0x71, 0x82, 0xc2, 0xa1, 0xc9, 0xb8, 0x79, 0x61, 0x63, 0x4a, 0x83, - 0x0b, 0x48, 0xe4, 0x00, 0x04, 0x69, 0xbc, 0x36, 0x6a, 0xea, 0x60, 0xee, 0x9f, 0x72, 0x93, 0x33, - 0x5f, 0x47, 0xeb, 0x82, 0x0c, 0x96, 0xec, 0x3f, 0xce, 0xf1, 0x9a, 0xff, 0x30, 0x60, 0x59, 0xbf, - 0xb7, 0xb6, 0x4b, 0xd8, 0xf0, 0x21, 0x25, 0x61, 0xc4, 0xa9, 0x40, 0xdf, 0x85, 0x3a, 0xf5, 0xc8, - 0xae, 0x4b, 0x9d, 0x44, 0xd4, 0x30, 0x94, 0xef, 0x97, 0x27, 0xe3, 0x66, 0x7d, 0x63, 0x5a, 0x85, - 0x8b, 0x58, 0xf4, 0x2e, 0x5c, 0xa5, 0x1f, 0x84, 0x94, 0x7b, 0xc4, 0x75, 0x0f, 0xb7, 0x88, 0x47, - 0x06, 0x39, 0xa2, 0x73, 0x8a, 0xe8, 0xfa, 0x64, 0xdc, 0xbc, 0xba, 0x71, 0x12, 0x08, 0x9f, 0x6c, - 0x8f, 0xbe, 0x0f, 0x17, 0x1d, 0x26, 0xa6, 0x9d, 0x2b, 0x29, 0xce, 0xe5, 0xc9, 0xb8, 0x79, 0xb1, - 0x53, 0xd0, 0xe1, 0x63, 0x68, 0xf3, 0xa7, 0x06, 0x5c, 0xcc, 0x6f, 0x5b, 0x25, 0xc1, 0x21, 0xd4, - 0x75, 0xb6, 0xd9, 0xa2, 0x21, 0x71, 0x48, 0x48, 0xd4, 0xbb, 0x3f, 0xfd, 0x01, 0xe5, 0x32, 0x69, - 0xeb, 0x8a, 0x7e, 0x9d, 0xf5, 0xf6, 0x34, 0x15, 0x2e, 0x72, 0x9b, 0x7f, 0x34, 0xa0, 0x96, 0xcf, - 0xc1, 0xd7, 0xa1, 0x14, 0x31, 0x47, 0xa7, 0x9a, 0x9a, 0xa6, 0x29, 0x3d, 0xed, 0x76, 0xb0, 0x94, - 0xa3, 0x1b, 0x50, 0x96, 0x09, 0x54, 0xe7, 0xd7, 0x45, 0xad, 0x2f, 0xab, 0xe7, 0xaf, 0x34, 0xf2, - 0xca, 0x92, 0x35, 0xd4, 0x81, 0xf1, 0xe4, 0x54, 0x2e, 0xe7, 0xfd, 0xd1, 0x2a, 0x5c, 0xc4, 0xa2, - 0x4d, 0x28, 0xdb, 0x24, 0x60, 0x3a, 0x69, 0x58, 0xa7, 0xed, 0x79, 0xba, 0x82, 0xc4, 0xa1, 0x2f, - 0x85, 0x58, 0xb1, 0x98, 0xff, 0x2e, 0x43, 0xf1, 0x08, 0xfe, 0xf7, 0x1d, 0x3e, 0x80, 0x9a, 0xc3, - 0x44, 0xe0, 0x92, 0xc3, 0x59, 0x75, 0xa3, 0x93, 0xa9, 0x70, 0x1e, 0x87, 0xbe, 0x97, 0xab, 0x6e, - 0x65, 0x65, 0x73, 0x73, 0x46, 0x75, 0xab, 0x3f, 0xf6, 0x45, 0xc8, 0xbc, 0xc1, 0x8c, 0x02, 0x77, - 0x07, 0x16, 0xfc, 0xf7, 0x3d, 0xca, 0xbb, 0x1d, 0x95, 0xfe, 0xaa, 0xad, 0xba, 0xb6, 0x5f, 0xd8, - 0x8e, 0xc5, 0x38, 0xd1, 0xcb, 0x5a, 0xa8, 0x7e, 0xca, 0x6c, 0xaf, 0xd2, 0x59, 0xae, 0x16, 0x6e, - 0x27, 0x0a, 0x9c, 0x61, 0xe4, 0x9e, 0x48, 0xc0, 0x36, 0x3c, 0x27, 0xf0, 0x99, 0x17, 0x36, 0x16, - 0xa6, 0xf7, 0xb4, 0xde, 0xeb, 0x26, 0x2a, 0x9c, 0xc7, 0xa1, 0x57, 0xa1, 0x62, 0x93, 0x56, 0xe4, - 0x39, 0x2e, 0x6d, 0x54, 0x94, 0xcd, 0xc5, 0x64, 0x4f, 0xed, 0xf5, 0x58, 0x8e, 0x53, 0x84, 0xf4, - 0x6a, 0x18, 0xdf, 0x73, 0xb7, 0xd3, 0xa8, 0x4e, 0x7b, 0xb5, 0x95, 0x28, 0x70, 0x86, 0x41, 0xaf, - 0xc1, 0xe2, 0x7e, 0xb4, 0x9b, 0x5c, 0x70, 0xa7, 0x01, 0xca, 0x66, 0x59, 0xdb, 0x2c, 0x3e, 0xce, - 0xe9, 0xf0, 0x14, 0x12, 0xf5, 0x60, 0xd9, 0x76, 0xfd, 0xc8, 0xe9, 0x53, 0x3e, 0x62, 0x36, 0x5d, - 0x8f, 0xc2, 0xfd, 0x2d, 0xdf, 0xa1, 0x2a, 0x83, 0x55, 0x5b, 0xaf, 0x68, 0x86, 0xe5, 0xf6, 0x0c, - 0x0c, 0x9e, 0x69, 0x89, 0x56, 0xa1, 0x3c, 0x94, 0x0c, 0x8b, 0x8a, 0xe1, 0xcb, 0x49, 0x5c, 0x48, - 0xdd, 0x51, 0xd6, 0x2e, 0x28, 0x02, 0x05, 0x34, 0xff, 0x55, 0x82, 0x6a, 0xdb, 0xf7, 0x1c, 0xa6, - 0x4a, 0xcc, 0x1a, 0x94, 0x43, 0x79, 0x19, 0xf1, 0xcd, 0x5f, 0x4f, 0xcc, 0xe5, 0xe1, 0x1f, 0x8d, - 0x9b, 0x4b, 0x29, 0x50, 0x5d, 0x8c, 0x82, 0xa2, 0x1f, 0xc3, 0x79, 0x11, 0x92, 0x30, 0x12, 0xfa, - 0xba, 0x1f, 0x6a, 0xa3, 0xf3, 0x7d, 0x25, 0x3d, 0x1a, 0x37, 0xcf, 0xd4, 0x7a, 0x59, 0x29, 0x77, - 0x6c, 0x87, 0x35, 0x2b, 0x7a, 0x03, 0x90, 0xbf, 0x2b, 0x28, 0x1f, 0x51, 0xe7, 0x51, 0xdc, 0x9d, - 0xc9, 0xca, 0x2a, 0xc3, 0xb9, 0xd4, 0xba, 0xa6, 0xd7, 0x42, 0xdb, 0xc7, 0x10, 0x78, 0x86, 0x15, - 0x5a, 0x87, 0x8a, 0xa0, 0x23, 0xca, 0x59, 0x78, 0xa8, 0xe3, 0xed, 0xab, 0x49, 0x20, 0xf4, 0xb5, - 0xfc, 0x68, 0xdc, 0xbc, 0x94, 0xb9, 0xa2, 0x85, 0x38, 0x35, 0x43, 0x23, 0x40, 0x2e, 0x11, 0xe1, - 0x0e, 0x27, 0x9e, 0x88, 0x8f, 0x82, 0x0d, 0xa9, 0x8a, 0x44, 0x95, 0xfb, 0xce, 0x52, 0x8b, 0xa5, - 0x45, 0xe6, 0xfa, 0xe6, 0x31, 0x36, 0x3c, 0x63, 0x05, 0x74, 0x0b, 0xce, 0x73, 0x4a, 0x84, 0xef, - 0xe9, 0x08, 0xbe, 0x90, 0x1c, 0x33, 0x56, 0x52, 0xac, 0xb5, 0xf2, 0xf9, 0x0d, 0xa9, 0x10, 0x64, - 0x40, 0x75, 0xec, 0xa6, 0xcf, 0x6f, 0x2b, 0x16, 0xe3, 0x44, 0x6f, 0xfe, 0xcd, 0x80, 0xfa, 0x63, - 0x4a, 0xdc, 0x70, 0xbf, 0xbd, 0x4f, 0xed, 0x03, 0xd5, 0xc5, 0xfd, 0xc2, 0x80, 0x2b, 0x9c, 0x12, - 0xc7, 0xf7, 0xdc, 0xc3, 0x82, 0x4e, 0x27, 0xf8, 0x6f, 0x9e, 0x92, 0xec, 0xf0, 0x6c, 0xeb, 0x56, - 0x53, 0xfb, 0x71, 0xe5, 0x04, 0x00, 0x3e, 0x69, 0x5d, 0xf4, 0x08, 0x2e, 0xe9, 0xa2, 0xf4, 0x16, - 0x67, 0x21, 0x55, 0x0a, 0x95, 0xf8, 0x2a, 0xad, 0xab, 0x9a, 0xf4, 0x52, 0xa7, 0x08, 0xc0, 0xc7, - 0x6d, 0xcc, 0x7f, 0x1a, 0x50, 0xed, 0x0e, 0xc9, 0x80, 0xaa, 0x1a, 0x72, 0x13, 0xe6, 0x99, 0xfc, - 0x53, 0x6c, 0x58, 0x15, 0x02, 0xc7, 0x3a, 0xb4, 0x03, 0x15, 0x97, 0x79, 0x94, 0x0c, 0x74, 0x29, - 0xae, 0xdd, 0xbb, 0x75, 0xca, 0xfe, 0x37, 0x63, 0x78, 0x96, 0x62, 0xb4, 0x40, 0xe0, 0x94, 0x49, - 0x56, 0xcf, 0x20, 0x72, 0xdd, 0x36, 0xa7, 0x0e, 0xf5, 0x42, 0x46, 0x5c, 0xa1, 0x02, 0xfa, 0xf4, - 0x4a, 0xd2, 0x9b, 0xb6, 0x8a, 0xab, 0x55, 0x41, 0x88, 0x8b, 0xdc, 0xe6, 0xcf, 0x0d, 0x58, 0xd0, - 0x5e, 0xa0, 0x27, 0x30, 0x6f, 0xef, 0x13, 0xe6, 0xa9, 0x0e, 0xa5, 0x76, 0xef, 0xce, 0x29, 0x0b, - 0xc6, 0xed, 0xb7, 0xaa, 0x5a, 0xe9, 0x01, 0xb5, 0xa5, 0x3d, 0x8e, 0x69, 0x90, 0x05, 0x60, 0xfb, - 0x5e, 0x48, 0x64, 0xac, 0x27, 0xdd, 0x8a, 0x6a, 0xa2, 0xda, 0xa9, 0x14, 0xe7, 0x10, 0xe6, 0xaf, - 0x0c, 0xa8, 0x68, 0xd2, 0x8e, 0xbc, 0x82, 0x01, 0xf7, 0xa3, 0xa0, 0x78, 0x05, 0x8f, 0xa4, 0x10, - 0xc7, 0x3a, 0x59, 0xea, 0x0e, 0x98, 0xe7, 0x14, 0x4b, 0xdd, 0x9b, 0xcc, 0x73, 0xb0, 0xd2, 0x4c, - 0xcf, 0x54, 0xa5, 0x33, 0xcc, 0x54, 0x49, 0xf5, 0x2c, 0x9f, 0x54, 0x3d, 0xcd, 0x5f, 0x1b, 0x00, - 0xd9, 0xde, 0xd1, 0x5b, 0x50, 0xe1, 0x54, 0xf8, 0x11, 0xb7, 0xa9, 0x7e, 0x06, 0x77, 0x4e, 0x7d, - 0x06, 0x31, 0xbc, 0xdb, 0xc9, 0x22, 0x21, 0x91, 0xe1, 0x94, 0x0c, 0x6d, 0x41, 0x89, 0xa7, 0xa3, - 0x90, 0x75, 0xa6, 0xcb, 0xc8, 0x66, 0xa1, 0xb4, 0x2d, 0x90, 0x93, 0x90, 0xe4, 0x31, 0x1d, 0xa8, - 0x17, 0x40, 0xd3, 0x87, 0x63, 0x7c, 0x8e, 0xc3, 0x39, 0xb1, 0xb5, 0x30, 0xff, 0x6a, 0x40, 0x31, - 0xe8, 0x3e, 0xff, 0x32, 0x6f, 0x00, 0x12, 0xba, 0x78, 0xd9, 0xb6, 0x1f, 0x79, 0xf1, 0xd8, 0x16, - 0x2f, 0x9a, 0x26, 0xc7, 0xfe, 0x31, 0x04, 0x9e, 0x61, 0x85, 0x7e, 0x94, 0x8c, 0x7e, 0x98, 0xee, - 0xc5, 0x8d, 0x5c, 0xed, 0xde, 0xed, 0x59, 0x73, 0xe5, 0xcc, 0x91, 0xb2, 0x30, 0x24, 0x4a, 0x0e, - 0x9c, 0xe3, 0x33, 0x5f, 0x18, 0x70, 0x52, 0xd2, 0x42, 0xdf, 0x82, 0xa5, 0x80, 0x72, 0xe6, 0x3b, - 0x7d, 0x6a, 0xfb, 0x9e, 0x13, 0x4f, 0xbf, 0xf3, 0xad, 0x4b, 0x93, 0x71, 0x73, 0xa9, 0x97, 0x57, - 0xe0, 0x69, 0x9c, 0x1c, 0x77, 0x42, 0x36, 0xa4, 0x7e, 0x14, 0x26, 0x96, 0xe7, 0x94, 0xa5, 0x1a, - 0x77, 0x76, 0xa6, 0x34, 0xb8, 0x80, 0x94, 0x3d, 0xfd, 0x1e, 0x61, 0x6e, 0xc4, 0xe9, 0xce, 0x3e, - 0xa7, 0x62, 0xdf, 0x77, 0x1d, 0x15, 0xf6, 0xf3, 0x71, 0x4f, 0xff, 0xb0, 0xa0, 0xc3, 0xc7, 0xd0, - 0xe6, 0x1f, 0x0c, 0x80, 0x2c, 0x42, 0xcf, 0xf6, 0x0e, 0xef, 0xc0, 0xc2, 0x88, 0x72, 0x21, 0xab, - 0xef, 0xb9, 0xe9, 0xca, 0xf2, 0xc3, 0x58, 0x8c, 0x13, 0x7d, 0x1a, 0x42, 0xa5, 0x13, 0xbb, 0xd3, - 0xe4, 0x51, 0x97, 0x4f, 0x7c, 0xd4, 0xf7, 0x61, 0x5e, 0xd8, 0x7e, 0x40, 0x75, 0x5b, 0xb1, 0x92, - 0xf8, 0xd4, 0x97, 0x42, 0xd9, 0x8c, 0x24, 0xfe, 0x2b, 0x01, 0x8e, 0xc1, 0xe6, 0xef, 0x0d, 0xa8, - 0xee, 0x6c, 0xf6, 0xdb, 0xbe, 0xb7, 0xc7, 0x06, 0xd3, 0x9f, 0x1b, 0x8c, 0x2f, 0xf6, 0x73, 0xc3, - 0x3e, 0x2c, 0xda, 0xd9, 0x08, 0x99, 0x54, 0x07, 0xeb, 0xec, 0x53, 0xa7, 0xaa, 0x8a, 0x69, 0x97, - 0x98, 0x53, 0x08, 0x3c, 0xc5, 0x6c, 0x7e, 0x05, 0xaa, 0x32, 0x20, 0xb6, 0xf7, 0x3a, 0xe4, 0xf0, - 0xf5, 0xe5, 0x5f, 0x7e, 0xd2, 0x9c, 0xfb, 0xd9, 0xb3, 0xe6, 0xdc, 0xc7, 0xcf, 0x9a, 0x73, 0x9f, - 0x3c, 0x6b, 0xce, 0x7d, 0xf4, 0xa7, 0x1b, 0x73, 0xe6, 0x7b, 0xb0, 0xa4, 0x5a, 0xb2, 0xf4, 0xd5, - 0xbf, 0x0a, 0x15, 0x12, 0xb0, 0x47, 0xb9, 0x4b, 0x4d, 0xb3, 0xd0, 0x7a, 0xaf, 0x1b, 0xdf, 0x6b, - 0x8a, 0x38, 0x3d, 0xc5, 0x9a, 0xbf, 0x35, 0x60, 0x59, 0x9d, 0x52, 0x31, 0xbd, 0x7c, 0xc1, 0x0b, - 0xfd, 0x3f, 0x72, 0xf9, 0xef, 0x4a, 0x50, 0xcb, 0x7d, 0xb7, 0x91, 0x6f, 0xd6, 0xe7, 0x03, 0xe2, - 0xb1, 0x0f, 0x55, 0x57, 0x98, 0x0c, 0xeb, 0xea, 0xcd, 0x6e, 0xe7, 0x15, 0x78, 0x1a, 0x87, 0xbe, - 0x0e, 0x55, 0x95, 0x73, 0x38, 0x4b, 0x07, 0x73, 0x15, 0x1f, 0xed, 0x44, 0x88, 0x33, 0x3d, 0xea, - 0xc2, 0xe5, 0xbc, 0x35, 0x71, 0x9f, 0x7a, 0x2c, 0x4c, 0xa6, 0xcc, 0x2b, 0x93, 0x71, 0xf3, 0xf2, - 0xf6, 0x71, 0x35, 0x9e, 0x65, 0x23, 0x6b, 0xac, 0x2b, 0x83, 0x93, 0x85, 0x72, 0xe1, 0x72, 0x56, - 0x63, 0x37, 0x53, 0x29, 0xce, 0x21, 0xa4, 0x9f, 0x6a, 0x1c, 0xf3, 0x6c, 0x2a, 0xbb, 0xf2, 0xd4, - 0xcf, 0x5e, 0x22, 0xc4, 0x99, 0x5e, 0x4e, 0xc2, 0x22, 0xe4, 0x94, 0x86, 0xd9, 0x87, 0x97, 0xf3, - 0xd9, 0x24, 0xdc, 0x9f, 0x56, 0xe1, 0x22, 0x16, 0xad, 0x41, 0x2d, 0xf0, 0x45, 0x48, 0xdc, 0xb6, - 0xef, 0xa4, 0x1f, 0x8d, 0xd4, 0x77, 0xa0, 0x5e, 0x26, 0xc6, 0x79, 0x8c, 0x9c, 0x97, 0x04, 0xe5, - 0x8c, 0xb8, 0x4f, 0xa2, 0xe1, 0x2e, 0xe5, 0xba, 0xa1, 0x4d, 0x5f, 0x42, 0x3f, 0xa7, 0xc3, 0x53, - 0xc8, 0x56, 0xfb, 0xf9, 0xcb, 0x95, 0xb9, 0x17, 0x2f, 0x57, 0xe6, 0x3e, 0x7d, 0xb9, 0x32, 0xf7, - 0xd1, 0x64, 0xc5, 0x78, 0x3e, 0x59, 0x31, 0x5e, 0x4c, 0x56, 0x8c, 0x4f, 0x27, 0x2b, 0xc6, 0x9f, - 0x27, 0x2b, 0xc6, 0xc7, 0x7f, 0x59, 0x99, 0x7b, 0xe7, 0xfa, 0x67, 0x7e, 0x8b, 0xfe, 0x4f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x23, 0xdc, 0x56, 0x82, 0xab, 0x16, 0x00, 0x00, + // 2140 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcf, 0x6f, 0x1c, 0x49, + 0xf5, 0x77, 0x67, 0xc6, 0xf1, 0xcc, 0x1b, 0x3b, 0x4e, 0x2a, 0xfe, 0x2a, 0x93, 0x7c, 0x37, 0x1e, + 0xd3, 0x11, 0x51, 0x02, 0x9b, 0x36, 0x8e, 0x12, 0x08, 0x11, 0x08, 0x3c, 0x63, 0x27, 0x99, 0x5d, + 0x3b, 0x1e, 0x6a, 0x1c, 0x76, 0xb5, 0x8b, 0x58, 0x95, 0xbb, 0xcb, 0xe3, 0xc2, 0x3d, 0xdd, 0xad, + 0xaa, 0xee, 0xd9, 0x9d, 0x3d, 0x2d, 0x27, 0x40, 0x5c, 0x96, 0x1b, 0xc7, 0x8d, 0xc4, 0x9f, 0x80, + 0x84, 0xf8, 0x0b, 0xc8, 0x31, 0x5c, 0xd0, 0x4a, 0xa0, 0x11, 0x19, 0xae, 0x88, 0x0b, 0x42, 0x02, + 0x9f, 0x50, 0x55, 0x57, 0xff, 0x98, 0xf6, 0x78, 0xed, 0x85, 0xe5, 0x36, 0xf3, 0xde, 0xe7, 0x7d, + 0xea, 0x55, 0xd5, 0xab, 0xf7, 0xa3, 0xe1, 0xce, 0x61, 0xdf, 0x77, 0x22, 0x97, 0x0a, 0xeb, 0x83, + 0xe1, 0x87, 0xab, 0xb6, 0xcb, 0xa8, 0x17, 0xde, 0xe9, 0xf9, 0xab, 0x24, 0x60, 0xab, 0x83, 0xb5, + 0xd5, 0x1e, 0xf5, 0x28, 0x27, 0x21, 0x75, 0xac, 0x80, 0xfb, 0xa1, 0x8f, 0xae, 0xe7, 0xe1, 0x56, + 0x0c, 0x7f, 0xaf, 0xe7, 0x5b, 0x24, 0x60, 0xd6, 0x60, 0xed, 0xda, 0x9d, 0x1e, 0x0b, 0x0f, 0xa2, + 0x3d, 0xcb, 0xf6, 0xfb, 0xab, 0x3d, 0xbf, 0xe7, 0xaf, 0x2a, 0xab, 0xbd, 0x68, 0x5f, 0xfd, 0x53, + 0x7f, 0xd4, 0xaf, 0x98, 0xed, 0x9a, 0x79, 0xf8, 0x40, 0x58, 0x2c, 0x5e, 0xcc, 0xf6, 0x39, 0x9d, + 0xb2, 0xe2, 0xb5, 0x7b, 0x19, 0xa6, 0x4f, 0xec, 0x03, 0xe6, 0x51, 0x3e, 0x5c, 0x0d, 0x0e, 0x7b, + 0x52, 0x20, 0x56, 0xfb, 0x34, 0x24, 0x53, 0xac, 0xcc, 0xdf, 0x18, 0xb0, 0xd8, 0x5a, 0xef, 0xb4, + 0x5b, 0x6e, 0x24, 0x42, 0xca, 0xdb, 0xde, 0xbe, 0x8f, 0xbe, 0x05, 0x95, 0x80, 0xfb, 0x03, 0xe6, + 0x50, 0x5e, 0x37, 0x56, 0x8c, 0x5b, 0xd5, 0xe6, 0xca, 0x8b, 0x51, 0x63, 0x66, 0x3c, 0x6a, 0x54, + 0x3a, 0x5a, 0x7e, 0x34, 0x6a, 0xcc, 0x4b, 0xb3, 0xe4, 0x3f, 0x4e, 0x2d, 0xd0, 0x2a, 0x54, 0x3d, + 0xd2, 0xa7, 0x22, 0x20, 0x36, 0xad, 0x9f, 0x53, 0xe6, 0x97, 0xb4, 0x79, 0xf5, 0x69, 0xa2, 0xc0, + 0x19, 0x06, 0xdd, 0x87, 0x9a, 0x1d, 0xaf, 0x2e, 0xd5, 0xf5, 0x92, 0x32, 0xb9, 0xac, 0x4d, 0x6a, + 0xad, 0x4c, 0x85, 0xf3, 0x38, 0xf3, 0x5d, 0xf8, 0xbf, 0x16, 0xe5, 0x21, 0xdb, 0x67, 0x36, 0x09, + 0x69, 0x87, 0xb3, 0x01, 0x09, 0xe9, 0x9b, 0x74, 0x88, 0x9a, 0x50, 0xa1, 0x9e, 0xed, 0x3b, 0xcc, + 0xeb, 0x69, 0xf7, 0x6f, 0x26, 0xee, 0x6f, 0x6a, 0xf9, 0xd1, 0xa8, 0x81, 0x32, 0x8b, 0x44, 0x8a, + 0x53, 0x3b, 0xf3, 0xef, 0xb3, 0xb0, 0x98, 0x63, 0xef, 0x06, 0xd4, 0x46, 0x37, 0x60, 0x96, 0xb8, + 0x8c, 0x08, 0x4d, 0xba, 0xa0, 0x49, 0x67, 0xd7, 0xa5, 0x10, 0xc7, 0x3a, 0xf4, 0x0e, 0x54, 0x99, + 0x10, 0x11, 0xe5, 0x98, 0xee, 0xab, 0xdd, 0xd7, 0xee, 0xde, 0xb1, 0xe2, 0x9b, 0x51, 0x77, 0x2f, + 0x6f, 0xcf, 0x1a, 0xac, 0x59, 0xbb, 0xc3, 0x80, 0x3a, 0x5b, 0xbe, 0x4d, 0xdc, 0x9d, 0xbd, 0x1f, + 0x51, 0x3b, 0xc4, 0x74, 0x9f, 0x72, 0xea, 0xd9, 0xb4, 0xb9, 0x20, 0x0f, 0xaa, 0x9d, 0x70, 0xe0, + 0x8c, 0x0e, 0xdd, 0x05, 0x10, 0xd4, 0xe6, 0x34, 0xcc, 0x9d, 0x13, 0xd2, 0x5e, 0x40, 0x37, 0xd5, + 0xe0, 0x1c, 0x0a, 0x7d, 0x0f, 0xe6, 0x44, 0xa4, 0x56, 0xa8, 0x97, 0x95, 0x37, 0x5f, 0xb1, 0x3e, + 0x33, 0x32, 0xad, 0xb7, 0xef, 0x7f, 0xed, 0x9b, 0xdd, 0xd8, 0xa2, 0x59, 0x1b, 0x8f, 0x1a, 0x73, + 0xfa, 0x0f, 0x4e, 0x78, 0xd0, 0xdb, 0x50, 0x71, 0x22, 0x4e, 0x42, 0xe6, 0x7b, 0xf5, 0x59, 0xc5, + 0x69, 0xe5, 0x76, 0x98, 0xc6, 0x9e, 0x15, 0x1c, 0xf6, 0xa4, 0x40, 0x58, 0x32, 0xf6, 0x24, 0xf5, + 0x86, 0xb6, 0x6a, 0xce, 0xcb, 0xbb, 0x48, 0xfe, 0xe1, 0x94, 0x0d, 0x11, 0xa8, 0x71, 0xea, 0xd1, + 0xf7, 0x9b, 0x74, 0xdf, 0xe7, 0xb4, 0x7e, 0xfe, 0x3f, 0x22, 0x5f, 0x94, 0x51, 0x83, 0x33, 0x1a, + 0x9c, 0xe7, 0x44, 0xb7, 0xa0, 0xe2, 0x78, 0x42, 0xc5, 0x61, 0x7d, 0x6e, 0xa5, 0x74, 0xab, 0xaa, + 0x9d, 0x79, 0xda, 0x55, 0x32, 0x9c, 0x6a, 0xd1, 0x1a, 0xd4, 0x58, 0xb0, 0xee, 0x38, 0x9c, 0x0a, + 0x41, 0x45, 0xbd, 0xa2, 0xc0, 0x8a, 0xbc, 0xdd, 0x49, 0xc5, 0x38, 0x8f, 0x41, 0xaf, 0x41, 0x39, + 0xe2, 0x4c, 0xd4, 0xab, 0x0a, 0x5b, 0x19, 0x8f, 0x1a, 0xe5, 0x67, 0xb8, 0x2d, 0xb0, 0x92, 0xa2, + 0x87, 0x70, 0x81, 0xf6, 0x09, 0x73, 0x33, 0x4e, 0x50, 0x38, 0x34, 0x1e, 0x35, 0x2e, 0x6c, 0x4e, + 0x68, 0x70, 0x01, 0x89, 0x1c, 0x80, 0x20, 0x8d, 0xd7, 0x7a, 0x4d, 0x1d, 0xcc, 0xbd, 0x53, 0x6e, + 0x72, 0xea, 0xeb, 0x68, 0x5e, 0x90, 0xc1, 0x92, 0xfd, 0xc7, 0x39, 0x5e, 0xf3, 0x27, 0x25, 0x58, + 0xd2, 0xef, 0xad, 0xe5, 0x12, 0xd6, 0x7f, 0x44, 0x49, 0x18, 0x71, 0x2a, 0xd0, 0xcf, 0x0d, 0x58, + 0xa4, 0x1e, 0xd9, 0x73, 0xa9, 0x93, 0xc8, 0xea, 0xc6, 0x4a, 0xe9, 0x56, 0xed, 0xee, 0x93, 0xd3, + 0x9c, 0x98, 0x42, 0x67, 0x6d, 0x4e, 0x52, 0x6d, 0x7a, 0x21, 0x1f, 0x36, 0xaf, 0xe8, 0x48, 0x5e, + 0x2c, 0x68, 0x71, 0x71, 0x65, 0xf4, 0x2e, 0x5c, 0xa5, 0x1f, 0x84, 0x94, 0x7b, 0xc4, 0x75, 0x87, + 0xdb, 0xc4, 0x23, 0xbd, 0x9c, 0x5b, 0xe7, 0xd4, 0x99, 0x5e, 0x1f, 0x8f, 0x1a, 0x57, 0x37, 0x4f, + 0x02, 0xe1, 0x93, 0xed, 0xd1, 0x77, 0xe1, 0xa2, 0xc3, 0xc4, 0xe4, 0x56, 0x4b, 0x8a, 0x73, 0x69, + 0x3c, 0x6a, 0x5c, 0xdc, 0x28, 0xe8, 0xf0, 0x31, 0xf4, 0xb5, 0x26, 0x2c, 0x4d, 0xdb, 0x20, 0xba, + 0x08, 0xa5, 0x43, 0x3a, 0x8c, 0xb3, 0x07, 0x96, 0x3f, 0xd1, 0x12, 0xcc, 0x0e, 0x88, 0x1b, 0xe9, + 0x34, 0x89, 0xe3, 0x3f, 0x0f, 0xcf, 0x3d, 0x30, 0xcc, 0x1f, 0x1b, 0x70, 0x31, 0x7f, 0x74, 0x2a, + 0x2f, 0xf7, 0x61, 0x51, 0x27, 0xc0, 0x6d, 0x1a, 0x12, 0x87, 0x84, 0x44, 0x91, 0x9d, 0xfe, 0xa6, + 0x73, 0xc9, 0x3d, 0x3b, 0xe6, 0xd6, 0x24, 0x15, 0x2e, 0x72, 0x9b, 0x7f, 0x34, 0xa0, 0x96, 0x2f, + 0x0b, 0xd7, 0xa1, 0x14, 0x31, 0x47, 0x67, 0xbf, 0x9a, 0xa6, 0x29, 0x3d, 0x6b, 0x6f, 0x60, 0x29, + 0x47, 0x2b, 0x50, 0x96, 0x39, 0x5d, 0xa7, 0xfc, 0x79, 0xad, 0x2f, 0xab, 0x8c, 0xa4, 0x34, 0xe8, + 0xdb, 0x99, 0xff, 0xea, 0xd0, 0x79, 0x72, 0xb2, 0x97, 0xf3, 0xfe, 0x68, 0x15, 0x2e, 0x62, 0xd1, + 0x16, 0x94, 0x6d, 0x12, 0x30, 0x9d, 0xc7, 0xac, 0xd3, 0xf6, 0x3c, 0x59, 0xd4, 0xe2, 0xd7, 0x28, + 0x85, 0x58, 0xb1, 0x98, 0xff, 0x2a, 0x43, 0xf1, 0x08, 0xfe, 0xfb, 0x1d, 0xde, 0x87, 0x9a, 0xc3, + 0x44, 0xe0, 0x92, 0xe1, 0xb4, 0x52, 0xb6, 0x91, 0xa9, 0x70, 0x1e, 0x87, 0xbe, 0x93, 0x2b, 0xb8, + 0x65, 0x65, 0x73, 0x63, 0x4a, 0xc1, 0x5d, 0x7c, 0xe2, 0x8b, 0x90, 0x79, 0xbd, 0x29, 0x35, 0xf7, + 0x36, 0xcc, 0xf9, 0xef, 0x7b, 0x94, 0xb7, 0x37, 0x54, 0x46, 0xae, 0x36, 0x17, 0xb5, 0xfd, 0xdc, + 0x4e, 0x2c, 0xc6, 0x89, 0x5e, 0x96, 0x67, 0xf5, 0x53, 0x16, 0x20, 0x95, 0x61, 0x73, 0xe5, 0x79, + 0x27, 0x51, 0xe0, 0x0c, 0x23, 0xf7, 0x44, 0x02, 0xb6, 0xe9, 0x39, 0x81, 0xcf, 0xbc, 0xb0, 0x3e, + 0x37, 0xb9, 0xa7, 0xf5, 0x4e, 0x3b, 0x51, 0xe1, 0x3c, 0x0e, 0xbd, 0x0e, 0x15, 0x9b, 0x34, 0x23, + 0xcf, 0x71, 0x69, 0xbd, 0xa2, 0x6c, 0x2e, 0x26, 0x7b, 0x6a, 0xad, 0xc7, 0x72, 0x9c, 0x22, 0xa4, + 0x57, 0xfd, 0xf8, 0x9e, 0xdb, 0x1b, 0xf5, 0xea, 0xa4, 0x57, 0xdb, 0x89, 0x02, 0x67, 0x18, 0xf4, + 0x00, 0xe6, 0x0f, 0xa2, 0xbd, 0xe4, 0x82, 0x37, 0xea, 0xa0, 0x6c, 0x96, 0xb4, 0xcd, 0xfc, 0x93, + 0x9c, 0x0e, 0x4f, 0x20, 0x51, 0x07, 0x96, 0x6c, 0xd7, 0x8f, 0x9c, 0x2e, 0xe5, 0x03, 0x66, 0xd3, + 0xf5, 0x28, 0x3c, 0xd8, 0xf6, 0x1d, 0xaa, 0x92, 0x6a, 0xb5, 0xf9, 0x9a, 0x66, 0x58, 0x6a, 0x4d, + 0xc1, 0xe0, 0xa9, 0x96, 0x68, 0x15, 0xca, 0x7d, 0xc9, 0x30, 0xaf, 0x18, 0xfe, 0x3f, 0x89, 0x0b, + 0xa9, 0x3b, 0xca, 0x3a, 0x18, 0x45, 0xa0, 0x80, 0xe6, 0x3f, 0x4b, 0x50, 0x6d, 0xf9, 0x9e, 0xc3, + 0x54, 0xd5, 0x5b, 0x83, 0x72, 0x28, 0x2f, 0x23, 0xbe, 0xf9, 0xeb, 0x89, 0xb9, 0x3c, 0xfc, 0xa3, + 0x51, 0x63, 0x21, 0x05, 0xaa, 0x8b, 0x51, 0x50, 0xf4, 0x43, 0x38, 0x2f, 0x42, 0x12, 0x46, 0x42, + 0x5f, 0xf7, 0x23, 0x6d, 0x74, 0xbe, 0xab, 0xa4, 0x47, 0xa3, 0xc6, 0x99, 0xba, 0x41, 0x2b, 0xe5, + 0x8e, 0xed, 0xb0, 0x66, 0x45, 0x6f, 0x00, 0xf2, 0xf7, 0x04, 0xe5, 0x03, 0xea, 0x3c, 0x8e, 0x1b, + 0x46, 0x59, 0xec, 0x65, 0x38, 0x97, 0x9a, 0xd7, 0xf4, 0x5a, 0x68, 0xe7, 0x18, 0x02, 0x4f, 0xb1, + 0x42, 0xeb, 0x50, 0x11, 0x74, 0x40, 0x39, 0x0b, 0x87, 0x3a, 0xde, 0xbe, 0x9c, 0x04, 0x42, 0x57, + 0xcb, 0x8f, 0x46, 0x8d, 0x4b, 0x99, 0x2b, 0x5a, 0x88, 0x53, 0x33, 0x34, 0x00, 0xe4, 0x12, 0x11, + 0xee, 0x72, 0xe2, 0x89, 0xf8, 0x28, 0x58, 0x9f, 0xaa, 0x48, 0x54, 0xb9, 0xef, 0x2c, 0xed, 0x81, + 0xb4, 0xc8, 0x5c, 0xdf, 0x3a, 0xc6, 0x86, 0xa7, 0xac, 0x80, 0x6e, 0xc2, 0x79, 0x4e, 0x89, 0xf0, + 0x3d, 0x1d, 0xc1, 0x17, 0x92, 0x63, 0xc6, 0x4a, 0x8a, 0xb5, 0x56, 0x3e, 0xbf, 0x3e, 0x15, 0x82, + 0xf4, 0xa8, 0x8e, 0xdd, 0xf4, 0xf9, 0x6d, 0xc7, 0x62, 0x9c, 0xe8, 0xcd, 0xbf, 0x19, 0xb0, 0xf8, + 0x84, 0x12, 0x37, 0x3c, 0x68, 0x1d, 0x50, 0xfb, 0x50, 0x35, 0x96, 0xbf, 0x30, 0xe0, 0x0a, 0xa7, + 0xc4, 0xf1, 0x3d, 0x77, 0x58, 0xd0, 0xe9, 0x04, 0xff, 0xf5, 0x53, 0x92, 0x1d, 0x9e, 0x6e, 0xdd, + 0x6c, 0x68, 0x3f, 0xae, 0x9c, 0x00, 0xc0, 0x27, 0xad, 0x8b, 0x1e, 0xc3, 0x25, 0x5d, 0xd8, 0xde, + 0xe2, 0x2c, 0xa4, 0x4a, 0xa1, 0x12, 0x5f, 0xa5, 0x79, 0x55, 0x93, 0x5e, 0xda, 0x28, 0x02, 0xf0, + 0x71, 0x1b, 0xf3, 0x1f, 0x06, 0x54, 0xdb, 0x7d, 0xd2, 0xa3, 0xaa, 0x86, 0xdc, 0x80, 0x59, 0x26, + 0xff, 0x14, 0x7b, 0x68, 0x85, 0xc0, 0xb1, 0x0e, 0xed, 0x42, 0xc5, 0x65, 0x1e, 0x25, 0x3d, 0x5d, + 0xce, 0x6b, 0x77, 0x6f, 0x9e, 0xb2, 0xff, 0xad, 0x18, 0x9e, 0xa5, 0x18, 0x2d, 0x10, 0x38, 0x65, + 0x92, 0xd5, 0x33, 0x88, 0x5c, 0xb7, 0xc5, 0xa9, 0x43, 0xbd, 0x90, 0x11, 0x57, 0xa8, 0x80, 0x3e, + 0xbd, 0x92, 0x74, 0x26, 0xad, 0xe2, 0x6a, 0x55, 0x10, 0xe2, 0x22, 0xb7, 0xf9, 0x33, 0x03, 0xe6, + 0xb4, 0x17, 0xe8, 0x29, 0xcc, 0xda, 0x07, 0x84, 0x79, 0xba, 0x67, 0xba, 0x7d, 0xca, 0x82, 0xf1, + 0x44, 0xa0, 0xaa, 0x56, 0x7a, 0x40, 0x2d, 0x69, 0x8f, 0x63, 0x1a, 0x64, 0x01, 0xd8, 0xbe, 0x17, + 0x12, 0x19, 0xeb, 0x49, 0xc7, 0xa3, 0xfa, 0xba, 0x56, 0x2a, 0xc5, 0x39, 0x84, 0xf9, 0x2b, 0x03, + 0x2a, 0x9a, 0x74, 0x43, 0x5e, 0x41, 0x8f, 0xfb, 0x51, 0x50, 0xbc, 0x82, 0xc7, 0x52, 0x88, 0x63, + 0x9d, 0x2c, 0x75, 0x87, 0xcc, 0x73, 0x8a, 0xa5, 0xee, 0x4d, 0xe6, 0x39, 0x58, 0x69, 0x26, 0xc7, + 0xbc, 0xd2, 0x19, 0xc6, 0xbc, 0xa4, 0x7a, 0x96, 0x4f, 0xaa, 0x9e, 0xe6, 0xaf, 0x0d, 0x80, 0x6c, + 0xef, 0xe8, 0x2d, 0xa8, 0x70, 0x2a, 0xfc, 0x88, 0xdb, 0x54, 0x3f, 0x83, 0xdb, 0xa7, 0x3e, 0x83, + 0x18, 0xde, 0xde, 0xc8, 0x22, 0x21, 0x91, 0xe1, 0x94, 0x0c, 0x6d, 0x43, 0x89, 0xa7, 0xd3, 0x99, + 0x75, 0xa6, 0xcb, 0xc8, 0xc6, 0xb3, 0xb4, 0x2d, 0x90, 0xc3, 0x99, 0xe4, 0x31, 0x1d, 0x58, 0x2c, + 0x80, 0x26, 0x0f, 0xc7, 0xf8, 0x1c, 0x87, 0x73, 0x62, 0x6b, 0x61, 0xfe, 0xd5, 0x80, 0x62, 0xd0, + 0x7d, 0xfe, 0x65, 0xde, 0x00, 0x24, 0x74, 0xf1, 0xb2, 0x6d, 0x3f, 0xf2, 0xe2, 0x49, 0x32, 0x5e, + 0x34, 0x4d, 0x8e, 0xdd, 0x63, 0x08, 0x3c, 0xc5, 0x0a, 0xfd, 0x20, 0x99, 0x46, 0x31, 0xdd, 0x8f, + 0x1b, 0xb9, 0xda, 0xdd, 0x5b, 0xd3, 0x46, 0xdd, 0xa9, 0x53, 0x6e, 0x61, 0x6e, 0x95, 0x1c, 0x38, + 0xc7, 0x67, 0xbe, 0x34, 0xe0, 0xa4, 0xa4, 0x85, 0xbe, 0x01, 0x0b, 0x01, 0xe5, 0xcc, 0x77, 0xba, + 0xd4, 0xf6, 0x3d, 0x27, 0x1e, 0xc8, 0x67, 0x9b, 0x97, 0xc6, 0xa3, 0xc6, 0x42, 0x27, 0xaf, 0xc0, + 0x93, 0x38, 0x39, 0x81, 0x85, 0xac, 0x4f, 0xfd, 0x28, 0x4c, 0x2c, 0xcf, 0x29, 0x4b, 0x35, 0x81, + 0xed, 0x4e, 0x68, 0x70, 0x01, 0x29, 0xe7, 0x82, 0x7d, 0xc2, 0xdc, 0x88, 0xd3, 0xdd, 0x03, 0x4e, + 0xc5, 0x81, 0xef, 0x3a, 0x2a, 0xec, 0x67, 0xe3, 0xb9, 0xe0, 0x51, 0x41, 0x87, 0x8f, 0xa1, 0xcd, + 0x3f, 0x18, 0x00, 0x59, 0x84, 0x9e, 0xed, 0x1d, 0xde, 0x86, 0xb9, 0x01, 0xe5, 0x42, 0x56, 0xdf, + 0x73, 0x93, 0x95, 0xe5, 0xfb, 0xb1, 0x18, 0x27, 0xfa, 0x34, 0x84, 0x4a, 0x27, 0x76, 0xa7, 0xc9, + 0xa3, 0x2e, 0x9f, 0xf8, 0xa8, 0xef, 0xc1, 0xac, 0xb0, 0xfd, 0x80, 0xea, 0xb6, 0x62, 0x39, 0xf1, + 0xa9, 0x2b, 0x85, 0xb2, 0x19, 0x49, 0xfc, 0x57, 0x02, 0x1c, 0x83, 0xcd, 0xdf, 0x1b, 0x50, 0xdd, + 0xdd, 0xea, 0xb6, 0x7c, 0x6f, 0x9f, 0xf5, 0x26, 0xbf, 0x80, 0x18, 0x5f, 0xec, 0x17, 0x90, 0x03, + 0x98, 0xb7, 0xb3, 0xa9, 0x36, 0xa9, 0x0e, 0xd6, 0xd9, 0x07, 0x61, 0x55, 0x15, 0xd3, 0x2e, 0x31, + 0xa7, 0x10, 0x78, 0x82, 0xd9, 0xfc, 0x12, 0x54, 0x65, 0x40, 0xec, 0xec, 0x6f, 0x90, 0xe1, 0xc3, + 0xa5, 0x5f, 0x7e, 0xd2, 0x98, 0xf9, 0xe9, 0xf3, 0xc6, 0xcc, 0xc7, 0xcf, 0x1b, 0x33, 0x9f, 0x3c, + 0x6f, 0xcc, 0x7c, 0xf4, 0xa7, 0x95, 0x19, 0xf3, 0x3d, 0x58, 0x50, 0x2d, 0x59, 0xfa, 0xea, 0x5f, + 0x87, 0x0a, 0x09, 0xd8, 0xe3, 0xdc, 0xa5, 0xa6, 0x59, 0x68, 0xbd, 0xd3, 0x8e, 0xef, 0x35, 0x45, + 0x9c, 0x9e, 0x62, 0xcd, 0xdf, 0x1a, 0xb0, 0xa4, 0x4e, 0xa9, 0x98, 0x5e, 0xbe, 0xe0, 0x85, 0xfe, + 0x17, 0xb9, 0xfc, 0x77, 0x25, 0xa8, 0xe5, 0x3e, 0x25, 0xc9, 0x37, 0xeb, 0xf3, 0x1e, 0xf1, 0xd8, + 0x87, 0xaa, 0x2b, 0x8c, 0x3f, 0x1f, 0x54, 0xe3, 0x37, 0xbb, 0x93, 0x57, 0xe0, 0x49, 0x1c, 0xfa, + 0x2a, 0x54, 0x55, 0xce, 0xe1, 0x2c, 0x1d, 0xee, 0x55, 0x7c, 0xb4, 0x12, 0x21, 0xce, 0xf4, 0xa8, + 0x0d, 0x97, 0xf3, 0xd6, 0xc4, 0x7d, 0xe6, 0xb1, 0x30, 0x99, 0x32, 0xaf, 0x8c, 0x47, 0x8d, 0xcb, + 0x3b, 0xc7, 0xd5, 0x78, 0x9a, 0x8d, 0xac, 0xb1, 0xae, 0x0c, 0x4e, 0x16, 0xca, 0x85, 0xcb, 0x59, + 0x8d, 0xdd, 0x4a, 0xa5, 0x38, 0x87, 0x90, 0x7e, 0xaa, 0x71, 0xcc, 0xb3, 0xa9, 0xec, 0xca, 0x53, + 0x3f, 0x3b, 0x89, 0x10, 0x67, 0x7a, 0x39, 0x09, 0x8b, 0x90, 0x53, 0x1a, 0x66, 0xdf, 0x82, 0xce, + 0x67, 0x93, 0x70, 0x77, 0x52, 0x85, 0x8b, 0x58, 0xb4, 0x06, 0xb5, 0xc0, 0x17, 0x21, 0x71, 0x5b, + 0xbe, 0x93, 0x7e, 0xc7, 0x52, 0x9f, 0xa6, 0x3a, 0x99, 0x18, 0xe7, 0x31, 0x72, 0x5e, 0x12, 0x94, + 0x33, 0xe2, 0x3e, 0x8d, 0xfa, 0x7b, 0x94, 0xeb, 0x86, 0x36, 0x7d, 0x09, 0xdd, 0x9c, 0x0e, 0x4f, + 0x20, 0x9b, 0xad, 0x17, 0xaf, 0x96, 0x67, 0x5e, 0xbe, 0x5a, 0x9e, 0xf9, 0xf4, 0xd5, 0xf2, 0xcc, + 0x47, 0xe3, 0x65, 0xe3, 0xc5, 0x78, 0xd9, 0x78, 0x39, 0x5e, 0x36, 0x3e, 0x1d, 0x2f, 0x1b, 0x7f, + 0x1e, 0x2f, 0x1b, 0x1f, 0xff, 0x65, 0x79, 0xe6, 0x9d, 0xeb, 0x9f, 0xf9, 0x79, 0xfc, 0xdf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x1e, 0x81, 0x20, 0x02, 0x3e, 0x17, 0x00, 0x00, } func (m *CAPIClusterInfo) Marshal() (dAtA []byte, err error) { @@ -1053,10 +1058,25 @@ func (m *ClusterClaimFeatures) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.EnabledFeatures) > 0 { - for iNdEx := len(m.EnabledFeatures) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.EnabledFeatures[iNdEx]) - copy(dAtA[i:], m.EnabledFeatures[iNdEx]) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.EnabledFeatures[iNdEx]))) + keysForEnabledFeatures := make([]string, 0, len(m.EnabledFeatures)) + for k := range m.EnabledFeatures { + keysForEnabledFeatures = append(keysForEnabledFeatures, string(k)) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForEnabledFeatures) + for iNdEx := len(keysForEnabledFeatures) - 1; iNdEx >= 0; iNdEx-- { + v := m.EnabledFeatures[string(keysForEnabledFeatures[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintGenerated(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForEnabledFeatures[iNdEx]) + copy(dAtA[i:], keysForEnabledFeatures[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(keysForEnabledFeatures[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintGenerated(dAtA, i, uint64(baseI-i)) i-- dAtA[i] = 0xa } @@ -2005,9 +2025,11 @@ func (m *ClusterClaimFeatures) Size() (n int) { var l int _ = l if len(m.EnabledFeatures) > 0 { - for _, s := range m.EnabledFeatures { - l = len(s) - n += 1 + l + sovGenerated(uint64(l)) + for k, v := range m.EnabledFeatures { + _ = k + _ = v + mapEntrySize := 1 + len(k) + sovGenerated(uint64(len(k))) + 1 + len(v) + sovGenerated(uint64(len(v))) + n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize)) } } if len(m.ExternallyManagedFeatures) > 0 { @@ -2421,8 +2443,18 @@ func (this *ClusterClaimFeatures) String() string { if this == nil { return "nil" } + keysForEnabledFeatures := make([]string, 0, len(this.EnabledFeatures)) + for k := range this.EnabledFeatures { + keysForEnabledFeatures = append(keysForEnabledFeatures, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForEnabledFeatures) + mapStringForEnabledFeatures := "map[string]string{" + for _, k := range keysForEnabledFeatures { + mapStringForEnabledFeatures += fmt.Sprintf("%v: %v,", k, this.EnabledFeatures[k]) + } + mapStringForEnabledFeatures += "}" s := strings.Join([]string{`&ClusterClaimFeatures{`, - `EnabledFeatures:` + fmt.Sprintf("%v", this.EnabledFeatures) + `,`, + `EnabledFeatures:` + mapStringForEnabledFeatures + `,`, `ExternallyManagedFeatures:` + fmt.Sprintf("%v", this.ExternallyManagedFeatures) + `,`, `DisabledFeatures:` + fmt.Sprintf("%v", this.DisabledFeatures) + `,`, `}`, @@ -3359,7 +3391,7 @@ func (m *ClusterClaimFeatures) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EnabledFeatures", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -3369,23 +3401,118 @@ func (m *ClusterClaimFeatures) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.EnabledFeatures = append(m.EnabledFeatures, string(dAtA[iNdEx:postIndex])) + if m.EnabledFeatures == nil { + m.EnabledFeatures = make(map[string]string) + } + var mapkey string + var mapvalue string + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthGenerated + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthGenerated + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var stringLenmapvalue uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapvalue |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapvalue := int(stringLenmapvalue) + if intStringLenmapvalue < 0 { + return ErrInvalidLengthGenerated + } + postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthGenerated + } + if postStringIndexmapvalue > l { + return io.ErrUnexpectedEOF + } + mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) + iNdEx = postStringIndexmapvalue + } else { + iNdEx = entryPreIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.EnabledFeatures[mapkey] = mapvalue iNdEx = postIndex case 2: if wireType != 2 { diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto index c3a8864e..dc1b76e3 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.proto +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.proto @@ -100,7 +100,7 @@ message CertificateSpec { } message ClusterClaimFeatures { - repeated string enabledFeatures = 1; + map enabledFeatures = 1; repeated string externallyManagedFeatures = 2; diff --git a/vendor/kmodules.xyz/client-go/api/v1/object.go b/vendor/kmodules.xyz/client-go/api/v1/object.go index 90e50df8..c582ae5f 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/object.go +++ b/vendor/kmodules.xyz/client-go/api/v1/object.go @@ -115,8 +115,8 @@ func NewObjectID(obj client.Object) *ObjectID { func ParseObjectID(key OID) (*ObjectID, error) { var id ObjectID - chunks := strings.Split(string(key), ",") - for _, chunk := range chunks { + chunks := strings.SplitSeq(string(key), ",") + for chunk := range chunks { parts := strings.FieldsFunc(chunk, func(r rune) bool { return r == '=' || unicode.IsSpace(r) }) @@ -166,8 +166,8 @@ func ObjectIDMap(key OID) (map[string]any, error) { "name": "", } - chunks := strings.Split(string(key), ",") - for _, chunk := range chunks { + chunks := strings.SplitSeq(string(key), ",") + for chunk := range chunks { parts := strings.FieldsFunc(chunk, func(r rune) bool { return r == '=' || unicode.IsSpace(r) }) diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go index 303ef0d2..cacb9e1c 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go @@ -124,8 +124,10 @@ func (in *ClusterClaimFeatures) DeepCopyInto(out *ClusterClaimFeatures) { *out = *in if in.EnabledFeatures != nil { in, out := &in.EnabledFeatures, &out.EnabledFeatures - *out = make([]string, len(*in)) - copy(*out, *in) + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } } if in.ExternallyManagedFeatures != nil { in, out := &in.ExternallyManagedFeatures, &out.ExternallyManagedFeatures diff --git a/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go b/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go index 9a5c5ef1..ade90bc2 100644 --- a/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go +++ b/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go @@ -17,6 +17,7 @@ limitations under the License. package v1 import ( + "slices" "sort" "kmodules.xyz/client-go/meta" @@ -31,22 +32,15 @@ import ( var json = jsoniter.ConfigFastest func AddFinalizer(m metav1.ObjectMeta, finalizer string) metav1.ObjectMeta { - for _, name := range m.Finalizers { - if name == finalizer { - return m - } + if slices.Contains(m.Finalizers, finalizer) { + return m } m.Finalizers = append(m.Finalizers, finalizer) return m } func HasFinalizer(m metav1.ObjectMeta, finalizer string) bool { - for _, name := range m.Finalizers { - if name == finalizer { - return true - } - } - return false + return slices.Contains(m.Finalizers, finalizer) } func RemoveFinalizer(m metav1.ObjectMeta, finalizer string) metav1.ObjectMeta { diff --git a/vendor/kmodules.xyz/client-go/meta/conditions.go b/vendor/kmodules.xyz/client-go/meta/conditions.go index 2c72db47..34792870 100644 --- a/vendor/kmodules.xyz/client-go/meta/conditions.go +++ b/vendor/kmodules.xyz/client-go/meta/conditions.go @@ -18,6 +18,7 @@ package meta import ( "fmt" + "slices" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -156,10 +157,8 @@ func (s Status) String() string { // not a valid status. func StatusFromStringOrDie(text string) Status { s := Status(text) - for _, r := range Statuses { - if s == r { - return s - } + if slices.Contains(Statuses, s) { + return s } panic(fmt.Errorf("string has invalid status: %s", s)) } diff --git a/vendor/kmodules.xyz/client-go/meta/encoding.go b/vendor/kmodules.xyz/client-go/meta/encoding.go index 1ba1b120..cb562db7 100644 --- a/vendor/kmodules.xyz/client-go/meta/encoding.go +++ b/vendor/kmodules.xyz/client-go/meta/encoding.go @@ -174,7 +174,7 @@ func StringToQuantityHookFunc() mapstructure.DecodeHookFunc { if f.Kind() != reflect.String { return data, nil } - if t != reflect.TypeOf(resource.Quantity{}) { + if t != reflect.TypeFor[resource.Quantity]() { return data, nil } diff --git a/vendor/kmodules.xyz/client-go/meta/lib.go b/vendor/kmodules.xyz/client-go/meta/lib.go index 0e6f761e..d9027fdd 100644 --- a/vendor/kmodules.xyz/client-go/meta/lib.go +++ b/vendor/kmodules.xyz/client-go/meta/lib.go @@ -18,6 +18,7 @@ package meta import ( "fmt" + "maps" "reflect" "strings" @@ -131,9 +132,7 @@ func OverwriteKeys(out map[string]string, ins ...map[string]string) map[string]s } for _, in := range ins { - for k, v := range in { - out[k] = v - } + maps.Copy(out, in) } return out } @@ -198,20 +197,6 @@ func ValidCronJobNameWithPrefixNSuffix(prefix, name, suffix string) string { return ValidNameWithPrefixNSuffix(prefix, name, suffix, MaxCronJobNameLength) } -func min(x, y int) int { - if x < y { - return x - } - return y -} - -func max(x, y int) int { - if x > y { - return x - } - return y -} - func IsOfficialType(group string) bool { switch { case group == "": diff --git a/vendor/modules.txt b/vendor/modules.txt index cdab77bf..02f8e8e4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# filippo.io/edwards25519 v1.1.0 +# filippo.io/edwards25519 v1.1.1 ## explicit; go 1.20 filippo.io/edwards25519 filippo.io/edwards25519/field @@ -245,7 +245,7 @@ golang.org/x/oauth2/internal # golang.org/x/sync v0.19.0 ## explicit; go 1.24.0 golang.org/x/sync/errgroup -# golang.org/x/sys v0.39.0 +# golang.org/x/sys v0.40.0 ## explicit; go 1.24.0 golang.org/x/sys/plan9 golang.org/x/sys/unix @@ -764,7 +764,7 @@ k8s.io/utils/trace # kmodules.xyz/apiversion v0.2.0 ## explicit; go 1.14 kmodules.xyz/apiversion -# kmodules.xyz/client-go v0.34.2 +# kmodules.xyz/client-go v0.34.4 ## explicit; go 1.24.0 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -774,7 +774,7 @@ kmodules.xyz/client-go/core/v1 kmodules.xyz/client-go/discovery kmodules.xyz/client-go/meta kmodules.xyz/client-go/policy/secomp -# kmodules.xyz/custom-resources v0.32.3-0.20251226151909-e0c7e447f3de +# kmodules.xyz/custom-resources v0.34.0 ## explicit; go 1.24.0 kmodules.xyz/custom-resources/apis/appcatalog kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1