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

Jump to bottom

[AutoPR datafactory/resource-manager] Add new features to Swagger #1994

Merged
merged 5 commits into from
Feb 20, 2018
Merged

[AutoPR datafactory/resource-manager] Add new features to Swagger #1994

merged 5 commits into from
Feb 20, 2018

Conversation

AutorestCI
Copy link
Contributor

@AutorestCI
Generated from d3a7a8fc4c777ea3f0840efed6e5aa30c1f0bb37
1f8d7e4 
Add new features
1. SecureOutput and BatchCount
2. Filter Activity
3. LInked Service Parameters
4. FilterActivity
@AutorestCI AutorestCI requested a review from hvermis as a code owner February 15, 2018 20:14
@AutorestCI AutorestCI mentioned this pull request Feb 15, 2018
Merged
10 tasks
@hvermis
Copy link
Contributor

hvermis commented Feb 15, 2018

Please do not merge this PR yet.

hvermis
hvermis requested changes Feb 15, 2018
View reviewed changes
azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
@@ -59,8 +59,6 @@
from .operation_list_response import OperationListResponse
from .azure_data_lake_analytics_linked_service import AzureDataLakeAnalyticsLinkedService
from .hd_insight_on_demand_linked_service import HDInsightOnDemandLinkedService
from .netezza_linked_service import NetezzaLinkedService
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this removed?

Copy link
Member

Choose a reason for hiding this comment

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

Because @haricr fork is not up to date to latest master, and we build from the branch, not from the state that would be the PR after merge.

See, 18 commits behind:
image

Copy link
Member

Choose a reason for hiding this comment

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

That's an interesting scenario indeed for the automation system.

Copy link
Contributor

Choose a reason for hiding this comment

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

Either way, we need to block the merge of this PR until we release 0.5.0. So please do not merge this.

Copy link
Member

Choose a reason for hiding this comment

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

@hvermis two things:

  • I'm working right now to improve the system and play with git to be smarter
  • The base of this PR is restapi_auto_datafactory/resource-manager, not master. I added a layer of branches. This PR will be merged automatically when the Swagger will be merged. The one you don't want to merge too early is the cumulative PR that contains all your work in progress:
    [AutoPR] restapi_auto_datafactory/resource-manager #1972

Am I clear?

Copy link
Contributor

Choose a reason for hiding this comment

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

I have approved #1972 and we want that one merged, but not the latest changes in this one that have only Hari's update - Filteractivity, parameter in Linked service etc.

Copy link
Member

Choose a reason for hiding this comment

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

I you don't merge a Swagger that you don't want to release we're good :)
That's the process anyway, since merging a Swagger means ready to release for other languages.

@lmazuel
Copy link
Member

lmazuel commented Feb 15, 2018

@AutorestCI rebase

@AutorestCI
Copy link
Contributor Author

Rebase done and pushed to the branch

@codecov-io
Copy link

codecov-io commented Feb 16, 2018 •
edited
Loading

Codecov Report

Merging #1994 into restapi_auto_datafactory/resource-manager will increase coverage by 0.5%.
The diff coverage is 56.49%.

Impacted file tree graph

@@                             Coverage Diff                              @@
##           restapi_auto_datafactory/resource-manager    #1994     +/-   ##
============================================================================
+ Coverage                                      52.69%    53.2%   +0.5%     
============================================================================
  Files                                           4763     4723     -40     
  Lines                                         120903   117305   -3598     
============================================================================
- Hits                                           63712    62412   -1300     
+ Misses                                         57191    54893   -2298
Impacted Files Coverage Δ
.../azure/mgmt/datafactory/models/control_activity.py 71.42% <ø> (ø) ⬆️
...tory/azure/mgmt/datafactory/models/web_activity.py 35.71% <ø> (ø) ⬆️
...ctory/azure/mgmt/datafactory/models/copy_source.py 100% <ø> (ø) ⬆️
...mgmt/datafactory/models/parameter_specification.py 100% <ø> (ø) ⬆️
...zure/mgmt/datafactory/models/azure_blob_dataset.py 100% <100%> (ø) ⬆️
...ry/azure/mgmt/datafactory/models/linked_service.py 100% <100%> (ø) ⬆️
...ory/models/data_factory_management_client_enums.py 100% <100%> (ø) ⬆️
...datafactory/models/azure_storage_linked_service.py 100% <100%> (ø) ⬆️
...azure/mgmt/datafactory/models/pipeline_resource.py 100% <100%> (ø) ⬆️
...gmt/datafactory/models/linked_service_reference.py 100% <100%> (ø) ⬆️
... and 301 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 852353f...24293a2. Read the comment docs.

@lmazuel
Copy link
Member

lmazuel commented Feb 16, 2018 •
edited
Loading

@hvermis I fixed the automation system. It's now generating as it would be if the Swagger is merged, so this includes commits that are not in the original fork, but are already on master.
See previous commit is catching up "master"

@hvermis
Copy link
Contributor

hvermis commented Feb 17, 2018

This PR is unblocked now.

@lmazuel lmazuel merged this pull request into restapi_auto_datafactory/resource-manager Feb 20, 2018
lmazuel pushed a commit that referenced this pull request Feb 20, 2018
@AutorestCI @lmazuel
[AutoPR datafactory/resource-manager] Add new features to Swagger (#1994
1a03456 
)

* Generated from d3a7a8fc4c777ea3f0840efed6e5aa30c1f0bb37

Add new features
1. SecureOutput and BatchCount
2. Filter Activity
3. LInked Service Parameters
4. FilterActivity

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments
@lmazuel lmazuel deleted the restapi_auto_2504 branch February 23, 2018 22:42
AutorestCI added a commit that referenced this pull request Feb 28, 2018
@AutorestCI
[AutoPR datafactory/resource-manager] Add new features to Swagger (#1994
a717dbd 
)

* Generated from d3a7a8fc4c777ea3f0840efed6e5aa30c1f0bb37

Add new features
1. SecureOutput and BatchCount
2. Filter Activity
3. LInked Service Parameters
4. FilterActivity

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments
AutorestCI added a commit that referenced this pull request Mar 7, 2018
@AutorestCI
[AutoPR datafactory/resource-manager] Add new features to Swagger (#1994
1c62b2a 
)

* Generated from d3a7a8fc4c777ea3f0840efed6e5aa30c1f0bb37

Add new features
1. SecureOutput and BatchCount
2. Filter Activity
3. LInked Service Parameters
4. FilterActivity

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments
lmazuel pushed a commit that referenced this pull request Mar 22, 2018
@AutorestCI @lmazuel
[AutoPR] datafactory/resource-manager (#2011)
e1807eb 
* [AutoPR datafactory/resource-manager] Add new features to Swagger (#1994)

* Generated from d3a7a8fc4c777ea3f0840efed6e5aa30c1f0bb37

Add new features
1. SecureOutput and BatchCount
2. Filter Activity
3. LInked Service Parameters
4. FilterActivity

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from f3fea57efdf47fafb1ee05f6462cafbc29ccbffc

Fix indentations

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments

* Generated from 2db35f5ed880e50231afcd4c30f2fbfe81b18b11

Fix review comments

* [AutoPR datafactory/resource-manager] Add AzureDatabricks Linked Service and DatabricksNote Activity (#2081)

* Generated from 2a25328ea6d9c2c7e49a1ecd3ed07aaecddd0c54

fix a description

* Generated from c1cfc35403764b249f3998e4a4df37ae98d9b824

remove addtional ,

* Generated from 831239b28db1ffc80eb34c7b0269a9cea98b04c3 (#2192)

Add package-version for ADF
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lmazuel lmazuel lmazuel left review comments

@hvermis hvermis hvermis approved these changes

Assignees
No one assigned
Labels
RestPRMerged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AutorestCI @hvermis @lmazuel @codecov-io