Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
7 changes: 2 additions & 5 deletions sdk/keyvault/azkeys/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# Release History

## 0.1.1 (Unreleased)

### Features Added

### Breaking Changes
## 0.2.0 (2022-01-11)

### Bugs Fixed
* Fixes a bug in `crypto.NewClient` where the key version was required in the path, it is no longer required but is recommended.

### Other Changes
* Updates `azcore` dependency from `v0.20.0` to `v1.0.0`

## 0.1.0 (2021-11-09)
* This is the initial release of the `azkeys` library
2 changes: 1 addition & 1 deletion sdk/keyvault/azkeys/autorest.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module: azkeys
openapi-type: "data-plane"
security: "AADToken"
security-scopes: "https://vault.azure.net/.default"
use: "@autorest/[email protected].30"
use: "@autorest/[email protected].35"
module-version: 0.1.0
export-clients: true
```
23 changes: 12 additions & 11 deletions sdk/keyvault/azkeys/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import (

"github.com/Azure/azure-sdk-for-go/sdk/azcore"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
generated "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys/internal/generated"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
"github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys/internal/generated"
shared "github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal"
)

Expand Down Expand Up @@ -58,9 +59,9 @@ func NewClient(vaultUrl string, credential azcore.TokenCredential, options *Clie
shared.NewKeyVaultChallengePolicy(credential),
)

conn := generated.NewConnection(genOptions)
pl := runtime.NewPipeline(generated.ModuleName, generated.ModuleVersion, runtime.PipelineOptions{}, genOptions)
return &Client{
kvClient: generated.NewKeyVaultClient(conn),
kvClient: generated.NewKeyVaultClient(pl),
vaultUrl: vaultUrl,
}, nil
}
Expand Down Expand Up @@ -603,9 +604,9 @@ func (s *startDeleteKeyPoller) Poll(ctx context.Context) (*http.Response, error)
return resp.RawResponse, nil
}

var httpResponseErr azcore.HTTPResponse
var httpResponseErr *azcore.ResponseError
if errors.As(err, &httpResponseErr) {
if httpResponseErr.RawResponse().StatusCode == http.StatusNotFound {
if httpResponseErr.StatusCode == http.StatusNotFound {
// This is the expected result
return s.deleteResponse.RawResponse, nil
}
Expand Down Expand Up @@ -660,9 +661,9 @@ func (c *Client) BeginDeleteKey(ctx context.Context, keyName string, options *Be
}

getResp, err := c.kvClient.GetDeletedKey(ctx, c.vaultUrl, keyName, nil)
var httpErr azcore.HTTPResponse
var httpErr *azcore.ResponseError
if errors.As(err, &httpErr) {
if httpErr.RawResponse().StatusCode != http.StatusNotFound {
if httpErr.StatusCode != http.StatusNotFound {
return DeleteKeyPollerResponse{}, err
}
}
Expand Down Expand Up @@ -765,9 +766,9 @@ func (b *beginRecoverPoller) Done() bool {
func (b *beginRecoverPoller) Poll(ctx context.Context) (*http.Response, error) {
resp, err := b.client.GetKey(ctx, b.vaultUrl, b.keyName, "", nil)
b.lastResponse = resp
var httpErr azcore.HTTPResponse
var httpErr *azcore.ResponseError
if errors.As(err, &httpErr) {
return httpErr.RawResponse(), err
return httpErr.RawResponse, err
}
return resp.RawResponse, nil
}
Expand Down Expand Up @@ -845,9 +846,9 @@ func (c *Client) BeginRecoverDeletedKey(ctx context.Context, keyName string, opt
}

getResp, err := c.kvClient.GetKey(ctx, c.vaultUrl, keyName, "", nil)
var httpErr azcore.HTTPResponse
var httpErr *azcore.ResponseError
if errors.As(err, &httpErr) {
if httpErr.RawResponse().StatusCode != http.StatusNotFound {
if httpErr.StatusCode != http.StatusNotFound {
return RecoverDeletedKeyPollerResponse{}, err
}
}
Expand Down
8 changes: 4 additions & 4 deletions sdk/keyvault/azkeys/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,13 @@ func TestBackupKey(t *testing.T) {
require.NoError(t, err)

_, err = client.GetKey(ctx, key, nil)
var httpErr azcore.HTTPResponse
var httpErr *azcore.ResponseError
require.True(t, errors.As(err, &httpErr))
require.Equal(t, httpErr.RawResponse().StatusCode, http.StatusNotFound)
require.Equal(t, httpErr.RawResponse.StatusCode, http.StatusNotFound)

_, err = client.GetDeletedKey(ctx, key, nil)
require.True(t, errors.As(err, &httpErr))
require.Equal(t, httpErr.RawResponse().StatusCode, http.StatusNotFound)
require.Equal(t, httpErr.RawResponse.StatusCode, http.StatusNotFound)

time.Sleep(30 * delay())
// Poll this operation manually
Expand Down Expand Up @@ -643,7 +643,7 @@ func TestReleaseKey(t *testing.T) {
t.Skip("Skipping test in playback")
}
_, err = http.DefaultClient.Do(req)
require.NoError(t, err)
require.Error(t, err) // This URL doesn't exist so this should fail, will pass after 7.4-preview release
// require.Equal(t, resp.StatusCode, http.StatusOK)
// defer resp.Body.Close()

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azkeys/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package azkeys

import generated "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys/internal/generated"
import "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys/internal/generated"

// DeletionRecoveryLevel - Reflects the deletion recovery level currently in effect for certificates in the current vault. If it contains 'Purgeable', the
// certificate can be permanently deleted by a privileged user; otherwise,
Expand Down
3 changes: 1 addition & 2 deletions sdk/keyvault/azkeys/constants_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ func TestToPtrMethods(t *testing.T) {
//nolint
func TestToGeneratedMethods(t *testing.T) {
// If done incorrectly, this will have a nil pointer reference
var l *ListKeyVersionsOptions
l = nil
var l *ListKeyVersionsOptions = nil
_ = l.toGenerated()
}
5 changes: 3 additions & 2 deletions sdk/keyvault/azkeys/crypto/crypto_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"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/azcore/runtime"
generated "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys/internal/generated"
shared "github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal"
)
Expand Down Expand Up @@ -97,7 +98,7 @@ func NewClient(keyURL string, credential azcore.TokenCredential, options *Client
genOptions.PerRetryPolicies,
shared.NewKeyVaultChallengePolicy(credential),
)
conn := generated.NewConnection(genOptions)
pl := runtime.NewPipeline(generated.ModuleName, generated.ModuleVersion, runtime.PipelineOptions{}, genOptions)

vaultURL, err := parseVaultURL(keyURL)
if err != nil {
Expand All @@ -110,7 +111,7 @@ func NewClient(keyURL string, credential azcore.TokenCredential, options *Client
}

return &Client{
kvClient: generated.NewKeyVaultClient(conn),
kvClient: generated.NewKeyVaultClient(pl),
vaultURL: vaultURL,
keyID: keyID,
keyVersion: keyVersion,
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azkeys/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.16
replace github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal => ../internal

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.1.0
github.com/stretchr/testify v1.7.0
Expand Down
29 changes: 22 additions & 7 deletions sdk/keyvault/azkeys/go.sum
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0 h1:KQgdWmEOmaJKxaUUZwHAYh12t+b+ZJf8q3friycK1kA=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0/go.mod h1:ZPW/Z0kLCTdDZaDbYTetxc9Cxl/2lNqxYHYNOF2bti0=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0 h1:VBvHGLJbaY0+c66NZHdS9cgjHVYSH6DDa0XJMyrblsI=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0/go.mod h1:GJzjM4SR9T0KyX5gKCVyz1ytD8FeWeUPCwtFCt1AyfE=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0/go.mod h1:TmXReXZ9yPp5D5TBRMTAtyz+UyOl15Py4hL5E5p6igQ=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c=
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI=
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand All @@ -24,18 +34,23 @@ golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNm
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b h1:k+E048sYJHyVnsr1GDrRZWQ32D2C7lWs9JRc0bel53A=
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
37 changes: 0 additions & 37 deletions sdk/keyvault/azkeys/internal/generated/connection.go

This file was deleted.

Loading