Skip to content

[Storage][Blob] Flatten and simplify access conditions #5672

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
ramya-rao-a merged 3 commits into from
Oct 21, 2019
Merged

[Storage][Blob] Flatten and simplify access conditions #5672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
862f930
[Storage][Blob] Flatten and simplify access conditions
jeremymeng Oct 19, 2019
fdc52ed
Merge remote-tracking branch 'origin/master' into pr/jeremymeng/5672
ramya-rao-a Oct 21, 2019
94b9a65
Fix merge conflict
ramya-rao-a Oct 21, 2019
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
50 changes: 25 additions & 25 deletions sdk/storage/storage-blob/src/AppendBlobClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import { AbortSignalLike } from "@azure/abort-controller";
import { BlobClient, CommonOptions } from "./internal";
import { AppendBlob } from "./generated/src/operations";
import {
AppendBlobAccessConditions,
BlobAccessConditions,
AppendBlobRequestConditions,
BlobRequestConditions,
Metadata,
ensureCpkIfSpecified
} from "./models";
Expand Down Expand Up @@ -57,10 +57,10 @@ export interface AppendBlobCreateOptions extends CommonOptions {
/**
* Conditions to meet when creating append blobs.
*
* @type {BlobAccessConditions}
* @type {BlobRequestConditions}
* @memberof AppendBlobCreateOptions
*/
accessConditions?: BlobAccessConditions;
conditions?: BlobRequestConditions;
/**
* HTTP headers to set when creating append blobs.
*
Expand Down Expand Up @@ -102,10 +102,10 @@ export interface AppendBlobAppendBlockOptions extends CommonOptions {
/**
* Conditions to meet when appending append blob blocks.
*
* @type {AppendBlobAccessConditions}
* @type {AppendBlobRequestConditions}
* @memberof AppendBlobAppendBlockOptions
*/
accessConditions?: AppendBlobAccessConditions;
conditions?: AppendBlobRequestConditions;
/**
* Callback to receive events on the progress of append block operation.
*
Expand Down Expand Up @@ -153,17 +153,17 @@ export interface AppendBlobAppendBlockFromURLOptions extends CommonOptions {
/**
* Conditions to meet when appending append blob blocks.
*
* @type {AppendBlobAccessConditions}
* @type {AppendBlobRequestConditions}
* @memberof AppendBlobAppendBlockFromURLOptions
*/
accessConditions?: AppendBlobAccessConditions;
conditions?: AppendBlobRequestConditions;
/**
* Conditions to meet for the source Azure Blob/File when copying from a URL to the blob.
*
* @type {ModifiedAccessConditions}
* @memberof AppendBlobAppendBlockFromURLOptions
*/
sourceModifiedAccessConditions?: ModifiedAccessConditions;
sourceConditions?: ModifiedAccessConditions;
/**
* An MD5 hash of the append block content from the URI.
* This hash is used to verify the integrity of the append block during transport of the data from the URI.
Expand Down Expand Up @@ -391,16 +391,16 @@ export class AppendBlobClient extends BlobClient {
*/
public async create(options: AppendBlobCreateOptions = {}): Promise<AppendBlobCreateResponse> {
const { span, spanOptions } = createSpan("AppendBlobClient-create", options.spanOptions);
options.accessConditions = options.accessConditions || {};
options.conditions = options.conditions || {};
try {
ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);

return this.appendBlobContext.create(0, {
abortSignal: options.abortSignal,
blobHTTPHeaders: options.blobHTTPHeaders,
leaseAccessConditions: options.accessConditions.leaseAccessConditions,
leaseAccessConditions: options.conditions,
metadata: options.metadata,
modifiedAccessConditions: options.accessConditions.modifiedAccessConditions,
modifiedAccessConditions: options.conditions,
cpkInfo: options.customerProvidedKey,
spanOptions
});
Expand Down Expand Up @@ -431,15 +431,15 @@ export class AppendBlobClient extends BlobClient {
options: AppendBlobAppendBlockOptions = {}
): Promise<AppendBlobAppendBlockResponse> {
const { span, spanOptions } = createSpan("AppendBlobClient-appendBlock", options.spanOptions);
options.accessConditions = options.accessConditions || {};
options.conditions = options.conditions || {};
try {
ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);

return this.appendBlobContext.appendBlock(body, contentLength, {
abortSignal: options.abortSignal,
appendPositionAccessConditions: options.accessConditions.appendPositionAccessConditions,
leaseAccessConditions: options.accessConditions.leaseAccessConditions,
modifiedAccessConditions: options.accessConditions.modifiedAccessConditions,
appendPositionAccessConditions: options.conditions,
leaseAccessConditions: options.conditions,
modifiedAccessConditions: options.conditions,
onUploadProgress: options.onProgress,
transactionalContentMD5: options.transactionalContentMD5,
transactionalContentCrc64: options.transactionalContentCrc64,
Expand Down Expand Up @@ -483,8 +483,8 @@ export class AppendBlobClient extends BlobClient {
"AppendBlobClient-appendBlockFromURL",
options.spanOptions
);
options.accessConditions = options.accessConditions || {};
options.sourceModifiedAccessConditions = options.sourceModifiedAccessConditions || {};
options.conditions = options.conditions || {};
options.sourceConditions = options.sourceConditions || {};
try {
ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);

Expand All @@ -493,14 +493,14 @@ export class AppendBlobClient extends BlobClient {
sourceRange: rangeToString({ offset: sourceOffset, count }),
sourceContentMD5: options.sourceContentMD5,
sourceContentCrc64: options.sourceContentCrc64,
leaseAccessConditions: options.accessConditions.leaseAccessConditions,
appendPositionAccessConditions: options.accessConditions.appendPositionAccessConditions,
modifiedAccessConditions: options.accessConditions.modifiedAccessConditions,
leaseAccessConditions: options.conditions,
appendPositionAccessConditions: options.conditions,
modifiedAccessConditions: options.conditions,
sourceModifiedAccessConditions: {
sourceIfMatch: options.sourceModifiedAccessConditions.ifMatch,
sourceIfModifiedSince: options.sourceModifiedAccessConditions.ifModifiedSince,
sourceIfNoneMatch: options.sourceModifiedAccessConditions.ifNoneMatch,
sourceIfUnmodifiedSince: options.sourceModifiedAccessConditions.ifUnmodifiedSince
sourceIfMatch: options.sourceConditions.ifMatch,
sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince
},
cpkInfo: options.customerProvidedKey,
spanOptions
Expand Down
Loading