diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Build.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Build.json index cd340580bafd..cce6d1cf45fe 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Build.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Build.json @@ -2,75 +2,18 @@ "parameters": { "api-version": "2016-11-01", "parameters": { - "jobId": "076713da-9018-41ae-a3bd-9eab14e54d09", "name": "test_name", "type": "USql", - "submitter": "test_submitter", - "errorMessage": [{ - "description": "test_description", - "details": "test_details", - "endOffset": 1, - "errorId": "test_error_id", - "filePath": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/test_file.txt", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "lineNumber": 1, - "message": "test_message", - "resolution": "test_resolution", - "innerError": { - "diagnosticCode": 1, - "severity": "Warning", - "details": "test_details", - "component": "test_component", - "errorId": "test_error_id", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "message": "test_message", - "resolution": "test_resolution", - "source": "SYSTEM", - "description": "test_description" - }, - "severity": "Warning", - "source": "SYSTEM", - "startOffset": 1 - }], - "degreeOfParallelism": 1, - "priority": 1, - "submitTime": "2017-04-18T11:16:49.0748958-07:00", - "startTime": "2017-04-18T11:16:49.0748958-07:00", - "endTime": "2017-04-18T11:16:49.0748958-07:00", - "state": "Accepted", - "result": "Succeeded", - "logFolder": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/", - "logFilePatterns": [ - "test_log_file_pattern_1", - "test_log_file_pattern_2" - ], - "stateAuditRecords": [{ - "newState": "test_new_state", - "timeStamp": "2017-04-18T11:16:49.0748958-07:00", - "requestedByUser": "test_requested_by_user", - "details": "test_details" - }], "properties": { "runtimeVersion": "test_runtime_version", "script": "test_script", - "type": "Hive" - }, - "related": { - "pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09", - "pipelineName": "test_pipeline_name", - "pipelineUri": "https://account123.contosopipelineservice.com/076713da-9018-41ae-a3bd-9eab14e54d09", - "runId": "67034c12-b250-468e-992d-39fb978bde2c", - "recurrenceId": "67034c12-b250-468e-992d-39fb978bde2d", - "recurrenceName": "test_recurrence_name" + "type": "USql" } } }, "responses": { "200": { "body": { - "jobId": "076713da-9018-41ae-a3bd-9eab14e54d09", "name": "test_name", "type": "USql", "submitter": "test_submitter", @@ -102,18 +45,11 @@ "source": "SYSTEM", "startOffset": 1 }], - "degreeOfParallelism": 1, - "priority": 1, "submitTime": "2017-04-18T11:16:49.0748958-07:00", "startTime": "2017-04-18T11:16:49.0748958-07:00", "endTime": "2017-04-18T11:16:49.0748958-07:00", "state": "Accepted", "result": "Succeeded", - "logFolder": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/", - "logFilePatterns": [ - "test_log_file_pattern_1", - "test_log_file_pattern_2" - ], "stateAuditRecords": [{ "newState": "test_new_state", "timeStamp": "2017-04-18T11:16:49.0748958-07:00", @@ -123,15 +59,7 @@ "properties": { "runtimeVersion": "test_runtime_version", "script": "test_script", - "type": "Hive" - }, - "related": { - "pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09", - "pipelineName": "test_pipeline_name", - "pipelineUri": "https://account123.contosopipelineservice.com/076713da-9018-41ae-a3bd-9eab14e54d09", - "runId": "67034c12-b250-468e-992d-39fb978bde2c", - "recurrenceId": "67034c12-b250-468e-992d-39fb978bde2d", - "recurrenceName": "test_recurrence_name" + "type": "USql" } } } diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Create.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Create.json index c45613f38d4a..7ea3e6f57238 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Create.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Create.json @@ -3,60 +3,18 @@ "api-version": "2016-11-01", "jobIdentity": "076713da-9018-41ae-a3bd-9eab14e54d09", "parameters": { - "jobId": "076713da-9018-41ae-a3bd-9eab14e54d09", "name": "test_name", "type": "USql", - "submitter": "test_submitter", - "errorMessage": [{ - "description": "test_description", - "details": "test_details", - "endOffset": 1, - "errorId": "test_error_id", - "filePath": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/test_file.txt", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "lineNumber": 1, - "message": "test_message", - "resolution": "test_resolution", - "innerError": { - "diagnosticCode": 1, - "severity": "Warning", - "details": "test_details", - "component": "test_component", - "errorId": "test_error_id", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "message": "test_message", - "resolution": "test_resolution", - "source": "SYSTEM", - "description": "test_description" - }, - "severity": "Warning", - "source": "SYSTEM", - "startOffset": 1 - }], "degreeOfParallelism": 1, "priority": 1, - "submitTime": "2017-04-18T11:16:49.0748958-07:00", - "startTime": "2017-04-18T11:16:49.0748958-07:00", - "endTime": "2017-04-18T11:16:49.0748958-07:00", - "state": "Accepted", - "result": "Succeeded", - "logFolder": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/", "logFilePatterns": [ "test_log_file_pattern_1", "test_log_file_pattern_2" ], - "stateAuditRecords": [{ - "newState": "test_new_state", - "timeStamp": "2017-04-18T11:16:49.0748958-07:00", - "requestedByUser": "test_requested_by_user", - "details": "test_details" - }], "properties": { "runtimeVersion": "test_runtime_version", "script": "test_script", - "type": "Hive" + "type": "USql" }, "related": { "pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09", @@ -75,34 +33,6 @@ "name": "test_name", "type": "USql", "submitter": "test_submitter", - "errorMessage": [{ - "description": "test_description", - "details": "test_details", - "endOffset": 1, - "errorId": "test_error_id", - "filePath": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/test_file.txt", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "lineNumber": 1, - "message": "test_message", - "resolution": "test_resolution", - "innerError": { - "diagnosticCode": 1, - "severity": "Warning", - "details": "test_details", - "component": "test_component", - "errorId": "test_error_id", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "message": "test_message", - "resolution": "test_resolution", - "source": "SYSTEM", - "description": "test_description" - }, - "severity": "Warning", - "source": "SYSTEM", - "startOffset": 1 - }], "degreeOfParallelism": 1, "priority": 1, "submitTime": "2017-04-18T11:16:49.0748958-07:00", @@ -124,7 +54,7 @@ "properties": { "runtimeVersion": "test_runtime_version", "script": "test_script", - "type": "Hive" + "type": "USql" }, "related": { "pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09", diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_List.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_List.json index c22947463523..58f69edaa90a 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_List.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_List.json @@ -16,34 +16,6 @@ "name": "test_name", "type": "USql", "submitter": "test_submitter", - "errorMessage": [{ - "description": "test_description", - "details": "test_details", - "endOffset": 1, - "errorId": "test_error_id", - "filePath": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/test_file.txt", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "lineNumber": 1, - "message": "test_message", - "resolution": "test_resolution", - "innerError": { - "diagnosticCode": 1, - "severity": "Warning", - "details": "test_details", - "component": "test_component", - "errorId": "test_error_id", - "helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/", - "internalDiagnostics": "test_internal_diagnostics", - "message": "test_message", - "resolution": "test_resolution", - "source": "SYSTEM", - "description": "test_description" - }, - "severity": "Warning", - "source": "SYSTEM", - "startOffset": 1 - }], "degreeOfParallelism": 1, "priority": 1, "submitTime": "2017-04-18T11:16:49.0748958-07:00", @@ -56,17 +28,6 @@ "test_log_file_pattern_1", "test_log_file_pattern_2" ], - "stateAuditRecords": [{ - "newState": "test_new_state", - "timeStamp": "2017-04-18T11:16:49.0748958-07:00", - "requestedByUser": "test_requested_by_user", - "details": "test_details" - }], - "properties": { - "runtimeVersion": "test_runtime_version", - "script": "test_script", - "type": "Hive" - }, "related": { "pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09", "pipelineName": "test_pipeline_name", diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/job.json index 473560b3461c..7f12a59704d1 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/job.json @@ -303,7 +303,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/JobInformation" + "$ref": "#/definitions/BuildJobParameters" }, "description": "The parameters to build a job." }, @@ -406,7 +406,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/JobInformation" + "$ref": "#/definitions/CreateJobParameters" }, "description": "The parameters to submit a job." }, @@ -739,6 +739,7 @@ "properties": { "resources": { "type": "array", + "readOnly": true, "items": { "$ref": "#/definitions/JobResource" }, @@ -746,14 +747,17 @@ }, "statistics": { "$ref": "#/definitions/JobStatistics", + "readOnly": true, "description": "the job specific statistics." }, "debugData": { "$ref": "#/definitions/JobDataPath", + "readOnly": true, "description": "the job specific debug data locations." }, "diagnostics": { "type": "array", + "readOnly": true, "items": { "$ref": "#/definitions/Diagnostics" }, @@ -806,7 +810,8 @@ }, "compileMode": { "type": "string", - "description": "Optionally enforces a specific compilation mode for the job during execution. If this is not specified during submission, the server will determine the optimal compilation mode.", + "readOnly": true, + "description": "the specific compilation mode for the job used during execution. If this is not specified during submission, the server will determine the optimal compilation mode.", "enum": [ "Semantic", "Full", @@ -818,7 +823,7 @@ } } }, - "description": "U-SQL job properties used when submitting and retrieving U-SQL jobs." + "description": "U-SQL job properties used when retrieving U-SQL jobs." }, "HiveJobProperties": { "x-ms-discriminator-value": "Hive", @@ -851,7 +856,7 @@ "description": "the number of statements that have been run based on the script" } }, - "description": "Hive job properties used when submitting and retrieving Hive jobs." + "description": "Hive job properties used when retrieving Hive jobs." }, "JobProperties": { "discriminator": "type", @@ -875,6 +880,52 @@ }, "description": "The common Data Lake Analytics job properties." }, + "CreateUSqlJobProperties": { + "x-ms-discriminator-value": "USql", + "allOf": [ + { + "$ref": "#/definitions/CreateJobProperties" + } + ], + "properties": { + "compileMode": { + "type": "string", + "description": "Optionally enforces a specific compilation mode for the job during execution. If this is not specified during submission, the server will determine the optimal compilation mode.", + "enum": [ + "Semantic", + "Full", + "SingleBox" + ], + "x-ms-enum": { + "name": "CompileMode", + "modelAsString": false + } + } + }, + "description": "U-SQL job properties used when submitting U-SQL jobs." + }, + "CreateJobProperties": { + "discriminator": "type", + "required": [ + "script", + "type" + ], + "properties": { + "runtimeVersion": { + "type": "string", + "description": "the runtime version of the Data Lake Analytics engine to use for the specific type of job being run." + }, + "script": { + "type": "string", + "description": "the script to run" + }, + "type": { + "type": "string", + "description": "the job type of the current job (i.e. U-SQL)." + } + }, + "description": "The common Data Lake Analytics job properties for job submission." + }, "Diagnostics" : { "properties": { "columnNumber" : { @@ -1318,7 +1369,85 @@ }, "description": "Run info for a specific job pipeline." }, - "JobInformation": { + "CreateJobParameters": { + "allOf": [ + { + "$ref": "#/definitions/BaseJobParameters" + } + ], + "properties": { + "name": { + "type": "string", + "description": "the friendly name of the job to submit." + }, + "degreeOfParallelism": { + "type": "integer", + "default": 1, + "format": "int32", + "description": "the degree of parallelism to use for this job. This must be greater than 0, if set to less than 0 it will default to 1." + }, + "priority": { + "type": "integer", + "format": "int32", + "description": "the priority value to use for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0." + }, + "logFilePatterns": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the list of log file name patterns to find in the logFolder. '*' is the only matching character allowed. Example format: jobExecution*.log or *mylog*.txt" + }, + "related": { + "$ref": "#/definitions/JobRelationshipProperties", + "description": "the recurring job relationship information properties." + } + }, + "required": [ + "name" + ], + "description": "The parameters used to submit a new Data Lake Analytics job." + }, + "BuildJobParameters": { + "allOf": [ + { + "$ref": "#/definitions/BaseJobParameters" + } + ], + "properties": { + "name": { + "type": "string", + "description": "the friendly name of the job to build." + } + }, + "description": "The parameters used to build a new Data Lake Analytics job." + }, + "BaseJobParameters": { + "properties": { + "type": { + "type": "string", + "description": "the job type of the current job (Hive or USql).", + "enum": [ + "USql", + "Hive" + ], + "x-ms-enum": { + "name": "JobType", + "modelAsString": false + } + }, + "properties": { + "$ref": "#/definitions/CreateJobProperties", + "description": "the job specific properties." + } + }, + "required": [ + "type", + "properties" + ], + "description": "Data Lake Analytics Job Parameters base class for build and submit." + }, + "JobInformationBasic": { "properties": { "jobId": { "type": "string", @@ -1347,14 +1476,6 @@ "readOnly": true, "description": "the user or account that submitted the job." }, - "errorMessage": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/JobErrorDetails" - }, - "description": "the error message details for the job, if the job failed." - }, "degreeOfParallelism": { "type": "integer", "default": 1, @@ -1432,6 +1553,32 @@ }, "description": "the list of log file name patterns to find in the logFolder. '*' is the only matching character allowed. Example format: jobExecution*.log or *mylog*.txt" }, + "related": { + "$ref": "#/definitions/JobRelationshipProperties", + "description": "the recurring job relationship information properties." + } + }, + "required": [ + "name", + "type" + ], + "description": "The common Data Lake Analytics job information properties." + }, + "JobInformation": { + "allOf": [ + { + "$ref": "#/definitions/JobInformationBasic" + } + ], + "properties": { + "errorMessage": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/JobErrorDetails" + }, + "description": "the error message details for the job, if the job failed." + }, "stateAuditRecords": { "type": "array", "readOnly": true, @@ -1443,18 +1590,12 @@ "properties": { "$ref": "#/definitions/JobProperties", "description": "the job specific properties." - }, - "related": { - "$ref": "#/definitions/JobRelationshipProperties", - "description": "the recurring job relationship information properties." } }, "required": [ - "name", - "type", "properties" ], - "description": "The common Data Lake Analytics job information properties." + "description": "The extended Data Lake Analytics job information properties returned when retrieving a specific job." }, "JobInfoListResult": { "properties": { @@ -1462,7 +1603,7 @@ "type": "array", "readOnly": true, "items": { - "$ref": "#/definitions/JobInformation" + "$ref": "#/definitions/JobInformationBasic" }, "description": "the list of jobInfo items." }, diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/account.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/account.json index 07d83f09757b..baa1d7f8d12a 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/account.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/account.json @@ -1791,44 +1791,16 @@ "description": "Data Lake Account list information." }, "DataLakeAnalyticsAccountProperties": { + "allOf": [ + { + "$ref": "#/definitions/DataLakeAnalyticsAccountPropertiesBasic" + } + ], "required": [ "defaultDataLakeStoreAccount", "dataLakeStoreAccounts" ], "properties": { - "provisioningState": { - "readOnly": true, - "type": "string", - "description": "the provisioning status of the Data Lake Analytics account.", - "enum": [ - "Failed", - "Creating", - "Running", - "Succeeded", - "Patching", - "Suspending", - "Resuming", - "Deleting", - "Deleted" - ], - "x-ms-enum": { - "name": "DataLakeAnalyticsAccountStatus", - "modelAsString": false - } - }, - "state": { - "readOnly": true, - "type": "string", - "description": "the state of the Data Lake Analytics account.", - "enum": [ - "Active", - "Suspended" - ], - "x-ms-enum": { - "name": "DataLakeAnalyticsAccountState", - "modelAsString": false - } - }, "defaultDataLakeStoreAccount": { "type": "string", "description": "the default data lake storage account associated with this Data Lake Analytics account." @@ -1881,23 +1853,6 @@ }, "description": "the list of Azure Blob storage accounts associated with this account." }, - "creationTime": { - "type": "string", - "readOnly": true, - "format": "date-time", - "description": "the account creation time." - }, - "lastModifiedTime": { - "type": "string", - "readOnly": true, - "format": "date-time", - "description": "the account last modified time." - }, - "endpoint": { - "type": "string", - "readOnly": true, - "description": "the full CName endpoint for this account." - }, "newTier": { "type": "string", "enum": [ @@ -1988,7 +1943,7 @@ "description": "the list of compute policies to create in this account." } }, - "description": "The account specific properties that are associated with an underlying Data Lake Analytics account." + "description": "The account specific properties that are associated with an underlying Data Lake Analytics account. Returned only when retrieving a specific account." }, "UpdateDataLakeAnalyticsAccountProperties": { "properties": { @@ -2273,6 +2228,85 @@ }, "description": "The parameters that can be used to update an existing Data Lake Analytics account." }, + "DataLakeAnalyticsAccountBasic": { + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "required": [ + "properties" + ], + "properties": { + "properties": { + "$ref": "#/definitions/DataLakeAnalyticsAccountPropertiesBasic", + "description": "The properties defined by Data Lake Analytics all properties are specific to each resource provider.", + "x-ms-client-flatten": true + } + }, + "description": "A Data Lake Analytics account object, containing all information associated with the named Data Lake Analytics account." + }, + "DataLakeAnalyticsAccountPropertiesBasic": { + "properties": { + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "the provisioning status of the Data Lake Analytics account.", + "enum": [ + "Failed", + "Creating", + "Running", + "Succeeded", + "Patching", + "Suspending", + "Resuming", + "Deleting", + "Deleted" + ], + "x-ms-enum": { + "name": "DataLakeAnalyticsAccountStatus", + "modelAsString": false + } + }, + "state": { + "readOnly": true, + "type": "string", + "description": "the state of the Data Lake Analytics account.", + "enum": [ + "Active", + "Suspended" + ], + "x-ms-enum": { + "name": "DataLakeAnalyticsAccountState", + "modelAsString": false + } + }, + "creationTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "the account creation time." + }, + "lastModifiedTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "the account last modified time." + }, + "endpoint": { + "type": "string", + "readOnly": true, + "description": "the full CName endpoint for this account." + }, + "accountId": { + "type": "string", + "format": "uuid", + "readOnly": true, + "description": "The unique identifier associated with this Data Lake Analytics account." + } + }, + "description": "The basic account specific properties that are associated with an underlying Data Lake Analytics account." + }, "DataLakeAnalyticsAccount": { "allOf": [ { @@ -2296,7 +2330,7 @@ "value": { "type": "array", "items": { - "$ref": "#/definitions/DataLakeAnalyticsAccount" + "$ref": "#/definitions/DataLakeAnalyticsAccountBasic" }, "readOnly": true, "description": "the results of the list operation" diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Get.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Get.json index fbc1a0e438cb..336c9cb4982d 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Get.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Get.json @@ -67,7 +67,8 @@ "maxDegreeOfParallelismPerJob": 1, "minPriorityPerJob": 1 } - }] + }], + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898" } } } diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_List.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_List.json index 02a13bbd70fd..b0129e40bea8 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_List.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_List.json @@ -23,56 +23,10 @@ "properties": { "provisioningState": "Succeeded", "state": "Active", - "defaultDataLakeStoreAccount": "test_account", - "maxDegreeOfParallelism": 30, - "queryStoreRetention": 30, - "maxJobCount": 3, - "systemMaxDegreeOfParallelism": 1, - "systemMaxJobCount": 1, - "dataLakeStoreAccounts": [{ - "id": "test_adls_id", - "name": "test_adls", - "type": "test_type", - "properties": { - "suffix": "test_suffix" - } - }], - "storageAccounts": [{ - "id": "test_storage_id", - "name": "test_storage", - "type": "test_type", - "properties": { - "accessKey": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab346", - "suffix": "test_suffix" - } - }], "creationTime": "2017-04-14T13:21:56.6819037-07:00", "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", "endpoint": "test_endpoint", - "newTier": "Consumption", - "currentTier": "Consumption", - "firewallState": "Enabled", - "firewallAllowAzureIps": "Enabled", - "firewallRules": [{ - "id": "test_firewall_id", - "name": "test_rule", - "type": "test_type", - "properties": { - "startIpAddress": "1.1.1.1", - "endIpAddress": "2.2.2.2" - } - }], - "maxDegreeOfParallelismPerJob": 1, - "minPriorityPerJob": 1, - "computePolicies": [{ - "name": "test_policy", - "properties": { - "objectId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "objectType": "User", - "maxDegreeOfParallelismPerJob": 1, - "minPriorityPerJob": 1 - } - }] + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898" } }], "nextLink": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla/jobPolicies?api-version=2016-11-01&%24skiptoken=" diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_ListByResourceGroup.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_ListByResourceGroup.json index 13895a21dd98..0f1e4a6926ad 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_ListByResourceGroup.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_ListByResourceGroup.json @@ -24,56 +24,10 @@ "properties": { "provisioningState": "Succeeded", "state": "Active", - "defaultDataLakeStoreAccount": "test_account", - "maxDegreeOfParallelism": 30, - "queryStoreRetention": 30, - "maxJobCount": 3, - "systemMaxDegreeOfParallelism": 1, - "systemMaxJobCount": 1, - "dataLakeStoreAccounts": [{ - "id": "test_adls_id", - "name": "test_adls", - "type": "test_type", - "properties": { - "suffix": "test_suffix" - } - }], - "storageAccounts": [{ - "id": "test_storage_id", - "name": "test_storage", - "type": "test_type", - "properties": { - "accessKey": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab346", - "suffix": "test_suffix" - } - }], "creationTime": "2017-04-14T13:21:56.6819037-07:00", "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", "endpoint": "test_endpoint", - "newTier": "Consumption", - "currentTier": "Consumption", - "firewallState": "Enabled", - "firewallAllowAzureIps": "Enabled", - "firewallRules": [{ - "id": "test_firewall_id", - "name": "test_rule", - "type": "test_type", - "properties": { - "startIpAddress": "1.1.1.1", - "endIpAddress": "2.2.2.2" - } - }], - "maxDegreeOfParallelismPerJob": 1, - "minPriorityPerJob": 1, - "computePolicies": [{ - "name": "test_policy", - "properties": { - "objectId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "objectType": "User", - "maxDegreeOfParallelismPerJob": 1, - "minPriorityPerJob": 1 - } - }] + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898" } }], "nextLink": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla/jobPolicies?api-version=2016-11-01&%24skiptoken=" diff --git a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/account.json b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/account.json index 093f8d629618..8bb5dfc3f1b5 100644 --- a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/account.json +++ b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/account.json @@ -1184,46 +1184,12 @@ "description": "The Key Vault update information used for user managed key rotation." }, "DataLakeStoreAccountProperties": { + "allOf": [ + { + "$ref": "#/definitions/DataLakeStoreAccountPropertiesBasic" + } + ], "properties": { - "provisioningState": { - "readOnly": true, - "type": "string", - "description": "the status of the Data Lake Store account while being provisioned.", - "enum": [ - "Failed", - "Creating", - "Running", - "Succeeded", - "Patching", - "Suspending", - "Resuming", - "Deleting", - "Deleted" - ], - "x-ms-enum": { - "name": "DataLakeStoreAccountStatus", - "modelAsString": false - } - }, - "state": { - "readOnly": true, - "type": "string", - "description": "the status of the Data Lake Store account after provisioning has completed.", - "enum": [ - "Active", - "Suspended" - ], - "x-ms-enum": { - "name": "DataLakeStoreAccountState", - "modelAsString": false - } - }, - "creationTime": { - "type": "string", - "readOnly": true, - "format": "date-time", - "description": "the account creation time." - }, "encryptionState": { "type": "string", "description": "The current state of encryption for this Data Lake store account.", @@ -1291,17 +1257,6 @@ }, "description": "The list of trusted identity providers associated with this Data Lake store account." }, - "lastModifiedTime": { - "type": "string", - "readOnly": true, - "format": "date-time", - "description": "the account last modified time." - }, - "endpoint": { - "type": "string", - "readOnly": true, - "description": "the gateway host." - }, "defaultGroup": { "type": "string", "description": "the default owner group for all new folders and files created in the Data Lake Store account." @@ -1458,13 +1413,89 @@ }, "description": "Data Lake Store account information" }, + "DataLakeStoreAccountBasic": { + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/DataLakeStoreAccountPropertiesBasic", + "description": "the basic Data Lake Store account properties.", + "x-ms-client-flatten": true + } + }, + "description": "Basic Data Lake Store account information, returned on list calls." + }, + "DataLakeStoreAccountPropertiesBasic": { + "properties": { + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "the provisioning status of the Data Lake Store account.", + "enum": [ + "Failed", + "Creating", + "Running", + "Succeeded", + "Patching", + "Suspending", + "Resuming", + "Deleting", + "Deleted" + ], + "x-ms-enum": { + "name": "DataLakeStoreAccountStatus", + "modelAsString": false + } + }, + "state": { + "readOnly": true, + "type": "string", + "description": "the state of the Data Lake Store account.", + "enum": [ + "Active", + "Suspended" + ], + "x-ms-enum": { + "name": "DataLakeStoreAccountState", + "modelAsString": false + } + }, + "creationTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "the account creation time." + }, + "lastModifiedTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "the account last modified time." + }, + "endpoint": { + "type": "string", + "readOnly": true, + "description": "the full CName endpoint for this account." + }, + "accountId": { + "type": "string", + "format": "uuid", + "readOnly": true, + "description": "The unique identifier associated with this Data Lake Store account." + } + }, + "description": "The basic account specific properties that are associated with an underlying Data Lake Store account." + }, "DataLakeStoreAccountListResult": { "properties": { "value": { "type": "array", "readOnly": true, "items": { - "$ref": "#/definitions/DataLakeStoreAccount" + "$ref": "#/definitions/DataLakeStoreAccountBasic" }, "description": "the results of the list operation" }, diff --git a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Get.json b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Get.json index f1ddc3a31d63..5c7c418ccb15 100644 --- a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Get.json +++ b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Get.json @@ -58,7 +58,8 @@ "defaultGroup": "test_default_group", "newTier": "Consumption", "currentTier": "Consumption", - "firewallAllowAzureIps": "Enabled" + "firewallAllowAzureIps": "Enabled", + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898" } } } diff --git a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_List.json b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_List.json index 18582047c47e..40d0c767db01 100644 --- a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_List.json +++ b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_List.json @@ -20,50 +20,13 @@ "tags": { "test_key": "test_value" }, - "identity": { - "type": "SystemAssigned", - "principalId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "tenantId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab346" - }, "properties": { "provisioningState": "Succeeded", "state": "Active", "creationTime": "2017-04-14T13:21:56.6819037-07:00", - "encryptionState": "Enabled", - "encryptionProvisioningState": "Succeeded", - "encryptionConfig": { - "type": "UserManaged", - "keyVaultMetaInfo": { - "keyVaultResourceId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "encryptionKeyName": "test_encryption_key_name", - "encryptionKeyVersion": "encryption_key_version" - } - }, - "firewallState": "Enabled", - "firewallRules": [{ - "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "name": "test_rule", - "type": "test_type", - "properties": { - "startIpAddress": "1.1.1.1", - "endIpAddress": "2.2.2.2" - } - }], - "trustedIdProviderState": "Enabled", - "trustedIdProviders": [{ - "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "name": "test_trusted_id_provider_name", - "type": "test_type", - "properties": { - "idProvider": "https://sts.windows.net/ea9ec534-a3e3-4e45-ad36-3afc5bb291c1" - } - }], "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", "endpoint": "testadlfs17607.azuredatalakestore.net", - "defaultGroup": "test_default_group", - "newTier": "Consumption", - "currentTier": "Consumption", - "firewallAllowAzureIps": "Enabled" + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898" } }], "nextLink": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeStore/accounts/contosoadla/jobPolicies?api-version=2016-11-01&%24skiptoken=" diff --git a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_ListByResourceGroup.json b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_ListByResourceGroup.json index 4e72d7f584d3..36c407671507 100644 --- a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_ListByResourceGroup.json +++ b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_ListByResourceGroup.json @@ -21,50 +21,13 @@ "tags": { "test_key": "test_value" }, - "identity": { - "type": "SystemAssigned", - "principalId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "tenantId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab346" - }, "properties": { "provisioningState": "Succeeded", "state": "Active", "creationTime": "2017-04-14T13:21:56.6819037-07:00", - "encryptionState": "Enabled", - "encryptionProvisioningState": "Succeeded", - "encryptionConfig": { - "type": "UserManaged", - "keyVaultMetaInfo": { - "keyVaultResourceId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "encryptionKeyName": "test_encryption_key_name", - "encryptionKeyVersion": "encryption_key_version" - } - }, - "firewallState": "Enabled", - "firewallRules": [{ - "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "name": "test_rule", - "type": "test_type", - "properties": { - "startIpAddress": "1.1.1.1", - "endIpAddress": "2.2.2.2" - } - }], - "trustedIdProviderState": "Enabled", - "trustedIdProviders": [{ - "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "name": "test_trusted_id_provider_name", - "type": "test_type", - "properties": { - "idProvider": "https://sts.windows.net/ea9ec534-a3e3-4e45-ad36-3afc5bb291c1" - } - }], "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", "endpoint": "testadlfs17607.azuredatalakestore.net", - "defaultGroup": "test_default_group", - "newTier": "Consumption", - "currentTier": "Consumption", - "firewallAllowAzureIps": "Enabled" + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898" } }], "nextLink": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeStore/accounts/contosoadla/jobPolicies?api-version=2016-11-01&%24skiptoken="