Skip to content

Commit 7bce2f8

Browse files
authored
Merge pull request #111515 from djpmsft/docUpdates
fixing typo
2 parents e7d4f38 + bec5f8c commit 7bce2f8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

articles/data-factory/source-control.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The configuration pane shows the following Azure Repos code repository settings:
7373
| **Azure Repos Organization** | Your Azure Repos organization name. You can locate your Azure Repos organization name at `https://{organization name}.visualstudio.com`. You can [sign in to your Azure Repos organization](https://www.visualstudio.com/team-services/git/) to access your Visual Studio profile and see your repositories and projects. | `<your organization name>` |
7474
| **ProjectName** | Your Azure Repos project name. You can locate your Azure Repos project name at `https://{organization name}.visualstudio.com/{project name}`. | `<your Azure Repos project name>` |
7575
| **RepositoryName** | Your Azure Repos code repository name. Azure Repos projects contain Git repositories to manage your source code as your project grows. You can create a new repository or use an existing repository that's already in your project. | `<your Azure Repos code repository name>` |
76-
| **Collaboration branch** | Your Azure Repos collaboration branch that is used for publishing. By default, its `master`. Change this setting in case you want to publish resources from another branch. | `<your collaboration branch name>` |
76+
| **Collaboration branch** | Your Azure Repos collaboration branch that is used for publishing. By default, it's `master`. Change this setting in case you want to publish resources from another branch. | `<your collaboration branch name>` |
7777
| **Root folder** | Your root folder in your Azure Repos collaboration branch. | `<your root folder name>` |
7878
| **Import existing Data Factory resources to repository** | Specifies whether to import existing data factory resources from the UX **Authoring canvas** into an Azure Repos Git repository. Select the box to import your data factory resources into the associated Git repository in JSON format. This action exports each resource individually (that is, the linked services and datasets are exported into separate JSONs). When this box isn't selected, the existing resources aren't imported. | Selected (default) |
7979
| **Branch to import resource into** | Specifies into which branch the data factory resources (pipelines, datasets, linked services etc.) are imported. You can import resources into one of the following branches: a. Collaboration b. Create new c. Use Existing | |
@@ -157,7 +157,7 @@ The configuration pane shows the following GitHub repository settings:
157157

158158
## Switch to a different Git repo
159159

160-
To switch to a different Git repo, click the **Git Repo Settings** icon in the upper right corner of the Data Factory overview page. If you cant see the icon, clear your local browser cache. Select the icon to remove the association with the current repo.
160+
To switch to a different Git repo, click the **Git Repo Settings** icon in the upper right corner of the Data Factory overview page. If you can't see the icon, clear your local browser cache. Select the icon to remove the association with the current repo.
161161

162162
![Git icon](media/author-visually/remove-repo.png)
163163

@@ -214,26 +214,26 @@ A side pane will open where you confirm that the publish branch and pending chan
214214
- **Source Control**. As your data factory workloads become crucial, you would want to integrate your factory with Git to leverage several source control benefits like the following:
215215
- Ability to track/audit changes.
216216
- Ability to revert changes that introduced bugs.
217-
- **Partial Saves**. As you make a lot of changes in your factory, you will realize that in the regular LIVE mode, you can't save your changes as draft, because you are not ready, or you dont want to lose your changes in case your computer crashes. With Git integration, you can continue saving your changes incrementally, and publish to the factory only when you are ready. Git acts as a staging place for your work, until you have tested your changes to your satisfaction.
217+
- **Partial Saves**. As you make a lot of changes in your factory, you will realize that in the regular LIVE mode, you can't save your changes as draft, because you are not ready, or you don't want to lose your changes in case your computer crashes. With Git integration, you can continue saving your changes incrementally, and publish to the factory only when you are ready. Git acts as a staging place for your work, until you have tested your changes to your satisfaction.
218218
- **Collaboration and Control**. If you have multiple team members participating to the same factory, you may want to let your teammates collaborate with each other via a code review process. You can also set up your factory such that not every contributor to the factory has permission to deploy to the factory. Team members may just be allowed to make changes via Git, but only certain people in the team are allowed to "Publish" the changes to the factory.
219-
- **Showing diffs**. In Git mode, you get to see a nice diff of the payload thats about to get published to the factory. This diff shows you all resources/entities that got modified/added/deleted since the last time you published to your factory. Based on this diff, you can either continue further with publishing, or go back and check your changes, and then come back later.
219+
- **Showing diffs**. In Git mode, you get to see a nice diff of the payload that's about to get published to the factory. This diff shows you all resources/entities that got modified/added/deleted since the last time you published to your factory. Based on this diff, you can either continue further with publishing, or go back and check your changes, and then come back later.
220220
- **Better CI/CD**. If you are using Git mode, you can configure your release pipeline to trigger automatically as soon as there are any changes made in the dev factory. You also get to customize the properties in your factory that are available as parameters in the Resource Manager template. It can be useful to keep only the required set of properties as parameters, and have everything else hard coded.
221221
- **Better Performance**. An average factory loads ten times faster in Git mode than in regular LIVE mode, because the resources are downloaded via Git.
222222

223223
## Best practices for Git integration
224224

225225
### Permissions
226226

227-
Typically you dont want every team member to have permissions to update the factory. The following permissions settings are recommended:
227+
Typically you don't want every team member to have permissions to update the factory. The following permissions settings are recommended:
228228

229229
* All team members should have read permissions to the data factory.
230-
* Only a select set of people should be allowed to publish to the factory. To do so, they must have the **Data Factory contributor** role on the factory. For more information on permissions, see [Roles and permissions for Azure Data Factory](concepts-roles-permissions.md).
230+
* Only a select set of people should be allowed to publish to the factory. To do so, they must have the **Data Factory contributor** role on the resource group the factory is in. For more information on permissions, see [Roles and permissions for Azure Data Factory](concepts-roles-permissions.md).
231231

232232
It's recommended to not allow direct check-ins to the collaboration branch. This restriction can help prevent bugs as every check-in will go through a pull request review process described in [Creating feature branches](source-control.md#creating-feature-branches).
233233

234234
### Using passwords from Azure Key Vault
235235

236-
It's recommended to use Azure Key Vault to store any connection strings or passwords for Data Factory Linked Services. For security reasons, we dont store any such secret information in Git, so any changes to Linked Services are published immediately to the Azure Data Factory service.
236+
It's recommended to use Azure Key Vault to store any connection strings or passwords for Data Factory Linked Services. For security reasons, we don't store any such secret information in Git, so any changes to Linked Services are published immediately to the Azure Data Factory service.
237237

238238
Using Key Vault also makes continuous integration and deployment easier as you will not have to provide these secrets during Resource Manager template deployment.
239239

0 commit comments

Comments
 (0)