From 7ff0402ed8f59f7250f6101f2397858f0b73889e Mon Sep 17 00:00:00 2001 From: Santosh Kulkarni <66682828+kr-santosh@users.noreply.github.com> Date: Fri, 25 Feb 2022 05:52:09 +0000 Subject: [PATCH 1/4] Add new algorithm field to KeyWrapMetadata. --- package-lock.json | 2 +- .../preview/2021-11-15-preview/cosmos-db.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 251071956c75..3af4d45ae15b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3839,4 +3839,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/cosmos-db.json index d027269b0bd7..2e559f0e2b07 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/cosmos-db.json @@ -8179,6 +8179,10 @@ "value": { "type": "string", "description": "Reference / link to the KeyEncryptionKey." + }, + "algorithm": { + "type": "string", + "description": "Algorithm used in wrapping and unwrapping of the data encryption key." } } }, From f7281b90eb87f77b5200c29b0443fe91e6ff41b0 Mon Sep 17 00:00:00 2001 From: Santosh Kulkarni <66682828+kr-santosh@users.noreply.github.com> Date: Fri, 25 Feb 2022 06:00:35 +0000 Subject: [PATCH 2/4] Updated Client Encryption Key examples. --- package-lock.json | 2 +- .../CosmosDBSqlClientEncryptionKeyCreateUpdate.json | 6 ++++-- .../examples/CosmosDBSqlClientEncryptionKeyGet.json | 3 ++- .../examples/CosmosDBSqlClientEncryptionKeysList.json | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3af4d45ae15b..251071956c75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3839,4 +3839,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json index 7407a34663fd..978717b681af 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json @@ -15,7 +15,8 @@ "keyWrapMetadata": { "name": "customerManagedKey", "type": "AzureKeyVault", - "value": "AzureKeyVault Key URL" + "value": "AzureKeyVault Key URL", + "algorithm": "RSA_OAEP" } } } @@ -35,7 +36,8 @@ "keyWrapMetadata": { "name": "customerManagedKey", "type": "AzureKeyVault", - "value": "AzureKeyVault Key URL" + "value": "AzureKeyVault Key URL", + "algorithm": "AZURE_KEY_VAULT" }, "_rid": "tNc4AAAAAAAQkjzWAgAAAA==", "_ts": 1626425552, diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json index 6a4c0907eff0..899a41d4d10e 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json @@ -21,7 +21,8 @@ "keyWrapMetadata": { "name": "customerManagedKey", "type": "AzureKeyVault", - "value": "AzureKeyVault Key URL" + "value": "AzureKeyVault Key URL", + "algorithm": "RSA_OAEP" }, "_rid": "tNc4AAAAAAAQkjzWAgAAAA==", "_ts": 1626425552, diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json index 78d8d467923a..b23882ecc075 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json @@ -22,7 +22,8 @@ "keyWrapMetadata": { "name": "customerManagedKey1", "type": "AzureKeyVault", - "value": "AzureKeyVault Key URL for customerManagedKey1" + "value": "AzureKeyVault Key URL for customerManagedKey1", + "algorithm": "RSA_OAEP" }, "_rid": "nAMyAAAAAADPw1kKAgAAAA==", "_ts": 1626425552, From 1cf0953c2d36abc6f11eb6be795d7852b69104c6 Mon Sep 17 00:00:00 2001 From: Santosh Kulkarni <66682828+kr-santosh@users.noreply.github.com> Date: Fri, 25 Feb 2022 06:02:37 +0000 Subject: [PATCH 3/4] fixed algorithm in example. --- .../examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json index 978717b681af..434bc81f3811 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json @@ -37,7 +37,7 @@ "name": "customerManagedKey", "type": "AzureKeyVault", "value": "AzureKeyVault Key URL", - "algorithm": "AZURE_KEY_VAULT" + "algorithm": "RSA_OAEP" }, "_rid": "tNc4AAAAAAAQkjzWAgAAAA==", "_ts": 1626425552, From 5931b1ea135e17c13b9e3789844a6f4f6fccec42 Mon Sep 17 00:00:00 2001 From: Santosh Kulkarni <66682828+kr-santosh@users.noreply.github.com> Date: Fri, 25 Feb 2022 06:14:37 +0000 Subject: [PATCH 4/4] fixed algo name. --- .../examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json | 4 ++-- .../examples/CosmosDBSqlClientEncryptionKeyGet.json | 2 +- .../examples/CosmosDBSqlClientEncryptionKeysList.json | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json index 434bc81f3811..f9b4d2a77485 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyCreateUpdate.json @@ -16,7 +16,7 @@ "name": "customerManagedKey", "type": "AzureKeyVault", "value": "AzureKeyVault Key URL", - "algorithm": "RSA_OAEP" + "algorithm": "RSA-OAEP" } } } @@ -37,7 +37,7 @@ "name": "customerManagedKey", "type": "AzureKeyVault", "value": "AzureKeyVault Key URL", - "algorithm": "RSA_OAEP" + "algorithm": "RSA-OAEP" }, "_rid": "tNc4AAAAAAAQkjzWAgAAAA==", "_ts": 1626425552, diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json index 899a41d4d10e..293f767419f7 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeyGet.json @@ -22,7 +22,7 @@ "name": "customerManagedKey", "type": "AzureKeyVault", "value": "AzureKeyVault Key URL", - "algorithm": "RSA_OAEP" + "algorithm": "RSA-OAEP" }, "_rid": "tNc4AAAAAAAQkjzWAgAAAA==", "_ts": 1626425552, diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json index b23882ecc075..ca7691c7d19d 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-11-15-preview/examples/CosmosDBSqlClientEncryptionKeysList.json @@ -23,7 +23,7 @@ "name": "customerManagedKey1", "type": "AzureKeyVault", "value": "AzureKeyVault Key URL for customerManagedKey1", - "algorithm": "RSA_OAEP" + "algorithm": "RSA-OAEP" }, "_rid": "nAMyAAAAAADPw1kKAgAAAA==", "_ts": 1626425552, @@ -43,7 +43,8 @@ "keyWrapMetadata": { "name": "customerManagedKey2", "type": "AzureKeyVault", - "value": "AzureKeyVault Key URL for customerManagedKey2" + "value": "AzureKeyVault Key URL for customerManagedKey2", + "algorithm": "RSA-OAEP" }, "_rid": "nAMyAAAAAAAWWfxHAgAAAA==", "_ts": 1626425631,