Skip to content

Commit 2803ce5

Browse files
authored
Merge pull request #116229 from MashaMSFT/fix3
fixing things
2 parents e6059b0 + d18e6a0 commit 2803ce5

File tree

5 files changed

+33
-50
lines changed

5 files changed

+33
-50
lines changed

articles/azure-sql/database/always-encrypted-azure-key-vault-configure.md

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ ms.reviewer:
1414
ms.date: 04/23/2020
1515
---
1616
# Configure Always Encrypted using Azure Key Vault
17-
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
17+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb-sqlmi.md)]
1818

19-
This article shows you how to secure sensitive data in Azure SQL Database with data encryption using the [Always Encrypted Wizard](/sql/relational-databases/security/encryption/always-encrypted-wizard) in [SQL Server Management Studio (SSMS)](/sql/ssms/sql-server-management-studio-ssms). It also includes instructions that will show you how to store each encryption key in Azure Key Vault.
19+
This article shows you how to secure sensitive data for your database in Azure SQL Database or Azure SQL Managed Instance with data encryption using the [Always Encrypted Wizard](/sql/relational-databases/security/encryption/always-encrypted-wizard) in [SQL Server Management Studio (SSMS)](/sql/ssms/sql-server-management-studio-ssms). It also includes instructions that will show you how to store each encryption key in Azure Key Vault.
2020

2121
Always Encrypted is a data encryption technology that helps protect sensitive data at rest on the server, during movement between client and server, and while the data is in use. Always Encrypted ensures that sensitive data never appears as plaintext inside the database system. After you configure data encryption, only client applications or app servers that have access to the keys can access plaintext data. For detailed information, see [Always Encrypted (Database Engine)](https://msdn.microsoft.com/library/mt163865.aspx).
2222

2323
After you configure the database to use Always Encrypted, you will create a client application in C# with Visual Studio to work with the encrypted data.
2424

25-
Follow the steps in this article and learn how to set up Always Encrypted for Azure SQL Database. In this article you will learn how to perform the following tasks:
25+
Follow the steps in this article and learn how to set up Always Encrypted for your database in Azure SQL Database or SQL Managed Instance. In this article you will learn how to perform the following tasks:
2626

2727
- Use the Always Encrypted wizard in SSMS to create [Always Encrypted keys](https://msdn.microsoft.com/library/mt163865.aspx#Anchor_3).
2828
- Create a [column master key (CMK)](https://msdn.microsoft.com/library/mt146393.aspx).
@@ -34,14 +34,15 @@ Follow the steps in this article and learn how to set up Always Encrypted for Az
3434

3535

3636
- An Azure account and subscription. If you don't have one, sign up for a [free trial](https://azure.microsoft.com/pricing/free-trial/).
37+
- A database in [Azure SQL Database](single-database-create-quickstart.md) or [Azure SQL Managed Instance](../managed-instance/instance-create-quickstart.md).
3738
- [SQL Server Management Studio](https://msdn.microsoft.com/library/mt238290.aspx) version 13.0.700.242 or later.
3839
- [.NET Framework 4.6](https://msdn.microsoft.com/library/w0x726c2.aspx) or later (on the client computer).
3940
- [Visual Studio](https://www.visualstudio.com/downloads/download-visual-studio-vs.aspx).
4041
- [Azure PowerShell](/powershell/azure/overview) or [Azure CLI](/cli/azure/install-azure-cli)
4142

42-
## Enable your client application to access SQL Database
43+
## Enable client application access
4344

44-
You must enable your client application to access SQL Database by setting up an Azure Active Directory (AAD) application and copying the *Application ID* and *key* that you will need to authenticate your application.
45+
You must enable your client application to access SQL Database or SQL Managed Instance by setting up an Azure Active Directory (AAD) application and copying the *Application ID* and *key* that you will need to authenticate your application.
4546

4647
To get the *Application ID* and *key*, follow the steps in [create an Azure Active Directory application and service principal that can access resources](../../active-directory/develop/howto-create-service-principal-portal.md).
4748

@@ -98,28 +99,14 @@ az keyvault set-policy --name $vaultName --key-permissions get, list, sign, unwr
9899

99100
* * *
100101

101-
## Create a blank SQL database
102102

103-
1. Sign in to the [Azure portal](https://portal.azure.com/).
104-
2. Go to **Create a resource** > **Databases** > **SQL Database**.
105-
3. Create a **Blank** database named **Clinic** on a new or existing server. For detailed directions about how to create a database in the Azure portal, see [Your first Azure SQL Database](single-database-create-quickstart.md).
103+
## Connect with SSMS
106104

107-
![Create a blank database](./media/always-encrypted-azure-key-vault-configure/create-database.png)
108-
109-
You will need the connection string later in the tutorial, so after you create the database, browse to the new Clinic database and copy the connection string. You can get the connection string at any time, but it's easy to copy it in the Azure portal.
110-
111-
1. Go to **SQL databases** > **Clinic** > **Show database connection strings**.
112-
2. Copy the connection string for **ADO.NET**.
113-
114-
![Copy the connection string](./media/always-encrypted-azure-key-vault-configure/connection-strings.png)
115-
116-
## Connect to the database with SSMS
117-
118-
Open SSMS and connect to the server with the Clinic database.
105+
Open SQL Server Managed Studio (SSMS) and connect to the server or managed with your database.
119106

120107
1. Open SSMS. (Go to **Connect** > **Database Engine** to open the **Connect to Server** window if it isn't open.)
121108

122-
2. Enter your server name and credentials. The server name can be found on the SQL database blade and in the connection string you copied earlier. Type the complete server name, including *database.windows.net*.
109+
2. Enter your server name or instance name and credentials.
123110

124111
![Copy the connection string](./media/always-encrypted-azure-key-vault-configure/ssms-connect.png)
125112

@@ -130,7 +117,7 @@ If the **New Firewall Rule** window opens, sign in to Azure and let SSMS create
130117
In this section, you will create a table to hold patient data. It's not initially encrypted--you will configure encryption in the next section.
131118

132119
1. Expand **Databases**.
133-
2. Right-click the **Clinic** database and click **New Query**.
120+
2. Right-click the database and click **New Query**.
134121
3. Paste the following Transact-SQL (T-SQL) into the new query window and **Execute** it.
135122

136123
```sql
@@ -222,7 +209,7 @@ Run these two lines of code in the Package Manager Console:
222209

223210
## Modify your connection string to enable Always Encrypted
224211

225-
This section explains how to enable Always Encrypted in your database connection string.
212+
This section explains how to enable Always Encrypted in your database connection string.
226213

227214
To enable Always Encrypted, you need to add the **Column Encryption Setting** keyword to your connection string and set it to **Enabled**.
228215

@@ -604,7 +591,7 @@ Then add the *Column Encryption Setting=enabled* parameter during your connectio
604591

605592
## Next steps
606593

607-
After you create a database that uses Always Encrypted, you may want to do the following:
594+
After your database is configured to use Always Encrypted, you may want to do the following:
608595

609596
- [Rotate and clean up your keys](https://msdn.microsoft.com/library/mt607048.aspx).
610597
- [Migrate data that is already encrypted with Always Encrypted](https://msdn.microsoft.com/library/mt621539.aspx).

articles/azure-sql/database/always-encrypted-certificate-store-configure.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ ms.reviwer:
1414
ms.date: 04/23/2020
1515
---
1616
# Configure Always Encrypted using Windows certificate store
17-
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
17+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb-sqlmi.md)]
1818

19-
This tutorial shows you how to secure sensitive data in Azure SQL Database with database encryption by using the [Always Encrypted Wizard](/sql/relational-databases/security/encryption/always-encrypted-wizard) in [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/hh213248.aspx). It also shows you how to store your encryption keys in the Windows certificate store.
19+
This tutorial shows you how to secure sensitive data in a database in Azure SQL Database or Azure SQL Managed Instance with database encryption using the [Always Encrypted Wizard](/sql/relational-databases/security/encryption/always-encrypted-wizard) in [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/hh213248.aspx). It also shows you how to store your encryption keys in the Windows certificate store.
2020

2121
Always Encrypted is a data encryption technology that helps protect sensitive data at rest on the server, during movement between client and server, and while the data is in use, ensuring that sensitive data never appears as plaintext inside the database system. After you encrypt data, only client applications or app servers that have access to the keys can access plaintext data. For detailed information, see [Always Encrypted (Database Engine)](https://msdn.microsoft.com/library/mt163865.aspx).
2222

2323
After configuring the database to use Always Encrypted, you will create a client application in C# with Visual Studio to work with the encrypted data.
2424

25-
Follow the steps in this article to learn how to set up Always Encrypted for Azure SQL Database. In this article, you will learn how to perform the following tasks:
25+
Follow the steps in this article to learn how to set up Always Encrypted for SQL Database or SQL Managed Instance. In this article, you will learn how to perform the following tasks:
2626

2727
* Use the Always Encrypted wizard in SSMS to create [Always Encrypted Keys](https://msdn.microsoft.com/library/mt163865.aspx#Anchor_3).
2828
* Create a [Column Master Key (CMK)](https://msdn.microsoft.com/library/mt146393.aspx).
@@ -35,31 +35,25 @@ Follow the steps in this article to learn how to set up Always Encrypted for Azu
3535
For this tutorial, you'll need:
3636

3737
* An Azure account and subscription. If you don't have one, sign up for a [free trial](https://azure.microsoft.com/pricing/free-trial/).
38+
- A database in [Azure SQL Database](single-database-create-quickstart.md) or [Azure SQL Managed Instance](../managed-instance/instance-create-quickstart.md).
3839
* [SQL Server Management Studio](https://msdn.microsoft.com/library/mt238290.aspx) version 13.0.700.242 or later.
3940
* [.NET Framework 4.6](https://msdn.microsoft.com/library/w0x726c2.aspx) or later (on the client computer).
4041
* [Visual Studio](https://www.visualstudio.com/downloads/download-visual-studio-vs.aspx).
4142

42-
## Create a blank SQL database
43+
## Enable client application access
4344

44-
1. Sign in to the [Azure portal](https://portal.azure.com/).
45-
2. Click **Create a resource** > **Data + Storage** > **SQL Database**.
46-
3. Create a **Blank** database named **Clinic** on a new or existing server. For detailed instructions about creating a database in the Azure portal, see [Your first Azure SQL Database](single-database-create-quickstart.md).
45+
You must enable your client application to access SQL Database or SQL Managed Instance by setting up an Azure Active Directory (AAD) application and copying the *Application ID* and *key* that you will need to authenticate your application.
4746

48-
![Create a blank database](./media/always-encrypted-certificate-store-configure/create-database.png)
47+
To get the *Application ID* and *key*, follow the steps in [create an Azure Active Directory application and service principal that can access resources](../../active-directory/develop/howto-create-service-principal-portal.md).
4948

50-
You will need the connection string later in the tutorial. After the database is created, go to the new **Clinic** database and copy the connection string. You can get the connection string at any time, but it's easy to copy it when you're in the Azure portal.
5149

52-
1. Click **SQL databases** > **Clinic** > **Show database connection strings**.
53-
2. Copy the connection string for **ADO.NET**.
5450

55-
![Copy the connection string](./media/always-encrypted-certificate-store-configure/connection-strings.png)
51+
## Connect with SSMS
5652

57-
## Connect to the database with SSMS
58-
59-
Open SSMS and connect to the server with the Clinic database.
53+
Open SQL Server Managed Studio (SSMS) and connect to the server or managed with your database.
6054

6155
1. Open SSMS. (Click **Connect** > **Database Engine** to open the **Connect to Server** window if it is not open).
62-
2. Enter your server name and credentials. The server name can be found on the **SQL database** blade and in the connection string you copied earlier. Type the complete server name including *database.windows.net*.
56+
2. Enter your server name and credentials.
6357

6458
![Copy the connection string](./media/always-encrypted-certificate-store-configure/ssms-connect.png)
6559

articles/azure-sql/database/automation-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.reviewer: carlrab
1313
ms.date: 03/12/2019
1414
---
1515
# Managing Azure SQL Database using Azure Automation
16-
[!INCLUDE[appliesto-sqldb-sqlmi](../includes/appliesto-sqldb-sqlmi.md)]
16+
[!INCLUDE[appliesto-sqldb-sqlmi](../includes/appliesto-sqldb.md)]
1717

1818
This guide will introduce you to the Azure Automation service, and how it can be used to simplify management of databases in Azure SQL database.
1919

articles/azure-sql/database/doc-changes-updates-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Documentation for Azure SQL Database and Azure SQL Managed Instance has been spl
2323

2424
We've done this because some features and functionality vary greatly between a single database and managed instance, and it's become increasingly more of a challenge to explain complex nuances between Azure SQL Database and Azure SQL Managed Instance in individual 'shared' articles.
2525

26-
This clarification between the different Azure SQL products should simplify and streamline the process of working with SQL in Azure, whether that be a single managed database in Azure SQL Database, a fully-fledged managed instance hosting multiple databases in Azure SQL Managed Instance, or the familiar on-premises SQL Server product but hosted on a virtual machine in Azure.
26+
This clarification between the different Azure SQL products should simplify and streamline the process of working with the SQL Server database engine in Azure, whether that be a single managed database in Azure SQL Database, a fully-fledged managed instance hosting multiple databases in Azure SQL Managed Instance, or the familiar on-premises SQL Server product but hosted on a virtual machine in Azure.
2727

2828
Consider that this is a work in progress and not every document has been updated yet. For example, Transact-SQL (T-SQL) statements, stored procedures, and many features shared between Azure SQL Database and Azure SQL Managed Instance are not yet complete, so please bear with us!
2929

articles/azure-sql/toc.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@
146146
href: database/transparent-data-encryption-byok-configure.md
147147
- name: Store vulnerability scans in storage
148148
href: database/sql-database-vulnerability-assessment-storage.md
149+
- name: Always Encrypted
150+
items:
151+
- name: Use the Azure key vault
152+
href: database/always-encrypted-azure-key-vault-configure.md
153+
- name: Use the certificate store
154+
href: database/always-encrypted-certificate-store-configure.md
149155

150156

151157
- name: Monitor & tune
@@ -236,6 +242,7 @@
236242
href: database/service-tiers-prs.md
237243

238244
- name: Quickstarts
245+
href: database/quickstart-content-reference-guide.md
239246
items:
240247
- name: Create database
241248
items:
@@ -348,7 +355,7 @@
348355
- name: Azure SQL Auditing
349356
href: database/auditing-overview.md
350357
- name: Audit log format
351-
href: database/audit-log-format.md
358+
href: database/audit-log-format.md
352359
- name: Network access controls
353360
href: database/network-access-controls-overview.md
354361
- name: DNS aliases
@@ -491,12 +498,6 @@
491498
href: database/firewall-configure.md
492499
- name: vNet endpoints - PowerShell
493500
href: database/scripts/vnet-service-endpoint-rule-powershell-create.md
494-
- name: Always Encrypted
495-
items:
496-
- name: Use the certificate store
497-
href: database/always-encrypted-certificate-store-configure.md
498-
- name: Use the Azure key vault
499-
href: database/always-encrypted-azure-key-vault-configure.md
500501

501502
- name: Business continuity
502503
items:
@@ -697,6 +698,7 @@
697698
- name: Release notes
698699
href: database/doc-changes-updates-release-notes.md?&tabs=managed-instance
699700
- name: Quickstarts
701+
href: managed-instance/quickstart-content-reference-guide.md
700702
items:
701703
- name: Create
702704
items:

0 commit comments

Comments
 (0)