From 0ba240fdcb0176aa9956d633f1d1158aeaff5c25 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 11 Jan 2021 01:04:17 +0000 Subject: [PATCH] CodeGen from PR 11289 in Azure/azure-rest-api-specs [Hub Generated] Review request for Microsoft.DataLakeAnalytics to add version preview/2015-10-01-preview (#11289) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * build failue fix * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Issue 8189082: Swagger Correctness: MICROSOFT.DATALAKEANALYTICS(null) * Validation issue fix * Removing example JSON file is not referenced from the swagger file * Prettier Error Fix * Prettier Check fixes * typo fix and Removed breaking changes for Readonly field * Validation issue fix * prettier error fix * Reverting Readonly propertly fix * Semantic Validation fix * Semantic Validation fix * BreakingChange fix for 2015 preview version * ReadonlyPropertyChanged * ReadonlyPropertyChanged Fix * Swagger SemanticValidation failed Fix * prettier check fix * Fixing swagger issues * fixed model validation errors * Review feedback fix and adding default response * lint diff tool fixes * Removed Error codes and defaulted error response * Prettier fixes * breaking changes and sdk failure fixes * prettier fix * fixing merge conflicts * swagger lintdiff fixes * breaking changes fix * prettier fix * Update custom-words.txt * piepline Error Fix * Path fixed * duplicate path fix * Removed duplicate paths * Lintdiff fixes * lint diff fixes for list schema * code review comments * Swagger Model Validation Failure Fix * prettier fix Co-authored-by: Sravan Thupili --- .../Microsoft.DataLakeAnalytics.json | 517 ++++++++++++++++-- .../Microsoft.DataLakeAnalytics.json | 2 +- 2 files changed, 466 insertions(+), 53 deletions(-) diff --git a/schemas/2015-10-01-preview/Microsoft.DataLakeAnalytics.json b/schemas/2015-10-01-preview/Microsoft.DataLakeAnalytics.json index 74d98d0fb5..42d3941e2c 100644 --- a/schemas/2015-10-01-preview/Microsoft.DataLakeAnalytics.json +++ b/schemas/2015-10-01-preview/Microsoft.DataLakeAnalytics.json @@ -15,32 +15,37 @@ }, "location": { "type": "string", - "description": "the account regional location." + "description": "The resource location." }, "name": { "type": "string", - "description": "The name of the Data Lake Analytics account to create." + "description": "The name of the Data Lake Analytics account to retrieve." }, "properties": { "oneOf": [ { - "$ref": "#/definitions/DataLakeAnalyticsAccountProperties" + "$ref": "#/definitions/CreateDataLakeAnalyticsAccountProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } - ], - "description": "The account specific properties that are associated with an underlying Data Lake Analytics account." + ] }, "resources": { "type": "array", "items": { "oneOf": [ + { + "$ref": "#/definitions/accounts_DataLakeStoreAccounts_childResource" + }, { "$ref": "#/definitions/accounts_StorageAccounts_childResource" }, { - "$ref": "#/definitions/accounts_DataLakeStoreAccounts_childResource" + "$ref": "#/definitions/accounts_computePolicies_childResource" + }, + { + "$ref": "#/definitions/accounts_firewallRules_childResource" } ] } @@ -58,7 +63,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "the value of custom properties." + "description": "The resource tags." }, "type": { "type": "string", @@ -69,12 +74,52 @@ }, "required": [ "apiVersion", + "location", "name", "properties", "type" ], "description": "Microsoft.DataLakeAnalytics/accounts" }, + "accounts_computePolicies": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2015-10-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the compute policy to create or update." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/CreateOrUpdateComputePolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The compute policy properties to use when creating a new compute policy." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.DataLakeAnalytics/accounts/computePolicies" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataLakeAnalytics/accounts/computePolicies" + }, "accounts_DataLakeStoreAccounts": { "type": "object", "properties": { @@ -91,13 +136,13 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/DataLakeStoreAccountInfoProperties" + "$ref": "#/definitions/AddDataLakeStoreProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Data Lake Store account properties information." + "description": "The Data Lake Store account properties to use when adding a new Data Lake Store account." }, "type": { "type": "string", @@ -114,6 +159,45 @@ ], "description": "Microsoft.DataLakeAnalytics/accounts/DataLakeStoreAccounts" }, + "accounts_firewallRules": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2015-10-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the firewall rule to create or update." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/CreateOrUpdateFirewallRuleProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The firewall rule properties to use when creating a new firewall rule." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.DataLakeAnalytics/accounts/firewallRules" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataLakeAnalytics/accounts/firewallRules" + }, "accounts_StorageAccounts": { "type": "object", "properties": { @@ -136,7 +220,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Azure Storage account properties information." + "description": "The Azure Storage account properties to use when adding a new Azure Storage account." }, "type": { "type": "string", @@ -155,6 +239,45 @@ } }, "definitions": { + "accounts_computePolicies_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2015-10-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the compute policy to create or update." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/CreateOrUpdateComputePolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The compute policy properties to use when creating a new compute policy." + }, + "type": { + "type": "string", + "enum": [ + "computePolicies" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataLakeAnalytics/accounts/computePolicies" + }, "accounts_DataLakeStoreAccounts_childResource": { "type": "object", "properties": { @@ -171,13 +294,13 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/DataLakeStoreAccountInfoProperties" + "$ref": "#/definitions/AddDataLakeStoreProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Data Lake Store account properties information." + "description": "The Data Lake Store account properties to use when adding a new Data Lake Store account." }, "type": { "type": "string", @@ -194,6 +317,45 @@ ], "description": "Microsoft.DataLakeAnalytics/accounts/DataLakeStoreAccounts" }, + "accounts_firewallRules_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2015-10-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the firewall rule to create or update." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/CreateOrUpdateFirewallRuleProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The firewall rule properties to use when creating a new firewall rule." + }, + "type": { + "type": "string", + "enum": [ + "firewallRules" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataLakeAnalytics/accounts/firewallRules" + }, "accounts_StorageAccounts_childResource": { "type": "object", "properties": { @@ -216,7 +378,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Azure Storage account properties information." + "description": "The Azure Storage account properties to use when adding a new Azure Storage account." }, "type": { "type": "string", @@ -233,26 +395,168 @@ ], "description": "Microsoft.DataLakeAnalytics/accounts/StorageAccounts" }, - "DataLakeAnalyticsAccountProperties": { + "AddDataLakeStoreProperties": { "type": "object", "properties": { + "suffix": { + "type": "string", + "description": "The optional suffix for the Data Lake Store account." + } + }, + "description": "The Data Lake Store account properties to use when adding a new Data Lake Store account." + }, + "AddDataLakeStoreWithAccountParameters": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The unique name of the Data Lake Store account to add." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AddDataLakeStoreProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Data Lake Store account properties to use when adding a new Data Lake Store account." + } + }, + "required": [ + "name" + ], + "description": "The parameters used to add a new Data Lake Store account while creating a new Data Lake Analytics account." + }, + "AddStorageAccountWithAccountParameters": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The unique name of the Azure Storage account to add." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/StorageAccountProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Azure Storage account properties to use when adding a new Azure Storage account." + } + }, + "required": [ + "name", + "properties" + ], + "description": "The parameters used to add a new Azure Storage account while creating a new Data Lake Analytics account." + }, + "CreateComputePolicyWithAccountParameters": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The unique name of the compute policy to create." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/CreateOrUpdateComputePolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The compute policy properties to use when creating a new compute policy." + } + }, + "required": [ + "name", + "properties" + ], + "description": "The parameters used to create a new compute policy while creating a new Data Lake Analytics account." + }, + "CreateDataLakeAnalyticsAccountProperties": { + "type": "object", + "properties": { + "computePolicies": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/CreateComputePolicyWithAccountParameters" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of compute policies associated with this account." + }, "dataLakeStoreAccounts": { "oneOf": [ { "type": "array", "items": { - "$ref": "#/definitions/DataLakeStoreAccountInfo" + "$ref": "#/definitions/AddDataLakeStoreWithAccountParameters" } }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "the list of Data Lake storage accounts associated with this account." + "description": "The list of Data Lake Store accounts associated with this account." }, "defaultDataLakeStoreAccount": { "type": "string", - "description": "the default data lake storage account associated with this Data Lake Analytics account." + "description": "The default Data Lake Store account associated with this account." + }, + "firewallAllowAzureIps": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Enabled", + "Disabled" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced." + }, + "firewallRules": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/CreateFirewallRuleWithAccountParameters" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of firewall rules associated with this account." + }, + "firewallState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Enabled", + "Disabled" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The current state of the IP address firewall for this account." }, "maxDegreeOfParallelism": { "oneOf": [ @@ -263,7 +567,19 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "the maximum supported degree of parallelism for this account." + "description": "The maximum supported degree of parallelism for this account." + }, + "maxDegreeOfParallelismPerJob": { + "oneOf": [ + { + "type": "integer", + "minimum": 1 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The maximum supported degree of parallelism per job for this account." }, "maxJobCount": { "oneOf": [ @@ -274,100 +590,197 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "the maximum supported jobs running under the account at the same time." + "description": "The maximum supported jobs running under the account at the same time." + }, + "minPriorityPerJob": { + "oneOf": [ + { + "type": "integer", + "minimum": 1 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The minimum supported priority per job for this account." + }, + "newTier": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Consumption", + "Commitment_100AUHours", + "Commitment_500AUHours", + "Commitment_1000AUHours", + "Commitment_5000AUHours", + "Commitment_10000AUHours", + "Commitment_50000AUHours", + "Commitment_100000AUHours", + "Commitment_500000AUHours" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The commitment tier for the next month." + }, + "queryStoreRetention": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "maximum": 180, + "default": "30" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of days that job metadata is retained." }, "storageAccounts": { "oneOf": [ { "type": "array", "items": { - "$ref": "#/definitions/StorageAccountInfo" + "$ref": "#/definitions/AddStorageAccountWithAccountParameters" } }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "the list of Azure Blob storage accounts associated with this account." + "description": "The list of Azure Blob Storage accounts associated with this account." } }, - "description": "The account specific properties that are associated with an underlying Data Lake Analytics account." + "required": [ + "dataLakeStoreAccounts", + "defaultDataLakeStoreAccount" + ] }, - "DataLakeStoreAccountInfo": { + "CreateFirewallRuleWithAccountParameters": { "type": "object", "properties": { "name": { "type": "string", - "description": "the account name of the Data Lake Store account." + "description": "The unique name of the firewall rule to create." }, "properties": { "oneOf": [ { - "$ref": "#/definitions/DataLakeStoreAccountInfoProperties" + "$ref": "#/definitions/CreateOrUpdateFirewallRuleProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Data Lake Store account properties information." + "description": "The firewall rule properties to use when creating a new firewall rule." } }, "required": [ - "name" + "name", + "properties" ], - "description": "Data Lake Store account information." + "description": "The parameters used to create a new firewall rule while creating a new Data Lake Analytics account." }, - "DataLakeStoreAccountInfoProperties": { + "CreateOrUpdateComputePolicyProperties": { "type": "object", "properties": { - "suffix": { - "type": "string", - "description": "the optional suffix for the Data Lake Store account." - } - }, - "description": "Data Lake Store account properties information." - }, - "StorageAccountInfo": { - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "the account name associated with the Azure storage account." + "maxDegreeOfParallelismPerJob": { + "oneOf": [ + { + "type": "integer", + "minimum": 1 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The maximum degree of parallelism per job this user can use to submit jobs. This property, the min priority per job property, or both must be passed." }, - "properties": { + "minPriorityPerJob": { "oneOf": [ { - "$ref": "#/definitions/StorageAccountProperties" + "type": "integer", + "minimum": 1 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The minimum priority per job this user can use to submit jobs. This property, the max degree of parallelism per job property, or both must be passed." + }, + "objectId": { + "oneOf": [ + { + "type": "string", + "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Azure Storage account properties information." + "description": "The AAD object identifier for the entity to create a policy for." + }, + "objectType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "User", + "Group", + "ServicePrincipal" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The type of AAD object the object identifier refers to." } }, "required": [ - "name", - "properties" + "objectId", + "objectType" + ], + "description": "The compute policy properties to use when creating a new compute policy." + }, + "CreateOrUpdateFirewallRuleProperties": { + "type": "object", + "properties": { + "endIpAddress": { + "type": "string", + "description": "The end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol." + }, + "startIpAddress": { + "type": "string", + "description": "The start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol." + } + }, + "required": [ + "endIpAddress", + "startIpAddress" ], - "description": "Azure Storage account information." + "description": "The firewall rule properties to use when creating a new firewall rule." }, "StorageAccountProperties": { "type": "object", "properties": { "accessKey": { "type": "string", - "description": "the access key associated with this Azure Storage account that will be used to connect to it." + "description": "The access key associated with this Azure Storage account that will be used to connect to it." }, "suffix": { "type": "string", - "description": "the optional suffix for the Data Lake account." + "description": "The optional suffix for the storage account." } }, "required": [ "accessKey" ], - "description": "Azure Storage account properties information." + "description": "The Azure Storage account properties to use when adding a new Azure Storage account." } } -} \ No newline at end of file +} diff --git a/schemas/2016-11-01/Microsoft.DataLakeAnalytics.json b/schemas/2016-11-01/Microsoft.DataLakeAnalytics.json index dfc33144bf..369e130cbb 100644 --- a/schemas/2016-11-01/Microsoft.DataLakeAnalytics.json +++ b/schemas/2016-11-01/Microsoft.DataLakeAnalytics.json @@ -787,4 +787,4 @@ "description": "The firewall rule properties to use when creating a new firewall rule." } } -} \ No newline at end of file +}