Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add common provider headers to cloud-provider-client #1828

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Add common provider headers to cloud-provider-client #1828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
119dd55
Add provider headers
thepalbi Oct 2, 2024
69128f8
Apply suggestions from code review
thepalbi Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions internal/common/cloudproviderapi/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,18 @@ import (
)

type Client struct {
authToken string
apiURL url.URL
client *http.Client
authToken string
apiURL url.URL
client *http.Client
defaultHeaders map[string]string
}

const (
defaultRetries = 3
defaultTimeout = 90 * time.Second
)

func NewClient(authToken string, rawAPIURL string, client *http.Client) (*Client, error) {
func NewClient(authToken string, rawAPIURL string, client *http.Client, defualtHeaders map[string]string) (*Client, error) {
thepalbi marked this conversation as resolved.
Show resolved Hide resolved
parsedAPIURL, err := url.Parse(rawAPIURL)
if err != nil {
return nil, fmt.Errorf("failed to parse Cloud Provider API url: %w", err)
Expand All @@ -38,9 +39,10 @@ func NewClient(authToken string, rawAPIURL string, client *http.Client) (*Client
}

return &Client{
authToken: authToken,
apiURL: *parsedAPIURL,
client: client,
authToken: authToken,
apiURL: *parsedAPIURL,
client: client,
defaultHeaders: defualtHeaders,
thepalbi marked this conversation as resolved.
Show resolved Hide resolved
}, nil
}

Expand Down Expand Up @@ -195,6 +197,9 @@ func (c *Client) doAPIRequest(ctx context.Context, method string, path string, b
}
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", c.authToken))
req.Header.Add("Content-Type", "application/json")
for k, v := range c.defaultHeaders {
req.Header.Add(k, v)
}

resp, err = c.client.Do(req)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions pkg/provider/configure_clients.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,16 @@ func createOnCallClient(providerConfig ProviderConfig) (*onCallAPI.Client, error
}

func createCloudProviderClient(client *common.Client, providerConfig ProviderConfig) error {
providerHeaders, err := getHTTPHeadersMap(providerConfig)
if err != nil {
return fmt.Errorf("failed to get provider default HTTP headers: %w", err)
}

apiClient, err := cloudproviderapi.NewClient(
providerConfig.CloudProviderAccessToken.ValueString(),
providerConfig.CloudProviderURL.ValueString(),
getRetryClient(providerConfig),
providerHeaders,
)
if err != nil {
return err
Expand Down
Loading