From 090b0d9400beb594f0497feaa1dd9d5e3388ec6f Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Mon, 30 Mar 2020 14:55:09 +0800 Subject: [PATCH 1/5] Enable excel in public swagger --- .../2018-06-01/entityTypes/Dataset.json | 50 +++++++++++++++++++ .../2018-06-01/entityTypes/Pipeline.json | 22 ++++++++ 2 files changed, 72 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 8e1e0fcb1665..a0d04a784add 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -593,6 +593,56 @@ "location" ] }, + "ExcelDataset": { + "x-ms-discriminator-value": "Excel", + "description": "Excel dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Excel dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ExcelDatasetTypeProperties" + } + } + }, + "ExcelDatasetTypeProperties": { + "description": "Excel dataset properties.", + "properties": { + "location": { + "$ref": "#/definitions/DatasetLocation", + "description": "The location of the excel storage." + }, + "sheetName": { + "type": "object", + "description": "The sheet of excel file. Type: string (or Expression with resultType string)." + }, + "range": { + "type": "object", + "description": "The partial data of one sheet. Type: string (or Expression with resultType string)." + }, + "firstRowAsHeader": { + "type": "object", + "description": "When used as input, treat the first row of data as headers. When used as output,write the headers into the output as the first row of data. The default value is false. Type: boolean (or Expression with resultType boolean)." + }, + "compression": { + "description": "The data compression method used for the json dataset.", + "$ref": "#/definitions/DatasetCompression" + }, + "nullValue": { + "type": "object", + "description": "The null value string. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "location", + "sheetName" + ] + }, "ParquetDataset": { "x-ms-discriminator-value": "Parquet", "description": "Parquet dataset.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 1a296d318ee1..886dab3e277d 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -888,6 +888,28 @@ } } }, + "ExcelSource": { + "description": "A copy activity excel source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "storeSettings": { + "$ref": "#/definitions/StoreReadSettings", + "description": "Excel store settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } + } + } + }, "ParquetSource": { "description": "A copy activity Parquet source.", "type": "object", From 5f992bf8497c8c13d4bd2ad7651f02f9ae28945d Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Wed, 6 May 2020 11:09:22 +0800 Subject: [PATCH 2/5] update --- .../stable/2018-06-01/entityTypes/DataFlow.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json index 3644a5838df0..3c68c77ab066 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json @@ -113,6 +113,10 @@ "dataset": { "description": "Dataset reference.", "$ref": "../datafactory.json#/definitions/DatasetReference" + }, + "linkedService": { + "description": "Linked service reference.", + "$ref": "../datafactory.json#/definitions/LinkedServiceReference" } } }, @@ -127,6 +131,10 @@ "dataset": { "description": "Dataset reference.", "$ref": "../datafactory.json#/definitions/DatasetReference" + }, + "linkedService": { + "description": "Linked service reference.", + "$ref": "../datafactory.json#/definitions/LinkedServiceReference" } } } From bbafcb25c3c63e7c9885ea799b7052b5524ae5a3 Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Mon, 25 May 2020 14:27:53 +0800 Subject: [PATCH 3/5] rollback dataflow change --- .../stable/2018-06-01/entityTypes/DataFlow.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json index 3c68c77ab066..3644a5838df0 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json @@ -113,10 +113,6 @@ "dataset": { "description": "Dataset reference.", "$ref": "../datafactory.json#/definitions/DatasetReference" - }, - "linkedService": { - "description": "Linked service reference.", - "$ref": "../datafactory.json#/definitions/LinkedServiceReference" } } }, @@ -131,10 +127,6 @@ "dataset": { "description": "Dataset reference.", "$ref": "../datafactory.json#/definitions/DatasetReference" - }, - "linkedService": { - "description": "Linked service reference.", - "$ref": "../datafactory.json#/definitions/LinkedServiceReference" } } } From 0852d02d603624594fa9174b85f2da245bbf64b0 Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Wed, 8 Sep 2021 11:32:48 +0800 Subject: [PATCH 4/5] Support UAMI in ADF - M2 --- .../entityTypes/IntegrationRuntime.json | 4 ++++ .../2018-06-01/entityTypes/LinkedService.json | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json index 6d80db17de7a..7d070e09afbd 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json @@ -615,6 +615,10 @@ "resourceId": { "description": "The resource identifier of the integration runtime to be shared.", "type": "string" + }, + "credential": { + "$ref": "../datafactory.json#/definitions/CredentialReference", + "description": "The credential reference containing authentication information." } }, "required": [ diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 83144bae15a5..9a38210f41d8 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -686,6 +686,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." } } }, @@ -2586,13 +2590,14 @@ "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": [ - "office365TenantId", - "servicePrincipalTenantId", - "servicePrincipalId", - "servicePrincipalKey" + "office365TenantId" ] }, "SalesforceLinkedService": { @@ -5727,6 +5732,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": [ From 0b617dffac782446918dfbeb958a3c5ea9466522 Mon Sep 17 00:00:00 2001 From: zhanyu2014 Date: Mon, 20 Dec 2021 13:38:11 +0800 Subject: [PATCH 5/5] UPDATE --- .../2018-06-01/entityTypes/LinkedService.json | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 8ea527151837..2269bc231394 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -763,6 +763,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": [ @@ -2590,14 +2594,13 @@ "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": [ - "office365TenantId" + "office365TenantId", + "servicePrincipalTenantId", + "servicePrincipalId", + "servicePrincipalKey" ] }, "SalesforceLinkedService": { @@ -5736,6 +5739,10 @@ "credential": { "$ref": "../datafactory.json#/definitions/CredentialReference", "description": "The credential reference containing authentication information." + }, + "workspaceResourceId": { + "type": "object", + "description": "Workspace resource id for databricks REST API. Type: string (or Expression with resultType string)." } }, "required": [