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

managed_hsm: skip managed hsm auth build if not specified like in cn env #22400

Merged
merged 2 commits into from
Jul 28, 2023
Merged

managed_hsm: skip managed hsm auth build if not specified like in cn env #22400

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49b0988
skip managed hsm auth build if not specified like in cn env
wuxu92 Jul 7, 2023
fab37c2
use Api.Available instead of check resourceIdentifier
wuxu92 Jul 27, 2023
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
15 changes: 10 additions & 5 deletions internal/clients/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func Build(ctx context.Context, builder ClientBuilder) (*Client, error) {
return nil, fmt.Errorf("unable to build authorizer for Key Vault API: %+v", err)
}

if _, ok := builder.AuthConfig.Environment.Synapse.ResourceIdentifier(); ok {
if builder.AuthConfig.Environment.Synapse.Available() {
synapseAuth, err = auth.NewAuthorizerFromCredentials(ctx, *builder.AuthConfig, builder.AuthConfig.Environment.Synapse)
if err != nil {
return nil, fmt.Errorf("unable to build authorizer for Synapse API: %+v", err)
Expand All @@ -78,7 +78,7 @@ func Build(ctx context.Context, builder ClientBuilder) (*Client, error) {
log.Printf("[DEBUG] Skipping building the Synapse Authorizer since this is not supported in the current Azure Environment")
}

if _, ok := builder.AuthConfig.Environment.Batch.ResourceIdentifier(); ok {
if builder.AuthConfig.Environment.Batch.Available() {
batchManagementAuth, err = auth.NewAuthorizerFromCredentials(ctx, *builder.AuthConfig, builder.AuthConfig.Environment.Batch)
if err != nil {
return nil, fmt.Errorf("unable to build authorizer for Batch Management API: %+v", err)
Expand Down Expand Up @@ -109,9 +109,14 @@ func Build(ctx context.Context, builder ClientBuilder) (*Client, error) {
return nil, fmt.Errorf("building account: %+v", err)
}

managedHSMAuth, err := auth.NewAuthorizerFromCredentials(ctx, *builder.AuthConfig, builder.AuthConfig.Environment.ManagedHSM)
if err != nil {
return nil, fmt.Errorf("unable to build authorizer for Managed HSM API: %+v", err)
var managedHSMAuth auth.Authorizer
if builder.AuthConfig.Environment.ManagedHSM.Available() {
managedHSMAuth, err = auth.NewAuthorizerFromCredentials(ctx, *builder.AuthConfig, builder.AuthConfig.Environment.ManagedHSM)
if err != nil {
return nil, fmt.Errorf("unable to build authorizer for Managed HSM API: %+v", err)
}
} else {
log.Printf("[DEBUG] Skipping building the Managed HSM Authorizer since this is not supported in the current Azure Environment")
}

client := Client{
Expand Down