From bb38ab45132654a4493d8aaa5b144b296d0e485a Mon Sep 17 00:00:00 2001 From: Ivan Liu Date: Thu, 15 Aug 2019 16:34:04 +0800 Subject: [PATCH 1/4] support Express Custom Setup --- .../entityTypes/IntegrationRuntime.json | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) 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 ad3967204e8a..9a1bb8e26248 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 @@ -165,6 +165,13 @@ "name": "IntegrationRuntimeEdition", "modelAsString": true } + }, + "expressCustomSetupProperties": { + "description": "Custom setup without script properties for a SSIS integration runtime.", + "type": "array", + "items": { + "$ref": "#/definitions/CustomSetupBase" + } } }, "additionalProperties": { @@ -240,6 +247,132 @@ } } }, + "CustomSetupBase": { + "description": "The base definition of the custom setup.", + "type": "object", + "discriminator": "type", + "properties": { + "type": { + "description": "The type of custom setup.", + "type": "string" + } + }, + "required": [ + "type" + ] + }, + "CmdkeySetup": { + "description": "The custom setup of running cmdkey commands.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CustomSetupBase" + } + ], + "properties": { + "typeProperties": { + "description": "Cmdkey command custom setup type properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/CmdkeySetupTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "CmdkeySetupTypeProperties": { + "description": "Cmdkey command custom setup type properties.", + "type": "object,", + "properties": { + "targetName": { + "description": "The server name of data source access.", + "type": "object" + }, + "userName": { + "description": "The user name of data source access.", + "type": "object" + }, + "password": { + "description": "The password of data source access.", + "$ref": "../datafactory.json#/definitions/SecretBase" + } + } + }, + "EnvironmentVariableSetup": { + "description": "The custom setup of setting environment variable.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CustomSetupBase" + } + ], + "properties": { + "typeProperties": { + "description": "Add environment variable type properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/EnvironmentVariableSetupTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "EnvironmentVariableSetupTypeProperties": { + "description": "Environment variable custom setup type properties.", + "type": "object", + "properties": { + "variableName": { + "description": "The name of the environment variable.", + "type": "string" + }, + "variableValue": { + "description": "The value of the environment variable.", + "type": "string" + } + } + }, + "ComponentSetup": { + "description": "The custom setup of installing 3rd party components.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CustomSetupBase" + } + ], + "properties": { + "typeProperties": { + "description": "Install 3rd party component type properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ComponentSetupTypeProperties" + } + } + }, + "ComponentSetupTypeProperties": { + "description": "Install 3rd party component setup type properties.", + "type": "object", + "discriminator": "type", + "properties": { + "componentName": { + "description": "The name of the 3rd party component.", + "type": "string" + } + } + }, + "LicensedComponentSetupTypeProperties": { + "description": "Installation of licensed component setup type properties.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ComponentSetupTypeProperties" + } + ], + "properties": { + "licenseKey": { + "description": "The license key to activate the component.", + "$ref": "../datafactory.json#/definitions/SecretBase" + } + } + }, "EntityReference": { "description": "The entity reference.", "type": "object", From 696212c605edef333cba0f0e86d42ba344f4fc42 Mon Sep 17 00:00:00 2001 From: Ivan Liu Date: Fri, 16 Aug 2019 11:00:02 +0800 Subject: [PATCH 2/4] address the comments --- custom-words.txt | 1 + .../entityTypes/IntegrationRuntime.json | 25 +++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index 46592c167985..5e4fa36869bf 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -257,6 +257,7 @@ Cloudamize cloudapp cloudsimple clustermonitoring +Cmdkey cmdlet CMMI CNAME 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 9a1bb8e26248..3d6324cabc02 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 @@ -282,7 +282,7 @@ }, "CmdkeySetupTypeProperties": { "description": "Cmdkey command custom setup type properties.", - "type": "object,", + "type": "object", "properties": { "targetName": { "description": "The server name of data source access.", @@ -296,7 +296,12 @@ "description": "The password of data source access.", "$ref": "../datafactory.json#/definitions/SecretBase" } - } + }, + "required": [ + "targetName", + "userName", + "password" + ] }, "EnvironmentVariableSetup": { "description": "The custom setup of setting environment variable.", @@ -329,7 +334,11 @@ "description": "The value of the environment variable.", "type": "string" } - } + }, + "required": [ + "variableName", + "variableValue" + ] }, "ComponentSetup": { "description": "The custom setup of installing 3rd party components.", @@ -356,7 +365,10 @@ "description": "The name of the 3rd party component.", "type": "string" } - } + }, + "required": [ + "componentName" + ] }, "LicensedComponentSetupTypeProperties": { "description": "Installation of licensed component setup type properties.", @@ -371,7 +383,10 @@ "description": "The license key to activate the component.", "$ref": "../datafactory.json#/definitions/SecretBase" } - } + }, + "required": [ + "licenseKey" + ] }, "EntityReference": { "description": "The entity reference.", From 48cfc8cb77dcf1deeeb39ad1dd2e118e7c0991d8 Mon Sep 17 00:00:00 2001 From: Ivan Liu Date: Fri, 16 Aug 2019 12:35:17 +0800 Subject: [PATCH 3/4] add type as the required properties --- .../stable/2018-06-01/entityTypes/IntegrationRuntime.json | 1 + 1 file changed, 1 insertion(+) 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 3d6324cabc02..0a376c73f12f 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 @@ -367,6 +367,7 @@ } }, "required": [ + "type", "componentName" ] }, From 4de64a2262df8e2e971620c95f7c3a2ba91d49d9 Mon Sep 17 00:00:00 2001 From: Ivan Liu Date: Fri, 16 Aug 2019 13:09:27 +0800 Subject: [PATCH 4/4] address comments --- .../entityTypes/IntegrationRuntime.json | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 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 0a376c73f12f..45e22d283d74 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 @@ -352,40 +352,28 @@ "typeProperties": { "description": "Install 3rd party component type properties.", "x-ms-client-flatten": true, - "$ref": "#/definitions/ComponentSetupTypeProperties" - } - } - }, - "ComponentSetupTypeProperties": { - "description": "Install 3rd party component setup type properties.", - "type": "object", - "discriminator": "type", - "properties": { - "componentName": { - "description": "The name of the 3rd party component.", - "type": "string" + "$ref": "#/definitions/LicensedComponentSetupTypeProperties" } }, "required": [ - "type", - "componentName" + "typeProperties" ] }, "LicensedComponentSetupTypeProperties": { "description": "Installation of licensed component setup type properties.", "type": "object", - "allOf": [ - { - "$ref": "#/definitions/ComponentSetupTypeProperties" - } - ], "properties": { + "componentName": { + "description": "The name of the 3rd party component.", + "type": "string" + }, "licenseKey": { "description": "The license key to activate the component.", "$ref": "../datafactory.json#/definitions/SecretBase" } }, "required": [ + "componentName", "licenseKey" ] },