From 91edc3084d674ecabb105584ad926d4d8449b054 Mon Sep 17 00:00:00 2001 From: Joo Wan Ro Date: Mon, 24 Jul 2017 16:21:47 -0700 Subject: [PATCH] Refactoring changes in order to match with Ben's refactoring changes (#1452) * There is no functional change in this commit * This change is purely for refactoring related to Ben's refactoring changes (which has already been accepted): https://github.com/Azure/azure-rest-api-specs/pull/1429 * Reordering fields in the example files to match with Ben's refactoring changes * Other minor changes or moving code around --- .../2016-11-01/examples/Adla_Job_Build.json | 30 +++- .../2016-11-01/examples/Adla_Job_Create.json | 56 +++++-- .../2016-11-01/examples/Adla_Job_Get.json | 42 +++--- .../2016-11-01/job.json | 62 ++++---- .../2016-11-01/account.json | 8 +- .../examples/Adla_Account_Create.json | 20 +-- .../2016-11-01/examples/Adla_Account_Get.json | 10 +- .../examples/Adla_Account_Update.json | 14 +- .../2016-11-01/filesystem.json | 138 +++++++++--------- .../2016-11-01/account.json | 8 +- .../examples/Adls_Account_Create.json | 14 +- .../2016-11-01/examples/Adls_Account_Get.json | 8 +- .../examples/Adls_Account_Update.json | 10 +- 13 files changed, 236 insertions(+), 184 deletions(-) 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 cce6d1cf45fe..7ffa45a81dba 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,21 +2,42 @@ "parameters": { "api-version": "2016-11-01", "parameters": { - "name": "test_name", "type": "USql", "properties": { "runtimeVersion": "test_runtime_version", "script": "test_script", "type": "USql" - } + }, + "name": "test_name" } }, "responses": { "200": { "body": { + "jobId": "076713da-9018-41ae-a3bd-9eab14e54d09", "name": "test_name", "type": "USql", "submitter": "test_submitter", + "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" + ], + "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" + }, "errorMessage": [{ "description": "test_description", "details": "test_details", @@ -45,11 +66,6 @@ "source": "SYSTEM", "startOffset": 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", "stateAuditRecords": [{ "newState": "test_new_state", "timeStamp": "2017-04-18T11:16:49.0748958-07:00", 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 7ea3e6f57238..bc9886a8fd68 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,19 +3,19 @@ "api-version": "2016-11-01", "jobIdentity": "076713da-9018-41ae-a3bd-9eab14e54d09", "parameters": { - "name": "test_name", "type": "USql", + "properties": { + "runtimeVersion": "test_runtime_version", + "script": "test_script", + "type": "USql" + }, + "name": "test_name", "degreeOfParallelism": 1, "priority": 1, "logFilePatterns": [ "test_log_file_pattern_1", "test_log_file_pattern_2" ], - "properties": { - "runtimeVersion": "test_runtime_version", - "script": "test_script", - "type": "USql" - }, "related": { "pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09", "pipelineName": "test_pipeline_name", @@ -45,6 +45,42 @@ "test_log_file_pattern_1", "test_log_file_pattern_2" ], + "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" + }, + "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 + }], "stateAuditRecords": [{ "newState": "test_new_state", "timeStamp": "2017-04-18T11:16:49.0748958-07:00", @@ -55,14 +91,6 @@ "runtimeVersion": "test_runtime_version", "script": "test_script", "type": "USql" - }, - "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" } } } diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Get.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Get.json index 2552eea2c1ef..1f910c27948d 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Get.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Get.json @@ -10,6 +10,26 @@ "name": "test_name", "type": "USql", "submitter": "test_submitter", + "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" + ], + "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" + }, "errorMessage": [{ "description": "test_description", "details": "test_details", @@ -38,18 +58,6 @@ "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", @@ -59,15 +67,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/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/job.json index 7f12a59704d1..eba983c46077 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 @@ -35,7 +35,7 @@ "application/json" ], "paths": { - "/pipelines" : { + "/pipelines": { "get": { "tags": [ "Pipeline" @@ -128,7 +128,7 @@ } } }, - "/recurrences" : { + "/recurrences": { "get": { "tags": [ "Recurrence" @@ -352,14 +352,14 @@ } }, "/Jobs/{jobIdentity}": { - "get": { + "put": { "tags": [ "Job" ], - "operationId": "Job_Get", - "description": "Gets the job information for the specified job ID.", + "operationId": "Job_Create", + "description": "Submits a job to the specified Data Lake Analytics account.", "x-ms-examples": { - "Gets the job information for the specified job ID": { "$ref": "./examples/Adla_Job_Get.json" } + "Submits a job to the specified Data Lake Analytics account": { "$ref": "./examples/Adla_Job_Create.json" } }, "parameters": [ { @@ -368,7 +368,16 @@ "required": true, "type": "string", "format": "uuid", - "description": "JobInfo ID." + "description": "The job ID (a GUID) for the job being submitted." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/CreateJobParameters" + }, + "description": "The parameters to submit a job." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -376,21 +385,21 @@ ], "responses": { "200": { - "description": "Successfully retrieved details of the specified job.", + "description": "Successfully submitted the job.", "schema": { "$ref": "#/definitions/JobInformation" } } } }, - "put": { + "get": { "tags": [ "Job" ], - "operationId": "Job_Create", - "description": "Submits a job to the specified Data Lake Analytics account.", + "operationId": "Job_Get", + "description": "Gets the job information for the specified job ID.", "x-ms-examples": { - "Submits a job to the specified Data Lake Analytics account": { "$ref": "./examples/Adla_Job_Create.json" } + "Gets the job information for the specified job ID": { "$ref": "./examples/Adla_Job_Get.json" } }, "parameters": [ { @@ -399,16 +408,7 @@ "required": true, "type": "string", "format": "uuid", - "description": "The job ID (a GUID) for the job being submitted." - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/CreateJobParameters" - }, - "description": "The parameters to submit a job." + "description": "JobInfo ID." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -416,7 +416,7 @@ ], "responses": { "200": { - "description": "Successfully submitted the job.", + "description": "Successfully retrieved details of the specified job.", "schema": { "$ref": "#/definitions/JobInformation" } @@ -695,7 +695,7 @@ "details": { "type": "string", "readOnly": true, - "description": " the details of the audit log." + "description": "the details of the audit log." } }, "description": "The Data Lake Analytics job state audit records for tracking the lifecycle of a job." @@ -926,32 +926,32 @@ }, "description": "The common Data Lake Analytics job properties for job submission." }, - "Diagnostics" : { + "Diagnostics": { "properties": { - "columnNumber" : { + "columnNumber": { "description": "the column where the error occured.", "type": "integer", "format": "int32", "readOnly": true }, - "end" : { + "end": { "description": "the ending index of the error.", "type": "integer", "format": "int32", "readOnly": true }, - "lineNumber" : { + "lineNumber": { "description": "the line number the error occured on.", "type": "integer", "format": "int32", "readOnly": true }, - "message" : { + "message": { "description": "the error message.", "type": "string", "readOnly": true }, - "severity" : { + "severity": { "description": "the severity of the error.", "readOnly": true, "type": "string", @@ -968,7 +968,7 @@ "modelAsString": false } }, - "start" : { + "start": { "description": "the starting index of the error.", "type": "integer", "format": "int32", 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 baa1d7f8d12a..0c730535dcc0 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 @@ -1443,14 +1443,14 @@ } ], "responses": { - "201": { - "description": "Successfully initiated creation of the specified account.", + "200": { + "description": "Successfully created the specified account.", "schema": { "$ref": "#/definitions/DataLakeAnalyticsAccount" } }, - "200": { - "description": "Successfully created the specified account.", + "201": { + "description": "Successfully initiated creation of the specified account.", "schema": { "$ref": "#/definitions/DataLakeAnalyticsAccount" } diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Create.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Create.json index 0bba6ff6a53f..453b295ad544 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Create.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Create.json @@ -58,7 +58,7 @@ } }, "responses": { - "201": { + "200": { "body": { "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "name": "test_account", @@ -70,6 +70,10 @@ "properties": { "provisioningState": "Succeeded", "state": "Active", + "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "test_endpoint", + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "defaultDataLakeStoreAccount": "test_account", "maxDegreeOfParallelism": 30, "queryStoreRetention": 30, @@ -93,9 +97,6 @@ "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", @@ -123,9 +124,9 @@ } } }, - "200": { + "201": { "body": { - "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "name": "test_account", "type": "test_type", "location": "test_location", @@ -135,6 +136,10 @@ "properties": { "provisioningState": "Succeeded", "state": "Active", + "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "test_endpoint", + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "defaultDataLakeStoreAccount": "test_account", "maxDegreeOfParallelism": 30, "queryStoreRetention": 30, @@ -158,9 +163,6 @@ "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", 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 336c9cb4982d..54f5282d66f3 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 @@ -18,6 +18,10 @@ "properties": { "provisioningState": "Succeeded", "state": "Active", + "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "test_endpoint", + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "defaultDataLakeStoreAccount": "test_account", "maxDegreeOfParallelism": 30, "queryStoreRetention": 30, @@ -41,9 +45,6 @@ "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", @@ -67,8 +68,7 @@ "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_Update.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Update.json index 9d392d9bf58d..d2c52e226875 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Update.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Account_Update.json @@ -51,6 +51,10 @@ "properties": { "provisioningState": "Succeeded", "state": "Active", + "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "test_endpoint", + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "defaultDataLakeStoreAccount": "test_account", "maxDegreeOfParallelism": 30, "queryStoreRetention": 30, @@ -74,9 +78,6 @@ "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", @@ -116,6 +117,10 @@ "properties": { "provisioningState": "Succeeded", "state": "Active", + "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "test_endpoint", + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "defaultDataLakeStoreAccount": "test_account", "maxDegreeOfParallelism": 30, "queryStoreRetention": 30, @@ -139,9 +144,6 @@ "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", diff --git a/specification/datalake-store/data-plane/Microsoft.DataLakeStore/2016-11-01/filesystem.json b/specification/datalake-store/data-plane/Microsoft.DataLakeStore/2016-11-01/filesystem.json index 297a17155d77..52193b09cdc3 100644 --- a/specification/datalake-store/data-plane/Microsoft.DataLakeStore/2016-11-01/filesystem.json +++ b/specification/datalake-store/data-plane/Microsoft.DataLakeStore/2016-11-01/filesystem.json @@ -35,6 +35,75 @@ ], "paths": { "/WebHdfsExt/{path}": { + "put": { + "tags": [ + "FileSystem" + ], + "operationId": "FileSystem_SetFileExpiry", + "description": "Sets or removes the expiration time on the specified file. This operation can only be executed against files. Folders are not supported.", + "x-ms-examples": { + "Sets or removes the expiration time on the specified file. This operation can only be executed against files. Folders are not supported": { "$ref": "./examples/Adls_FileSystem_SetFileExpiry.json" } + }, + "parameters": [ + { + "name": "path", + "in": "path", + "required": true, + "type": "string", + "description": "The Data Lake Store path (starting with '/') of the file on which to set or remove the expiration time." + }, + { + "name": "expiryOption", + "in": "query", + "required": true, + "type": "string", + "enum": [ + "NeverExpire", + "RelativeToNow", + "RelativeToCreationDate", + "Absolute" + ], + "x-ms-enum": { + "name": "ExpiryOptionType", + "modelAsString": false + }, + "description": "Indicates the type of expiration to use for the file: 1. NeverExpire: ExpireTime is ignored. 2. RelativeToNow: ExpireTime is an integer in milliseconds representing the expiration date relative to when file expiration is updated. 3. RelativeToCreationDate: ExpireTime is an integer in milliseconds representing the expiration date relative to file creation. 4. Absolute: ExpireTime is an integer in milliseconds, as a Unix timestamp relative to 1/1/1970 00:00:00." + }, + { + "name": "expireTime", + "in": "query", + "required": false, + "type": "integer", + "format": "int64", + "description": "The time that the file will expire, corresponding to the ExpiryOption that was set." + }, + { + "name": "op", + "in": "query", + "required": true, + "type": "string", + "description": "The constant value for the operation.", + "enum": [ + "SETEXPIRY" + ] + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully set the expiration time on the specified file." + }, + "default": { + "description": "An unexpected error from the server.", + "schema": + { + "$ref": "#/definitions/AdlsError" + } + } + } + }, "post": { "tags": [ "FileSystem" @@ -132,75 +201,6 @@ } } } - }, - "put": { - "tags": [ - "FileSystem" - ], - "operationId": "FileSystem_SetFileExpiry", - "description": "Sets or removes the expiration time on the specified file. This operation can only be executed against files. Folders are not supported.", - "x-ms-examples": { - "Sets or removes the expiration time on the specified file. This operation can only be executed against files. Folders are not supported": { "$ref": "./examples/Adls_FileSystem_SetFileExpiry.json" } - }, - "parameters": [ - { - "name": "path", - "in": "path", - "required": true, - "type": "string", - "description": "The Data Lake Store path (starting with '/') of the file on which to set or remove the expiration time." - }, - { - "name": "expiryOption", - "in": "query", - "required": true, - "type": "string", - "enum": [ - "NeverExpire", - "RelativeToNow", - "RelativeToCreationDate", - "Absolute" - ], - "x-ms-enum": { - "name": "ExpiryOptionType", - "modelAsString": false - }, - "description": "Indicates the type of expiration to use for the file: 1. NeverExpire: ExpireTime is ignored. 2. RelativeToNow: ExpireTime is an integer in milliseconds representing the expiration date relative to when file expiration is updated. 3. RelativeToCreationDate: ExpireTime is an integer in milliseconds representing the expiration date relative to file creation. 4. Absolute: ExpireTime is an integer in milliseconds, as a Unix timestamp relative to 1/1/1970 00:00:00." - }, - { - "name": "expireTime", - "in": "query", - "required": false, - "type": "integer", - "format": "int64", - "description": "The time that the file will expire, corresponding to the ExpiryOption that was set." - }, - { - "name": "op", - "in": "query", - "required": true, - "type": "string", - "description": "The constant value for the operation.", - "enum": [ - "SETEXPIRY" - ] - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Successfully set the expiration time on the specified file." - }, - "default": { - "description": "An unexpected error from the server.", - "schema": - { - "$ref": "#/definitions/AdlsError" - } - } - } } }, "/webhdfs/v1/{path}": { 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 8bb5dfc3f1b5..353c5835cd8b 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 @@ -585,14 +585,14 @@ } ], "responses": { - "201": { - "description": "Successfully initiated creation of the account.", + "200": { + "description": "Successfully created the account.", "schema": { "$ref": "#/definitions/DataLakeStoreAccount" } }, - "200": { - "description": "Successfully created the account.", + "201": { + "description": "Successfully initiated creation of the account.", "schema": { "$ref": "#/definitions/DataLakeStoreAccount" } diff --git a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Create.json b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Create.json index cd47afc10a4b..dd6c63323890 100644 --- a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Create.json +++ b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Create.json @@ -44,7 +44,7 @@ } }, "responses": { - "201": { + "200": { "body": { "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "name": "contosoadla", @@ -62,6 +62,9 @@ "provisioningState": "Succeeded", "state": "Active", "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "testadlfs17607.azuredatalakestore.net", + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898", "encryptionState": "Enabled", "encryptionProvisioningState": "Succeeded", "encryptionConfig": { @@ -91,8 +94,6 @@ "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", @@ -100,7 +101,7 @@ } } }, - "200": { + "201": { "body": { "id": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "name": "contosoadla", @@ -118,6 +119,9 @@ "provisioningState": "Succeeded", "state": "Active", "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "testadlfs17607.azuredatalakestore.net", + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898", "encryptionState": "Enabled", "encryptionProvisioningState": "Succeeded", "encryptionConfig": { @@ -147,8 +151,6 @@ "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", 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 5c7c418ccb15..552dfd61bd95 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 @@ -24,6 +24,9 @@ "provisioningState": "Succeeded", "state": "Active", "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "testadlfs17607.azuredatalakestore.net", + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898", "encryptionState": "Enabled", "encryptionProvisioningState": "Succeeded", "encryptionConfig": { @@ -53,13 +56,10 @@ "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" + "firewallAllowAzureIps": "Enabled" } } } diff --git a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Update.json b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Update.json index e671dd80e49c..d66e6d45dd64 100644 --- a/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Update.json +++ b/specification/datalake-store/resource-manager/Microsoft.DataLakeStore/2016-11-01/examples/Adls_Account_Update.json @@ -41,6 +41,9 @@ "provisioningState": "Succeeded", "state": "Active", "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "testadlfs17607.azuredatalakestore.net", + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898", "encryptionState": "Enabled", "encryptionProvisioningState": "Succeeded", "encryptionConfig": { @@ -70,8 +73,6 @@ "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", @@ -97,6 +98,9 @@ "provisioningState": "Succeeded", "state": "Active", "creationTime": "2017-04-14T13:21:56.6819037-07:00", + "lastModifiedTime": "2017-04-14T13:21:56.6819037-07:00", + "endpoint": "testadlfs17607.azuredatalakestore.net", + "accountId": "94f4bf5d-78a9-4c31-8aa7-b34d07bad898", "encryptionState": "Enabled", "encryptionProvisioningState": "Succeeded", "encryptionConfig": { @@ -126,8 +130,6 @@ "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",