Skip to content

Commit

Permalink
[BUG FIX] - Making JobInnerError object recursively defined (Azure#3666)
Browse files Browse the repository at this point in the history
* Code gen for ADLA

* This change is mapped to this PR:
Azure/azure-rest-api-specs#1429

* This commit is for ADLA

* Code gen for ADLS

* This change is mapped to this PR:
Azure/azure-rest-api-specs#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:
Azure/azure-rest-api-specs#1452

* Update Azure Batch to 5.1.0 (Azure#3513)

* Fixing publishing of symbols. Fixing issue# 3518 (Azure#3519)

* Do hydra to swagger specs migration for azure-sdk-for-net (Azure#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 a33beb0.

* 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 (Azure#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:
Azure/azure-rest-api-specs@e33ebf8

* [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:
Azure/azure-rest-api-specs#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
  • Loading branch information
ro-joowan authored and JasonYang-MSFT committed Nov 17, 2017
1 parent 5537bda commit e37ede0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
/// </summary>
internal const string PackageVersion = "3.1.1-preview";
internal const string PackageVersion = "3.1.2-preview";

internal const string DefaultAdlaDnsSuffix = "azuredatalakeanalytics.net";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ public JobInnerError()
/// <param name="source">the ultimate source of the failure (usually
/// either SYSTEM or USER).</param>
/// <param name="description">the error message description</param>
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))
/// <param name="innerError">the inner error of this specific job error
/// message, if any.</param>
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;
Expand All @@ -65,6 +67,7 @@ public JobInnerError()
Resolution = resolution;
Source = source;
Description = description;
InnerError = innerError;
CustomInit();
}

Expand Down Expand Up @@ -145,5 +148,11 @@ public JobInnerError()
[JsonProperty(PropertyName = "description")]
public string Description { get; private set; }

/// <summary>
/// Gets the inner error of this specific job error message, if any.
/// </summary>
[JsonProperty(PropertyName = "innerError")]
public JobInnerError InnerError { get; private set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<PackageId>Microsoft.Azure.Management.DataLake.Analytics</PackageId>
<Description>Provides Data Lake Analytics account, job and catalog management capabilities for Microsoft Azure.</Description>
<VersionPrefix>3.1.1-preview</VersionPrefix>
<VersionPrefix>3.1.2-preview</VersionPrefix>
<AssemblyName>Microsoft.Azure.Management.DataLake.Analytics</AssemblyName>
<PackageTags>Microsoft Azure Data Lake Analytics management;DataLakeAnalytics;Data Lake Analytics management;REST HTTP client;windowsazureofficial;netcore451511</PackageTags>
<PackageReleaseNotes>See https://aka.ms/adladotnetsdkchangelog for release notes.</PackageReleaseNotes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
8 changes: 7 additions & 1 deletion src/SDKs/DataLake.Analytics/changelog.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit e37ede0

Please sign in to comment.