Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG FIX] - Making JobInnerError object recursively defined #3666

Merged
merged 31 commits into from
Sep 13, 2017
Merged

[BUG FIX] - Making JobInnerError object recursively defined #3666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
853090a
Code gen for ADLA
ro-joowan Jul 24, 2017
8a72cc4
Code gen for ADLS
ro-joowan Jul 24, 2017
d0429b1
Code gen for ADLS (part 2)
ro-joowan Jul 24, 2017
d97f093
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
ro-joowan Jul 25, 2017
0bbe518
Code gen for ADL (part 3)
ro-joowan Jul 25, 2017
a01781f
Update Azure Batch to 5.1.0 (#3513)
matthchr Jul 27, 2017
3793362
Fixing publishing of symbols. Fixing issue# 3518 (#3519)
shahabhijeet Jul 27, 2017
9efe32f
Do hydra to swagger specs migration for azure-sdk-for-net (#3482)
Monicalyy Jul 27, 2017
caba128
Fix Batch changelog references (#3517)
matthchr Jul 27, 2017
528d017
Merge branch 'psSdkJson6' into psSdkJson6
ro-joowan Aug 2, 2017
2b8907f
Fixing changelog.md
ro-joowan Aug 3, 2017
c4593fb
Fixing up changelog.md
ro-joowan Aug 3, 2017
ddb1ea6
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
ro-joowan Aug 7, 2017
ee186ba
[DataLake Analytics] Fixing changelog.md
ro-joowan Aug 7, 2017
75f6a49
[DataLake Store] Fixing changelog.md
ro-joowan Aug 7, 2017
deb131f
[DataLake Analytics] Fixing changelog.md
ro-joowan Aug 7, 2017
398f5b5
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
ro-joowan Aug 12, 2017
7c8a514
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
ro-joowan Aug 18, 2017
7338779
Revising custom Job Exists method
ro-joowan Aug 18, 2017
5eec416
Adding a TODO comment
ro-joowan Aug 18, 2017
b047658
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
ro-joowan Aug 28, 2017
d45f70b
[CODE GEN] - Reverting readOnly for two fields
ro-joowan Aug 28, 2017
0487521
[CODE GEN] - Updating the version (3.1.0 to 3.1.1)
ro-joowan Aug 28, 2017
7c1e6f0
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
ro-joowan Aug 30, 2017
61aeb65
[CODE REFACTOR] - Removing flaky test
ro-joowan Aug 30, 2017
f9b2727
[DOC] - Updating the changelog to describe 3.1.1-preview
ro-joowan Aug 30, 2017
69f1810
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
ro-joowan Sep 5, 2017
c9e918e
[CODE REFACTOR] - Skipping flaky test
ro-joowan Sep 6, 2017
cca05fe
[BUG FIX] - Making JobInnerError object recursively defined
ro-joowan Sep 6, 2017
341b0bb
Merge branch 'psSdkJson6' into inner-error
shahabhijeet Sep 7, 2017
1699af5
Merge branch 'psSdkJson6' into inner-error
ro-joowan Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tics/Management.DataLake.Analytics/Customizations/DataLakeAnalyticsCustomizationHelper.cs
View file
Open in desktop
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";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ro-joowan can you explain what is this package number and what project.json file are you referring to.

Copy link
Contributor Author

@ro-joowan ro-joowan Sep 7, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shahabhijeet Couldn't find a project.json file in the src. Ben might be referring to the csproj file (https://github.com/ro-joowan/azure-sdk-for-net/blob/341b0bbea8d9110f2047f9d28150a4cc95ef34fc/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Microsoft.Azure.Management.DataLake.Analytics.csproj).

This is one of the three places I've been told to update the version number -- the other place being in AssemblyInfo.cs

As for its purpose, I found this in here (https://github.com/ro-joowan/azure-sdk-for-net/blob/341b0bbea8d9110f2047f9d28150a4cc95ef34fc/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Customizations/DataLakeAnalyticsAccountManagementClient.Customizations.cs):

    /// <param name='userAgentAssemblyVersion'>
    /// Optional. The version string that should be sent in the user-agent header for all requests. The default is the current version of the SDK.
    /// </param>

It looks like this custom method is a way for the user to set the SDK version in the user agent.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shahabhijeet And so this PackageVersion is used as the default SDK version in the event that the user does not provide a custom version (https://github.com/ro-joowan/azure-sdk-for-net/blob/psSdkJson6/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Customizations/DataLakeAnalyticsCustomizationHelper.cs#L29)

Copy link
Member

@shahabhijeet shahabhijeet Sep 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's revisit this in the next release.
If the package version reflects what is in project.json (which is package version in csproj)
We do pass the Assembly File version in user Agent string, so how will this version be any different from the other?
Will allow now.


internal const string DefaultAdlaDnsSuffix = "azuredatalakeanalytics.net";

Expand Down
11 changes: 10 additions & 1 deletion src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/Models/JobInnerError.cs
View file
Open in desktop
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; }

}
}
2 changes: 1 addition & 1 deletion ...lytics/Management.DataLake.Analytics/Microsoft.Azure.Management.DataLake.Analytics.csproj
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Properties/AssemblyInfo.cs
View file
Open in desktop
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
View file
Open in desktop
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