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

[Service Bus] Merge feature/service-bus-track-2 into master #7312

Merged
merged 26 commits into from
Feb 12, 2020
Merged

[Service Bus] Merge feature/service-bus-track-2 into master #7312

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7ba4432
Pin core-amqp version to preview.1
ramya-rao-a Jul 22, 2019
79bd77b
Merge remote-tracking branch 'origin/master' into feature/service-bus…
ramya-rao-a Aug 21, 2019
3598296
Merge remote-tracking branch 'origin/master' into feature/service-bus…
ramya-rao-a Sep 13, 2019
1708b42
Update lock file
ramya-rao-a Sep 13, 2019
8b8f422
Fix merge conflicts
ramya-rao-a Sep 13, 2019
0c584b5
[Service Bus] Update to use core-amqp (#5324)
ramya0820 Jan 2, 2020
b6687e2
Merge remote-tracking branch 'origin/master' into feature/service-bus…
ramya-rao-a Jan 3, 2020
2b18d0f
Use core-amqp in atom management client, comment tests that use token…
ramya-rao-a Jan 3, 2020
7630056
Merge remote-tracking branch 'origin/master' into feature/service-bus…
ramya-rao-a Jan 8, 2020
1cc899e
Merge remote-tracking branch 'origin/master' into feature/service-bus…
ramya-rao-a Jan 14, 2020
d5a4da5
Merge remote-tracking branch 'origin/master' into feature/service-bus…
ramya-rao-a Jan 14, 2020
b04922a
[Service Bus] Update to use latest core-amqp (#6861)
ramya0820 Jan 15, 2020
6947606
[Service Bus] Update constructors to add overloads and use Azure Iden…
ramya0820 Jan 15, 2020
1f33e84
Merge remote-tracking branch 'origin/master' into feature/service-bus…
ramya-rao-a Jan 15, 2020
6f59691
Merge remote-tracking branch 'upstream/feature/service-bus-track-2' i…
HarshaNalluru Feb 10, 2020
64d9e59
sync-versions: rhea-promise and @azure/core-amqp for service-bus
HarshaNalluru Feb 10, 2020
f4dd7ed
resolve merge conflicts appropriately
HarshaNalluru Feb 10, 2020
8431d03
API Report File for "@azure/service-bus"
HarshaNalluru Feb 10, 2020
069d65c
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-js in…
HarshaNalluru Feb 11, 2020
3106eb1
Address feedback
HarshaNalluru Feb 11, 2020
d52c703
SERVICEBUS_CONNECTION_STRING_BROWSER remove from karma.conf
HarshaNalluru Feb 11, 2020
8afa665
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-js in…
HarshaNalluru Feb 11, 2020
8896002
update pnpm-lock file
HarshaNalluru Feb 11, 2020
d193227
update API Report File for "@azure/service-bus"
HarshaNalluru Feb 11, 2020
a3dd240
remove rhea and rhea-promise dependencies
HarshaNalluru Feb 11, 2020
8c72d78
add "rhea-promise" back
HarshaNalluru Feb 11, 2020
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
3 changes: 0 additions & 3 deletions common/config/rush/common-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@
// "typescript": [
// "~2.4.0"
// ]
// Following is required to allow for backward compatibility with Service Bus Track 1
// TODO: Remove this once Service Bus is updated to use current depenedencies as part of Track 2
"rhea-promise": ["^0.1.15"],
// Following is required to allow for backward compatibility with Event Processor Host Track 1
"@azure/event-hubs": ["^2.1.4"]
}
Expand Down
81 changes: 30 additions & 51 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/servicebus/service-bus/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,13 @@ export DEBUG=azure*,rhea*
- If you are **not interested in viewing the message transformation** (which consumes lot of console/disk space) then you can set the `DEBUG` environment variable as follows:

```bash
export DEBUG=azure*,rhea*,-rhea:raw,-rhea:message,-azure:amqp-common:datatransformer
export DEBUG=azure*,rhea*,-rhea:raw,-rhea:message,-azure:core-amqp:datatransformer
```

- If you are interested only in **errors**, then you can set the `DEBUG` environment variable as follows:

```bash
export DEBUG=azure:service-bus:error,azure-amqp-common:error,rhea-promise:error,rhea:events,rhea:frames,rhea:io,rhea:flow
export DEBUG=azure:service-bus:error,azure-core-amqp:error,rhea-promise:error,rhea:events,rhea:frames,rhea:io,rhea:flow
```

### Logging to a file
Expand Down
6 changes: 3 additions & 3 deletions sdk/servicebus/service-bus/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ module.exports = function(config) {
// https://www.npmjs.com/package/karma-env-preprocessor
envPreprocessor: [
"SERVICEBUS_CONNECTION_STRING",
"AAD_CLIENT_ID",
"AAD_CLIENT_SECRET",
"AAD_TENANT_ID"
"AZURE_CLIENT_ID",
"AZURE_CLIENT_SECRET",
"AZURE_TENANT_ID"
],

// test results reporter to use
Expand Down
9 changes: 4 additions & 5 deletions sdk/servicebus/service-bus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@azure/service-bus",
"sdk-type": "client",
"author": "Microsoft Corporation",
"version": "1.1.3",
"version": "2.0.0-preview.1",
"license": "MIT",
"description": "Azure Service Bus SDK for Node.js",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/servicebus/service-bus",
Expand All @@ -20,7 +20,6 @@
"module": "dist-esm/src/index.js",
"browser": {
"./dist/index.js": "./browser/service-bus.js",
"./dist-esm/test/utils/aadUtils.js": "./dist-esm/test/utils/aadUtils.browser.js",
"./dist-esm/src/util/crypto.js": "./dist-esm/src/util/crypto.browser.js",
"./dist-esm/src/util/parseUrl.js": "./dist-esm/src/util/parseUrl.browser.js",
"buffer": "buffer",
Expand Down Expand Up @@ -78,9 +77,8 @@
]
},
"dependencies": {
"@azure/amqp-common": "1.0.0-preview.10",
"@azure/core-amqp": "^1.0.1",
"@azure/core-http": "^1.0.0",
"@azure/ms-rest-nodeauth": "^0.9.2",
"@opentelemetry/types": "^0.2.0",
"@types/is-buffer": "^2.0.0",
"@types/long": "^4.0.0",
Expand All @@ -90,11 +88,12 @@
"long": "^4.0.0",
"process": "^0.11.10",
"rhea": "^1.0.18",
"rhea-promise": "^0.1.15",
"rhea-promise": "^1.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

This and rhea shouldn't be needed anymore. core-amqp pulls them in.

Copy link
Member Author

Choose a reason for hiding this comment

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

removed rhea and rhea-promise.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I didn't realize rhea-promise was being used directly. It looks like only rhea can be safely removed.

Copy link
Member Author

Choose a reason for hiding this comment

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

added "rhea-promise" back

"tslib": "^1.10.0"
},
"devDependencies": {
"@azure/eslint-plugin-azure-sdk": "^2.0.1",
"@azure/identity": "^1.0.0",
"@microsoft/api-extractor": "^7.5.4",
"@rollup/plugin-commonjs": "^11.0.1",
"@rollup/plugin-inject": "^4.0.0",
Expand Down
Loading