-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
backend/azurerm: upgrading the SDK / support for proxies (#19414)
* vendor updates - updating to v21.3.0 of github.com/Azure/azure-sdk-for-go - updating to v10.15.4 of github.com/Azure/go-autorest - vendoring github.com/hashicorp/go-azure-helpers @ 0.1.1 * backend/azurerm: refactoring to use the new auth package - refactoring the backend to use a shared client via the new auth package - adding tests covering both Service Principal and Access Key auth - support for authenticating using a proxy - rewriting the backend documentation to include examples of both authentication types * switching to use the build-in logging function * documenting it's also possible to retrieve the access key from an env var
- Loading branch information
1 parent
7d5db95
commit 0ec109b
Showing
146 changed files
with
13,031 additions
and
4,784 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| package azure | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "time" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/resources/mgmt/resources" | ||
| armStorage "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/storage/mgmt/storage" | ||
| "github.com/Azure/azure-sdk-for-go/storage" | ||
| "github.com/Azure/go-autorest/autorest" | ||
| "github.com/Azure/go-autorest/autorest/adal" | ||
| "github.com/Azure/go-autorest/autorest/azure" | ||
| "github.com/hashicorp/go-azure-helpers/authentication" | ||
| "github.com/hashicorp/terraform/httpclient" | ||
| ) | ||
|
|
||
| type ArmClient struct { | ||
| // These Clients are only initialized if an Access Key isn't provided | ||
| groupsClient *resources.GroupsClient | ||
| storageAccountsClient *armStorage.AccountsClient | ||
|
|
||
| accessKey string | ||
| environment azure.Environment | ||
| resourceGroupName string | ||
| storageAccountName string | ||
| } | ||
|
|
||
| func buildArmClient(config BackendConfig) (*ArmClient, error) { | ||
| env, err := authentication.DetermineEnvironment(config.Environment) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| client := ArmClient{ | ||
| environment: *env, | ||
| resourceGroupName: config.ResourceGroupName, | ||
| storageAccountName: config.StorageAccountName, | ||
| } | ||
|
|
||
| // if we have an Access Key - we don't need the other clients | ||
| if config.AccessKey != "" { | ||
| client.accessKey = config.AccessKey | ||
| return &client, nil | ||
| } | ||
|
|
||
| builder := authentication.Builder{ | ||
| ClientID: config.ClientID, | ||
| ClientSecret: config.ClientSecret, | ||
| SubscriptionID: config.SubscriptionID, | ||
| TenantID: config.TenantID, | ||
| Environment: config.Environment, | ||
|
|
||
| // Feature Toggles | ||
| SupportsClientSecretAuth: true, | ||
| // TODO: support for Azure CLI / Client Certificate / MSI | ||
| } | ||
| armConfig, err := builder.Build() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error building ARM Config: %+v", err) | ||
| } | ||
|
|
||
| oauthConfig, err := adal.NewOAuthConfig(env.ActiveDirectoryEndpoint, armConfig.TenantID) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| auth, err := armConfig.GetAuthorizationToken(oauthConfig, env.ResourceManagerEndpoint) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| accountsClient := armStorage.NewAccountsClientWithBaseURI(env.ResourceManagerEndpoint, armConfig.SubscriptionID) | ||
| client.configureClient(&accountsClient.Client, auth) | ||
| client.storageAccountsClient = &accountsClient | ||
|
|
||
| groupsClient := resources.NewGroupsClientWithBaseURI(env.ResourceManagerEndpoint, armConfig.SubscriptionID) | ||
| client.configureClient(&groupsClient.Client, auth) | ||
| client.groupsClient = &groupsClient | ||
|
|
||
| return &client, nil | ||
| } | ||
|
|
||
| func (c ArmClient) getBlobClient(ctx context.Context) (*storage.BlobStorageClient, error) { | ||
| if c.accessKey != "" { | ||
| storageClient, err := storage.NewBasicClientOnSovereignCloud(c.storageAccountName, c.accessKey, c.environment) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error creating storage client for storage account %q: %s", c.storageAccountName, err) | ||
| } | ||
| client := storageClient.GetBlobService() | ||
| return &client, nil | ||
| } | ||
|
|
||
| keys, err := c.storageAccountsClient.ListKeys(ctx, c.resourceGroupName, c.storageAccountName) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error retrieving keys for Storage Account %q: %s", c.storageAccountName, err) | ||
| } | ||
|
|
||
| if keys.Keys == nil { | ||
| return nil, fmt.Errorf("Nil key returned for storage account %q", c.storageAccountName) | ||
| } | ||
|
|
||
| accessKeys := *keys.Keys | ||
| accessKey := accessKeys[0].Value | ||
|
|
||
| storageClient, err := storage.NewBasicClientOnSovereignCloud(c.storageAccountName, *accessKey, c.environment) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error creating storage client for storage account %q: %s", c.storageAccountName, err) | ||
| } | ||
| client := storageClient.GetBlobService() | ||
| return &client, nil | ||
| } | ||
|
|
||
| func (c *ArmClient) configureClient(client *autorest.Client, auth autorest.Authorizer) { | ||
| client.UserAgent = buildUserAgent() | ||
| client.Authorizer = auth | ||
| client.Sender = buildSender() | ||
| client.SkipResourceProviderRegistration = false | ||
| client.PollingDuration = 60 * time.Minute | ||
| } | ||
|
|
||
| func buildUserAgent() string { | ||
| userAgent := httpclient.UserAgentString() | ||
|
|
||
| // append the CloudShell version to the user agent if it exists | ||
| if azureAgent := os.Getenv("AZURE_HTTP_USER_AGENT"); azureAgent != "" { | ||
| userAgent = fmt.Sprintf("%s %s", userAgent, azureAgent) | ||
| } | ||
|
|
||
| return userAgent | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.