From 5a6aba4027f3ebe09efdfe9fc151ea166f8c900c Mon Sep 17 00:00:00 2001 From: Adriano Arce Date: Thu, 15 Jun 2023 17:17:26 -0700 Subject: [PATCH 1/4] Align the casing of LifetimeActionsType with the service. --- .../GetKeyRotationPolicy-example.json | 4 ++-- .../UpdateKeyRotationPolicy-example.json | 8 +++---- .../preview/7.3-preview/keys.json | 13 ++++++++---- .../GetKeyRotationPolicy-example.json | 4 ++-- .../UpdateKeyRotationPolicy-example.json | 8 +++---- .../preview/7.4-preview.1/keys.json | 13 ++++++++---- .../GetKeyRotationPolicy-example.json | 4 ++-- .../UpdateKeyRotationPolicy-example.json | 8 +++---- .../preview/7.5-preview.1/keys.json | 15 ++++++++----- .../GetKeyRotationPolicy-example.json | 4 ++-- .../UpdateKeyRotationPolicy-example.json | 8 +++---- .../Microsoft.KeyVault/stable/7.3/keys.json | 13 ++++++++---- .../GetKeyRotationPolicy-example.json | 4 ++-- .../UpdateKeyRotationPolicy-example.json | 8 +++---- .../Microsoft.KeyVault/stable/7.4/keys.json | 15 ++++++++----- .../preview/2021-04-01-preview/keys.json | 21 ++++++++++++++++--- .../preview/2021-06-01-preview/keys.json | 21 ++++++++++++++++--- .../preview/2021-11-01-preview/keys.json | 21 ++++++++++++++++--- .../preview/2022-02-01-preview/keys.json | 21 ++++++++++++++++--- .../stable/2022-07-01/keys.json | 21 ++++++++++++++++--- .../stable/2022-11-01/keys.json | 21 ++++++++++++++++--- .../stable/2022-11-01/keysManagedHsm.json | 21 ++++++++++++++++--- .../stable/2023-02-01/keys.json | 21 ++++++++++++++++--- .../stable/2023-02-01/keysManagedHsm.json | 21 ++++++++++++++++--- 24 files changed, 239 insertions(+), 79 deletions(-) diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/GetKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/GetKeyRotationPolicy-example.json index a811e1a71e74..735b8487e5cb 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/GetKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/GetKeyRotationPolicy-example.json @@ -14,7 +14,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -22,7 +22,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/UpdateKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/UpdateKeyRotationPolicy-example.json index 32503f0c56ab..8b1c8f7ec077 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/UpdateKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/UpdateKeyRotationPolicy-example.json @@ -10,7 +10,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -18,7 +18,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], @@ -37,7 +37,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -45,7 +45,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json index f96dbb2fc530..966bf4d6253d 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json @@ -2195,20 +2195,25 @@ "type": "string", "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "ActionType", "modelAsString": false, "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, { "value": "rotate", - "description": "Rotate the key based on the key policy." + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." }, { - "value": "notify", - "description": "Trigger event grid events. For preview, the notification time is not configurable and it is default to 30 days before expiry." + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." } ] } diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/GetKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/GetKeyRotationPolicy-example.json index 3f59a1904358..ca5385133242 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/GetKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/GetKeyRotationPolicy-example.json @@ -14,7 +14,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -22,7 +22,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/UpdateKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/UpdateKeyRotationPolicy-example.json index ca52501ec548..36fd97bde243 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/UpdateKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/examples/UpdateKeyRotationPolicy-example.json @@ -10,7 +10,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -18,7 +18,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], @@ -37,7 +37,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -45,7 +45,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/keys.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/keys.json index 8a9c15ea5f92..393002f81be8 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/keys.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.4-preview.1/keys.json @@ -2223,20 +2223,25 @@ "type": "string", "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "ActionType", "modelAsString": false, "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, { "value": "rotate", - "description": "Rotate the key based on the key policy." + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." }, { - "value": "notify", - "description": "Trigger event grid events. For preview, the notification time is not configurable and it is default to 30 days before expiry." + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." } ] } diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/GetKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/GetKeyRotationPolicy-example.json index 4fcc24b06a9f..07c03ec5ffa1 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/GetKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/GetKeyRotationPolicy-example.json @@ -14,7 +14,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -22,7 +22,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/UpdateKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/UpdateKeyRotationPolicy-example.json index 2572ad447ebc..57033ff93d28 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/UpdateKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/examples/UpdateKeyRotationPolicy-example.json @@ -10,7 +10,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -18,7 +18,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], @@ -37,7 +37,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -45,7 +45,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/keys.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/keys.json index 515664072bf7..4f95d0c37e6a 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/keys.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.5-preview.1/keys.json @@ -2201,20 +2201,25 @@ "type": "string", "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { - "name": "KeyRotationPolicyAction", + "name": "ActionType", "modelAsString": false, "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, { "value": "rotate", - "description": "Rotate the key based on the key policy." + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." }, { - "value": "notify", - "description": "Trigger event grid events. For preview, the notification time is not configurable and it is default to 30 days before expiry." + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." } ] } diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/GetKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/GetKeyRotationPolicy-example.json index 23ac2d9e190f..7044f0735571 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/GetKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/GetKeyRotationPolicy-example.json @@ -14,7 +14,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -22,7 +22,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/UpdateKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/UpdateKeyRotationPolicy-example.json index 55330de1a0c6..f0f3b05f8266 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/UpdateKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/examples/UpdateKeyRotationPolicy-example.json @@ -10,7 +10,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -18,7 +18,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], @@ -37,7 +37,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -45,7 +45,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/keys.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/keys.json index 1b6e2f982cfe..9f578346fe52 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/keys.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.3/keys.json @@ -2196,20 +2196,25 @@ "type": "string", "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "ActionType", "modelAsString": false, "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, { "value": "rotate", - "description": "Rotate the key based on the key policy." + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." }, { - "value": "notify", - "description": "Trigger event grid events. For preview, the notification time is not configurable and it is default to 30 days before expiry." + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." } ] } diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/GetKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/GetKeyRotationPolicy-example.json index 66233f906de3..950fc74fb616 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/GetKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/GetKeyRotationPolicy-example.json @@ -14,7 +14,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -22,7 +22,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/UpdateKeyRotationPolicy-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/UpdateKeyRotationPolicy-example.json index a8b238c2eb1e..9b317eda4fd5 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/UpdateKeyRotationPolicy-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/examples/UpdateKeyRotationPolicy-example.json @@ -10,7 +10,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -18,7 +18,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], @@ -37,7 +37,7 @@ "timeAfterCreate": "P90D" }, "action": { - "type": "rotate" + "type": "Rotate" } }, { @@ -45,7 +45,7 @@ "timeBeforeExpiry": "P30D" }, "action": { - "type": "notify" + "type": "Notify" } } ], diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/keys.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/keys.json index 737c17443b8a..c8cc240a287c 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/keys.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.4/keys.json @@ -2196,20 +2196,25 @@ "type": "string", "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { - "name": "KeyRotationPolicyAction", + "name": "ActionType", "modelAsString": false, "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, { "value": "rotate", - "description": "Rotate the key based on the key policy." + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." }, { - "value": "notify", - "description": "Trigger event grid events. For preview, the notification time is not configurable and it is default to 30 days before expiry." + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." } ] } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/keys.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/keys.json index 31deba9a7489..eedd77532bb7 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/keys.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/keys.json @@ -593,14 +593,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/keys.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/keys.json index 272c2aafa28c..8ee98a88195e 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/keys.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/keys.json @@ -611,14 +611,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/keys.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/keys.json index 126b60420093..0804a4ae1c2a 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/keys.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/keys.json @@ -611,14 +611,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/keys.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/keys.json index 6ffb7bec0f95..2343ed894da5 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/keys.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/keys.json @@ -612,14 +612,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/keys.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/keys.json index ff6bced897b2..a9a578d8750e 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/keys.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/keys.json @@ -613,14 +613,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keys.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keys.json index 82825d7ddd7a..9b7b1e5cddc9 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keys.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keys.json @@ -613,14 +613,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keysManagedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keysManagedHsm.json index 1c080301c4c8..93fdaa82bae7 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keysManagedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/keysManagedHsm.json @@ -542,14 +542,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keys.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keys.json index 17770d950931..d14d4976ade4 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keys.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keys.json @@ -613,14 +613,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keysManagedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keysManagedHsm.json index cc6a85fee21e..3c7b025ae29c 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keysManagedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/keysManagedHsm.json @@ -542,14 +542,29 @@ "properties": { "type": { "type": "string", - "description": "The type of action.", + "description": "The type of the action.", "enum": [ + "Rotate", "rotate", - "notify" + "Notify" ], "x-ms-enum": { "name": "KeyRotationPolicyActionType", - "modelAsString": false + "modelAsString": false, + "values": [ + { + "value": "Rotate", + "description": "Rotate the key based on the key policy. Key Vault only. Managed HSM uses camelCase 'rotate' instead." + }, + { + "value": "rotate", + "description": "Rotate the key based on the key policy. Managed HSM only. Key Vault uses PascalCase 'Rotate' instead." + }, + { + "value": "Notify", + "description": "Trigger Event Grid events. Defaults to 30 days before expiry. Key Vault only." + } + ] } } }, From 0e4959f4b02f03fee86155bc7fa5435688cc4f44 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Tue, 22 Aug 2023 15:26:56 -0700 Subject: [PATCH 2/4] Add suppressions for EnumUniqueValue --- specification/keyvault/data-plane/readme.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/keyvault/data-plane/readme.md b/specification/keyvault/data-plane/readme.md index c1c256347aef..cb32c420841f 100644 --- a/specification/keyvault/data-plane/readme.md +++ b/specification/keyvault/data-plane/readme.md @@ -496,6 +496,18 @@ directive: from: securitydomain.json where: $.definitions.TransferKey.properties.key_format reason: Consistency with other properties + - suppress: EnumUniqueValue + from keys.json + where: $.definitions.LifetimeActionsType.properties.type + reason: SDK, docs workaround for current service behavior. + - suppress: EnumUniqueValue + from keys.json + where: $.definitions.Action.properties.type + reason: SDK, docs workaround for current service behavior. + - suppress: EnumUniqueValue + from keysManagedHsm.json + where: $.definitions.ManagedHsmAction.properties.type + reason: SDK, docs workaround for current service behavior. - suppress: DOUBLE_FORWARD_SLASHES_IN_URL from: rbac.json reason: / is a valid scope in this scenario. From 26f65e63ddd7740b3ca09944e3cb8a14da682a6a Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Wed, 23 Aug 2023 09:49:26 -0700 Subject: [PATCH 3/4] Fix suppressions YAML --- specification/keyvault/data-plane/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/keyvault/data-plane/readme.md b/specification/keyvault/data-plane/readme.md index cb32c420841f..e36ac537870d 100644 --- a/specification/keyvault/data-plane/readme.md +++ b/specification/keyvault/data-plane/readme.md @@ -497,15 +497,15 @@ directive: where: $.definitions.TransferKey.properties.key_format reason: Consistency with other properties - suppress: EnumUniqueValue - from keys.json + from: keys.json where: $.definitions.LifetimeActionsType.properties.type reason: SDK, docs workaround for current service behavior. - suppress: EnumUniqueValue - from keys.json + from: keys.json where: $.definitions.Action.properties.type reason: SDK, docs workaround for current service behavior. - suppress: EnumUniqueValue - from keysManagedHsm.json + from: keysManagedHsm.json where: $.definitions.ManagedHsmAction.properties.type reason: SDK, docs workaround for current service behavior. - suppress: DOUBLE_FORWARD_SLASHES_IN_URL From a424071f62633d7c9fe36e1c94dd4c890dd6dc6a Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Wed, 23 Aug 2023 09:59:20 -0700 Subject: [PATCH 4/4] Move ARM suppressions to right readme.md --- specification/keyvault/data-plane/readme.md | 8 -------- specification/keyvault/resource-manager/readme.md | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/specification/keyvault/data-plane/readme.md b/specification/keyvault/data-plane/readme.md index e36ac537870d..e8f09cb362ba 100644 --- a/specification/keyvault/data-plane/readme.md +++ b/specification/keyvault/data-plane/readme.md @@ -500,14 +500,6 @@ directive: from: keys.json where: $.definitions.LifetimeActionsType.properties.type reason: SDK, docs workaround for current service behavior. - - suppress: EnumUniqueValue - from: keys.json - where: $.definitions.Action.properties.type - reason: SDK, docs workaround for current service behavior. - - suppress: EnumUniqueValue - from: keysManagedHsm.json - where: $.definitions.ManagedHsmAction.properties.type - reason: SDK, docs workaround for current service behavior. - suppress: DOUBLE_FORWARD_SLASHES_IN_URL from: rbac.json reason: / is a valid scope in this scenario. diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md index f92a28449645..d328f155997d 100644 --- a/specification/keyvault/resource-manager/readme.md +++ b/specification/keyvault/resource-manager/readme.md @@ -261,6 +261,15 @@ directive: from: keysManagedHsm.json reason: This is to keep compatibility with existing data plane property. The 'release_policy' property for KeyCreateParameters does not support camelCase. +- suppress: EnumUniqueValue + from: keys.json + where: $.definitions.Action.properties.type + reason: SDK, docs workaround for current service behavior. +- suppress: EnumUniqueValue + from: keysManagedHsm.json + where: $.definitions.ManagedHsmAction.properties.type + reason: SDK, docs workaround for current service behavior. + - suppress: INVALID_REQUEST_PARAMETER from: keyvault.json reason: The Vaults_List API endpoint only supports version 2015-11-01.