upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-05-28 04:35:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #8259 from paulmey/azure-chroot/user-agent

Browse source 
[azure] Set correct user agent for Azure client set
This commit is contained in:
Megan Marsh 2019-10-23 12:15:23 -07:00 committed by GitHub
commit ea3e9b67a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
builder/azure/common/client/azure_client_set.go
View file

@ -8,6 +8,7 @@ import (
"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute/computeapi"
"github.com/Azure/go-autorest/autorest"
"github.com/hashicorp/packer/helper/useragent"
)
type AzureClientSet interface {
@ -33,6 +34,10 @@ type azureClientSet struct {
}
func New(c Config, say func(string)) (AzureClientSet, error) {
return new(c, say)
}
func new(c Config, say func(string)) (*azureClientSet, error) {
token, err := c.GetServicePrincipalToken(say, c.CloudEnvironment().ResourceManagerEndpoint)
if err != nil {
return nil, err
@ -46,12 +51,16 @@ func New(c Config, say func(string)) (AzureClientSet, error) {
}
func (s azureClientSet) configureAutorestClient(c *autorest.Client) {
c.AddToUserAgent(useragent.String())
c.Authorizer = s.authorizer
c.Sender = s.sender
}
func (s azureClientSet) MetadataClient() MetadataClientAPI {
return metadataClient{s.sender}
return metadataClient{
s.sender,
useragent.String(),
}
}
func (s azureClientSet) DisksClient() computeapi.DisksClientAPI {

2
builder/azure/common/client/metadata.go
View file

@ -27,6 +27,7 @@ type ComputeInfo struct {
// metadataClient implements MetadataClient
type metadataClient struct {
autorest.Sender
UserAgent string
}
var _ MetadataClientAPI = metadataClient{}
@ -38,6 +39,7 @@ func (client metadataClient) GetComputeInfo() (*ComputeInfo, error) {
req, err := autorest.CreatePreparer(
autorest.AsGet(),
autorest.WithHeader("Metadata", "true"),
autorest.WithUserAgent(client.UserAgent),
autorest.WithBaseURL(imdsURL),
).Prepare((&http.Request{}))
if err != nil {