d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[ACI] Support to add extra user agent to the request (#378)

Browse Source 
* Add UserAgent

* Change to join the user agent with a whitespace and set in the header

* Remove empty entry from user agent
This commit is contained in:
Robbie Zhang
2018-10-18 14:28:43 -07:00
committed by GitHub
parent 0dbc88826c
commit 5991b29f76
8 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
providers/azure/client/aci/client.go
View File

@@ -13,9 +13,9 @@ import (
const (
// BaseURI is the default URI used for compute services.
baseURI = "https://management.azure.com"
userAgent = "virtual-kubelet/azure-arm-aci/2018-09-01"
apiVersion = "2018-09-01"
baseURI = "https://management.azure.com"
defaultUserAgent = "virtual-kubelet/azure-arm-aci/2018-09-01"
apiVersion = "2018-09-01"
containerGroupURLPath = "subscriptions/{{.subscriptionId}}/resourceGroups/{{.resourceGroup}}/providers/Microsoft.ContainerInstance/containerGroups/{{.containerGroupName}}"
containerGroupListURLPath = "subscriptions/{{.subscriptionId}}/providers/Microsoft.ContainerInstance/containerGroups"
@@ -34,12 +34,17 @@ type Client struct {
auth *azure.Authentication
}
// NewClient creates a new Azure Container Instances client.
func NewClient(auth *azure.Authentication) (*Client, error) {
// NewClient creates a new Azure Container Instances client with extra user agent.
func NewClient(auth *azure.Authentication, extraUserAgent string) (*Client, error) {
if auth == nil {
return nil, fmt.Errorf("Authentication is not supplied for the Azure client")
}
userAgent := []string{defaultUserAgent}
if extraUserAgent != "" {
userAgent = append(userAgent, extraUserAgent)
}
client, err := azure.NewClient(auth, baseURI, userAgent)
if err != nil {
return nil, fmt.Errorf("Creating Azure client failed: %v", err)

4
providers/azure/client/aci/client_test.go
View File

@@ -39,7 +39,7 @@ func TestMain(m *testing.M) {
subscriptionID = auth.SubscriptionID
// Check if the resource group exists and create it if not.
rgCli, err := resourcegroups.NewClient(auth)
rgCli, err := resourcegroups.NewClient(auth, "unit-test")
if err != nil {
log.Fatalf("creating new resourcegroups client failed: %v", err)
}
@@ -82,7 +82,7 @@ func TestNewClient(t *testing.T) {
log.Fatalf("Failed to load Azure authentication file: %v", err)
}
c, err := NewClient(auth)
c, err := NewClient(auth, "unit-test")
if err != nil {
t.Fatal(err)
}