public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Azure SDK with bug fixes (#38952)

Browse Source
This commit is contained in:
Sergey Kostrukov
2021-09-09 17:32:36 +01:00
committed by GitHub
parent 39a3bb8a1c
commit 06a616e630
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/azuremonitor/aztokenprovider/token_provider.go
+3 -8
View File
@@ -6,6 +6,7 @@ import (
"fmt"
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azcredentials"
@@ -140,13 +141,7 @@ func (c *managedIdentityTokenRetriever) Init() error {
}
func (c *managedIdentityTokenRetriever) GetAccessToken(ctx context.Context, scopes []string) (*AccessToken, error) {
// Workaround for a bug in Azure SDK which mutates the passed array of scopes
// See details https://github.com/Azure/azure-sdk-for-go/issues/15308
arr := make([]string, len(scopes))
copy(arr, scopes)
scopes = arr
accessToken, err := c.credential.GetToken(ctx, azcore.TokenRequestOptions{Scopes: scopes})
accessToken, err := c.credential.GetToken(ctx, policy.TokenRequestOptions{Scopes: scopes})
if err != nil {
return nil, err
}
@@ -177,7 +172,7 @@ func (c *clientSecretTokenRetriever) Init() error {
}
func (c *clientSecretTokenRetriever) GetAccessToken(ctx context.Context, scopes []string) (*AccessToken, error) {
accessToken, err := c.credential.GetToken(ctx, azcore.TokenRequestOptions{Scopes: scopes})
accessToken, err := c.credential.GetToken(ctx, policy.TokenRequestOptions{Scopes: scopes})
if err != nil {
return nil, err
}