Skip to content

Commit 36d8f1b

Browse files
authored
secrets/azurekeyvault: migrate from beta keyvault/azkeys to stable security/keyvault/azkeys (#3689)
Fixes #3687.
1 parent 36773c1 commit 36d8f1b

13 files changed

Lines changed: 52 additions & 54 deletions

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ require (
2828
github.com/Azure/azure-amqp-common-go/v3 v3.2.3
2929
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
3030
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
31-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0
3231
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.10.0
32+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0
3333
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4
3434
github.com/Azure/go-amqp v1.5.1
3535
github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.13
@@ -94,7 +94,7 @@ require (
9494
cloud.google.com/go/trace v1.11.7 // indirect
9595
filippo.io/edwards25519 v1.2.0 // indirect
9696
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
97-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
97+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
9898
github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0 // indirect
9999
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 // indirect
100100
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect

go.sum

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+
8181
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
8282
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
8383
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
84-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 h1:m/sWOGCREuSBqg2htVQTBY8nOZpyajYztF0vUvSZTuM=
85-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0/go.mod h1:Pu5Zksi2KrU7LPbZbNINx6fuVrUp/ffvpxdDj+i8LeE=
86-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 h1:FbH3BbSb4bvGluTesZZ+ttN/MDsnMmQP36OSnDuSXqw=
87-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA=
8884
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.10.0 h1:kE5kpeiSqu4jcCQ/sWuyggMXJ/pT6oQ99+8hwPmyeJ0=
8985
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.10.0/go.mod h1:IAN3Z0DMtehoxoQQnfqg1891z1P7GNoDryKtFcAyMBI=
9086
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
9187
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
88+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0 h1:E4MgwLBGeVB5f2MdcIVD3ELVAWpr+WD6MUe1i+tM/PA=
89+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0/go.mod h1:Y2b/1clN4zsAoUd/pgNAQHjLDnTis/6ROkUfyob6psM=
90+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 h1:nCYfgcSyHZXJI8J0IWE5MsCGlb2xp9fJiXyxWgmOFg4=
91+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0/go.mod h1:ucUjca2JtSZboY8IoUqyQyuuXvwbMBVwFOm0vdQPNhA=
9292
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 h1:jWQK1GI+LeGGUKBADtcH2rRqPxYB1Ljwms5gFA2LqrM=
9393
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4/go.mod h1:8mwH4klAm9DUgR2EEHyEEAQlRDvLPyg5fQry3y+cDew=
9494
github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg=
@@ -797,9 +797,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
797797
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
798798
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
799799
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
800+
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
800801
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
801-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
802-
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
803802
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
804803
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
805804
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/testing/alldeps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ github.com/Azure/azure-amqp-common-go/v3
1818
github.com/Azure/azure-sdk-for-go/sdk/azcore
1919
github.com/Azure/azure-sdk-for-go/sdk/azidentity
2020
github.com/Azure/azure-sdk-for-go/sdk/internal
21-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys
22-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal
2321
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus
22+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys
23+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal
2424
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob
2525
github.com/Azure/go-amqp
2626
github.com/AzureAD/microsoft-authentication-library-for-go

samples/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ require (
6868
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
6969
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
7070
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
71-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect
72-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
7371
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.10.0 // indirect
72+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0 // indirect
73+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
7474
github.com/Azure/go-amqp v1.5.1 // indirect
7575
github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0 // indirect
7676
github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.13 // indirect

samples/go.sum

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+
7979
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
8080
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
8181
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
82-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 h1:m/sWOGCREuSBqg2htVQTBY8nOZpyajYztF0vUvSZTuM=
83-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0/go.mod h1:Pu5Zksi2KrU7LPbZbNINx6fuVrUp/ffvpxdDj+i8LeE=
84-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 h1:FbH3BbSb4bvGluTesZZ+ttN/MDsnMmQP36OSnDuSXqw=
85-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA=
8682
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.10.0 h1:kE5kpeiSqu4jcCQ/sWuyggMXJ/pT6oQ99+8hwPmyeJ0=
8783
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.10.0/go.mod h1:IAN3Z0DMtehoxoQQnfqg1891z1P7GNoDryKtFcAyMBI=
8884
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
8985
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
86+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0 h1:E4MgwLBGeVB5f2MdcIVD3ELVAWpr+WD6MUe1i+tM/PA=
87+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0/go.mod h1:Y2b/1clN4zsAoUd/pgNAQHjLDnTis/6ROkUfyob6psM=
88+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 h1:nCYfgcSyHZXJI8J0IWE5MsCGlb2xp9fJiXyxWgmOFg4=
89+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0/go.mod h1:ucUjca2JtSZboY8IoUqyQyuuXvwbMBVwFOm0vdQPNhA=
9090
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 h1:jWQK1GI+LeGGUKBADtcH2rRqPxYB1Ljwms5gFA2LqrM=
9191
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4/go.mod h1:8mwH4klAm9DUgR2EEHyEEAQlRDvLPyg5fQry3y+cDew=
9292
github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg=
@@ -951,9 +951,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
951951
gopkg.in/pipe.v2 v2.0.0-20140414041502-3c2ca4d52544 h1:WJH1qsOB4/zb/li+zLMn0vaAUJ5FqPv6HYLI3aQVg1k=
952952
gopkg.in/pipe.v2 v2.0.0-20140414041502-3c2ca4d52544/go.mod h1:UhTeH/yXCK/KY7TX24mqPkaQ7gZeqmWd/8SSS8B3aHw=
953953
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
954+
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
954955
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
955-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
956-
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
957956
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
958957
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
959958
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

secrets/azurekeyvault/akv.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
4444
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
4545
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
46-
"github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys"
46+
"github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys"
4747
"github.com/google/wire"
4848
"gocloud.dev/gcerrors"
4949
"gocloud.dev/internal/gcerr"
@@ -113,7 +113,7 @@ func (o *URLOpener) OpenKeeperURL(ctx context.Context, u *url.URL) (*secrets.Kee
113113
q := u.Query()
114114
algorithm := q.Get("algorithm")
115115
if algorithm != "" {
116-
o.Options.Algorithm = azkeys.JSONWebKeyEncryptionAlgorithm(algorithm)
116+
o.Options.Algorithm = azkeys.EncryptionAlgorithm(algorithm)
117117
q.Del("algorithm")
118118
}
119119
for param := range q {
@@ -137,7 +137,7 @@ type KeeperOptions struct {
137137
// Defaults to "RSA-OAEP-256".
138138
// See https://docs.microsoft.com/en-us/rest/api/keyvault/encrypt/encrypt#jsonwebkeyencryptionalgorithm
139139
// for more details.
140-
Algorithm azkeys.JSONWebKeyEncryptionAlgorithm
140+
Algorithm azkeys.EncryptionAlgorithm
141141

142142
// EncryptOptions are passed through to Encrypt.
143143
EncryptOptions *azkeys.EncryptOptions
@@ -189,7 +189,7 @@ func openKeeper(clientMaker ClientMakerT, keyID string, opts *KeeperOptions) (*k
189189
opts = &KeeperOptions{}
190190
}
191191
if opts.Algorithm == "" {
192-
opts.Algorithm = azkeys.JSONWebKeyEncryptionAlgorithmRSAOAEP256
192+
opts.Algorithm = azkeys.EncryptionAlgorithmRSAOAEP256
193193
}
194194
matches := keyIDRE.FindStringSubmatch(keyID)
195195
if len(matches) != 3 {
@@ -218,7 +218,7 @@ func openKeeper(clientMaker ClientMakerT, keyID string, opts *KeeperOptions) (*k
218218

219219
// Encrypt encrypts the plaintext into a ciphertext.
220220
func (k *keeper) Encrypt(ctx context.Context, plaintext []byte) ([]byte, error) {
221-
keyOpsResult, err := k.client.Encrypt(ctx, k.keyName, k.keyVersion, azkeys.KeyOperationsParameters{
221+
keyOpsResult, err := k.client.Encrypt(ctx, k.keyName, k.keyVersion, azkeys.KeyOperationParameters{
222222
Algorithm: &k.options.Algorithm,
223223
Value: plaintext,
224224
}, k.options.EncryptOptions)
@@ -230,7 +230,7 @@ func (k *keeper) Encrypt(ctx context.Context, plaintext []byte) ([]byte, error)
230230

231231
// Decrypt decrypts the ciphertext into a plaintext.
232232
func (k *keeper) Decrypt(ctx context.Context, ciphertext []byte) ([]byte, error) {
233-
keyOpsResult, err := k.client.Decrypt(ctx, k.keyName, k.keyVersion, azkeys.KeyOperationsParameters{
233+
keyOpsResult, err := k.client.Decrypt(ctx, k.keyName, k.keyVersion, azkeys.KeyOperationParameters{
234234
Algorithm: &k.options.Algorithm,
235235
Value: ciphertext,
236236
}, k.options.DecryptOptions)

secrets/azurekeyvault/akv_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
2525
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
2626
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
27-
"github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys"
27+
"github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys"
2828
"gocloud.dev/internal/testing/setup"
2929
"gocloud.dev/internal/useragent"
3030
"gocloud.dev/secrets"

secrets/azurekeyvault/testdata/TestConformance/TestAs/verify_As_function.replay

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

secrets/azurekeyvault/testdata/TestConformance/TestAs/verify_As_returns_false_when_passed_nil.replay

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

secrets/azurekeyvault/testdata/TestConformance/TestDecryptMalformedError.replay

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)