Skip to content

Commit 903f76d

Browse files
authored
Merge pull request Azure#3531 from mihymel/dev
Updating Azure SQL Transparent Data Encryption with BYOK support cmdl…
2 parents 6132ebf + 38491a2 commit 903f76d

File tree

13 files changed

+31
-30
lines changed

13 files changed

+31
-30
lines changed

src/ResourceManager/Sql/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020
## Current Release
2121
* Bug fix - Auditing and Threat Detection cmdlets now return a meangfull error instead of null refernce error.
22+
* Updating Transparent Data Encryption (TDE) with Bring Your Own Key (BYOK) support cmdlets for updated API.
2223

2324
## Version 2.6.0
2425
* Adding new cmdlets for support for Azure SQL feature Transparent Data Encryption (TDE) with Bring Your Own Key (BYOK) Support

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.Sql">
73-
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.53.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
73+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.54.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
74+
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="Microsoft.Azure.Management.Storage">
7777
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerKeyVaultKeyTests/TestServerKeyVaultKeyAdd.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
"RequestUri": "/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk4934/providers/Microsoft.Sql/servers/onesdk8106/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106?api-version=2015-05-01-preview",
530530
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMGFhYzFjOTAtMmIyMi00MWFhLWE5ODMtNWI5M2MyYWZhMTcxL3Jlc291cmNlR3JvdXBzL29uZXNkazQ5MzQvcHJvdmlkZXJzL01pY3Jvc29mdC5TcWwvc2VydmVycy9vbmVzZGs4MTA2L2tleXMvYWt2dGRla2V5dmF1bHRfa2V5MV81MWMyZmFiOWZmM2M0YTE3YWFiNGNkNTFiOTMyYjEwNj9hcGktdmVyc2lvbj0yMDE1LTA1LTAxLXByZXZpZXc=",
531531
"RequestMethod": "PUT",
532-
"RequestBody": "{\r\n \"properties\": {\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"AzureKeyVault\"\r\n }\r\n}",
532+
"RequestBody": "{\r\n \"properties\": {\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"serverKeyType\": \"AzureKeyVault\"\r\n }\r\n}",
533533
"RequestHeaders": {
534534
"Content-Type": [
535535
"application/json; charset=utf-8"
@@ -670,7 +670,7 @@
670670
"f98a58f9-1a79-40ef-8756-920ff14ff5e2"
671671
]
672672
},
673-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk4934/providers/Microsoft.Sql/servers/onesdk8106/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"type\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:38:53.887Z\"\r\n }\r\n}",
673+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk4934/providers/Microsoft.Sql/servers/onesdk8106/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"serverKeyType\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:38:53.887Z\"\r\n }\r\n}",
674674
"ResponseHeaders": {
675675
"Content-Length": [
676676
"562"

src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerKeyVaultKeyTests/TestServerKeyVaultKeyGet.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
"RequestUri": "/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk7849/providers/Microsoft.Sql/servers/onesdk5823/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106?api-version=2015-05-01-preview",
530530
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMGFhYzFjOTAtMmIyMi00MWFhLWE5ODMtNWI5M2MyYWZhMTcxL3Jlc291cmNlR3JvdXBzL29uZXNkazc4NDkvcHJvdmlkZXJzL01pY3Jvc29mdC5TcWwvc2VydmVycy9vbmVzZGs1ODIzL2tleXMvYWt2dGRla2V5dmF1bHRfa2V5MV81MWMyZmFiOWZmM2M0YTE3YWFiNGNkNTFiOTMyYjEwNj9hcGktdmVyc2lvbj0yMDE1LTA1LTAxLXByZXZpZXc=",
531531
"RequestMethod": "PUT",
532-
"RequestBody": "{\r\n \"properties\": {\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"AzureKeyVault\"\r\n }\r\n}",
532+
"RequestBody": "{\r\n \"properties\": {\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"serverKeyType\": \"AzureKeyVault\"\r\n }\r\n}",
533533
"RequestHeaders": {
534534
"Content-Type": [
535535
"application/json; charset=utf-8"
@@ -670,7 +670,7 @@
670670
"ffcc3c18-bc0d-4f44-ad42-5babca56f2cf"
671671
]
672672
},
673-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk7849/providers/Microsoft.Sql/servers/onesdk5823/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"type\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:44:25.593Z\"\r\n }\r\n}",
673+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk7849/providers/Microsoft.Sql/servers/onesdk5823/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"serverKeyType\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:44:25.593Z\"\r\n }\r\n}",
674674
"ResponseHeaders": {
675675
"Content-Length": [
676676
"562"
@@ -724,7 +724,7 @@
724724
"c549cfed-55e0-4a26-b7aa-0d569e5f9143"
725725
]
726726
},
727-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk7849/providers/Microsoft.Sql/servers/onesdk5823/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"type\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:44:25.593Z\"\r\n }\r\n}",
727+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk7849/providers/Microsoft.Sql/servers/onesdk5823/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"serverKeyType\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:44:25.593Z\"\r\n }\r\n}",
728728
"ResponseHeaders": {
729729
"Content-Length": [
730730
"562"

src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerKeyVaultKeyTests/TestServerKeyVaultKeyRemove.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
"RequestUri": "/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk5188/providers/Microsoft.Sql/servers/onesdk516/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106?api-version=2015-05-01-preview",
530530
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMGFhYzFjOTAtMmIyMi00MWFhLWE5ODMtNWI5M2MyYWZhMTcxL3Jlc291cmNlR3JvdXBzL29uZXNkazUxODgvcHJvdmlkZXJzL01pY3Jvc29mdC5TcWwvc2VydmVycy9vbmVzZGs1MTYva2V5cy9ha3Z0ZGVrZXl2YXVsdF9rZXkxXzUxYzJmYWI5ZmYzYzRhMTdhYWI0Y2Q1MWI5MzJiMTA2P2FwaS12ZXJzaW9uPTIwMTUtMDUtMDEtcHJldmlldw==",
531531
"RequestMethod": "PUT",
532-
"RequestBody": "{\r\n \"properties\": {\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"AzureKeyVault\"\r\n }\r\n}",
532+
"RequestBody": "{\r\n \"properties\": {\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"serverKeyType\": \"AzureKeyVault\"\r\n }\r\n}",
533533
"RequestHeaders": {
534534
"Content-Type": [
535535
"application/json; charset=utf-8"
@@ -670,7 +670,7 @@
670670
"adf9e986-b6c3-46e4-b0af-52454268d7ba"
671671
]
672672
},
673-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk5188/providers/Microsoft.Sql/servers/onesdk516/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"type\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:57:09.7Z\"\r\n }\r\n}",
673+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk5188/providers/Microsoft.Sql/servers/onesdk516/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"serverKeyType\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:57:09.7Z\"\r\n }\r\n}",
674674
"ResponseHeaders": {
675675
"Content-Length": [
676676
"559"
@@ -724,7 +724,7 @@
724724
"a9ec9d09-606c-4af8-9375-651abbce886f"
725725
]
726726
},
727-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk5188/providers/Microsoft.Sql/servers/onesdk516/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"type\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:57:09.7Z\"\r\n }\r\n}",
727+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk5188/providers/Microsoft.Sql/servers/onesdk516/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"serverKeyType\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:57:09.7Z\"\r\n }\r\n}",
728728
"ResponseHeaders": {
729729
"Content-Length": [
730730
"559"
@@ -778,7 +778,7 @@
778778
"c1ae0720-552d-43d4-ba6a-703332c47ccb"
779779
]
780780
},
781-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk5188/providers/Microsoft.Sql/servers/onesdk516/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"type\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:57:09.7Z\"\r\n }\r\n}",
781+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk5188/providers/Microsoft.Sql/servers/onesdk516/keys/akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"name\": \"akvtdekeyvault_key1_51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"type\": \"Microsoft.Sql/servers/keys\",\r\n \"location\": \"SouthEast Asia\",\r\n \"kind\": \"azurekeyvault\",\r\n \"properties\": {\r\n \"serverKeyType\": \"AzureKeyVault\",\r\n \"uri\": \"https://akvtdekeyvault.vault.azure.net/keys/key1/51c2fab9ff3c4a17aab4cd51b932b106\",\r\n \"thumbprint\": \"8FD889928BFF1BC8A1B457FEFAECDEAD9E6FCF3D\",\r\n \"creationDate\": \"2017-01-24T23:57:09.7Z\"\r\n }\r\n}",
782782
"ResponseHeaders": {
783783
"Content-Length": [
784784
"559"

src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests/TestServerTransparentDataEncryptionProtectorGet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
"db1ead1e-0706-4e7e-8d49-82842d281e74"
539539
]
540540
},
541-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk8964/providers/Microsoft.Sql/servers/onesdk458/encryptionProtector/current\",\r\n \"name\": \"current\",\r\n \"type\": \"Microsoft.Sql/servers/encryptionProtector\",\r\n \"kind\": \"servicemanaged\",\r\n \"properties\": {\r\n \"serverKeyName\": \"ServiceManaged\",\r\n \"type\": \"ServiceManaged\"\r\n }\r\n}",
541+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/0aac1c90-2b22-41aa-a983-5b93c2afa171/resourceGroups/onesdk8964/providers/Microsoft.Sql/servers/onesdk458/encryptionProtector/current\",\r\n \"name\": \"current\",\r\n \"type\": \"Microsoft.Sql/servers/encryptionProtector\",\r\n \"kind\": \"servicemanaged\",\r\n \"properties\": {\r\n \"serverKeyName\": \"ServiceManaged\",\r\n \"serverKeyType\": \"ServiceManaged\"\r\n }\r\n}",
542542
"ResponseHeaders": {
543543
"Content-Length": [
544544
"320"

0 commit comments

Comments
 (0)