From 184fa9ef44de02658ea55024d64178532d79a0a3 Mon Sep 17 00:00:00 2001 From: nikzayn Date: Mon, 10 Jun 2024 20:44:05 +0530 Subject: [PATCH] feat: first batch of fixing error handeling with type checks #6906 Signed-off-by: nikzayn --- .../eviction/pods_eviction_restriction.go | 4 ++-- .../utils/limitrange/limit_range_calculator.go | 2 +- .../plugin/pkg/client/auth/exec/exec.go | 2 +- .../vendor/k8s.io/client-go/rest/exec.go | 2 +- .../vendor/k8s.io/client-go/scale/client.go | 14 +++++++------- .../k8s.io/client-go/tools/cache/reflector.go | 2 +- .../client-go/tools/cache/thread_safe_store.go | 4 ++-- .../k8s.io/client-go/transport/token_source.go | 2 +- .../vendor/k8s.io/client-go/util/cert/io.go | 4 ++-- .../k8s.io/client-go/util/keyutil/key.go | 4 ++-- .../cli/flag/ciphersuites_flag.go | 2 +- .../kube-openapi/pkg/validation/spec/schema.go | 12 ++++++------ .../vendor/k8s.io/utils/net/net.go | 2 +- .../structured-merge-diff/v4/merge/update.go | 12 ++++++------ .../structured-merge-diff/v4/typed/parser.go | 4 ++-- .../v4/typed/reconcile_schema.go | 2 +- .../v4/value/reflectcache.go | 10 +++++----- .../vendor/sigs.k8s.io/yaml/yaml.go | 18 +++++++++--------- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction.go b/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction.go index 5777cfdc36e1..996b25a68b84 100644 --- a/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction.go +++ b/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction.go @@ -381,13 +381,13 @@ func setUpInformer(kubeClient kube_client.Interface, kind controllerKind) (cache informer = appsinformer.NewDaemonSetInformer(kubeClient, apiv1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) default: - return nil, fmt.Errorf("Unknown controller kind: %v", kind) + return nil, fmt.Errorf("unknown controller kind: %s", kind) } stopCh := make(chan struct{}) go informer.Run(stopCh) synced := cache.WaitForCacheSync(stopCh, informer.HasSynced) if !synced { - return nil, fmt.Errorf("Failed to sync %v cache.", kind) + return nil, fmt.Errorf("failed to sync %s cache", kind) } return informer, nil } diff --git a/vertical-pod-autoscaler/pkg/utils/limitrange/limit_range_calculator.go b/vertical-pod-autoscaler/pkg/utils/limitrange/limit_range_calculator.go index e54804a383a9..d2ff767f7e0a 100644 --- a/vertical-pod-autoscaler/pkg/utils/limitrange/limit_range_calculator.go +++ b/vertical-pod-autoscaler/pkg/utils/limitrange/limit_range_calculator.go @@ -81,7 +81,7 @@ func (lc *limitsChecker) GetPodLimitRangeItem(namespace string) (*core.LimitRang func (lc *limitsChecker) getLimitRangeItem(namespace string, limitType core.LimitType) (*core.LimitRangeItem, error) { limitRanges, err := lc.limitRangeLister.LimitRanges(namespace).List(labels.Everything()) if err != nil { - return nil, fmt.Errorf("error loading limit ranges: %s", err) + return nil, fmt.Errorf("Error loading limit ranges: %w", err) } updatedResult := func(result core.ResourceList, lrItem core.ResourceList, diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go index b471f5cc6486..f90b5efdf039 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go @@ -344,7 +344,7 @@ func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) { creds, err := r.a.getCreds() if err != nil { - return nil, fmt.Errorf("getting credentials: %v", err) + return nil, fmt.Errorf("getting credentials: %w", err) } if creds.token != "" { req.Header.Set("Authorization", "Bearer "+creds.token) diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/rest/exec.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/rest/exec.go index 96f5dba3570a..a05ad4493363 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/rest/exec.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/rest/exec.go @@ -31,7 +31,7 @@ import ( func ConfigToExecCluster(config *Config) (*clientauthenticationapi.Cluster, error) { caData, err := dataFromSliceOrFile(config.CAData, config.CAFile) if err != nil { - return nil, fmt.Errorf("failed to load CA bundle for execProvider: %v", err) + return nil, fmt.Errorf("failed to load CA bundle for execProvider: %w", err) } var proxyURL string diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/scale/client.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/scale/client.go index 1306b37d9c01..ec35e9ab9f19 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/scale/client.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/scale/client.go @@ -104,7 +104,7 @@ func (c *scaleClient) apiPathFor(groupVer schema.GroupVersion) string { func (c *scaleClient) pathAndVersionFor(resource schema.GroupResource) (string, schema.GroupVersionResource, error) { gvr, err := c.mapper.ResourceFor(resource.WithVersion("")) if err != nil { - return "", gvr, fmt.Errorf("unable to get full preferred group-version-resource for %s: %v", resource.String(), err) + return "", gvr, fmt.Errorf("unable to get full preferred group-version-resource for %s: %w", resource.String(), err) } groupVer := gvr.GroupVersion() @@ -134,7 +134,7 @@ func convertToScale(result *restclient.Result) (*autoscaling.Scale, error) { // convert whatever this is to autoscaling/v1.Scale scaleObj, err := scaleConverter.ConvertToVersion(rawScaleObj, autoscaling.SchemeGroupVersion) if err != nil { - return nil, fmt.Errorf("received an object from a /scale endpoint which was not convertible to autoscaling Scale: %v", err) + return nil, fmt.Errorf("received an object from a /scale endpoint which was not convertible to autoscaling Scale: %w", err) } return scaleObj.(*autoscaling.Scale), nil @@ -155,7 +155,7 @@ func (c *namespacedScaleClient) Get(ctx context.Context, resource schema.GroupRe path, gvr, err := c.client.pathAndVersionFor(resource) if err != nil { - return nil, fmt.Errorf("unable to get client for %s: %v", resource.String(), err) + return nil, fmt.Errorf("unable to get client for %s: %w", resource.String(), err) } result := c.client.clientBase.Get(). @@ -176,7 +176,7 @@ func (c *namespacedScaleClient) Get(ctx context.Context, resource schema.GroupRe func (c *namespacedScaleClient) Update(ctx context.Context, resource schema.GroupResource, scale *autoscaling.Scale, opts metav1.UpdateOptions) (*autoscaling.Scale, error) { path, gvr, err := c.client.pathAndVersionFor(resource) if err != nil { - return nil, fmt.Errorf("unable to get client for %s: %v", resource.String(), err) + return nil, fmt.Errorf("unable to get client for %s: %w", resource.String(), err) } // Currently, a /scale endpoint can receive and return different scale types. @@ -186,18 +186,18 @@ func (c *namespacedScaleClient) Update(ctx context.Context, resource schema.Grou // figure out what scale we actually need here desiredGVK, err := c.client.scaleKindResolver.ScaleForResource(gvr) if err != nil { - return nil, fmt.Errorf("could not find proper group-version for scale subresource of %s: %v", gvr.String(), err) + return nil, fmt.Errorf("could not find proper group-version for scale subresource of %s: %w", gvr.String(), err) } // convert this to whatever this endpoint wants scaleUpdate, err := scaleConverter.ConvertToVersion(scale, desiredGVK.GroupVersion()) if err != nil { - return nil, fmt.Errorf("could not convert scale update to external Scale: %v", err) + return nil, fmt.Errorf("could not convert scale update to external Scale: %w", err) } encoder := scaleConverter.codecs.LegacyCodec(desiredGVK.GroupVersion()) scaleUpdateBytes, err := runtime.Encode(encoder, scaleUpdate) if err != nil { - return nil, fmt.Errorf("could not encode scale update to external Scale: %v", err) + return nil, fmt.Errorf("could not encode scale update to external Scale: %w", err) } result := c.client.clientBase.Put(). diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/reflector.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/reflector.go index 45eaff52853f..1c3b76488430 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/reflector.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/reflector.go @@ -671,7 +671,7 @@ func (r *Reflector) watchList(stopCh <-chan struct{}) (watch.Interface, error) { initTrace.Step("Objects streamed", trace.Field{Key: "count", Value: len(temporaryStore.List())}) r.setIsLastSyncResourceVersionUnavailable(false) if err = r.store.Replace(temporaryStore.List(), resourceVersion); err != nil { - return nil, fmt.Errorf("unable to sync watch-list result: %v", err) + return nil, fmt.Errorf("unable to sync watch-list result: %w", err) } initTrace.Step("SyncWith done") r.setLastSyncResourceVersion(resourceVersion) diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go index 145e93ee5353..334cb1854581 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go @@ -74,7 +74,7 @@ func (i *storeIndex) reset() { func (i *storeIndex) getKeysFromIndex(indexName string, obj interface{}) (sets.String, error) { indexFunc := i.indexers[indexName] if indexFunc == nil { - return nil, fmt.Errorf("Index with name %s does not exist", indexName) + return nil, fmt.Errorf("index with name %s does not exist", indexName) } indexedValues, err := indexFunc(obj) @@ -105,7 +105,7 @@ func (i *storeIndex) getKeysFromIndex(indexName string, obj interface{}) (sets.S func (i *storeIndex) getKeysByIndex(indexName, indexedValue string) (sets.String, error) { indexFunc := i.indexers[indexName] if indexFunc == nil { - return nil, fmt.Errorf("Index with name %s does not exist", indexName) + return nil, fmt.Errorf("index with name %s does not exist", indexName) } index := i.indices[indexName] diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/transport/token_source.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/transport/token_source.go index 8e312800f73b..0f622e0ec9ac 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/transport/token_source.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/transport/token_source.go @@ -134,7 +134,7 @@ var _ = oauth2.TokenSource(&fileTokenSource{}) func (ts *fileTokenSource) Token() (*oauth2.Token, error) { tokb, err := os.ReadFile(ts.path) if err != nil { - return nil, fmt.Errorf("failed to read token file %q: %v", ts.path, err) + return nil, fmt.Errorf("failed to read token file %q: %w", ts.path, err) } tok := strings.TrimSpace(string(tokb)) if len(tok) == 0 { diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/cert/io.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/cert/io.go index a70e51327191..8fb35a412e85 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/cert/io.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/cert/io.go @@ -78,7 +78,7 @@ func NewPool(filename string) (*x509.CertPool, error) { pool, err := NewPoolFromBytes(pemBlock) if err != nil { - return nil, fmt.Errorf("error creating pool from %s: %s", filename, err) + return nil, fmt.Errorf("error creating pool from %s: %w", filename, err) } return pool, nil } @@ -106,7 +106,7 @@ func CertsFromFile(file string) ([]*x509.Certificate, error) { } certs, err := ParseCertsPEM(pemBlock) if err != nil { - return nil, fmt.Errorf("error reading %s: %s", file, err) + return nil, fmt.Errorf("error reading %s: %w", file, err) } return certs, nil } diff --git a/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/keyutil/key.go b/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/keyutil/key.go index ecd3e4710fea..f3434f890b66 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/keyutil/key.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/client-go/util/keyutil/key.go @@ -127,7 +127,7 @@ func PrivateKeyFromFile(file string) (interface{}, error) { } key, err := ParsePrivateKeyPEM(data) if err != nil { - return nil, fmt.Errorf("error reading private key file %s: %v", file, err) + return nil, fmt.Errorf("error reading private key file %s: %w", file, err) } return key, nil } @@ -141,7 +141,7 @@ func PublicKeysFromFile(file string) ([]interface{}, error) { } keys, err := ParsePublicKeysPEM(data) if err != nil { - return nil, fmt.Errorf("error reading public key file %s: %v", file, err) + return nil, fmt.Errorf("error reading public key file %s: %w", file, err) } return keys, nil } diff --git a/vertical-pod-autoscaler/vendor/k8s.io/component-base/cli/flag/ciphersuites_flag.go b/vertical-pod-autoscaler/vendor/k8s.io/component-base/cli/flag/ciphersuites_flag.go index 11adc26831f0..62baf659ea43 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/component-base/cli/flag/ciphersuites_flag.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/component-base/cli/flag/ciphersuites_flag.go @@ -104,7 +104,7 @@ func TLSCipherSuites(cipherNames []string) ([]uint16, error) { for _, cipher := range cipherNames { intValue, ok := possibleCiphers[cipher] if !ok { - return nil, fmt.Errorf("Cipher suite %s not supported or doesn't exist", cipher) + return nil, fmt.Errorf("cipher suite %s not supported or doesn't exist", cipher) } ciphersIntSlice = append(ciphersIntSlice, intValue) } diff --git a/vertical-pod-autoscaler/vendor/k8s.io/kube-openapi/pkg/validation/spec/schema.go b/vertical-pod-autoscaler/vendor/k8s.io/kube-openapi/pkg/validation/spec/schema.go index dfbb2e05cba4..2a44137238b1 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/kube-openapi/pkg/validation/spec/schema.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/kube-openapi/pkg/validation/spec/schema.go @@ -488,29 +488,29 @@ func (s Schema) MarshalJSON() ([]byte, error) { } b1, err := json.Marshal(s.SchemaProps) if err != nil { - return nil, fmt.Errorf("schema props %v", err) + return nil, fmt.Errorf("schema props %w", err) } b2, err := json.Marshal(s.VendorExtensible) if err != nil { - return nil, fmt.Errorf("vendor props %v", err) + return nil, fmt.Errorf("vendor props %w", err) } b3, err := s.Ref.MarshalJSON() if err != nil { - return nil, fmt.Errorf("ref prop %v", err) + return nil, fmt.Errorf("ref prop %w", err) } b4, err := s.Schema.MarshalJSON() if err != nil { - return nil, fmt.Errorf("schema prop %v", err) + return nil, fmt.Errorf("schema prop %w", err) } b5, err := json.Marshal(s.SwaggerSchemaProps) if err != nil { - return nil, fmt.Errorf("common validations %v", err) + return nil, fmt.Errorf("common validations %w", err) } var b6 []byte if s.ExtraProps != nil { jj, err := json.Marshal(s.ExtraProps) if err != nil { - return nil, fmt.Errorf("extra props %v", err) + return nil, fmt.Errorf("extra props %w", err) } b6 = jj } diff --git a/vertical-pod-autoscaler/vendor/k8s.io/utils/net/net.go b/vertical-pod-autoscaler/vendor/k8s.io/utils/net/net.go index 704c1f232aef..4ff5fec995b2 100644 --- a/vertical-pod-autoscaler/vendor/k8s.io/utils/net/net.go +++ b/vertical-pod-autoscaler/vendor/k8s.io/utils/net/net.go @@ -32,7 +32,7 @@ func ParseCIDRs(cidrsString []string) ([]*net.IPNet, error) { for i, cidrString := range cidrsString { _, cidr, err := ParseCIDRSloppy(cidrString) if err != nil { - return nil, fmt.Errorf("invalid CIDR[%d]: %v (%v)", i, cidr, err) + return nil, fmt.Errorf("invalid CIDR[%d]: %v (%w)", i, cidr, err) } cidrs = append(cidrs, cidr) } diff --git a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go index 1b23dcbd5eff..857f67bda4a4 100644 --- a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go +++ b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go @@ -223,18 +223,18 @@ func (s *Updater) prune(merged *typed.TypedValue, managers fieldpath.ManagedFiel if s.Converter.IsMissingVersionError(err) { return merged, nil } - return nil, fmt.Errorf("failed to convert merged object to last applied version: %v", err) + return nil, fmt.Errorf("failed to convert merged object to last applied version: %w", err) } sc, tr := convertedMerged.Schema(), convertedMerged.TypeRef() pruned := convertedMerged.RemoveItems(lastSet.Set().EnsureNamedFieldsAreMembers(sc, tr)) pruned, err = s.addBackOwnedItems(convertedMerged, pruned, managers, applyingManager) if err != nil { - return nil, fmt.Errorf("failed add back owned items: %v", err) + return nil, fmt.Errorf("failed add back owned items: %w", err) } pruned, err = s.addBackDanglingItems(convertedMerged, pruned, lastSet) if err != nil { - return nil, fmt.Errorf("failed add back dangling items: %v", err) + return nil, fmt.Errorf("failed add back dangling items: %w", err) } return s.Converter.Convert(pruned, managers[applyingManager].APIVersion()) } @@ -309,15 +309,15 @@ func (s *Updater) addBackDanglingItems(merged, pruned *typed.TypedValue, lastSet if s.Converter.IsMissingVersionError(err) { return merged, nil } - return nil, fmt.Errorf("failed to convert pruned object to last applied version: %v", err) + return nil, fmt.Errorf("failed to convert pruned object to last applied version: %w", err) } prunedSet, err := convertedPruned.ToFieldSet() if err != nil { - return nil, fmt.Errorf("failed to create field set from pruned object in last applied version: %v", err) + return nil, fmt.Errorf("failed to create field set from pruned object in last applied version: %w", err) } mergedSet, err := merged.ToFieldSet() if err != nil { - return nil, fmt.Errorf("failed to create field set from merged object in last applied version: %v", err) + return nil, fmt.Errorf("failed to create field set from merged object in last applied version: %w", err) } sc, tr := merged.Schema(), merged.TypeRef() prunedSet = prunedSet.EnsureNamedFieldsAreMembers(sc, tr) diff --git a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/parser.go b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/parser.go index 3949a78fc670..a97777e68b11 100644 --- a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/parser.go +++ b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/parser.go @@ -53,7 +53,7 @@ var ssParser = createOrDie(YAMLObject(schema.SchemaSchemaYAML)) func NewParser(schema YAMLObject) (*Parser, error) { _, err := ssParser.Type("schema").FromYAML(schema) if err != nil { - return nil, fmt.Errorf("unable to validate schema: %v", err) + return nil, fmt.Errorf("unable to validate schema: %w", err) } p, err := create(schema) if err != nil { @@ -120,7 +120,7 @@ func (p ParseableType) FromUnstructured(in interface{}) (*TypedValue, error) { func (p ParseableType) FromStructured(in interface{}) (*TypedValue, error) { v, err := value.NewValueReflect(in) if err != nil { - return nil, fmt.Errorf("error creating struct value reflector: %v", err) + return nil, fmt.Errorf("error creating struct value reflector: %w", err) } return AsTyped(v, p.Schema, p.TypeRef) } diff --git a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/reconcile_schema.go b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/reconcile_schema.go index 6a7697e3b765..64331b2adfaa 100644 --- a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/reconcile_schema.go +++ b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/reconcile_schema.go @@ -128,7 +128,7 @@ func ReconcileFieldSetWithSchema(fieldset *fieldpath.Set, tv *TypedValue) (*fiel errs := v.reconcile() if len(errs) > 0 { - return nil, fmt.Errorf("errors reconciling field set with schema: %s", errs.Error()) + return nil, fmt.Errorf("errors reconciling field set with schema: %w", errs.Error()) } // If there are any accumulated changes, apply them diff --git a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/value/reflectcache.go b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/value/reflectcache.go index a5a467c0f00c..210bb605bf64 100644 --- a/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/value/reflectcache.go +++ b/vertical-pod-autoscaler/vendor/sigs.k8s.io/structured-merge-diff/v4/value/reflectcache.go @@ -216,7 +216,7 @@ func (e TypeReflectCacheEntry) ToUnstructured(sv reflect.Value) (interface{}, er var result string err := unmarshal(data, &result) if err != nil { - return nil, fmt.Errorf("error decoding string from json: %v", err) + return nil, fmt.Errorf("error decoding string from json: %w", err) } return result, nil @@ -224,7 +224,7 @@ func (e TypeReflectCacheEntry) ToUnstructured(sv reflect.Value) (interface{}, er result := make(map[string]interface{}) err := unmarshal(data, &result) if err != nil { - return nil, fmt.Errorf("error decoding object from json: %v", err) + return nil, fmt.Errorf("error decoding object from json: %w", err) } return result, nil @@ -232,7 +232,7 @@ func (e TypeReflectCacheEntry) ToUnstructured(sv reflect.Value) (interface{}, er result := make([]interface{}, 0) err := unmarshal(data, &result) if err != nil { - return nil, fmt.Errorf("error decoding array from json: %v", err) + return nil, fmt.Errorf("error decoding array from json: %w", err) } return result, nil @@ -247,7 +247,7 @@ func (e TypeReflectCacheEntry) ToUnstructured(sv reflect.Value) (interface{}, er } else if err = unmarshal(data, &resultFloat); err == nil { return resultFloat, nil } else { - return nil, fmt.Errorf("error decoding number from json: %v", err) + return nil, fmt.Errorf("error decoding number from json: %w", err) } } } @@ -267,7 +267,7 @@ func (e TypeReflectCacheEntry) FromUnstructured(sv, dv reflect.Value) error { st := dv.Type() data, err := json.Marshal(sv.Interface()) if err != nil { - return fmt.Errorf("error encoding %s to json: %v", st.String(), err) + return fmt.Errorf("error encoding %s to json: %w", st.String(), err) } if unmarshaler, ok := e.getJsonUnmarshaler(dv); ok { return unmarshaler.UnmarshalJSON(data) diff --git a/vertical-pod-autoscaler/vendor/sigs.k8s.io/yaml/yaml.go b/vertical-pod-autoscaler/vendor/sigs.k8s.io/yaml/yaml.go index efbc535d416e..5386e5b7a970 100644 --- a/vertical-pod-autoscaler/vendor/sigs.k8s.io/yaml/yaml.go +++ b/vertical-pod-autoscaler/vendor/sigs.k8s.io/yaml/yaml.go @@ -16,12 +16,12 @@ import ( func Marshal(o interface{}) ([]byte, error) { j, err := json.Marshal(o) if err != nil { - return nil, fmt.Errorf("error marshaling into JSON: %v", err) + return nil, fmt.Errorf("error marshaling into JSON: %w", err) } y, err := JSONToYAML(j) if err != nil { - return nil, fmt.Errorf("error converting JSON to YAML: %v", err) + return nil, fmt.Errorf("error converting JSON to YAML: %w", err) } return y, nil @@ -100,12 +100,12 @@ func JSONToYAML(j []byte) ([]byte, error) { // passing JSON through this method should be a no-op. // // Things YAML can do that are not supported by JSON: -// * In YAML you can have binary and null keys in your maps. These are invalid -// in JSON. (int and float keys are converted to strings.) -// * Binary data in YAML with the !!binary tag is not supported. If you want to -// use binary data with this library, encode the data as base64 as usual but do -// not use the !!binary tag in your YAML. This will ensure the original base64 -// encoded data makes it all the way through to the JSON. +// - In YAML you can have binary and null keys in your maps. These are invalid +// in JSON. (int and float keys are converted to strings.) +// - Binary data in YAML with the !!binary tag is not supported. If you want to +// use binary data with this library, encode the data as base64 as usual but do +// not use the !!binary tag in your YAML. This will ensure the original base64 +// encoded data makes it all the way through to the JSON. // // For strict decoding of YAML, use YAMLToJSONStrict. func YAMLToJSON(y []byte) ([]byte, error) { @@ -205,7 +205,7 @@ func convertToJSONableObject(yamlObj interface{}, jsonTarget *reflect.Value) (in keyString = "false" } default: - return nil, fmt.Errorf("Unsupported map key of type: %s, key: %+#v, value: %+#v", + return nil, fmt.Errorf("unsupported map key of type: %s, key: %+#v, value: %+#v", reflect.TypeOf(k), k, v) }