-
Notifications
You must be signed in to change notification settings - Fork 848
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[KeyVault] updating autorest version and swagger (#15904)
* updating autorst version * formatting * formatting * adding license to generated * updating to latest commit * Add ARM-specific bearer token policy (#15885) * Add ARM-specific bearer token policy Removed support for auxiliary tenants from the runtime version of this policy as this is specific to ARM. * add tests for expiring resource * remove superfluous x-ms-date header * remove policy.TokenRequestOptions from AuthenticationOptions * refactor bearer token policy constructors * new autorest.md * upgrading to 7.3-preview * upgraded to 7.3-preview * fixing azcrypto recordings * remove RunTests * fixing live.tests.yml * recordings * adding GetRandomBytes * upgrade swagger to latest version, add RotateKey method * GetKeyRotationPolicy * Update azservicebus test fake (#15735) * ReleaseKey * Add release date for azcore v0.20.0 (#15915) * UpdateKeyRotationPolicy * RotateKey recording * copying azsecrets files * updating to latest .net test-resources * recordings and coverage * fixed RotateKey test * adding support for hsm testing * Adding test structure for testing against HSM * prefixing consts Co-authored-by: Joel Hendrix <jhendrix@microsoft.com> Co-authored-by: Charles Lowell <chlowe@microsoft.com>
- Loading branch information
3 people
authored
Oct 25, 2021
1 parent
0481b50
commit 3cc0215
Showing
72 changed files
with
11,028 additions
and
27,452 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 |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ | |
| }, | ||
| { | ||
| "Name": "azkeys", | ||
| "CoverageGoal": 0.75 | ||
| "CoverageGoal": 0.72 | ||
| } | ||
| ] | ||
| } | ||
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
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,44 @@ | ||
| //go:build go1.16 | ||
| // +build go1.16 | ||
|
|
||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| package policy | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" | ||
| ) | ||
|
|
||
| // BearerTokenOptions configures the bearer token policy's behavior. | ||
| type BearerTokenOptions struct { | ||
| // Scopes contains the list of permission scopes required for the token. | ||
| Scopes []string | ||
| // AuxiliaryTenants contains a list of additional tenant IDs to be used to authenticate | ||
| // in cross-tenant applications. | ||
| AuxiliaryTenants []string | ||
| } | ||
|
|
||
| // RegistrationOptions configures the registration policy's behavior. | ||
| // All zero-value fields will be initialized with their default values. | ||
| type RegistrationOptions struct { | ||
| policy.ClientOptions | ||
|
|
||
| // MaxAttempts is the total number of times to attempt automatic registration | ||
| // in the event that an attempt fails. | ||
| // The default value is 3. | ||
| // Set to a value less than zero to disable the policy. | ||
| MaxAttempts int | ||
|
|
||
| // PollingDelay is the amount of time to sleep between polling intervals. | ||
| // The default value is 15 seconds. | ||
| // A value less than zero means no delay between polling intervals (not recommended). | ||
| PollingDelay time.Duration | ||
|
|
||
| // PollingDuration is the amount of time to wait before abandoning polling. | ||
| // The default valule is 5 minutes. | ||
| // NOTE: Setting this to a small value might cause the policy to prematurely fail. | ||
| PollingDuration time.Duration | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| package runtime | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/http" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore" | ||
| armpolicy "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm/policy" | ||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared" | ||
| azpolicy "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" | ||
| ) | ||
|
|
||
| type acquiringResourceState struct { | ||
| ctx context.Context | ||
| p *BearerTokenPolicy | ||
| tenant string | ||
| } | ||
|
|
||
| // acquire acquires or updates the resource; only one | ||
| // thread/goroutine at a time ever calls this function | ||
| func acquire(state interface{}) (newResource interface{}, newExpiration time.Time, err error) { | ||
| s := state.(acquiringResourceState) | ||
| tk, err := s.p.cred.GetToken(s.ctx, azpolicy.TokenRequestOptions{ | ||
| Scopes: s.p.options.Scopes, | ||
| TenantID: s.tenant, | ||
| }) | ||
| if err != nil { | ||
| return nil, time.Time{}, err | ||
| } | ||
| return tk, tk.ExpiresOn, nil | ||
| } | ||
|
|
||
| // BearerTokenPolicy authorizes requests with bearer tokens acquired from a TokenCredential. | ||
| type BearerTokenPolicy struct { | ||
| // mainResource is the resource to be retreived using the tenant specified in the credential | ||
| mainResource *shared.ExpiringResource | ||
| // auxResources are additional resources that are required for cross-tenant applications | ||
| auxResources map[string]*shared.ExpiringResource | ||
| // the following fields are read-only | ||
| cred azcore.TokenCredential | ||
| options armpolicy.BearerTokenOptions | ||
| } | ||
|
|
||
| // NewBearerTokenPolicy creates a policy object that authorizes requests with bearer tokens. | ||
| // cred: an azcore.TokenCredential implementation such as a credential object from azidentity | ||
| // opts: optional settings. Pass nil to accept default values; this is the same as passing a zero-value options. | ||
| func NewBearerTokenPolicy(cred azcore.TokenCredential, opts *armpolicy.BearerTokenOptions) *BearerTokenPolicy { | ||
| if opts == nil { | ||
| opts = &armpolicy.BearerTokenOptions{} | ||
| } | ||
| p := &BearerTokenPolicy{ | ||
| cred: cred, | ||
| options: *opts, | ||
| mainResource: shared.NewExpiringResource(acquire), | ||
| } | ||
| if len(opts.AuxiliaryTenants) > 0 { | ||
| p.auxResources = map[string]*shared.ExpiringResource{} | ||
| } | ||
| for _, t := range opts.AuxiliaryTenants { | ||
| p.auxResources[t] = shared.NewExpiringResource(acquire) | ||
|
|
||
| } | ||
| return p | ||
| } | ||
|
|
||
| // Do authorizes a request with a bearer token | ||
| func (b *BearerTokenPolicy) Do(req *azpolicy.Request) (*http.Response, error) { | ||
| as := acquiringResourceState{ | ||
| ctx: req.Raw().Context(), | ||
| p: b, | ||
| } | ||
| tk, err := b.mainResource.GetResource(as) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if token, ok := tk.(*azcore.AccessToken); ok { | ||
| req.Raw().Header.Set(shared.HeaderAuthorization, shared.BearerTokenPrefix+token.Token) | ||
| } | ||
| auxTokens := []string{} | ||
| for tenant, er := range b.auxResources { | ||
| as.tenant = tenant | ||
| auxTk, err := er.GetResource(as) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| auxTokens = append(auxTokens, fmt.Sprintf("%s%s", shared.BearerTokenPrefix, auxTk.(*azcore.AccessToken).Token)) | ||
| } | ||
| if len(auxTokens) > 0 { | ||
| req.Raw().Header.Set(shared.HeaderAuxiliaryAuthorization, strings.Join(auxTokens, ", ")) | ||
| } | ||
| return req.Next() | ||
| } |
Oops, something went wrong.