github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-04 18:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #118055 from timofurrer/export-default-server-url-for-func

Browse Source 
Export DefaultServerUrlFor utility function

Kubernetes-commit: cc60a9348536a85978946de3001dc6a3737cf516
This commit is contained in:
Kubernetes Publisher 2023-06-12 13:46:34 -07:00
commit 92512ee2b8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest/config.go
View File

@ -316,7 +316,7 @@ func RESTClientFor(config *Config) (*RESTClient, error) {
// Validate config.Host before constructing the transport/client so we can fail fast. // Validate config.Host before constructing the transport/client so we can fail fast.
// ServerURL will be obtained later in RESTClientForConfigAndClient() // ServerURL will be obtained later in RESTClientForConfigAndClient()
_, _, err := defaultServerUrlFor(config) _, _, err := DefaultServerUrlFor(config)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -343,7 +343,7 @@ func RESTClientForConfigAndClient(config *Config, httpClient *http.Client) (*RES
return nil, fmt.Errorf("NegotiatedSerializer is required when initializing a RESTClient") return nil, fmt.Errorf("NegotiatedSerializer is required when initializing a RESTClient")
} }
baseURL, versionedAPIPath, err := defaultServerUrlFor(config) baseURL, versionedAPIPath, err := DefaultServerUrlFor(config)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -390,7 +390,7 @@ func UnversionedRESTClientFor(config *Config) (*RESTClient, error) {
// Validate config.Host before constructing the transport/client so we can fail fast. // Validate config.Host before constructing the transport/client so we can fail fast.
// ServerURL will be obtained later in UnversionedRESTClientForConfigAndClient() // ServerURL will be obtained later in UnversionedRESTClientForConfigAndClient()
_, _, err := defaultServerUrlFor(config) _, _, err := DefaultServerUrlFor(config)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -410,7 +410,7 @@ func UnversionedRESTClientForConfigAndClient(config *Config, httpClient *http.Cl
return nil, fmt.Errorf("NegotiatedSerializer is required when initializing a RESTClient") return nil, fmt.Errorf("NegotiatedSerializer is required when initializing a RESTClient")
} }
baseURL, versionedAPIPath, err := defaultServerUrlFor(config) baseURL, versionedAPIPath, err := DefaultServerUrlFor(config)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -548,7 +548,7 @@ func InClusterConfig() (*Config, error) {
// Note: the Insecure flag is ignored when testing for this value, so MITM attacks are // Note: the Insecure flag is ignored when testing for this value, so MITM attacks are
// still possible. // still possible.
func IsConfigTransportTLS(config Config) bool { func IsConfigTransportTLS(config Config) bool {
baseURL, _, err := defaultServerUrlFor(&config) baseURL, _, err := DefaultServerUrlFor(&config)
if err != nil { if err != nil {
return false return false
} }

4
rest/url_utils.go
View File

@ -77,9 +77,9 @@ func DefaultVersionedAPIPath(apiPath string, groupVersion schema.GroupVersion) s
return versionedAPIPath return versionedAPIPath
} }
// defaultServerUrlFor is shared between IsConfigTransportTLS and RESTClientFor. It // DefaultServerUrlFor is shared between IsConfigTransportTLS and RESTClientFor. It
// requires Host and Version to be set prior to being called. // requires Host and Version to be set prior to being called.
func defaultServerUrlFor(config *Config) (*url.URL, string, error) { func DefaultServerUrlFor(config *Config) (*url.URL, string, error) {
// TODO: move the default to secure when the apiserver supports TLS by default // TODO: move the default to secure when the apiserver supports TLS by default
// config.Insecure is taken to mean "I want HTTPS but don't bother checking the certs against a CA." // config.Insecure is taken to mean "I want HTTPS but don't bother checking the certs against a CA."
hasCA := len(config.CAFile) != 0 || len(config.CAData) != 0 hasCA := len(config.CAFile) != 0 || len(config.CAData) != 0