Support UAMI in ADF IR/LS/Activity

custom-words.txt

@@ -291,6 +291,8 @@ BYOK
 BYOL
 BYOS
 bzip
+byoaSecretAkvUrl
+byoaSecretName
 cacerts
 calculatebaseline
 canadacentral

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json

@@ -6896,6 +6896,48 @@
           "readOnly": true
         }
       }
+    },
+    "CredentialReference": {
+      "description": "Credential reference type.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Credential reference type.",
+          "enum": [
+            "CredentialReference"
+          ]
+        },
+        "referenceName": {
+          "type": "string",
+          "description": "Reference credential name."
+        }
+      },
+      "additionalProperties": {
+        "type": "object"
+      },
+      "required": [
+        "type",
+        "referenceName"
+      ]
+    },
+    "CredentialResource": {
+      "description": "Credential resource type.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "./entityTypes/Credential.json#/definitions/Credential",
+          "description": "Properties of credentials."
+        }
+      },
+      "required": [
+        "properties"
+      ]
     }
   },
   "parameters": {

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Credential.json

@@ -0,0 +1,103 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "DataFactoryManagementClient",
+    "version": "2018-06-01"
+  },
+  "paths": {},
+  "definitions": {
+    "Credential": {
+      "description": "The Azure Data Factory nested object which contains the information and credential which can be used to connect with related store or compute resource.",
+      "type": "object",
+      "discriminator": "type",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Type of credential."
+        },
+        "description": {
+          "description": "Credential description.",
+          "type": "string"
+        },
+        "annotations": {
+          "description": "List of tags that can be used for describing the Credential.",
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        }
+      },
+      "additionalProperties": {
+        "type": "object"
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "ServicePrincipalCredential": {
+      "x-ms-discriminator-value": "ServicePrincipal",
+      "description": "Service principal credential.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Credential"
+        }
+      ],
+      "properties": {
+        "typeProperties": {
+          "description": "Service Principal credential properties.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ServicePrincipalCredentialTypeProperties"
+        }
+      },
+      "required": [
+        "typeProperties"
+      ]
+    },
+    "ServicePrincipalCredentialTypeProperties": {
+      "description": "Service Principal credential type properties.",
+      "type": "object",
+      "properties": {
+        "servicePrincipalId": {
+          "type": "object",
+          "description": "The app ID of the service principal used to authenticate"
+        },
+        "servicePrincipalKey": {
+          "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
+          "description": "The key of the service principal used to authenticate."
+        },
+        "tenant": {
+          "type": "object",
+          "description": "The ID of the tenant to which the service principal belongs"
+        }
+      }
+    },
+    "ManagedIdentityCredential": {
+      "x-ms-discriminator-value": "ManagedIdentity",
+      "description": "Managed identity credential.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Credential"
+        }
+      ],
+      "properties": {
+        "typeProperties": {
+          "description": "Managed identity credential properties.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ManagedIdentityTypeProperties"
+        }
+      }
+    },
+    "ManagedIdentityTypeProperties": {
+      "description": "Managed identity type properties.",
+      "type": "object",
+      "properties": {
+        "resourceId": {
+          "type": "string",
+          "description": "The resource id of user assigned managed identity"
+        }
+      }
+    }
+  }
+}

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json

@@ -238,9 +238,9 @@
             "$ref": "#/definitions/PackageStore"
           }
         },
-        "managedCredential": {
-          "description": "The user-assigned managed identity reference.",
-          "$ref": "#/definitions/EntityReference"
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "additionalProperties": {
@@ -508,8 +508,7 @@
           "type": "string",
           "enum": [
             "IntegrationRuntimeReference",
-            "LinkedServiceReference",
-            "CredentialReference"
+            "LinkedServiceReference"
           ],
           "x-ms-enum": {
             "name": "IntegrationRuntimeEntityReferenceType",

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json

@@ -184,6 +184,10 @@
         "encryptedCredential": {
           "type": "string",
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       }
     },
@@ -237,6 +241,10 @@
         "encryptedCredential": {
           "type": "object",
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -345,6 +353,10 @@
         "alwaysEncryptedSettings": {
           "$ref": "#/definitions/SqlAlwaysEncryptedProperties",
           "description": "Sql always encrypted properties."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -405,6 +417,10 @@
         "alwaysEncryptedSettings": {
           "$ref": "#/definitions/SqlAlwaysEncryptedProperties",
           "description": "Sql always encrypted properties."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -485,6 +501,10 @@
         "encryptedCredential": {
           "type": "object",
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -520,6 +540,10 @@
         "baseUrl": {
           "type": "object",
           "description": "The base URL of the Azure Key Vault. e.g. https://myakv.vault.azure.net Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -1575,6 +1599,10 @@
         "encryptedCredential": {
           "type": "object",
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "authentication": {
+          "type": "object",
+          "description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)."
         }
       },
       "required": [
@@ -2347,6 +2375,10 @@
         "encryptedCredential": {
           "type": "object",
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -2403,6 +2435,10 @@
         "encryptedCredential": {
           "type": "object",
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -2799,6 +2835,10 @@
         "encryptedCredential": {
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -5317,6 +5357,10 @@
         "subnetName": {
           "type": "object",
           "description": "The ARM resource ID for the subnet in the vNet. If virtualNetworkId was specified, then this property is required. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -5536,6 +5580,10 @@
         "policyId": {
           "type": "object",
           "description": "The policy id for limiting the ability to configure clusters based on a user defined set of rules. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -5970,6 +6018,10 @@
         "tenant": {
           "type": "object",
           "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
       },
       "required": [
@@ -6011,6 +6063,18 @@
         "encryptedCredential": {
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
+        },
+        "resourceId": {
+          "description": "Allowed token audiences for azure function.",
+          "type": "object"
+        },
+        "authentication": {
+          "type": "object",
+          "description": "Type of authentication (Required to specify MSI) used to connect to AzureFunction. Type: string (or Expression with resultType string)."
         }
       },
       "required": [

specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json

@@ -6043,11 +6043,12 @@
         "userTenant": {
           "description": "TenantId for which Azure Auth token will be requested when using ServicePrincipal Authentication. Type: string (or Expression with resultType string).",
           "type": "object"
+        },
+        "credential": {
+          "$ref": "../datafactory.json#/definitions/CredentialReference",
+          "description": "The credential reference containing authentication information."
         }
-      },
-      "required": [
-        "type"
-      ]
+      }
     },
     "WebActivityTypeProperties": {
       "description": "Web activity type properties.",