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

[Storage] Merge upstream/master into feature/storage #4726

Merged

Conversation

HarshaNalluru
Copy link
Member

@HarshaNalluru HarshaNalluru commented Aug 8, 2019

Due to the version bump in master, resolving the merge conflicts from upstream/master into feature/storage is not so trivial. Following are the steps to ensure that the merge happens successfully.

TO DO

  • Resolve merge conflicts with [Storage] Azure Storage SDK 2018-11-09 Feature Release #4418
    • CherryPick - a0e8338 (version bump in master)
  • Delete all the recordings to avoid resolving merge conflicts in recordings
  • Storage packages in upstream/master use ms-rest-js 2.0.
    In the feature/storage branch, @azure/core-http is being used.
    • Resolve the conflicts (Done)
    • core-http lacks the new features from ms-rest-js 2.0. (@daviwil is working on it.)
    • After the above step, import the latest core-http(preview 3 ??) to get the new features
  • Merge rest of the commits from upstream/master branch
  • After the build succeeds, generate and commit the recordings
  • Finally, ensure that the live tests succeed - blob | file | queue
  • Merge locally and push to the feature/storage branch

TO REVIEW

mikeharder and others added 30 commits July 22, 2019 18:22
…4327)" (Azure#4390)

- @typescript-eslint/[email protected] introduced an implicit dependency on @typescript-eslint/typescript-estree
- Fixed in @typescript-eslint/[email protected]
- typescript-eslint/typescript-eslint#705
…ecrets (Azure#4383)

With these changes, our current API fully supports cancelling a request
before we get a response. The idea is that this feature is already
supported by the core dependencies we use, and by passing this property
through, we'll get the benefits right away without having to do other
changes.

keyvault-keys and keyvault-secrets currently have a unit test that
proves that this works for one of the functions that shares this
underlying APIs. This PR adds the support to the other similar methods.
We could also add other tests demonstrating this behavior for these
other functions.

Fixes Azure#4357
Add challenge-based authentication
* [Event Hubs] Introduce timeoutInMs on RetryOptions (Azure#4239)

* Remove ENDPOINT env var

* Remove ENDPOINT var

* Update AAD env vars

* Revert "Update AAD env vars"

This reverts commit f6834cd.

* Remove ref from tests.yml
* Regenerated Code for ARM Authorization

* Update Version in package.json

* PR Comments
* [EPH] Add support for WebSockets and proxy
This file should have been removed previously.
…4425)

- Downloads may occasionally fail due to server or network issues
- Remove deprecated parameter UseBasicParsing
…zure#4367)

* Remove ServiceClientCredentials from ServiceClient API

* Remove additional check added to isTokenCredential

This rolls back the change made in 771614e because it will prevent
forward-compatibility in `ms-rest-nodeauth` and `ms-rest-browserauth`
credentials.

* Improve RawTokenCredential comment

* Improve credential detection logic in ServiceClient

* Add isTokenCredential heuristic to identify TokenClientCredentials

* Simplify ServiceClient constructor logic around credentials

* Move RawTokenCredential from core-http to core-arm

* Delete TokenCredentials, update samples to use RawTokenCredential

* Rename RawTokenCredential to SimpleTokenCredential
* [Storage] Fixed a bug of `downloadBlobToBuffer()` and `downloadAzureFileToBuffer()` when provided offset is not 0.

* [Storage] Fixed a bug that `Aborter` cannot work during retry interval.

* [Storage] * Export `RetryPolicyType`.

* [Storage] Fixed a bug that Aborter throws timeout error even though it succeeds of blobURL or fileURL download

* [Storage] Aborter doesn't require `dom` as tsconfig lib requirement anymore for `Event` type.

* [Storage] * Fixed a bug that "err.code.toUpperCase is not a function" when retries in browser

* [Storage] Resolved CR comments

* [Storage-Queue] Updated queue API version to 2018-11-09

* [Storage][Blob] Regenerated blob protocol layer code against swagger 2018-11-09; Updated to autorest 4.1.1 and ms-rest-js ^1.8.1

* [Storage-File] Updated API version to 2018-11-09; Updated to autorest.typescript 4.1.1 and ms-rest-js ^1.8.1;

* [Storage-File] Fixed FileURL.create() and setHTTPHeaders() issues introduced by re-generation

* Added `DirectoryURL.listHandlesSegment()` and `FileURL.listHandlesSegment()` to returns a list of open handles on a directory or a file.

* Added `DirectoryURL.forceCloseHandlesSegment()`, `FileURL.forceCloseHandlesSegment()`, `DirectoryURL.forceCloseHandle()` and `FileURL.forceCloseHandle()` to  close handles

* [Storage-File] Updated recorded tests

* [Storage-File] Updated package version to 10.2.0

* Rename handlerID parameter to handlerId

* [Storage] Updated contribution.md about record and play

* [Storage-File] Updated changelog and comments to make them clearer

* [Storage-Blob] Updated ChangeLog

* [Storage-Blob]  PageBlobURL.uploadPagesFromURL() AppendBlobURL.appendBlockFromURL() BlobURL.syncCopyFromURL()

* [Storage] Resolved CR comments

* [Storage][Blob] Added ServiceURL.getUserDelegationKey()

* [Storage] Update to [email protected]; Updated HTTP client from axios to node-fetch in Node.js runtime. Support keepalive;

* [Storage] Updated samples about keepAliveOptions

* [Storage] Updated changelog; Fixed testcases; Updated pnpmlock;

* [Storage] Added vinjiang and Jason Fan as storage code owners

* [Storage] Record test cases

* [Storage] Force to YYYY-MM-DDThh:mmTZD precision for getUserDelegationKey start and expiry time

* [Storage] Resolved PR comments; Updated contribution.md & API comments; Optimized generated code import paths;
…Azure#4416)

* [Event Hubs] Define classes and interfaces for EPH as per API design
- Suppress Rush warning for non-LTS versions
@daviwil
Copy link
Contributor

daviwil commented Aug 15, 2019

I apologize for the delay, the ms-rest-js v2 changes have just been merged!

@HarshaNalluru
Copy link
Member Author

Thanks @daviwil !

@HarshaNalluru
Copy link
Member Author

#4773

daviwil and others added 4 commits August 16, 2019 12:55
…ntial type (Azure#4773)

* Re-introduce ServiceClientCredentials interface to ServiceClient API

* Update versions of local core dependencies

* Remove unneeded conflicting methods from core-http's AbortSignalLike

* Improve ServiceClient and AzureServiceClient constructor comments

* Use and re-export AbortSignalLike from @azure/abort-controller
* Add @azure/app-configuration library

* Don't auto-publish @azure/app-configuration
@HarshaNalluru HarshaNalluru merged commit 5960561 into Azure:feature/storage Aug 18, 2019
@HarshaNalluru HarshaNalluru deleted the #4418_CherryPick_2018-11-09 branch August 18, 2019 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Client This issue points to a problem in the data-plane of the library. Storage Storage Service (Queues, Blobs, Files)
Projects
None yet
Development

Successfully merging this pull request may close these issues.