Merge pull request #103571 from djpmsft/docUpdates

adding git web activity note

Author: v-albemi

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

@@ -289,7 +289,7 @@ function Get-SortedTriggers {
         [string] $DataFactoryName,
         [string] $ResourceGroupName
     )
-    $triggers = Get-AzDataFactoryV2Trigger -DataFactoryName miliutesteu04 -ResourceGroupName miliu
+    $triggers = Get-AzDataFactoryV2Trigger -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName
     $triggerDict = @{}
     $visited = @{}
     $stack = new-object System.Collections.Stack
@@ -308,7 +308,7 @@ function Get-SortedLinkedServices {
         [string] $DataFactoryName,
         [string] $ResourceGroupName
     )
-    $linkedServices = Get-AzDataFactoryV2LinkedService -DataFactoryName miliutesteu04 -ResourceGroupName miliu
+    $linkedServices = Get-AzDataFactoryV2LinkedService -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName
     $LinkedServiceHasDependencies = @('HDInsightLinkedService', 'HDInsightOnDemandLinkedService', 'AzureBatchLinkedService')
     $Akv = 'AzureKeyVaultLinkedService'
     $HighOrderList = New-Object Collections.Generic.List[Microsoft.Azure.Commands.DataFactoryV2.Models.PSLinkedService]

articles/data-factory/control-flow-web-activity.md

@@ -85,10 +85,14 @@ The following table shows the requirements for JSON content:
 
 ## Authentication
 
+Below are the supported authentication types in the web activity.
+
 ### None
+
 If authentication is not required, do not include the "authentication" property.
 
 ### Basic
+
 Specify user name and password to use with the basic authentication.
 
 ```json
@@ -100,6 +104,7 @@ Specify user name and password to use with the basic authentication.
 ```
 
 ### Client certificate
+
 Specify base64-encoded contents of a PFX file and the password.
 
 ```json
@@ -121,6 +126,9 @@ Specify the resource uri for which the access token will be requested using the
 }
 ```
 
+> [!NOTE]
+> If your data factory is configured with a git repository, you must store your credentials in Azure Key Vault to use basic or client certificate authentication. Azure Data Factory doesn't store passwords in git.
+
 ## Request payload schema
 When you use the POST/PUT method, the body property represents the payload that is sent to the endpoint. You can pass linked services and datasets as part of the payload. Here is the schema for the payload:
 

articles/data-factory/control-flow-webhook-activity.md

@@ -60,6 +60,52 @@ authentication | Authentication method used for calling the endpoint. Supported
 timeout | How long the activity will wait for the 'callBackUri' to be invoked. How long the activity will wait for the ‘callBackUri’ to be invoked. Default value is 10mins (“00:10:00”). Format is Timespan i.e. d.hh:mm:ss | String | No |
 Report status on callback | Allows the user the report the failed status of the webhook activity which will mark the activity as failed | Boolean | No |
 
+## Authentication
+
+Below are the supported authentication types in the webhook activity.
+
+### None
+
+If authentication is not required, do not include the "authentication" property.
+
+### Basic
+
+Specify user name and password to use with the basic authentication.
+
+```json
+"authentication":{
+   "type":"Basic",
+   "username":"****",
+   "password":"****"
+}
+```
+
+### Client certificate
+
+Specify base64-encoded contents of a PFX file and the password.
+
+```json
+"authentication":{
+   "type":"ClientCertificate",
+   "pfx":"****",
+   "password":"****"
+}
+```
+
+### Managed Identity
+
+Specify the resource uri for which the access token will be requested using the managed identity for the data factory. To call the Azure Resource Management API, use `https://management.azure.com/`. For more information about how managed identities works see the [managed identities for Azure resources overview page](/azure/active-directory/managed-identities-azure-resources/overview).
+
+```json
+"authentication": {
+	"type": "MSI",
+	"resource": "https://management.azure.com/"
+}
+```
+
+> [!NOTE]
+> If your data factory is configured with a git repository, you must store your credentials in Azure Key Vault to use basic or client certificate authentication. Azure Data Factory doesn't store passwords in git.
+
 ## Additional notes
 
 Azure Data Factory will pass an additional property “callBackUri” in the body to the url endpoint, and will expect this uri to be invoked before the timeout value specified. If the uri is not invoked, the activity will fail with status ‘TimedOut’.