From e37ede0d99bb12e57cd7b8993307d079a1a03ffd Mon Sep 17 00:00:00 2001 From: Joo Wan Ro Date: Tue, 12 Sep 2017 22:00:52 -0700 Subject: [PATCH] [BUG FIX] - Making JobInnerError object recursively defined (#3666) * Code gen for ADLA * This change is mapped to this PR: https://github.com/Azure/azure-rest-api-specs/pull/1429 * This commit is for ADLA * Code gen for ADLS * This change is mapped to this PR: https://github.com/Azure/azure-rest-api-specs/pull/1429 * This commit for ADLS * Code gen for ADLS (part 2) * I missed this file! * Code gen for ADL (part 3) * Updating to the correct commit number: https://github.com/Azure/azure-rest-api-specs/pull/1452 * Update Azure Batch to 5.1.0 (#3513) * Fixing publishing of symbols. Fixing issue# 3518 (#3519) * Do hydra to swagger specs migration for azure-sdk-for-net (#3482) * Do hydra to swagger specs migration for azure-sdk-for-net * Fix build failed problem * update the assemblyinfo file with the updated version 2.6.0 * Revert "update the assemblyinfo file with the updated version 2.6.0" This reverts commit a33beb0ca5db650ab1ee672a412135dd06ba1ad5. * Updata the AssemblyFileVersion to 2.6.0.0 * revert package version * Make project files concise. * Add Provider test case * update the pr with new tests with session records * remove extra code * Fix Batch changelog references (#3517) * Fixing changelog.md * Fixing up changelog.md * [DataLake Analytics] Fixing changelog.md More descriptive and fixing indent issue that was not addressed in the previous commit * [DataLake Store] Fixing changelog.md More descriptive and fixing indent issue not addressed in a previous commit * [DataLake Analytics] Fixing changelog.md Adding an important note about retrieving a list of jobs and accounts * Revising custom Job Exists method * Ran into two regressions in JobOperationTests.cs * The custom Job Exists method is expecting a non-empty response body to validate non-existence. After speaking with a team member who implemented the service, I can no longer rely on this. Thus, I am removing the logic that checks for a non-empty response body. * Commenting out the test case for listing Jobs with a select parameter. This is currently being fixed. * Adding a TODO comment * Adding this as a reminder to re-enable the test * [CODE GEN] - Reverting readOnly for two fields * Code gen based on this very descriptive PR: https://github.com/Azure/azure-rest-api-specs/commit/e33ebf891469b27ed38f0de2d8cb37ae5d12f722 * [CODE GEN] - Updating the version (3.1.0 to 3.1.1) * [CODE REFACTOR] - Removing flaky test * Removing test case: DataLakeUploader_FreshFolderUploadDownload() * Note: In the near future, the custom ADLS Filesystem code will be replaced with a new SDK that has its own set of test cases. The account management side of ADLS will still remain, however. * [DOC] - Updating the changelog to describe 3.1.1-preview * [CODE REFACTOR] - Skipping flaky test * Skipping the flaky test as opposed to commenting it out * Also, I forgot to replace a SessionRecord file from last update, so I doing it now * [BUG FIX] - Making JobInnerError object recursively defined * Based on this PR: https://github.com/Azure/azure-rest-api-specs/pull/1627 * We are essentially adding one more property to the JobInnerError object (recursively) in order to capture the additional error information that's returned by the service * This added property has been tested successfully by a team member --- .../DataLakeAnalyticsCustomizationHelper.cs | 2 +- .../Generated/Models/JobInnerError.cs | 11 ++++++++++- ...crosoft.Azure.Management.DataLake.Analytics.csproj | 2 +- .../Properties/AssemblyInfo.cs | 2 +- src/SDKs/DataLake.Analytics/changelog.md | 8 +++++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Customizations/DataLakeAnalyticsCustomizationHelper.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Customizations/DataLakeAnalyticsCustomizationHelper.cs index e43e322584a9..d8cc1a0024d3 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Customizations/DataLakeAnalyticsCustomizationHelper.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Customizations/DataLakeAnalyticsCustomizationHelper.cs @@ -14,7 +14,7 @@ internal static class DataLakeAnalyticsCustomizationHelper /// This constant is used as the default package version to place in the user agent. /// It should mirror the package version in the project.json file. /// - internal const string PackageVersion = "3.1.1-preview"; + internal const string PackageVersion = "3.1.2-preview"; internal const string DefaultAdlaDnsSuffix = "azuredatalakeanalytics.net"; diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/Models/JobInnerError.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/Models/JobInnerError.cs index d148a8025cb1..49232dc9c52e 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/Models/JobInnerError.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/Models/JobInnerError.cs @@ -52,7 +52,9 @@ public JobInnerError() /// the ultimate source of the failure (usually /// either SYSTEM or USER). /// the error message description - public JobInnerError(int? diagnosticCode = default(int?), SeverityTypes? severity = default(SeverityTypes?), string details = default(string), string component = default(string), string errorId = default(string), string helpLink = default(string), string internalDiagnostics = default(string), string message = default(string), string resolution = default(string), string source = default(string), string description = default(string)) + /// the inner error of this specific job error + /// message, if any. + public JobInnerError(int? diagnosticCode = default(int?), SeverityTypes? severity = default(SeverityTypes?), string details = default(string), string component = default(string), string errorId = default(string), string helpLink = default(string), string internalDiagnostics = default(string), string message = default(string), string resolution = default(string), string source = default(string), string description = default(string), JobInnerError innerError = default(JobInnerError)) { DiagnosticCode = diagnosticCode; Severity = severity; @@ -65,6 +67,7 @@ public JobInnerError() Resolution = resolution; Source = source; Description = description; + InnerError = innerError; CustomInit(); } @@ -145,5 +148,11 @@ public JobInnerError() [JsonProperty(PropertyName = "description")] public string Description { get; private set; } + /// + /// Gets the inner error of this specific job error message, if any. + /// + [JsonProperty(PropertyName = "innerError")] + public JobInnerError InnerError { get; private set; } + } } diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Microsoft.Azure.Management.DataLake.Analytics.csproj b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Microsoft.Azure.Management.DataLake.Analytics.csproj index cbc2adcc4fb0..666b0969ed09 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Microsoft.Azure.Management.DataLake.Analytics.csproj +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Microsoft.Azure.Management.DataLake.Analytics.csproj @@ -3,7 +3,7 @@ Microsoft.Azure.Management.DataLake.Analytics Provides Data Lake Analytics account, job and catalog management capabilities for Microsoft Azure. - 3.1.1-preview + 3.1.2-preview Microsoft.Azure.Management.DataLake.Analytics Microsoft Azure Data Lake Analytics management;DataLakeAnalytics;Data Lake Analytics management;REST HTTP client;windowsazureofficial;netcore451511 See https://aka.ms/adladotnetsdkchangelog for release notes. diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Properties/AssemblyInfo.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Properties/AssemblyInfo.cs index 2ee6abcee659..18f3ec4c486a 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Properties/AssemblyInfo.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ [assembly: AssemblyDescription("Provides Microsoft Azure Data Lake Analytics management operations including account, catalog and job management.")] [assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.1.1.0")] +[assembly: AssemblyFileVersion("3.1.2.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Azure .NET SDK")] diff --git a/src/SDKs/DataLake.Analytics/changelog.md b/src/SDKs/DataLake.Analytics/changelog.md index e37ae3ef52bb..a9295e6b404a 100644 --- a/src/SDKs/DataLake.Analytics/changelog.md +++ b/src/SDKs/DataLake.Analytics/changelog.md @@ -1,9 +1,15 @@ ## Microsoft.Azure.Management.DataLake.Analytics release notes +### Changes in 3.1.2-preview + +**Notes** + +- The JobInnerError object is now recursively defined in order to capture additional error information returned by the service. + ### Changes in 3.1.1-preview **Notes** -- In version 3.1.0-preview, we made the fields "statistics" and "debugData" of the USqlJobProperties object read-only. This caused some unforeseen conflicts, so we are reverting this. +- Reverted the fields "statistics" and "debugData" of the USqlJobProperties object to be read-only. ### Changes in 3.1.0-preview