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.

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

[Service Bus] Update to use core-amqp #4794

Closed

Conversation

ramya0820
Copy link
Member

Makes Service Bus build fine with latest Track 2 core dependencies.
This would be precursor step to start making changes for Service Bus Track 2.

@ramya0820 ramya0820 self-assigned this Aug 19, 2019
@ramya0820 ramya0820 changed the base branch from feature/service-bus-track-2 to master August 19, 2019 17:08
@ramya-rao-a
Copy link
Contributor

We don't intend to update the master branch to use core-amqp just yet, therefore closing this PR.

We first want to ship the ATOM based management apis being tracked in #1057 from the master branch without causing any breaking changes. Using core-amqp introduces breaking changes to Service Bus.

@ramya0820
Copy link
Member Author

Re-opening as the changes here build over master and feature/service-bus-track-2 branches.
Will review once more to see if any other changes are required.
Looking to scope changes just to make sure the master branch integration with core-amqp dependency gets in place.

@ramya0820 ramya0820 reopened this Sep 13, 2019
@ramya0820 ramya0820 changed the base branch from master to feature/service-bus-track-2 September 13, 2019 00:55
@ramya0820 ramya0820 changed the base branch from feature/service-bus-track-2 to master September 13, 2019 00:55
@ramya0820 ramya0820 changed the base branch from master to feature/service-bus-track-2 September 13, 2019 01:00
@ramya0820 ramya0820 changed the base branch from feature/service-bus-track-2 to master September 13, 2019 01:04
@ramya0820
Copy link
Member Author

The base branch can be updated to a different one from master to house the Track 2 related progress.
However, the existing feature/service-bus-track-2 is way too old / behind master and missing some key updates.

@mikeharder can we create a new branch from the one submitted in this PR as the targeted Track 2 branch for Service Bus? Because this one correctly consolidates the changes required to match master.

@ramya0820
Copy link
Member Author

One thing we can do is to review the changes in PR basing off of master. And when ready to merge, can do so onto a new branch. Thoughts? @ramya-rao-a @chradek

@KarishmaGhiya
Copy link
Member

KarishmaGhiya commented Sep 13, 2019

@ramya0820 Why can we not pull in the commits from the master into the existing branch feature/service-bus-track-2 ? Is there any other major concern other than being 490 commits behind master? Does it have some other changes that we don't intend to have as part of track 2 service bus?

Also, if we want to create a new branch with similar name, shouldn't we delete this existing branch?Having similar names branches creates a lot of unnecessary confusion

@ramya0820 ramya0820 changed the base branch from master to feature/track-2-service-bus September 13, 2019 18:52
@KarishmaGhiya
Copy link
Member

/azp run js - client - ci

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@ramya-rao-a
Copy link
Contributor

Update feature/service-bus-track-2 to have the changes from master is the right approach. I can do this if needed

@ramya-rao-a
Copy link
Contributor

The branch feature/service-bus-track-2 has been updated with changes from the master branch, merge conflicts resolved and ensured that the build runs fine.

@KarishmaGhiya
Copy link
Member

@ramya0820 Please can you open a PR to the branch feature/service-bus-track-2 and close this PR. I want to delete the branch feature/track-2-service-bus to avoid any confusions

@ramya0820 ramya0820 changed the base branch from feature/track-2-service-bus to feature/service-bus-track-2 September 17, 2019 00:55
Copy link
Contributor

@ramya-rao-a ramya-rao-a left a comment

Choose a reason for hiding this comment

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

most of the changes appearing in this PR are already part of the feature/service-bus-track-2 branch, am not sure why they are appearing as diffs here again, please take a look

@@ -58,7 +58,7 @@
"unit-test": "npm run unit-test:node && npm run unit-test:browser"
},
"dependencies": {
"@azure/event-hubs": "^2.1.1",
"@azure/event-hubs": "5.0.0-preview.3",
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 change being made? EPH will be using the older version of event hubs and is not compatible with version 5

@@ -32,7 +32,7 @@
"unit-test": "npm run unit-test:node && npm run unit-test:browser"
},
"dependencies": {
"@azure/event-hubs": "^2.1.1",
"@azure/event-hubs": "5.0.0-preview.3",
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 change being made? The testhub package has not been updated to use the latest version of event hubs yet

Copy link
Member Author

Choose a reason for hiding this comment

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

Reverted in #5324
It was required for a build fix, the common-version file changes from master fixes it

@@ -45,13 +46,13 @@ export namespace ConnectionContext {

export function create(
config: ConnectionConfig,
tokenProvider: TokenProvider,
tokenCredential: SharedKeyCredential | TokenCredential,
Copy link
Contributor

Choose a reason for hiding this comment

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

The connectionContext.ts file in the feature/service-bus-track-2 branch already has these changes, so I am not sure why these are appearing in the diffs as part of this PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

I believe the upstream branch was updated after the PR was created, it should have still pulled in the updates..
Will open a new PR

@ramya0820
Copy link
Member Author

Something seems wrong when pulling from upstream branch on local.
Closing in favor of https://github.com/Azure/azure-sdk-for-js/pull/5324/files

@ramya0820 ramya0820 closed this Sep 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants