Skip to content

Commit 3a49666

Browse files
authored
Merge pull request #209589 from jess-hu-340/0830-update-screenshot
Update screenshot in doc ( REST, Hive )
2 parents cd8ce73 + 229fd37 commit 3a49666

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

articles/data-factory/connector-hive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: data-factory
77
ms.subservice: data-movement
88
ms.custom: synapse
99
ms.topic: conceptual
10-
ms.date: 09/09/2021
10+
ms.date: 08/30/2022
1111
ms.author: jianleishen
1212
---
1313

articles/data-factory/connector-rest.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: data-factory
77
ms.subservice: data-movement
88
ms.custom: synapse
99
ms.topic: conceptual
10-
ms.date: 06/13/2022
10+
ms.date: 08/30/2022
1111
ms.author: makromer
1212
---
1313

@@ -38,7 +38,7 @@ For a list of data stores that are supported as sources/sinks, see [Supported da
3838
Specifically, this generic REST connector supports:
3939

4040
- Copying data from a REST endpoint by using the **GET** or **POST** methods and copying data to a REST endpoint by using the **POST**, **PUT** or **PATCH** methods.
41-
- Copying data by using one of the following authentications: **Anonymous**, **Basic**, **AAD service principal**, and **user-assigned managed identity**.
41+
- Copying data by using one of the following authentications: **Anonymous**, **Basic**, **Service Principal**, and **user-assigned managed identity**.
4242
- **[Pagination](#pagination-support)** in the REST APIs.
4343
- For REST as source, copying the REST JSON response [as-is](#export-json-response-as-is) or parse it by using [schema mapping](copy-activity-schema-and-type-mapping.md#schema-mapping). Only response payload in **JSON** is supported.
4444

@@ -94,7 +94,7 @@ The following properties are supported for the REST linked service:
9494

9595
For different authentication types, see the corresponding sections for details.
9696
- [Basic authentication](#use-basic-authentication)
97-
- [AAD service principal authentication](#use-aad-service-principal-authentication)
97+
- [Service Principal authentication](#use-service-principal-authentication)
9898
- [OAuth2 Client Credential authentication](#use-oauth2-client-credential-authentication)
9999
- [User-assigned managed identity authentication](#use-user-assigned-managed-identity-authentication)
100100
- [Anonymous authentication](#using-authentication-headers)
@@ -132,7 +132,7 @@ Set the **authenticationType** property to **Basic**. In addition to the generic
132132
}
133133
```
134134

135-
### Use AAD service principal authentication
135+
### Use Service Principal authentication
136136

137137
Set the **authenticationType** property to **AadServicePrincipal**. In addition to the generic properties that are described in the preceding section, specify the following properties:
138138

@@ -141,8 +141,8 @@ Set the **authenticationType** property to **AadServicePrincipal**. In addition
141141
| servicePrincipalId | Specify the Azure Active Directory application's client ID. | Yes |
142142
| servicePrincipalKey | Specify the Azure Active Directory application's key. Mark this field as a **SecureString** to store it securely in Data Factory, or [reference a secret stored in Azure Key Vault](store-credentials-in-key-vault.md). | Yes |
143143
| tenant | Specify the tenant information (domain name or tenant ID) under which your application resides. Retrieve it by hovering the mouse in the top-right corner of the Azure portal. | Yes |
144-
| aadResourceId | Specify the AAD resource you are requesting for authorization, for example, `https://management.core.windows.net`.| Yes |
145-
| azureCloudType | For service principal authentication, specify the type of Azure cloud environment to which your AAD application is registered. <br/> Allowed values are **AzurePublic**, **AzureChina**, **AzureUsGovernment**, and **AzureGermany**. By default, the data factory's cloud environment is used. | No |
144+
| aadResourceId | Specify the Microsoft Azure Active Directory (Azure AD) resource you are requesting for authorization, for example, `https://management.core.windows.net`.| Yes |
145+
| azureCloudType | For Service Principal authentication, specify the type of Azure cloud environment to which your Azure AD application is registered. <br/> Allowed values are **AzurePublic**, **AzureChina**, **AzureUsGovernment**, and **AzureGermany**. By default, the data factory's cloud environment is used. | No |
146146

147147
**Example**
148148

@@ -160,7 +160,7 @@ Set the **authenticationType** property to **AadServicePrincipal**. In addition
160160
"type": "SecureString"
161161
},
162162
"tenant": "<tenant info, e.g. microsoft.onmicrosoft.com>",
163-
"aadResourceId": "<AAD resource URL e.g. https://management.core.windows.net>"
163+
"aadResourceId": "<Azure AD resource URL e.g. https://management.core.windows.net>"
164164
},
165165
"connectVia": {
166166
"referenceName": "<name of Integration Runtime>",
@@ -210,7 +210,7 @@ Set the **authenticationType** property to **ManagedServiceIdentity**. In additi
210210

211211
| Property | Description | Required |
212212
|:--- |:--- |:--- |
213-
| aadResourceId | Specify the AAD resource you are requesting for authorization, for example, `https://management.core.windows.net`.| Yes |
213+
| aadResourceId | Specify the Azure AD resource you are requesting for authorization, for example, `https://management.core.windows.net`.| Yes |
214214
| credentials | Specify the user-assigned managed identity as the credential object. | Yes |
215215

216216

@@ -224,7 +224,7 @@ Set the **authenticationType** property to **ManagedServiceIdentity**. In additi
224224
"typeProperties": {
225225
"url": "<REST endpoint e.g. https://www.example.com/>",
226226
"authenticationType": "ManagedServiceIdentity",
227-
"aadResourceId": "<AAD resource URL e.g. https://management.core.windows.net>",
227+
"aadResourceId": "<Azure AD resource URL e.g. https://management.core.windows.net>",
228228
"credential": {
229229
"referenceName": "credential1",
230230
"type": "CredentialReference"
@@ -680,14 +680,14 @@ Response 2:
680680

681681
:::image type="content" source="media/connector-rest/pagination-rule-example-4-1.png" alt-text="Screenshot showing the End Condition setting for Example 4.1.":::
682682

683-
- **Example 4.2: The pagination ends when the value of the specific node in response dose not exist**
683+
- **Example 4.2: The pagination ends when the value of the specific node in response does not exist**
684684

685685
The REST API returns the last response in the following structure:
686686

687687
```json
688688
{}
689689
```
690-
Set the end condition rule as **"EndCondition:$.data": "NonExist"** to end the pagination when the value of the specific node in response dose not exist.
690+
Set the end condition rule as **"EndCondition:$.data": "NonExist"** to end the pagination when the value of the specific node in response does not exist.
691691

692692
:::image type="content" source="media/connector-rest/pagination-rule-example-4-2.png" alt-text="Screenshot showing the End Condition setting for Example 4.2.":::
693693

16.7 KB
Loading
8.35 KB
Loading

0 commit comments

Comments
 (0)