@azure/storage-blob 12.13.0-alpha.20230117.2 → 12.13.0-alpha.20230120.2

package/dist-esm/storage-blob/src/ContainerClient.js

@@ -1,13 +1,14 @@
 import { __asyncDelegator, __asyncGenerator, __asyncValues, __await } from "tslib";
-import { getDefaultProxySettings, isNode, isTokenCredential, URLBuilder, } from "@azure/core-http";
+import { getDefaultProxySettings, } from "@azure/core-rest-pipeline";
+import { isNode } from "@azure/core-util";
+import { isTokenCredential } from "@azure/core-auth";
 import { SpanStatusCode } from "@azure/core-tracing";
 import { AnonymousCredential } from "./credentials/AnonymousCredential";
 import { StorageSharedKeyCredential } from "./credentials/StorageSharedKeyCredential";
-import { Container } from "./generated/src/operations";
 import { newPipeline, isPipelineLike } from "./Pipeline";
 import { StorageClient } from "./StorageClient";
-import { convertTracingToRequestOptionsBase, createSpan } from "./utils/tracing";
-import { appendToURLPath, appendToURLQuery, BlobNameToString, ConvertInternalResponseOfListBlobFlat, ConvertInternalResponseOfListBlobHierarchy, EscapePath, extractConnectionStringParts, isIpEndpointStyle, parseObjectReplicationRecord, toTags, truncatedISO8061Date, } from "./utils/utils.common";
+import { createSpan } from "./utils/tracing";
+import { appendToURLPath, appendToURLQuery, assertResponse, BlobNameToString, ConvertInternalResponseOfListBlobFlat, ConvertInternalResponseOfListBlobHierarchy, EscapePath, extractConnectionStringParts, isIpEndpointStyle, parseObjectReplicationRecord, toTags, truncatedISO8061Date, } from "./utils/utils.common";
 import { generateBlobSASQueryParameters } from "./sas/BlobSASSignatureValues";
 import { BlobLeaseClient } from "./BlobLeaseClient";
 import { AppendBlobClient, BlobClient, BlockBlobClient, PageBlobClient, } from "./Clients";
@@ -76,7 +77,7 @@ export class ContainerClient extends StorageClient {
         }
         super(url, pipeline);
         this._containerName = this.getContainerNameFromUrl();
-        this.containerContext = new Container(this.storageClientContext);
+        this.containerContext = this.storageClientContext.container;
     }
     /**
      * The name of the container.
@@ -106,7 +107,7 @@ export class ContainerClient extends StorageClient {
         try {
             // Spread operator in destructuring assignments,
             // this will filter out unwanted properties from the response object into result object
-            return await this.containerContext.create(Object.assign(Object.assign({}, options), convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.containerContext.create(Object.assign({}, updatedOptions)));
         }
         catch (e) {
             span.setStatus({
@@ -131,7 +132,7 @@ export class ContainerClient extends StorageClient {
         var _a, _b;
         const { span, updatedOptions } = createSpan("ContainerClient-createIfNotExists", options);
         try {
-            const res = await this.create(updatedOptions);
+            const res = assertResponse(await this.create(updatedOptions));
             return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
         }
         catch (e) {
@@ -249,7 +250,7 @@ export class ContainerClient extends StorageClient {
         }
         const { span, updatedOptions } = createSpan("ContainerClient-getProperties", options);
         try {
-            return await this.containerContext.getProperties(Object.assign(Object.assign({ abortSignal: options.abortSignal }, options.conditions), convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.containerContext.getProperties(Object.assign(Object.assign({ abortSignal: options.abortSignal }, options.conditions), { tracingOptions: updatedOptions.tracingOptions })));
         }
         catch (e) {
             span.setStatus({
@@ -275,7 +276,12 @@ export class ContainerClient extends StorageClient {
         }
         const { span, updatedOptions } = createSpan("ContainerClient-delete", options);
         try {
-            return await this.containerContext.delete(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: options.conditions }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.containerContext.delete({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: options.conditions,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -341,7 +347,13 @@ export class ContainerClient extends StorageClient {
         }
         const { span, updatedOptions } = createSpan("ContainerClient-setMetadata", options);
         try {
-            return await this.containerContext.setMetadata(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, metadata, modifiedAccessConditions: options.conditions }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.containerContext.setMetadata({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                metadata,
+                modifiedAccessConditions: options.conditions,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -371,7 +383,11 @@ export class ContainerClient extends StorageClient {
         }
         const { span, updatedOptions } = createSpan("ContainerClient-getAccessPolicy", options);
         try {
-            const response = await this.containerContext.getAccessPolicy(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions }, convertTracingToRequestOptionsBase(updatedOptions)));
+            const response = assertResponse(await this.containerContext.getAccessPolicy({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
             const res = {
                 _response: response._response,
                 blobPublicAccess: response.blobPublicAccess,
@@ -451,7 +467,14 @@ export class ContainerClient extends StorageClient {
                     id: identifier.id,
                 });
             }
-            return await this.containerContext.setAccessPolicy(Object.assign({ abortSignal: options.abortSignal, access, containerAcl: acl, leaseAccessConditions: options.conditions, modifiedAccessConditions: options.conditions }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.containerContext.setAccessPolicy({
+                abortSignal: options.abortSignal,
+                access,
+                containerAcl: acl,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: options.conditions,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -560,9 +583,9 @@ export class ContainerClient extends StorageClient {
     async listBlobFlatSegment(marker, options = {}) {
         const { span, updatedOptions } = createSpan("ContainerClient-listBlobFlatSegment", options);
         try {
-            const response = await this.containerContext.listBlobFlatSegment(Object.assign(Object.assign({ marker }, options), convertTracingToRequestOptionsBase(updatedOptions)));
-            const wrappedResponse = Object.assign(Object.assign({}, response), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListBlobFlat(response._response.parsedBody) }), segment: Object.assign(Object.assign({}, response.segment), { blobItems: response.segment.blobItems.map((blobItemInteral) => {
-                        const blobItem = Object.assign(Object.assign({}, blobItemInteral), { name: BlobNameToString(blobItemInteral.name), tags: toTags(blobItemInteral.blobTags), objectReplicationSourceProperties: parseObjectReplicationRecord(blobItemInteral.objectReplicationMetadata) });
+            const response = assertResponse(await this.containerContext.listBlobFlatSegment(Object.assign(Object.assign({ marker }, options), { tracingOptions: updatedOptions.tracingOptions })));
+            const wrappedResponse = Object.assign(Object.assign({}, response), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListBlobFlat(response._response.parsedBody) }), segment: Object.assign(Object.assign({}, response.segment), { blobItems: response.segment.blobItems.map((blobItemInternal) => {
+                        const blobItem = Object.assign(Object.assign({}, blobItemInternal), { name: BlobNameToString(blobItemInternal.name), tags: toTags(blobItemInternal.blobTags), objectReplicationSourceProperties: parseObjectReplicationRecord(blobItemInternal.objectReplicationMetadata) });
                         return blobItem;
                     }) }) });
             return wrappedResponse;
@@ -593,9 +616,9 @@ export class ContainerClient extends StorageClient {
         var _a;
         const { span, updatedOptions } = createSpan("ContainerClient-listBlobHierarchySegment", options);
         try {
-            const response = await this.containerContext.listBlobHierarchySegment(delimiter, Object.assign(Object.assign({ marker }, options), convertTracingToRequestOptionsBase(updatedOptions)));
-            const wrappedResponse = Object.assign(Object.assign({}, response), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListBlobHierarchy(response._response.parsedBody) }), segment: Object.assign(Object.assign({}, response.segment), { blobItems: response.segment.blobItems.map((blobItemInteral) => {
-                        const blobItem = Object.assign(Object.assign({}, blobItemInteral), { name: BlobNameToString(blobItemInteral.name), tags: toTags(blobItemInteral.blobTags), objectReplicationSourceProperties: parseObjectReplicationRecord(blobItemInteral.objectReplicationMetadata) });
+            const response = assertResponse(await this.containerContext.listBlobHierarchySegment(delimiter, Object.assign(Object.assign({ marker }, options), { tracingOptions: updatedOptions.tracingOptions })));
+            const wrappedResponse = Object.assign(Object.assign({}, response), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListBlobHierarchy(response._response.parsedBody) }), segment: Object.assign(Object.assign({}, response.segment), { blobItems: response.segment.blobItems.map((blobItemInternal) => {
+                        const blobItem = Object.assign(Object.assign({}, blobItemInternal), { name: BlobNameToString(blobItemInternal.name), tags: toTags(blobItemInternal.blobTags), objectReplicationSourceProperties: parseObjectReplicationRecord(blobItemInternal.objectReplicationMetadata) });
                         return blobItem;
                     }), blobPrefixes: (_a = response.segment.blobPrefixes) === null || _a === void 0 ? void 0 : _a.map((blobPrefixInternal) => {
                         const blobPrefix = {
@@ -1011,7 +1034,13 @@ export class ContainerClient extends StorageClient {
     async findBlobsByTagsSegment(tagFilterSqlExpression, marker, options = {}) {
         const { span, updatedOptions } = createSpan("ContainerClient-findBlobsByTagsSegment", options);
         try {
-            const response = await this.containerContext.filterBlobs(Object.assign({ abortSignal: options.abortSignal, where: tagFilterSqlExpression, marker, maxPageSize: options.maxPageSize }, convertTracingToRequestOptionsBase(updatedOptions)));
+            const response = assertResponse(await this.containerContext.filterBlobs({
+                abortSignal: options.abortSignal,
+                where: tagFilterSqlExpression,
+                marker,
+                maxPageSize: options.maxPageSize,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
             const wrappedResponse = Object.assign(Object.assign({}, response), { _response: response._response, blobs: response.blobs.map((blob) => {
                     var _a;
                     let tagValue = "";
@@ -1200,23 +1229,23 @@ export class ContainerClient extends StorageClient {
             // "https://myaccount.blob.core.windows.net/mycontainer";
             // IPv4/IPv6 address hosts, Endpoints - `http://127.0.0.1:10000/devstoreaccount1/containername`
             // http://localhost:10001/devstoreaccount1/containername
-            const parsedUrl = URLBuilder.parse(this.url);
-            if (parsedUrl.getHost().split(".")[1] === "blob") {
+            const parsedUrl = new URL(this.url);
+            if (parsedUrl.hostname.split(".")[1] === "blob") {
                 // "https://myaccount.blob.core.windows.net/containername".
                 // "https://customdomain.com/containername".
                 // .getPath() -> /containername
-                containerName = parsedUrl.getPath().split("/")[1];
+                containerName = parsedUrl.pathname.split("/")[1];
             }
             else if (isIpEndpointStyle(parsedUrl)) {
                 // IPv4/IPv6 address hosts... Example - http://192.0.0.10:10001/devstoreaccount1/containername
                 // Single word domain without a [dot] in the endpoint... Example - http://localhost:10001/devstoreaccount1/containername
                 // .getPath() -> /devstoreaccount1/containername
-                containerName = parsedUrl.getPath().split("/")[2];
+                containerName = parsedUrl.pathname.split("/")[2];
             }
             else {
                 // "https://customdomain.com/containername".
                 // .getPath() -> /containername
-                containerName = parsedUrl.getPath().split("/")[1];
+                containerName = parsedUrl.pathname.split("/")[1];
             }
             // decode the encoded containerName - to get all the special characters that might be present in it
             containerName = decodeURIComponent(containerName);