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 info back into configuration #1466

Merged
merged 4 commits into from
Jun 9, 2022
Merged

Add info back into configuration #1466

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec04f3a
Add info back into configuration
Jun 8, 2022
6f33a30
refactor to reduce number of var
Jun 9, 2022
36f690c
Update pkg/blockstorage/azure/client.go
leuyentran Jun 9, 2022
e995559
Fix linting error
Jun 9, 2022
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
20 changes: 10 additions & 10 deletions pkg/blockstorage/azure/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ type Client struct {
func NewClient(ctx context.Context, config map[string]string) (*Client, error) {
var resourceGroup string
var subscriptionID string
var cloudEnvironment string
var baseURI string
var ok bool
var err error

Expand All @@ -63,11 +61,11 @@ func NewClient(ctx context.Context, config map[string]string) (*Client, error) {
}
}

if cloudEnvironment, ok = config[blockstorage.AzureCloudEnviornmentID]; !ok || cloudEnvironment == "" {
cloudEnvironment = azure.PublicCloud.Name
if id, ok := config[blockstorage.AzureCloudEnviornmentID]; !ok || id == "" {
config[blockstorage.AzureCloudEnviornmentID] = azure.PublicCloud.Name
}

env, err := azure.EnvironmentFromName(cloudEnvironment)
env, err := azure.EnvironmentFromName(config[blockstorage.AzureCloudEnviornmentID])
if err != nil {
return nil, errors.Wrap(err, "Failed to fetch the cloud environment.")
}
Expand All @@ -77,19 +75,19 @@ func NewClient(ctx context.Context, config map[string]string) (*Client, error) {
return nil, err
}

baseURI, ok = config[blockstorage.AzureResurceMgrEndpoint]
_, ok = config[blockstorage.AzureResurceMgrEndpoint]
if !ok {
baseURI = env.ResourceManagerEndpoint
config[blockstorage.AzureResurceMgrEndpoint] = env.ResourceManagerEndpoint
}

disksClient := compute.NewDisksClientWithBaseURI(baseURI, subscriptionID)
disksClient := compute.NewDisksClientWithBaseURI(config[blockstorage.AzureResurceMgrEndpoint], subscriptionID)
disksClient.Authorizer = authorizer

snapshotsClient := compute.NewSnapshotsClientWithBaseURI(baseURI, subscriptionID)
snapshotsClient := compute.NewSnapshotsClientWithBaseURI(config[blockstorage.AzureResurceMgrEndpoint], subscriptionID)
snapshotsClient.Authorizer = authorizer

return &Client{
BaseURI: baseURI,
BaseURI: config[blockstorage.AzureResurceMgrEndpoint],
SubscriptionID: subscriptionID,
Authorizer: authorizer,
DisksClient: &disksClient,
Expand Down Expand Up @@ -135,10 +133,12 @@ func getCredConfig(env azure.Environment, config map[string]string) (auth.Client
credConfig := auth.NewClientCredentialsConfig(clientID, clientSecret, tenantID)
if credConfig.AADEndpoint, ok = config[blockstorage.AzureActiveDirEndpoint]; !ok || credConfig.AADEndpoint == "" {
credConfig.AADEndpoint = env.ActiveDirectoryEndpoint
config[blockstorage.AzureActiveDirEndpoint] = credConfig.AADEndpoint
}

if credConfig.Resource, ok = config[blockstorage.AzureActiveDirResourceID]; !ok || credConfig.Resource == "" {
credConfig.Resource = env.ResourceManagerEndpoint
config[blockstorage.AzureActiveDirResourceID] = credConfig.Resource
}

return credConfig, nil
Expand Down