Merge pull request #2161 from inteon/include_error

k8s-ci-robot · web-flow · commit 5db173878d6d · 2023-01-31T11:54:49.000-08:00
🌱 Return the error from rest.HTTPClientFor instead of hiding it
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -451,7 +451,7 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) {
 		opts.HTTPClient, err = rest.HTTPClientFor(config)
 		if err != nil {
 			logger.Error(err, "Failed to get HTTP client")
-			return opts, fmt.Errorf("could not create HTTP client from config")
+			return opts, fmt.Errorf("could not create HTTP client from config: %w", err)
 		}
 	}
 
@@ -466,7 +466,7 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) {
 		opts.Mapper, err = apiutil.NewDiscoveryRESTMapper(config, opts.HTTPClient)
 		if err != nil {
 			logger.Error(err, "Failed to get API Group-Resources")
-			return opts, fmt.Errorf("could not create RESTMapper from config")
+			return opts, fmt.Errorf("could not create RESTMapper from config: %w", err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) {`
`451`	`451`	`opts.HTTPClient, err = rest.HTTPClientFor(config)`
`452`	`452`	`if err != nil {`
`453`	`453`	`logger.Error(err, "Failed to get HTTP client")`
`454`		`- return opts, fmt.Errorf("could not create HTTP client from config")`
	`454`	`+ return opts, fmt.Errorf("could not create HTTP client from config: %w", err)`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`@@ -466,7 +466,7 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) {`
`466`	`466`	`opts.Mapper, err = apiutil.NewDiscoveryRESTMapper(config, opts.HTTPClient)`
`467`	`467`	`if err != nil {`
`468`	`468`	`logger.Error(err, "Failed to get API Group-Resources")`
`469`		`- return opts, fmt.Errorf("could not create RESTMapper from config")`
	`469`	`+ return opts, fmt.Errorf("could not create RESTMapper from config: %w", err)`
`470`	`470`	`}`
`471`	`471`	`}`
`472`	`472`