Skip to content

Commit

Permalink
fix: ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryce-Soghigian committed Jun 12, 2024
1 parent 7baa41e commit 2e7c340
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions pkg/auth/cred.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,24 @@ import (
"knative.dev/pkg/logging"
)


type TokenWrapper struct {
cred azcore.TokenCredential
}

func NewTokenWrapper(cred azcore.TokenCredential) *TokenWrapper {
return &TokenWrapper{
cred: cred,
cred: cred,
}
}

func (w *TokenWrapper) GetToken(ctx context.Context, options policy.TokenRequestOptions) (azcore.AccessToken, error) {
token, err := w.cred.GetToken(ctx, options)
token, err := w.cred.GetToken(ctx, options)
if err != nil {
return azcore.AccessToken{}, err
}
logging.FromContext(ctx).Info("refreshing MDAL Token")
logging.FromContext(ctx).Info("refreshing MDAL Token")
token.ExpiresOn = time.Now().Add(2 * time.Hour)
return token, nil
return token, nil
}

// NewCredential provides a token credential for msi and service principal auth
Expand All @@ -58,7 +57,7 @@ func NewCredential(cfg *Config) (azcore.TokenCredential, error) {
klog.V(2).Infoln("cred: using workload identity for new credential")
return azidentity.NewDefaultAzureCredential(nil)
}

if cfg.UseManagedIdentityExtension || cfg.AADClientID == "msi" {
klog.V(2).Infoln("cred: using msi for new credential")
msiCred, err := azidentity.NewManagedIdentityCredential(&azidentity.ManagedIdentityCredentialOptions{
Expand Down
4 changes: 2 additions & 2 deletions pkg/providers/instance/azure_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ func NewAZClient(ctx context.Context, cfg *auth.Config, env *azure.Environment)
return nil, err
}
klog.V(5).Infof("Created network interface client %v using token credential", interfacesClient)

virtualMachinesClient, err := armcompute.NewVirtualMachinesClient(cfg.SubscriptionID, cred, opts)
if err != nil {
return nil, err
}
klog.V(5).Infof("Created virtual machines client %v, using a token credential", virtualMachinesClient)
azureResourceGraphClient, err := armresourcegraph.NewClient(cred, opts)
if err != nil {
if err != nil {
return nil, err
}
klog.V(5).Infof("Created azure resource graph client %v, using a token credential", azureResourceGraphClient)
Expand Down

0 comments on commit 2e7c340

Please sign in to comment.