Skip to content

Add two properties into LinkedIntegrationRuntime and update to latest… #4041

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

Merged
shahabhijeet merged 4 commits into from
Feb 9, 2018
Merged

Add two properties into LinkedIntegrationRuntime and update to latest… #4041

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c63728
Add two properties into LinkedIntegrationRuntime and update to latest…
zhangyd2015 Feb 3, 2018
ceb063d
Resolve conflict
zhangyd2015 Feb 7, 2018
a61ccba
Regenerate SDK according the comments
zhangyd2015 Feb 8, 2018
77d98a3
Update change logs
zhangyd2015 Feb 8, 2018
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
26 changes: 23 additions & 3 deletions src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LinkedIntegrationRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,20 @@ public LinkedIntegrationRuntime()
/// </summary>
/// <param name="name">The name of the linked integration
/// runtime.</param>
/// <param name="dataFactoryName">The data factory name for which the
/// <param name="subscriptionId">The subscription ID for which the
/// linked integration runtime belong to.</param>
/// <param name="dataFactoryName">The name of the data factory for
/// which the linked integration runtime belong to.</param>
/// <param name="dataFactoryLocation">The location of the data factory
/// for which the linked integration runtime belong to.</param>
/// <param name="createTime">The creating time of the linked
/// integration runtime.</param>
public LinkedIntegrationRuntime(string name = default(string), string dataFactoryName = default(string), System.DateTime? createTime = default(System.DateTime?))
public LinkedIntegrationRuntime(string name = default(string), string subscriptionId = default(string), string dataFactoryName = default(string), string dataFactoryLocation = default(string), System.DateTime? createTime = default(System.DateTime?))
{
Name = name;
SubscriptionId = subscriptionId;
DataFactoryName = dataFactoryName;
DataFactoryLocation = dataFactoryLocation;
CreateTime = createTime;
CustomInit();
}
Expand All @@ -55,12 +61,26 @@ public LinkedIntegrationRuntime()
public string Name { get; private set; }

/// <summary>
/// Gets the data factory name for which the linked integration runtime
/// Gets the subscription ID for which the linked integration runtime
/// belong to.
/// </summary>
[JsonProperty(PropertyName = "subscriptionId")]
public string SubscriptionId { get; private set; }

/// <summary>
/// Gets the name of the data factory for which the linked integration
/// runtime belong to.
/// </summary>
[JsonProperty(PropertyName = "dataFactoryName")]
public string DataFactoryName { get; private set; }

/// <summary>
/// Gets the location of the data factory for which the linked
/// integration runtime belong to.
/// </summary>
[JsonProperty(PropertyName = "dataFactoryLocation")]
public string DataFactoryLocation { get; private set; }

/// <summary>
/// Gets the creating time of the linked integration runtime.
/// </summary>
Expand Down
1 change: 1 addition & 0 deletions src/SDKs/DataFactory/Management.DataFactory/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Feature Additions
* Enable AAD auth via service principal and management service identity for Azure SQL DB/DW linked service types
* Support integration runtime sharing across subscription and data factory

## Version 0.4.0-preview

Expand Down
5 changes: 2 additions & 3 deletions src/SDKs/_metadata/datafactory_resource-manager.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
2018-02-02 07:13:12 UTC
2018-02-03 03:06:57 UTC

1) azure-rest-api-specs repository information
GitHub user: Azure
Branch: master
Commit: f9ec24015ab77a2d7a1dfd33ddd208824459a7ca

2) AutoRest information
Requested version: latest
Bootstrapper version: C:\Program Files\nodejs `-- autorest@2.0.4245
Bootstrapper version: C:\Users\yanzhang\AppData\Roaming\npm `-- autorest@2.0.4245

@shahabhijeet shahabhijeet Feb 7, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@zhangyd2015 please make sure the commit is part of the meta data file.
This means you are not generating it from the right repo.

@zhangyd2015 zhangyd2015 Feb 9, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It turned out the bugs in Windows 10 RS4. I changed another machine and the commit id was generated correctly.

Latest installed version: