Merge pull request #26966 from MicrosoftDocs/main

v-alje · web-flow · commit 41cf5b7c7691 · 2023-05-03T15:31:52.000-07:00
05/03 PM Publishing
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -66,6 +66,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "terraform_samples",
+      "url": "https://github.com/Azure/terraform",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure",
       "url": "https://github.com/MicrosoftDocs/azure-docs-pr",
diff --git a/azure-sql/database/high-availability-sla.md b/azure-sql/database/high-availability-sla.md
@@ -122,7 +122,18 @@ The zone-redundant version of the high availability architecture for the General
 
 Consider the following when configuring your General Purpose databases with zone-redundancy: 
 
-- For General Purpose tier the zone-redundant configuration is Generally Available in the following regions: West Europe, North Europe, West US 2, France Central, East US 2, East US, Southeast Asia & Qatar Central. This is in preview in the following regions: Australia East, Japan East, and UK South.  
+- For General Purpose tier the zone-redundant configuration is Generally Available in the following regions: 
+  - (Asia Pacific) Australia East
+  - (Asia Pacific) Southeast Asia  
+  - (Europe) France Central
+  - (Europe) North Europe
+  - (Europe) West Europe
+  - (Europe) UK South
+  - (Middle East) Qatar Central
+  - (North America) East US
+  - (North America) East US 2
+  - (North America) West US 2   
+- It is in preview in the following region: Japan East.
 - For zone redundant availability, choosing a [maintenance window](maintenance-window.md) other than the default is currently available in [select regions](maintenance-window.md#azure-region-support).  
 - Zone-redundant configuration is only available in SQL Database when standard-series (Gen5) hardware is selected. 
 - Zone-redundancy is not available for Basic and Standard service tiers in the DTU purchasing model. 
diff --git a/azure-sql/database/single-database-create-terraform-quickstart.md b/azure-sql/database/single-database-create-terraform-quickstart.md
@@ -0,0 +1,132 @@
+---
+title: 'Quickstart: Create an Azure SQL Database server and database using Terraform'
+description: In this article, you create an Azure SQL Database server and database using Terraform.
+ms.topic: quickstart
+ms.service: sql-database
+ms.subservice: deployment-configuration
+ms.custom: devx-track-terraform, ai-gen-docs
+author: TomArcherMsft
+ms.author: tarcher
+ms.date: 5/03/2023
+---
+
+# Quickstart: Create an Azure SQL Database server and database using Terraform
+
+Creating a [single database](single-database-overview.md) is the quickest and simplest option to create a database in Azure SQL Database. This quickstart shows you how to create a single database using Terraform.
+
+[!INCLUDE [Terraform abstract](~/../azure-dev-docs-pr/articles/terraform/includes/abstract.md)]
+
+In this article, you learn how to:
+
+> [!div class="checklist"]
+> * Create a random value for the Azure resource group name using [random_pet](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet).
+> * Create an Azure resource group using [azurerm_resource_group](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group).
+> * Create a random value for the [logical server in Azure](logical-servers.md) using [random_pet](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet).
+> * Create a random password for the [logical server in Azure](logical-servers.md) using [random_password](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password).
+> * Create a [logical server in Azure](logical-servers.md) using [azurerm_mssql_server](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/mssql_server).
+> * Create a database in Azure SQL Database using [azurerm_mssql_database](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/mssql_database).
+
+[!INCLUDE [AI attribution](~/../azure/includes/ai-generated-attribution.md)]
+
+## Prerequisites
+
+- [Install and configure Terraform](/azure/developer/terraform/quickstart-configure)
+
+## Implement the Terraform code
+
+> [!NOTE]
+> The sample code for this article is located in the [Azure Terraform GitHub repo](https://github.com/Azure/terraform/tree/master/quickstart/101-sql-database). You can view the log file containing the [test results from current and previous versions of Terraform](https://github.com/Azure/terraform/tree/master/quickstart//101-sql-database/TestRecord.md).
+> 
+> See more [articles and sample code showing how to use Terraform to manage Azure resources](/azure/terraform)
+
+1. Create a directory in which to test and run the sample Terraform code and make it the current directory.
+
+1. Create a file named `providers.tf` and insert the following code:
+
+    [!code-terraform[master](~/../terraform_samples/quickstart/101-sql-database//providers.tf)]
+
+1. Create a file named `main.tf` and insert the following code:
+
+    [!code-terraform[master](~/../terraform_samples/quickstart/101-sql-database//main.tf)]
+
+1. Create a file named `variables.tf` and insert the following code:
+
+    [!code-terraform[master](~/../terraform_samples/quickstart/101-sql-database//variables.tf)]
+
+1. Create a file named `outputs.tf` and insert the following code:
+
+    [!code-terraform[master](~/../terraform_samples/quickstart/101-sql-database//outputs.tf)]
+
+## Initialize Terraform
+
+[!INCLUDE [terraform-init.md](~/../azure-dev-docs-pr/articles/terraform/includes/terraform-init.md)]
+
+## Create a Terraform execution plan
+
+[!INCLUDE [terraform-plan.md](~/../azure-dev-docs-pr/articles/terraform/includes/terraform-plan.md)]
+
+## Apply a Terraform execution plan
+
+[!INCLUDE [terraform-apply-plan.md](~/../azure-dev-docs-pr/articles/terraform/includes/terraform-apply-plan.md)]
+
+## Verify the results
+
+#### [Azure CLI](#tab/azure-cli)
+
+1. Get the Azure resource group name.
+
+    ```console
+    resource_group_name=$(terraform output -raw resource_group_name)
+    ```
+
+1. Get the new logical server name.
+
+    ```console
+   sql_server_name=$(terraform output -raw sql_server_name)
+    ```
+
+1. Run [az sql db list](http://cli/azure/sql/db#az-sql-db-list) to display the names of all the databases in your server.
+
+    ```azurecli
+    az sql db list \
+    --resource-group $resource_group_name \
+    --server $sql_server_name \
+    --output table
+    ```
+
+#### [Azure PowerShell](#tab/azure-powershell)
+
+1. Get the Azure resource group name.
+
+    ```console
+    $resource_group_name=$(terraform output -raw resource_group_name)
+    ```
+
+1. Get the new logical server name.
+
+    ```console
+    $sql_server_name=$(terraform output -raw sql_server_name)
+    ```
+
+1. Run [Get-AzSqlDatabase](/powershell/module/az.sql/get-azsqldatabase) to display the names of all the databases in your server.
+
+    ```azurepowershell
+     Get-AzSqlDatabase -ResourceGroupName $resource_group_name `
+                       -ServerName $sql_server_name `
+                       | Format-Table
+    ```
+
+---
+
+## Clean up resources
+
+[!INCLUDE [terraform-plan-destroy.md](~/../azure-dev-docs-pr/articles/terraform/includes/terraform-plan-destroy.md)]
+
+## Troubleshoot Terraform on Azure
+
+[Troubleshoot common problems when using Terraform on Azure](/azure/developer/terraform/troubleshoot)
+
+## Next steps
+
+> [!div class="nextstepaction"]
+> [Create a server-level firewall rule](firewall-create-server-level-portal-quickstart.md)
diff --git a/azure-sql/toc.yml b/azure-sql/toc.yml
@@ -298,6 +298,8 @@
       - name: ARM template
         displayName: Resource Manager
         href: database/single-database-create-arm-template-quickstart.md
+      - name: Terraform
+        href: database/single-database-create-terraform-quickstart.md
       - name: With ledger and digest storage
         displayName: Create Azure SQL Database with ledger
         href: database/ledger-create-a-single-database-with-ledger-enabled.md
diff --git a/docs/azure-data-studio/extensions/add-extensions.md b/docs/azure-data-studio/extensions/add-extensions.md
@@ -4,7 +4,7 @@ description: Learn how to add functionality to Azure Data Studio by selecting an
 author: markingmyname
 ms.author: maghan
 ms.reviewer: erinstellato, randolphwest
-ms.date: 12/16/2022
+ms.date: 05/02/2023
 ms.service: azure-data-studio
 ms.topic: conceptual
 ---
@@ -101,6 +101,10 @@ You can sort extensions with the `@sort` filter, which can take the following va
 - `rating` - Sort by extension gallery rating (1-5 stars), in descending order.
 - `name` - Sort alphabetically by extension name.
 
+## Troubleshooting and Support for extensions
+
+To obtain troubleshooting help and support for extensions that you add to Azure Data Studio, please refer to the extension `Details` or `Documentation` page inside Azure Data Studio. The extension author(s) will publish instructions on how to get support if the extension encounters a problem. Authors of a given extension may be from the third-party community.
+
 ## Common questions
 
 ### Where are extensions installed?
diff --git a/docs/relational-databases/system-stored-procedures/sys-sp-copy-data-in-batches-transact-sql.md b/docs/relational-databases/system-stored-procedures/sys-sp-copy-data-in-batches-transact-sql.md
@@ -1,39 +1,43 @@
 ---
 title: "sys.sp_copy_data_in_batches (Transact-SQL)"
-description: "sys.sp_copy_data_in_batches (Transact-SQL)"
+description: "Copies data from the source table to the target table after verifying that their schema is identical in terms of number of columns, column names and their data types."
 author: VanMSFT
 ms.author: vanto
-ms.date: "05/24/2022"
+ms.reviewer: randolphwest
+ms.date: 05/03/2023
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"
 dev_langs:
   - "TSQL"
 monikerRange: "= azuresqldb-current||>= sql-server-ver16||>= sql-server-linux-ver16"
 ---
-
 # sys.sp_copy_data_in_batches (Transact-SQL)
 
 [!INCLUDE [SQL Server 2022 Azure SQL Database](../../includes/applies-to-version/sqlserver2022-asdb.md)]
 
-Copies data from the source table to the target table after verifying that their schema is identical in terms of number of columns, column names and their data types. `TRANSACTION ID`, `SEQUENCE NUMBER`, and `GENERATED ALWAYS` columns are ignored since they're system generated and this allows copying data from a regular table to a ledger table and vice versa. Indexes between the tables can be different but the target table can only be a Heap or have a clustered index. The data is copied in batches in individual transactions. If the operation fails, the target table will be partially populated.
+Copies data from the source table to the target table after verifying that their schema is identical in terms of number of columns, column names and their data types. `TRANSACTION ID`, `SEQUENCE NUMBER`, and `GENERATED ALWAYS` columns are ignored since they're system generated and this allows copying data from a regular table to a ledger table and vice versa. Indexes between the tables can be different but the target table can only be a heap or have a clustered index. The data is copied in batches in individual transactions. If the operation fails, the target table is partially populated.
+
+For more information on database ledger, see [Ledger](/azure/azure-sql/database/ledger-overview).
 
-For more information on database ledger, see [Ledger](/azure/azure-sql/database/ledger-overview)
+:::image type="icon" source="../../includes/media/topic-link-icon.svg" border="false"::: [Transact-SQL syntax conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)
 
-:::image type="icon" source="../../includes/media/topic-link-icon.svg" border="false"::: [Transact-SQL syntax conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md) 
+## Syntax
 
-## Syntax  
-  
 ```syntaxsql
-sp_copy_data_in_batches [@source_table_name = ] N'source_table_name' , [@target_table_name = ] N'target_table_name'
+sp_copy_data_in_batches
+     [ @source_table_name = ] N'source_table_name'
+     , [ @target_table_name = ] N'target_table_name'
 ```
 
 ## Arguments
 
-[ @source_table_name = ] N'source_table_name'
+#### [ @source_table_name = ] N'*source_table_name*'
+
 The name of the table to be used as the source of the data copy.
 
-[ @target_table_name = ] N'target_table_name'
+#### [ @target_table_name = ] N'*target_table_name*'
+
 The name of the table to be used as the target of the data copy.
 
 ## Return code values
@@ -46,9 +50,9 @@ None.
 
 ## Permissions
 
-This operation requires **SELECT** on the source table, **INSERT** in the target table, and **ALTER** on the target table if there are Foreign Key or Check constraints that will be disabled or an Identity column that will be adjusted.
+This operation requires **SELECT** on the source table, **INSERT** in the target table, and **ALTER** on the target table if there are foreign key or check constraints that will be disabled, or an identity column that will be adjusted.
 
-## See also
+## Next steps
 
 - [Ledger considerations and limitations](../security/ledger/ledger-limits.md)
 - [Ledger overview](../security/ledger/ledger-overview.md)
diff --git a/docs/relational-databases/system-stored-procedures/sys-sp-generate-database-ledger-digest-transact-sql.md b/docs/relational-databases/system-stored-procedures/sys-sp-generate-database-ledger-digest-transact-sql.md
@@ -1,60 +1,62 @@
 ---
 title: "sys.sp_generate_database_ledger_digest (Transact-SQL)"
-description: "sys.sp_generate_database_ledger_digest (Transact-SQL)"
+description: "Generates the ledger digest, which is the hash of the last block in sys.database_ledger_blocks."
 author: VanMSFT
 ms.author: vanto
-ms.date: "05/24/2022"
+ms.reviewer: randolphwest
+ms.date: 05/03/2023
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"
 dev_langs:
   - "TSQL"
 monikerRange: "= azuresqldb-current||>= sql-server-ver16||>= sql-server-linux-ver16"
 ---
-
 # sys.sp_generate_database_ledger_digest (Transact-SQL)
 
 [!INCLUDE [SQL Server 2022 Azure SQL Database](../../includes/applies-to-version/sqlserver2022-asdb.md)]
 
-Generates the ledger digest, which is the hash of the last block in sys.database_ledger_blocks. If the last block is open (transactions have been grouped to the block but no final block hash has been generated), this stored procedure will close the block and generate the hash. Future transactions will then be assigned to the next block.
+Generates the ledger digest, which is the hash of the last block in `sys.database_ledger_blocks`. If the last block is open (transactions have been grouped to the block but no final block hash has been generated), this stored procedure closes the block and generates the hash. Future transactions will then be assigned to the next block.
+
+:::image type="icon" source="../../includes/media/topic-link-icon.svg" border="false"::: [Transact-SQL syntax conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)
 
-:::image type="icon" source="../../includes/media/topic-link-icon.svg" border="false"::: [Transact-SQL syntax conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md) 
+## Syntax
 
-## Syntax  
-  
 ```syntaxsql
-EXEC sys.sp_generate_database_ledger_digest
+sys.sp_generate_database_ledger_digest
 ```
+
 ## Arguments
-None
+
+None.
 
 ## Return code values
 
 0 (success) or 1 (failure).
 
 ## Result sets
 
-|Column name|Description|  
-|-----------------|---------------|
-|**latest_digest**|A JSON document containing the following data:<br/><br/>`database_name` - the name of the database. <br/>`block_id` – same as block_id from the last row in sys.database_ledger_blocks.<br/>`hash` – a hexadecimal string representing a SHA-256 hash of the last row in sys.database_ledger_blocks.<br/>`last_transaction_commit_time` - same as commit_time from the last row in sys.database_ledger_blocks in the ISO 8601 format.<br/>`digest_time` – the time when the digest was generated in the ISO 8601 format.
+| Column name | Description |
+| --- | --- |
+|**latest_digest**|A JSON document containing the following data:<br/><br/>`database_name` - the name of the database. <br/>`block_id` – same as block_id from the last row in `sys.database_ledger_blocks`.<br/>`hash` – a hexadecimal string representing the SHA-256 hash of the last row in `sys.database_ledger_blocks`.<br/>`last_transaction_commit_time` - same as commit_time from the last row in `sys.database_ledger_blocks` in the ISO 8601 format.<br/>`digest_time` – the time when the digest was generated in the ISO 8601 format.
 
-**Example JSON**
+**Example of the JSON**
 
 ```json
 {
-  "database_name": "contoso",
-  "block_id": 0,
-  "hash": "0x6D7D609DE43DDBF84A0346463D6F93CA979846CD5609E02E4FFC96338FC64DD5",
-  "last_transaction_commit_time": "2020-10-06T16:50:55.1066667",
-  "digest_time": "2020-10-07T01:13:23.3601279"
+    "database_name": "contoso",
+    "block_id": 0,
+    "hash": "0x6D7D609DE43DDBF84A0346463D6F93CA979846CD5609E02E4FFC96338FC64DD5",
+    "last_transaction_commit_time": "2020-10-06T16:50:55.1066667",
+    "digest_time": "2020-10-07T01:13:23.3601279"
 }
 ```
 
 ## Permissions
 
 Users with the **public** role are allowed to execute this stored procedure.
 
-## See also
+## Next steps
 
 - [Digest management](../security/ledger/ledger-digest-management.md)
 - [Ledger overview](../security/ledger/ledger-overview.md)
diff --git a/docs/relational-databases/system-stored-procedures/sys-sp-verify-database-ledger-from-digest-storage-transact-sql.md b/docs/relational-databases/system-stored-procedures/sys-sp-verify-database-ledger-from-digest-storage-transact-sql.md
diff --git a/docs/relational-databases/system-stored-procedures/sys-sp-verify-database-ledger-transact-sql.md b/docs/relational-databases/system-stored-procedures/sys-sp-verify-database-ledger-transact-sql.md
