diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json index b78b645cf1aa..b6a0482a6dab 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json @@ -4048,7 +4048,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ManagedIdentityCredentialResource" + "$ref": "#/definitions/CredentialResource" } } ], @@ -4056,7 +4056,7 @@ "200": { "description": "OK.", "schema": { - "$ref": "#/definitions/ManagedIdentityCredentialResource" + "$ref": "#/definitions/CredentialResource" } }, "default": { @@ -4106,7 +4106,7 @@ "200": { "description": "OK.", "schema": { - "$ref": "#/definitions/ManagedIdentityCredentialResource" + "$ref": "#/definitions/CredentialResource" } }, "304": { @@ -7645,7 +7645,7 @@ "type": "array", "description": "List of credentials.", "items": { - "$ref": "#/definitions/ManagedIdentityCredentialResource" + "$ref": "#/definitions/CredentialResource" } }, "nextLink": { @@ -7676,7 +7676,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/SubResource" + "$ref": "#/definitions/CredentialResource" } ], "properties": { @@ -7689,6 +7689,24 @@ "properties" ] }, + "ServicePrincipalCredentialResource": { + "description": "Credential resource type.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CredentialResource" + } + ], + "properties": { + "properties": { + "$ref": "./entityTypes/Credential.json#/definitions/ServicePrincipalCredential", + "description": "Service Principal Credential properties." + } + }, + "required": [ + "properties" + ] + }, "ManagedVirtualNetworkListResponse": { "description": "A list of managed Virtual Network resources.", "type": "object", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Credential.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Credential.json index b0bb7fb53329..310d3519c9da 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Credential.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Credential.json @@ -83,14 +83,7 @@ { "$ref": "#/definitions/Credential" } - ], - "properties": { - "typeProperties": { - "description": "Managed identity credential properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/ManagedIdentityTypeProperties" - } - } + ] }, "ManagedIdentityTypeProperties": { "description": "Managed identity type properties.", @@ -101,6 +94,52 @@ "description": "The resource id of user assigned managed identity" } } + }, + "UserAssignedManagedIdentityCredential": { + "description": "User Assigned Managed identity credential.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ManagedIdentityCredential" + } + ], + "properties": { + "typeProperties": { + "description": "User Assigned Managed identity credential properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/UserAssignedManagedIdentityTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "UserAssignedManagedIdentityTypeProperties": { + "description": "User Assigned Managed identity type properties.", + "$ref": "#/definitions/ManagedIdentityTypeProperties", + "required": [ + "resourceId" + ] + }, + "SystemAssignedManagedIdentityCredential": { + "description": "System Assigned Managed identity credential.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ManagedIdentityCredential" + } + ], + "properties": { + "typeProperties": { + "description": "System Assigned Managed identity credential properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SystemAssignedManagedIdentityTypeProperties" + } + } + }, + "SystemAssignedManagedIdentityTypeProperties": { + "description": "System Assigned Managed identity type properties.", + "$ref": "#/definitions/ManagedIdentityTypeProperties" } } }