Skip to content

Commit fc5e7be

Browse files
authored
[keyvault] update azkeys to api version 7.4 (Azure#20499)
* update autorest * upgrade to 7.4 * changelog
1 parent ec37d67 commit fc5e7be

File tree

13 files changed

+242
-219
lines changed

13 files changed

+242
-219
lines changed

sdk/security/keyvault/azkeys/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][code_of_con
139139
[goget_azkeys]: https://aka.ms/azsdk/go/keyvault-keys/docs
140140
[reference_docs]: https://aka.ms/azsdk/go/keyvault-keys/docs
141141
[client_docs]: https://aka.ms/azsdk/go/keyvault-keys/docs#Client
142-
[key_client_src]: https://github.com/Azure/azure-sdk-for-go/tree/main/sdk/keyvault/azkeys/client.go
142+
[key_client_src]: https://github.com/Azure/azure-sdk-for-go/tree/main/sdk/security/keyvault/azkeys/client.go
143143
[keys_samples]: https://aka.ms/azsdk/go/keyvault-keys/docs#pkg-examples
144144
[managed_identity]: https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/overview
145145

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Troubleshoot Azure Key Vault Keys Client Module Issues
22

3-
See our [Azure Key Vault SDK Troubleshooting Guide](https://github.com/Azure/azure-sdk-for-go/blob/main/sdk/keyvault/TROUBLESHOOTING.md)
3+
See our [Azure Key Vault SDK Troubleshooting Guide](https://github.com/Azure/azure-sdk-for-go/blob/main/sdk/security/keyvault/TROUBLESHOOTING.md)
44
to troubleshoot issues common to Azure Key Vault client modules.

sdk/security/keyvault/azkeys/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "go",
44
"TagPrefix": "go/security/keyvault/azkeys",
5-
"Tag": "go/security/keyvault/azkeys_d569f3aad0"
5+
"Tag": "go/security/keyvault/azkeys_d9ce3682be"
66
}

sdk/security/keyvault/azkeys/autorest.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
clear-output-folder: false
55
export-clients: true
66
go: true
7-
input-file: https://github.com/Azure/azure-rest-api-specs/blob/323a8c3fabad74fe18f4202926b8fd826551a7ce/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/keys.json
7+
input-file: https://github.com/Azure/azure-rest-api-specs/blob/551275acb80e1f8b39036b79dfc35a8f63b601a7/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/keys.json
88
license-header: MICROSOFT_MIT_NO_VERSION
99
module: github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys
1010
openapi-type: "data-plane"
1111
output-folder: ../azkeys
1212
override-client-name: Client
1313
security: "AADToken"
1414
security-scopes: "https://vault.azure.net/.default"
15-
use: "@autorest/[email protected].43"
15+
use: "@autorest/[email protected].46"
1616
version: "^3.0.0"
1717

1818
directive:
@@ -102,11 +102,6 @@ directive:
102102
where: $
103103
transform: return $.replace(/(?:\/\/.*\s)+func \(a \*?Attributes\).*\{\s(?:.+\s)+\}\s/g, "");
104104

105-
# delete generated constructor
106-
- from: client.go
107-
where: $
108-
transform: return $.replace(/(?:\/\/.*\s)+func NewClient.+\{\s(?:.+\s)+\}\s/, "");
109-
110105
# delete the version path param check (version == "" is legal for Key Vault but indescribable by OpenAPI)
111106
- from: client.go
112107
where: $

sdk/security/keyvault/azkeys/client.go

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

sdk/security/keyvault/azkeys/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ func TestRotateKey(t *testing.T) {
635635
LifetimeActions: []*azkeys.LifetimeActions{
636636
{
637637
Action: &azkeys.LifetimeActionsType{
638-
Type: to.Ptr(azkeys.ActionTypeRotate),
638+
Type: to.Ptr(azkeys.KeyRotationPolicyActionRotate),
639639
},
640640
Trigger: &azkeys.LifetimeActionsTrigger{
641641
TimeAfterCreate: timeAfterCreate,
@@ -653,7 +653,7 @@ func TestRotateKey(t *testing.T) {
653653
require.NotEmpty(t, getResp.LifetimeActions)
654654
require.Condition(t, func() bool {
655655
for _, action := range getResp.LifetimeActions {
656-
if strings.EqualFold(string(*action.Action.Type), string(azkeys.ActionTypeRotate)) && strings.EqualFold(string(*action.Trigger.TimeAfterCreate), *timeAfterCreate) {
656+
if strings.EqualFold(string(*action.Action.Type), string(azkeys.KeyRotationPolicyActionRotate)) && strings.EqualFold(string(*action.Trigger.TimeAfterCreate), *timeAfterCreate) {
657657
return true
658658
}
659659
}

sdk/security/keyvault/azkeys/constants.go

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

sdk/security/keyvault/azkeys/custom_client.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ func NewClient(vaultURL string, credential azcore.TokenCredential, options *Clie
3737
DisableChallengeResourceVerification: options.DisableChallengeResourceVerification,
3838
},
3939
)
40-
pl := runtime.NewPipeline(moduleName, version, runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}, &options.ClientOptions)
41-
return &Client{endpoint: vaultURL, pl: pl}, nil
40+
azcoreClient, err := azcore.NewClient("azkeys.Client", version, runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}, &options.ClientOptions)
41+
if err != nil {
42+
return nil, err
43+
}
44+
return &Client{endpoint: vaultURL, internal: azcoreClient}, nil
4245
}
4346

4447
// ID is a key's unique ID, containing its version, if any, and name.

sdk/security/keyvault/azkeys/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func ExampleClient_UpdateKeyRotationPolicy() {
126126
LifetimeActions: []*azkeys.LifetimeActions{
127127
{
128128
Action: &azkeys.LifetimeActionsType{
129-
Type: to.Ptr(azkeys.ActionTypeRotate),
129+
Type: to.Ptr(azkeys.KeyRotationPolicyActionRotate),
130130
},
131131
Trigger: &azkeys.LifetimeActionsTrigger{
132132
TimeAfterCreate: to.Ptr("P18M"),

sdk/security/keyvault/azkeys/models.go

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

0 commit comments

Comments
 (0)