Skip to content

Commit 39db286

Browse files
authored
Merge pull request #50081 from Ceespino/master
CI/CD doc fixes
2 parents b36d20d + 0c297ff commit 39db286

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

articles/data-factory/continuous-integration-deployment.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Continuous integration and delivery in Azure Data Factory
33
description: Learn how to use continuous integration and delivery to move Data Factory pipelines from one environment (development, test, production) to another.
44
services: data-factory
@@ -55,7 +55,7 @@ Below is a sample overview of the CI/CD lifecycle in an Azure data factory that'
5555

5656
![Build your own template](media/continuous-integration-deployment/custom-deployment-build-your-own-template.png)
5757

58-
1. Select **Load file**, and then select the generated Resource Manager template.
58+
1. Select **Load file**, and then select the generated Resource Manager template. This is the **arm_template.json** file located in the .zip file exported in step 1.
5959

6060
![Edit template](media/continuous-integration-deployment/custom-deployment-edit-template.png)
6161

@@ -166,17 +166,17 @@ There are two ways to handle secrets:
166166

167167
The parameters file needs to be in the publish branch as well.
168168

169-
- Add an [Azure Key Vault task](https://docs.microsoft.com/azure/devops/pipelines/tasks/deploy/azure-key-vault) before the Azure Resource Manager Deployment task described in the previous section:
169+
1. Add an [Azure Key Vault task](https://docs.microsoft.com/azure/devops/pipelines/tasks/deploy/azure-key-vault) before the Azure Resource Manager Deployment task described in the previous section:
170170

171171
1. On the **Tasks** tab, create a new task. Search for **Azure Key Vault** and add it.
172172

173173
1. In the Key Vault task, select the subscription in which you created the key vault. Provide credentials if necessary, and then select the key vault.
174174

175175
![Add a Key Vault task](media/continuous-integration-deployment/continuous-integration-image8.png)
176176

177-
#### Grant permissions to the Azure Pipelines agent
177+
#### Grant permissions to the Azure Pipelines agent
178178

179-
The Azure Key Vault task might fail with an Access Denied error if the correct permissions aren't set. Download the logs for the release, and locate the .ps1 file that contains the command to give permissions to the Azure Pipelines agent. You can run the command directly. Or you can copy the principal ID from the file and add the access policy manually in the Azure portal. `Get` and `List` are the minimum permissions required.
179+
The Azure Key Vault task might fail with an Access Denied error if the correct permissions aren't set. Download the logs for the release, and locate the .ps1 file that contains the command to give permissions to the Azure Pipelines agent. You can run the command directly. Or you can copy the principal ID from the file and add the access policy manually in the Azure portal. `Get` and `List` are the minimum permissions required.
180180

181181
### Update active triggers
182182

@@ -466,7 +466,10 @@ If you're in GIT mode, you can override the default properties in your Resource
466466
* You use automated CI/CD and you want to change some properties during Resource Manager deployment, but the properties aren't parameterized by default.
467467
* Your factory is so large that the default Resource Manager template is invalid because it has more than the maximum allowed parameters (256).
468468

469-
Under these conditions, to override the default parameterization template, create a file named arm-template-parameters-definition.json in the folder specified as the root folder for the data factory git integration. You must use that exact file name. Data Factory reads this file from whichever branch you're currently on in the Azure Data Factory portal, not just from the collaboration branch. You can create or edit the file from a private branch, where you can test your changes by selecting **Export ARM Template** in the UI. You can then merge the file into the collaboration branch. If no file is found, the default template is used.
469+
Under these conditions, to override the default parameterization template, create a file named **arm-template-parameters-definition.json** in the folder specified as the root folder for the data factory git integration. You must use that exact file name. Data Factory reads this file from whichever branch you're currently on in the Azure Data Factory portal, not just from the collaboration branch. You can create or edit the file from a private branch, where you can test your changes by selecting **Export ARM Template** in the UI. You can then merge the file into the collaboration branch. If no file is found, the default template is used.
470+
471+
> [!NOTE]
472+
> A custom parameterization template doesn't change the ARM template parameter limit of 256. It lets you choose and decrease the number of parameterized properties.
470473
471474
### Syntax of a custom parameters file
472475

@@ -652,7 +655,7 @@ Following is the current default parameterization template. If you need to add o
652655
"database": "=",
653656
"serviceEndpoint": "=",
654657
"batchUri": "=",
655-
"poolName": "=",
658+
"poolName": "=",
656659
"databaseName": "=",
657660
"systemNumber": "=",
658661
"server": "=",

0 commit comments

Comments
 (0)