Skip to content

Commit 77c9b7c

Browse files
committed
Made DevOps related changes esp for Azure Repos.
1 parent 647588c commit 77c9b7c

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

articles/data-factory/author-visually.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ ms.workload: data-services
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: conceptual
15-
ms.date: 09/18/2018
15+
ms.date: 09/19/2018
1616
ms.author: shlo
1717

1818
---
1919
# Visual authoring in Azure Data Factory
2020
The Azure Data Factory user interface experience (UX) lets you visually author and deploy resources for your data factory without having to write any code. You can drag activities to a pipeline canvas, perform test runs, debug iteratively, and deploy and monitor your pipeline runs. There are two approaches for using the UX to perform visual authoring:
2121

2222
- Author directly with the Data Factory service.
23-
- Author with Azure DevOps Git integration for collaboration, source control, or versioning.
23+
- Author with Git integration with Azure Repos for collaboration, source control, or versioning.
2424

2525
## Author directly with the Data Factory service
26-
Visual authoring with the Data Factory service differs from visual authoring with Azure DevOps in two ways:
26+
Visual authoring with the Data Factory service differs from visual authoring with Azure DevOps Services in two ways:
2727

2828
- The Data Factory service doesn't include a repository for storing the JSON entities for your changes.
2929
- The Data Factory service isn't optimized for collaboration or version control.
@@ -34,39 +34,39 @@ When you use the UX **Authoring canvas** to author directly with the Data Factor
3434

3535
![Publish mode](media/author-visually/data-factory-publish.png)
3636

37-
## Author with Azure DevOps Git integration
38-
Visual authoring with Azure DevOps Git integration supports source control and collaboration for work on your data factory pipelines. You can associate a data factory with an Azure DevOps Git organization repository for source control, collaboration, versioning, and so on. A single Azure DevOps Git organization can have multiple repositories, but an Azure DevOps Git repository can be associated with only one data factory. If you don't have an Azure DevOps organization or repository, follow [these instructions](https://docs.microsoft.com/azure/devops/organizations/accounts/create-organization-msa-or-work-student) to create your resources.
37+
## Author with Git integration with Azure Repos
38+
Visual authoring with Git integration with Azure Repos supports source control and collaboration for work on your data factory pipelines. You can associate a data factory with an Azure Repos Git organization repository for source control, collaboration, versioning, and so on. A single Azure Repos Git organization can have multiple repositories, but an Azure Repos Git repository can be associated with only one data factory. If you don't have an Azure Repos organization or repository, follow [these instructions](https://docs.microsoft.com/azure/devops/organizations/accounts/create-organization-msa-or-work-student) to create your resources.
3939

4040
> [!NOTE]
41-
> You can store script and data files in an Azure DevOps Git repository. However, you have to upload the files manually to Azure Storage. A Data Factory pipeline does not automatically upload script or data files stored in an Azure DevOps Git repository to Azure Storage.
41+
> You can store script and data files in an Azure Repos Git repository. However, you have to upload the files manually to Azure Storage. A Data Factory pipeline does not automatically upload script or data files stored in an Azure Repos Git repository to Azure Storage.
4242
43-
### Configure an Azure DevOps Git repository with Azure Data Factory
44-
You can configure an Azure DevOps Git repository with a data factory through two methods.
43+
### Configure an Azure Repos Git repository with Azure Data Factory
44+
You can configure an Azure Repos Git repository with a data factory through two methods.
4545

46-
#### <a name="method1"></a> Configuration method 1 (Azure DevOps Git repo): Let's get started page
46+
#### <a name="method1"></a> Configuration method 1 (Azure Repos Git repo): Let's get started page
4747

4848
In Azure Data Factory, go to the **Let's get started** page. Select **Configure Code Repository**:
4949

50-
![Configure an Azure DevOps code repository](media/author-visually/configure-repo.png)
50+
![Configure an Azure Repos code repository](media/author-visually/configure-repo.png)
5151

5252
The **Repository Settings** configuration pane appears:
5353

5454
![Configure the code repository settings](media/author-visually/repo-settings.png)
5555

56-
The pane shows the following Azure DevOps code repository settings:
56+
The pane shows the following Azure Repos code repository settings:
5757

5858
| Setting | Description | Value |
5959
|:--- |:--- |:--- |
60-
| **Repository Type** | The type of the Azure DevOps code repository.<br/>**Note**: GitHub is not currently supported. | Azure Dev Ops Git |
60+
| **Repository Type** | The type of the Azure Repos code repository.<br/>**Note**: GitHub is not currently supported. | Azure Dev Ops Git |
6161
| **Azure Active Directory** | Your Azure AD tenant name. | <your tenant name> |
62-
| **Azure DevOps Organization** | Your Azure DevOps organization name. You can locate your Azure DevOps organization name at `https://{organization name}.visualstudio.com`. You can [sign in to your Azure DevOps organization](https://www.visualstudio.com/team-services/git/) to access your Visual Studio profile and see your repositories and projects. | <your organization name> |
63-
| **ProjectName** | Your Azure DevOps project name. You can locate your Azure DevOps project name at `https://{organization name}.visualstudio.com/{project name}`. | <your Azure DevOps project name> |
64-
| **RepositoryName** | Your Azure DevOps code repository name. Azure DevOps 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 DevOps code repository name> |
65-
| **Collaboration branch** | Your Azure DevOps collaboration branch that is used for publishing. By default, it is `master`. Change this setting in case you want to publish resources from another branch. | <your collaboration branch name> |
66-
| **Root folder** | Your root folder in your Azure DevOps collaboration branch. | <your root folder name> |
67-
| **Import existing Data Factory resources to repository** | Specifies whether to import existing data factory resources from the UX **Authoring canvas** into an Azure DevOps 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) |
68-
69-
#### Configuration method 2 (Azure DevOps Git repo): UX authoring canvas
62+
| **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> |
63+
| **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> |
64+
| **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> |
65+
| **Collaboration branch** | Your Azure Repos collaboration branch that is used for publishing. By default, it is `master`. Change this setting in case you want to publish resources from another branch. | <your collaboration branch name> |
66+
| **Root folder** | Your root folder in your Azure Repos collaboration branch. | <your root folder name> |
67+
| **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) |
68+
69+
#### Configuration method 2 (Azure Repos Git repo): UX authoring canvas
7070
In the Azure Data Factory UX **Authoring canvas**, locate your data factory. Select the **Data Factory** drop-down menu, and then select **Configure Code Repository**.
7171

7272
A configuration pane appears. For details about the configuration settings, see the descriptions in <a href="#method1">Configuration method 1</a>.
@@ -75,7 +75,7 @@ A configuration pane appears. For details about the configuration settings, see
7575

7676
## Use a different Azure Active Directory tenant
7777

78-
You can create an Azure DevOps Git repo in a different Azure Active Directory tenant. To specify a different Azure AD tenant, you have to have administrator permissions for the Azure subscription that you're using.
78+
You can create an Azure Repos Git repo in a different Azure Active Directory tenant. To specify a different Azure AD tenant, you have to have administrator permissions for the Azure subscription that you're using.
7979

8080
## Switch to a different Git repo
8181

@@ -88,11 +88,11 @@ After you remove the association with the current repo, you can configure your G
8888
## Use version control
8989
Version control systems (also known as _source control_) let developers collaborate on code and track changes that are made to the code base. Source control is an essential tool for multi-developer projects.
9090

91-
Each Azure DevOps Git repository that's associated with a data factory has a collaboration branch. (`master` is the default collaboration branch). Users can also create feature branches by clicking **+ New Branch** and do development in the feature branches.
91+
Each Azure Repos Git repository that's associated with a data factory has a collaboration branch. (`master` is the default collaboration branch). Users can also create feature branches by clicking **+ New Branch** and do development in the feature branches.
9292

9393
![Change the code by syncing or publishing](media/author-visually/sync-publish.png)
9494

95-
When you are ready with the feature development in your feature branch, you can click **Create pull request**. This action takes you to Azure DevOps Git where you can raise pull requests, do code reviews, and merge changes to your collaboration branch. (`master` is the default). You are only allowed to publish to the Data Factory service from your collaboration branch.
95+
When you are ready with the feature development in your feature branch, you can click **Create pull request**. This action takes you to Azure Repos Git where you can raise pull requests, do code reviews, and merge changes to your collaboration branch. (`master` is the default). You are only allowed to publish to the Data Factory service from your collaboration branch.
9696

9797
![Create a new pull request](media/author-visually/create-pull-request.png)
9898

@@ -150,11 +150,11 @@ The **Repository Settings** configuration pane appears:
150150

151151
![GitHub repository settings](media/author-visually/github-integration-image2.png)
152152

153-
The pane shows the following Azure DevOps code repository settings:
153+
The pane shows the following Azure Repos code repository settings:
154154

155155
| **Setting** | **Description** | **Value** |
156156
|----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|
157-
| **Repository Type** | The type of the Azure DevOps code repository. | GitHub |
157+
| **Repository Type** | The type of the Azure Repos code repository. | GitHub |
158158
| **GitHub account** | Your GitHub account name. This name can be found from https://github.com/{account name}/{repository name}. Navigating to this page prompts you to enter GitHub OAuth credentials to your GitHub account. | |
159159
| **RepositoryName** | Your GitHub code repository name. GitHub accounts contain Git repositories to manage your source code. You can create a new repository or use an existing repository that's already in your account. | |
160160
| **Collaboration branch** | Your GitHub collaboration branch that is used for publishing. By default, it is master. Change this setting in case you want to publish resources from another branch. | |
@@ -182,11 +182,11 @@ The **Repository Settings** configuration pane appears:
182182

183183
![GitHub repository settings](media/author-visually/github-integration-image3.png)
184184

185-
The pane shows the following Azure DevOps code repository settings:
185+
The pane shows the following Azure Repos code repository settings:
186186

187187
| **Setting** | **Description** | **Value** |
188188
|----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|
189-
| **Repository Type** | The type of the Azure DevOps code repository. | GitHub |
189+
| **Repository Type** | The type of the Azure Repos code repository. | GitHub |
190190
| **Use GitHub Enterprise** | Checkbox to select GitHub Enterprise | |
191191
| **GitHub Enterprise URL** | The GitHub Enterprise root URL. For example: https://github.mydomain.com | |
192192
| **GitHub account** | Your GitHub account name. This name can be found from https://github.com/{account name}/{repository name}. Navigating to this page prompts you to enter GitHub OAuth credentials to your GitHub account. | |

0 commit comments

Comments
 (0)