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

Append AZURE_HTTP_USER_AGENT environment variable to UserAgent string. #483

Merged
merged 3 commits into from
Nov 4, 2017
Merged

Append AZURE_HTTP_USER_AGENT environment variable to UserAgent string. #483

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fbd7a9
Append AZURE_HTTP_USER_AGENT environment variable to UserAgent string.
Nov 2, 2017
216681e
Updated code per PR.
Nov 2, 2017
80053f7
Documenting the cloudshell user agent change
tombuildsstuff Nov 4, 2017
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
10 changes: 10 additions & 0 deletions azurerm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"log"
"net/http"
"net/http/httputil"
"os"
"strings"

"github.com/Azure/azure-sdk-for-go/arm/appinsights"
"github.com/Azure/azure-sdk-for-go/arm/authorization"
Expand Down Expand Up @@ -189,7 +191,15 @@ func withRequestLogging() autorest.SendDecorator {

func setUserAgent(client *autorest.Client) {
version := terraform.VersionString()
azureAgent := os.Getenv("AZURE_HTTP_USER_AGENT")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

out of interest - what's the use-case for this / where's this going to be set?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The azure compute cloud shell sets this in their dockerfile (i.e. ENV AZURE_HTTP_USER_AGENT cloud-shell/1.0). This way we can collect some BI data on the provider/environment usage.

client.UserAgent = fmt.Sprintf("HashiCorp-Terraform-v%s", version)

if azureAgent != "" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor we'd tend to make this:

if azureAgent := os.Getenv("AZURE_HTTP_USER_AGENT"); azureAgent != "" {
 // set it
}

rather than separating it out :)

s := []string{client.UserAgent, azureAgent}
client.UserAgent = strings.Join(s, ";")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor we'd tend to just format this directly:

client.UserAgent = fmt.Sprintf("%s;%s", client.UserAgent, azureAgent)

}

log.Printf("[DEBUG] User Agent: %s", client.UserAgent)
}

func (c *Config) getAuthorizationToken(oauthConfig *adal.OAuthConfig, endpoint string) (*autorest.BearerAuthorizer, error) {
Expand Down