Skip to content

Commit

Permalink
Merge branch 'storage/stg74GA' into storage/stg75GA-apireview
Browse files Browse the repository at this point in the history
  • Loading branch information
@ljian3377
ljian3377 authored Dec 13, 2020
2 parents 17f6db9 + 5cb62dc commit 37d8c26
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 247 deletions.
103 changes: 10 additions & 93 deletions sdk/storage/storage-blob/review/storage-blob.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@ export class BlobClient extends StorageClient {
downloadToBuffer(buffer: Buffer, offset?: number, count?: number, options?: BlobDownloadToBufferOptions): Promise<Buffer>;
downloadToFile(filePath: string, offset?: number, count?: number, options?: BlobDownloadOptions): Promise<BlobDownloadResponseParsed>;
exists(options?: BlobExistsOptions): Promise<boolean>;
generateSasUrl(options: BlobGenerateSasUrlOptions): Promise<string>;
getAppendBlobClient(): AppendBlobClient;
getBlobLeaseClient(proposeLeaseId?: string): BlobLeaseClient;
getBlockBlobClient(): BlockBlobClient;
Expand Down Expand Up @@ -619,11 +618,6 @@ export interface BlobFlatListSegmentModel {
blobItems: BlobItemInternal[];
}

// @public
export interface BlobGenerateSasUrlOptions extends CommonGenerateSasUrlOptions {
permissions?: BlobSASPermissions;
}

// @public
export interface BlobGetPropertiesHeaders {
acceptRanges?: string;
Expand Down Expand Up @@ -715,7 +709,7 @@ export interface BlobGetTagsHeaders {
// @public
export interface BlobGetTagsOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
conditions?: TagConditions & LeaseAccessConditions;
conditions?: TagConditions;
}

// @public
Expand Down Expand Up @@ -1047,7 +1041,6 @@ export class BlobServiceClient extends StorageClient {
deleteContainer(containerName: string, options?: ContainerDeleteMethodOptions): Promise<ContainerDeleteResponse>;
findBlobsByTags(tagFilterSqlExpression: string, options?: ServiceFindBlobByTagsOptions): PagedAsyncIterableIterator<FilterBlobItem, ServiceFindBlobsByTagsSegmentResponse>;
static fromConnectionString(connectionString: string, options?: StoragePipelineOptions): BlobServiceClient;
generateAccountSasUrl(expiresOn?: Date, permissions?: AccountSASPermissions, resourceTypes?: string, options?: ServiceGenerateAccountSasUrlOptions): string;
getAccountInfo(options?: ServiceGetAccountInfoOptions): Promise<ServiceGetAccountInfoResponse>;
getBlobBatchClient(): BlobBatchClient;
getContainerClient(containerName: string): ContainerClient;
Expand Down Expand Up @@ -1155,7 +1148,7 @@ export interface BlobSetTagsHeaders {
// @public
export interface BlobSetTagsOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
conditions?: TagConditions & LeaseAccessConditions;
conditions?: TagConditions;
}

// @public
Expand Down Expand Up @@ -1293,7 +1286,6 @@ export class BlockBlobClient extends BlobClient {
query(query: string, options?: BlockBlobQueryOptions): Promise<BlobDownloadResponseModel>;
stageBlock(blockId: string, body: HttpRequestBody, contentLength: number, options?: BlockBlobStageBlockOptions): Promise<BlockBlobStageBlockResponse>;
stageBlockFromURL(blockId: string, sourceURL: string, offset?: number, count?: number, options?: BlockBlobStageBlockFromURLOptions): Promise<BlockBlobStageBlockFromURLResponse>;
syncUploadFromURL(sourceURL: string, options?: BlockBlobSyncUploadFromURLOptions): Promise<BlockBlobPutBlobFromUrlResponse>;
upload(body: HttpRequestBody, contentLength: number, options?: BlockBlobUploadOptions): Promise<BlockBlobUploadResponse>;
// @deprecated
uploadBrowserData(browserData: Blob | ArrayBuffer | ArrayBufferView, options?: BlockBlobParallelUploadOptions): Promise<BlobUploadCommonResponse>;
Expand Down Expand Up @@ -1386,30 +1378,6 @@ export interface BlockBlobParallelUploadOptions extends CommonOptions {
tier?: BlockBlobTier | string;
}

// @public
export interface BlockBlobPutBlobFromUrlHeaders {
clientRequestId?: string;
contentMD5?: Uint8Array;
date?: Date;
encryptionKeySha256?: string;
encryptionScope?: string;
// (undocumented)
errorCode?: string;
etag?: string;
isServerEncrypted?: boolean;
lastModified?: Date;
requestId?: string;
version?: string;
versionId?: string;
}

// @public
export type BlockBlobPutBlobFromUrlResponse = BlockBlobPutBlobFromUrlHeaders & {
_response: coreHttp.HttpResponse & {
parsedHeaders: BlockBlobPutBlobFromUrlHeaders;
};
};

// @public
export interface BlockBlobQueryOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
Expand Down Expand Up @@ -1487,22 +1455,6 @@ export type BlockBlobStageBlockResponse = BlockBlobStageBlockHeaders & {
};
};

// @public
export interface BlockBlobSyncUploadFromURLOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
blobHTTPHeaders?: BlobHTTPHeaders;
conditions?: BlobRequestConditions;
copySourceBlobProperties?: boolean;
customerProvidedKey?: CpkInfo;
encryptionScope?: string;
metadata?: Metadata;
sourceConditions?: ModifiedAccessConditions;
sourceContentMD5?: Uint8Array;
tags?: Tags;
tier?: BlockBlobTier | string;
timeoutInSeconds?: number;
}

// @public
export enum BlockBlobTier {
Archive = "Archive",
Expand Down Expand Up @@ -1572,21 +1524,6 @@ export interface BlockList {
// @public
export type BlockListType = 'committed' | 'uncommitted' | 'all';

// @public
export interface CommonGenerateSasUrlOptions {
cacheControl?: string;
contentDisposition?: string;
contentEncoding?: string;
contentLanguage?: string;
contentType?: string;
expiresOn?: Date;
identifier?: string;
ipRange?: SasIPRange;
protocol?: SASProtocol;
startsOn?: Date;
version?: string;
}

// @public
export interface CommonOptions {
tracingOptions?: OperationTracingOptions;
Expand Down Expand Up @@ -1630,7 +1567,6 @@ export class ContainerClient extends StorageClient {
deleteBlob(blobName: string, options?: ContainerDeleteBlobOptions): Promise<BlobDeleteResponse>;
deleteIfExists(options?: ContainerDeleteMethodOptions): Promise<ContainerDeleteIfExistsResponse>;
exists(options?: ContainerExistsOptions): Promise<boolean>;
generateSasUrl(options: ContainerGenerateSasUrlOptions): Promise<string>;
getAccessPolicy(options?: ContainerGetAccessPolicyOptions): Promise<ContainerGetAccessPolicyResponse>;
getAppendBlobClient(blobName: string): AppendBlobClient;
getBlobClient(blobName: string): BlobClient;
Expand Down Expand Up @@ -1728,11 +1664,6 @@ export interface ContainerExistsOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
}

// @public
export interface ContainerGenerateSasUrlOptions extends CommonGenerateSasUrlOptions {
permissions?: ContainerSASPermissions;
}

// @public
export interface ContainerGetAccessPolicyHeaders {
blobPublicAccess?: PublicAccessType;
Expand Down Expand Up @@ -2054,13 +1985,13 @@ export interface FilterBlobItemModel {
// (undocumented)
name: string;
// (undocumented)
tags?: BlobTags;
tagValue: string;
}

// @public
export interface FilterBlobSegment {
// (undocumented)
blobs: FilterBlobItemModel[];
blobs: FilterBlobItem[];
// (undocumented)
continuationToken?: string;
// (undocumented)
Expand Down Expand Up @@ -2765,41 +2696,27 @@ export interface ServiceFilterBlobsHeaders {
version?: string;
}

// @public
export type ServiceFilterBlobsResponse = FilterBlobSegment & ServiceFilterBlobsHeaders & {
_response: coreHttp.HttpResponse & {
parsedHeaders: ServiceFilterBlobsHeaders;
bodyAsText: string;
parsedBody: FilterBlobSegment;
};
};

// @public
export interface ServiceFindBlobByTagsOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
}

// @public
export type ServiceFindBlobsByTagsSegmentResponse = Omit<ServiceFilterBlobsResponse, "blobs"> & {
blobs: FilterBlobItem[];
export type ServiceFindBlobsByTagsSegmentResponse = FilterBlobSegment & ServiceFilterBlobsHeaders & {
_response: coreHttp.HttpResponse & {
parsedHeaders: ServiceFilterBlobsHeaders;
bodyAsText: string;
parsedBody: FilterBlobSegment;
};
};

// @public
export interface ServiceGenerateAccountSasUrlOptions {
ipRange?: SasIPRange;
protocol?: SASProtocol;
startsOn?: Date;
version?: string;
}

// @public
export interface ServiceGetAccountInfoHeaders {
accountKind?: AccountKind;
clientRequestId?: string;
date?: Date;
// (undocumented)
errorCode?: string;
isHierarchicalNamespaceEnabled?: boolean;
requestId?: string;
skuName?: SkuName;
version?: string;
Expand Down
60 changes: 1 addition & 59 deletions sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,21 +130,6 @@ export class AnonymousCredentialPolicy extends CredentialPolicy {

export { BaseRequestPolicy }

// @public
export interface CommonGenerateSasUrlOptions {
cacheControl?: string;
contentDisposition?: string;
contentEncoding?: string;
contentLanguage?: string;
contentType?: string;
expiresOn?: Date;
identifier?: string;
ipRange?: SasIPRange;
protocol?: SASProtocol;
startsOn?: Date;
version?: string;
}

// @public
export interface CommonOptions {
tracingOptions?: OperationTracingOptions;
Expand Down Expand Up @@ -180,7 +165,6 @@ export class DataLakeDirectoryClient extends DataLakePathClient {
create(options?: DirectoryCreateOptions): Promise<DirectoryCreateResponse>;
createIfNotExists(resourceType: PathResourceTypeModel, options?: PathCreateIfNotExistsOptions): Promise<PathCreateIfNotExistsResponse>;
createIfNotExists(options?: DirectoryCreateIfNotExistsOptions): Promise<DirectoryCreateIfNotExistsResponse>;
generateSasUrl(options: DirectoryGenerateSasUrlOptions): Promise<string>;
getFileClient(fileName: string): DataLakeFileClient;
getSubdirectoryClient(subdirectoryName: string): DataLakeDirectoryClient;
}
Expand All @@ -195,7 +179,6 @@ export class DataLakeFileClient extends DataLakePathClient {
createIfNotExists(resourceType: PathResourceTypeModel, options?: PathCreateIfNotExistsOptions): Promise<PathCreateIfNotExistsResponse>;
createIfNotExists(options?: FileCreateIfNotExistsOptions): Promise<FileCreateIfNotExistsResponse>;
flush(position: number, options?: FileFlushOptions): Promise<PathFlushDataResponse>;
generateSasUrl(options: FileGenerateSasUrlOptions): Promise<string>;
query(query: string, options?: FileQueryOptions): Promise<FileReadResponse>;
read(offset?: number, count?: number, options?: FileReadOptions): Promise<FileReadResponse>;
readToBuffer(buffer: Buffer, offset?: number, count?: number, options?: FileReadToBufferOptions): Promise<Buffer>;
Expand All @@ -218,7 +201,6 @@ export class DataLakeFileSystemClient extends StorageClient {
delete(options?: FileSystemDeleteOptions): Promise<FileSystemDeleteResponse>;
deleteIfExists(options?: FileSystemDeleteOptions): Promise<FileSystemDeleteIfExistsResponse>;
exists(options?: FileSystemExistsOptions): Promise<boolean>;
generateSasUrl(options: FileSystemGenerateSasUrlOptions): Promise<string>;
getAccessPolicy(options?: FileSystemGetAccessPolicyOptions): Promise<FileSystemGetAccessPolicyResponse>;
getDataLakeLeaseClient(proposeLeaseId?: string): DataLakeLeaseClient;
getDirectoryClient(directoryName: string): DataLakeDirectoryClient;
Expand Down Expand Up @@ -311,7 +293,7 @@ export interface DataLakeSASSignatureValues {
ipRange?: SasIPRange;
isDirectory?: boolean;
pathName?: string;
permissions?: DataLakeSASPermissions | DirectorySASPermissions | FileSystemSASPermissions;
permissions?: DataLakeSASPermissions;
preauthorizedAgentObjectId?: string;
protocol?: SASProtocol;
snapshotTime?: string;
Expand All @@ -323,7 +305,6 @@ export interface DataLakeSASSignatureValues {
export class DataLakeServiceClient extends StorageClient {
constructor(url: string, credential?: StorageSharedKeyCredential | AnonymousCredential | TokenCredential, options?: StoragePipelineOptions);
constructor(url: string, pipeline: Pipeline);
generateAccountSasUrl(expiresOn?: Date, permissions?: AccountSASPermissions, resourceTypes?: string, options?: ServiceGenerateAccountSasUrlOptions): string;
getFileSystemClient(fileSystemName: string): DataLakeFileSystemClient;
getUserDelegationKey(startsOn: Date, expiresOn: Date, options?: ServiceGetUserDelegationKeyOptions): Promise<ServiceGetUserDelegationKeyResponse>;
listFileSystems(options?: ServiceListFileSystemsOptions): PagedAsyncIterableIterator<FileSystemItem, ServiceListFileSystemsSegmentResponse>;
Expand All @@ -347,27 +328,6 @@ export interface DirectoryCreateOptions extends PathCreateOptions {
export interface DirectoryCreateResponse extends PathCreateResponse {
}

// @public
export interface DirectoryGenerateSasUrlOptions extends CommonGenerateSasUrlOptions {
permissions?: DirectorySASPermissions;
}

// @public
export class DirectorySASPermissions {
add: boolean;
create: boolean;
delete: boolean;
execute: boolean;
list: boolean;
manageAccessControl: boolean;
manageOwnership: boolean;
move: boolean;
static parse(permissions: string): DirectorySASPermissions;
read: boolean;
toString(): string;
write: boolean;
}

// @public (undocumented)
export interface FileAppendOptions extends CommonOptions {
// (undocumented)
Expand Down Expand Up @@ -420,11 +380,6 @@ export interface FileFlushOptions extends CommonOptions {
retainUncommittedData?: boolean;
}

// @public
export interface FileGenerateSasUrlOptions extends CommonGenerateSasUrlOptions {
permissions?: DataLakeSASPermissions;
}

// @public
export interface FileParallelUploadOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
Expand Down Expand Up @@ -675,11 +630,6 @@ export interface FileSystemExistsOptions extends CommonOptions {
abortSignal?: AbortSignalLike;
}

// @public
export interface FileSystemGenerateSasUrlOptions extends CommonGenerateSasUrlOptions {
permissions?: FileSystemSASPermissions;
}

// @public (undocumented)
export interface FileSystemGetAccessPolicyHeaders {
// (undocumented)
Expand Down Expand Up @@ -1700,14 +1650,6 @@ export interface SASQueryParametersOptions {
userDelegationKey?: UserDelegationKey;
}

// @public
export interface ServiceGenerateAccountSasUrlOptions {
ipRange?: SasIPRange;
protocol?: SASProtocol;
startsOn?: Date;
version?: string;
}

// @public (undocumented)
export interface ServiceGetUserDelegationKeyHeaders {
// (undocumented)
Expand Down
Loading

0 comments on commit 37d8c26

Please sign in to comment.