diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Dataset.json index a18b8fe01f46..26290f034220 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Dataset.json @@ -282,7 +282,7 @@ "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", - "type": "object", + "type": "string", "enum": [ "Optimal", "Fastest" diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json index fdd52c0e61b7..76fb24bbdf78 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json @@ -374,7 +374,7 @@ "Online", "OnPremisesWithIfd" ], - "type": "object", + "type": "string", "description": "The deployment type of the Dynamics instance. 'Online' for Dynamics Online and 'OnPremisesWithIfd' for Dynamics on-premises with Ifd. Type: string (or Expression with resultType string)." }, "hostName": { @@ -402,7 +402,7 @@ "Office365", "Ifd" ], - "type": "object", + "type": "string", "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or Expression with resultType string)." }, "username": { diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json index 554d2135c6b2..cea78b86fdfb 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json @@ -371,7 +371,7 @@ }, "readBehavior": { "description": "The read behavior for the operation. Default is Query.", - "type": "object", + "type": "string", "enum": [ "Query", "QueryAll" @@ -577,7 +577,7 @@ }, "consistencyLevel": { "description": "The consistency level specifies how many Cassandra servers must respond to a read request before returning data to the client application. Cassandra checks the specified number of Cassandra servers for data to satisfy the read request. Must be one of cassandraSourceReadConsistencyLevels. The default value is 'ONE'. It is case-insensitive.", - "type": "object", + "type": "string", "enum": [ "ALL", "EACH_QUORUM", @@ -1148,7 +1148,7 @@ }, "StoredProcedureParameterType": { "description": "Stored procedure parameter type.", - "type": "object", + "type": "string", "enum": [ "String", "Int", @@ -1207,7 +1207,7 @@ "properties": { "writeBehavior": { "description": "The write behavior for the operation. Default is 'Insert'.", - "type": "object", + "type": "string", "enum": [ "Insert", "Update" @@ -1231,7 +1231,7 @@ }, "CopyBehaviorType": { "description": "All available types of copy behavior.", - "type": "object", + "type": "string", "enum": [ "PreserveHierarchy", "FlattenHierarchy", @@ -1406,7 +1406,7 @@ }, "PolybaseSettingsRejectType": { "description": "Indicates whether the RejectValue property is specified as a literal value or a percentage.", - "type": "object", + "type": "string", "enum": [ "value", "percentage" @@ -1501,7 +1501,7 @@ "properties": { "writeBehavior": { "description": "Specify the write behavior when upserting documents into Azure Search Index.", - "type": "object", + "type": "string", "enum": [ "Merge", "Upload" @@ -1539,7 +1539,7 @@ "properties": { "writeBehavior": { "description": "The write behavior for the operation.", - "type": "object", + "type": "string", "enum": [ "Upsert" ], @@ -1568,7 +1568,7 @@ "properties": { "writeBehavior": { "description": "The write behavior for the operation. Default is Insert.", - "type": "object", + "type": "string", "enum": [ "Insert", "Upsert" 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 edf05e372b2e..a363b89e1674 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 @@ -408,7 +408,7 @@ }, "JsonFormatFilePattern": { "description": "JSON format file pattern. A property of JsonFormat.", - "type": "object", + "type": "string", "enum": [ "setOfObjects", "arrayOfObjects" @@ -551,7 +551,7 @@ "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", - "type": "object", + "type": "string", "enum": [ "Optimal", "Fastest" @@ -744,7 +744,7 @@ "description": "The location of the parquet storage." }, "compressionCodec": { - "type": "object", + "type": "string", "enum": [ "none", "gzip", @@ -798,7 +798,7 @@ "description": "The code page name of the preferred encoding. If miss, the default value is UTF-8, unless BOM denotes another Unicode encoding. Refer to the name column of the table in the following link to set supported values: https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: string (or Expression with resultType string)." }, "compressionCodec": { - "type": "object", + "type": "string", "enum": [ "bzip2", "gzip", 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 3edf3c6f662c..fbb72ea5a74e 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 @@ -603,7 +603,7 @@ "Online", "OnPremisesWithIfd" ], - "type": "object", + "type": "string", "description": "The deployment type of the Dynamics instance. 'Online' for Dynamics Online and 'OnPremisesWithIfd' for Dynamics on-premises with Ifd. Type: string (or Expression with resultType string)." }, "hostName": { @@ -632,7 +632,7 @@ "Ifd", "AADServicePrincipal" ], - "type": "object", + "type": "string", "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." }, "username": { @@ -656,7 +656,7 @@ "ServicePrincipalKey", "ServicePrincipalCert" ], - "type": "object", + "type": "string", "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." }, "servicePrincipalCredential": { @@ -758,7 +758,7 @@ "ServicePrincipalKey", "ServicePrincipalCert" ], - "type": "object", + "type": "string", "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." }, "servicePrincipalCredential": { @@ -860,7 +860,7 @@ "ServicePrincipalKey", "ServicePrincipalCert" ], - "type": "object", + "type": "string", "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." }, "servicePrincipalCredential": { @@ -5349,7 +5349,7 @@ "Workernode", "Zookeeper" ], - "type": "object", + "type": "string", "description": "The node types on which the script action should be executed." }, "parameters": { diff --git a/specification/datafactory/resource-manager/readme.md b/specification/datafactory/resource-manager/readme.md index eb66b97b8020..5026d37a004c 100644 --- a/specification/datafactory/resource-manager/readme.md +++ b/specification/datafactory/resource-manager/readme.md @@ -68,6 +68,7 @@ This is not used by Autorest itself. swagger-to-sdk: - repo: azure-sdk-for-net - repo: azure-sdk-for-python + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js diff --git a/specification/datafactory/resource-manager/readme.python.md b/specification/datafactory/resource-manager/readme.python.md index 51f2c51d2ce3..944c83bf17a8 100644 --- a/specification/datafactory/resource-manager/readme.python.md +++ b/specification/datafactory/resource-manager/readme.python.md @@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) +``` yaml $(python) && !$(track2) python-mode: create python: azure-arm: true @@ -15,13 +15,51 @@ python: package-version: 1.0.0 clear-output-folder: true ``` -``` yaml $(python) && $(python-mode) == 'update' + +``` yaml $(python) && $(track2) +python-mode: create +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.datafactory +package-name: azure-mgmt-datafactory +package-version: 1.0.0b1 +clear-output-folder: true + +directive: + - from: Trigger.json + where: $.definitions.BlobEventTypes.items + transform: > + return { + "type": "string", + "enum": [ + "Microsoft.Storage.BlobCreated", + "Microsoft.Storage.BlobDeleted" + ], + "x-ms-enum": { + "name": "BlobEventTypesEnum", + "modelAsString": true + } + } +``` + +``` yaml $(python) && $(python-mode) == 'update' && !$(track2) python: no-namespace-folders: true output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory ``` -``` yaml $(python) && $(python-mode) == 'create' + +``` yaml $(python) && $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory +``` + +``` yaml $(python) && $(python-mode) == 'create' && !$(track2) python: basic-setup-py: true output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory ``` + +``` yaml $(python) && $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory +```