@ms-cloudpack/remote-cache 0.9.19 → 0.10.1

package/dist/{AzureRemoteCacheClient-2PTNMOT6.js → AzureRemoteCacheClient-XD7JMDG2.js}

@@ -4,17 +4,15 @@ import topLevelUrl from 'node:url';
 const require = topLevelCreateRequire(import.meta.url);
 const __filename = topLevelUrl.fileURLToPath(import.meta.url);
 const __dirname = topLevelPath.dirname(__filename);
+import {
+  require_dist
+} from "./chunk-RCTPZOA2.js";
 import {
   require_package as require_package2
 } from "./chunk-N4V3CONX.js";
-import {
-  createBlobStorageUrl,
-  require_dist
-} from "./chunk-LTZT5O5D.js";
 import {
   require_package2 as require_package
-} from "./chunk-RMB6VPNI.js";
-import "./chunk-KLSW7CDL.js";
+} from "./chunk-AAHKL65V.js";
 import {
   __commonJS,
   __name,
@@ -5326,9 +5324,9 @@ var require_lib2 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-config-npm-6.4.2-fc6a95e4f7/package/lib/cacheConfig.js
+// ../../node_modules/.store/backfill-config-npm-6.5.0-cd285d3dfd/package/lib/cacheConfig.js
 var require_cacheConfig = __commonJS({
-  "../../node_modules/.store/backfill-config-npm-6.4.2-fc6a95e4f7/package/lib/cacheConfig.js"(exports) {
+  "../../node_modules/.store/backfill-config-npm-6.5.0-cd285d3dfd/package/lib/cacheConfig.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getAzureBlobConfigFromSerializedOptions = exports.getNpmConfigFromSerializedOptions = void 0;
@@ -5369,9 +5367,9 @@ var require_cacheConfig = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-config-npm-6.4.2-fc6a95e4f7/package/lib/envConfig.js
+// ../../node_modules/.store/backfill-config-npm-6.5.0-cd285d3dfd/package/lib/envConfig.js
 var require_envConfig = __commonJS({
-  "../../node_modules/.store/backfill-config-npm-6.4.2-fc6a95e4f7/package/lib/envConfig.js"(exports) {
+  "../../node_modules/.store/backfill-config-npm-6.5.0-cd285d3dfd/package/lib/envConfig.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getEnvConfig = void 0;
@@ -5435,9 +5433,9 @@ var require_envConfig = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-config-npm-6.4.2-fc6a95e4f7/package/lib/index.js
+// ../../node_modules/.store/backfill-config-npm-6.5.0-cd285d3dfd/package/lib/index.js
 var require_lib3 = __commonJS({
-  "../../node_modules/.store/backfill-config-npm-6.4.2-fc6a95e4f7/package/lib/index.js"(exports) {
+  "../../node_modules/.store/backfill-config-npm-6.5.0-cd285d3dfd/package/lib/index.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
@@ -26234,9 +26232,9 @@ var require_lib9 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/helpers.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/helpers.js
 var require_helpers = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/helpers.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/helpers.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -26272,9 +26270,9 @@ var require_helpers = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/hashOfFiles.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/hashOfFiles.js
 var require_hashOfFiles = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/hashOfFiles.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/hashOfFiles.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
@@ -26328,9 +26326,9 @@ var require_hashOfFiles = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/resolveInternalDependencies.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/resolveInternalDependencies.js
 var require_resolveInternalDependencies = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/resolveInternalDependencies.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/resolveInternalDependencies.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.resolveInternalDependencies = exports.filterInternalDependencies = void 0;
@@ -26350,9 +26348,9 @@ var require_resolveInternalDependencies = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/resolveExternalDependencies.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/resolveExternalDependencies.js
 var require_resolveExternalDependencies = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/resolveExternalDependencies.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/resolveExternalDependencies.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.resolveExternalDependencies = exports.addToQueue = exports.filterExternalDependencies = void 0;
@@ -26418,9 +26416,9 @@ var require_resolveExternalDependencies = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/hashOfPackage.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/hashOfPackage.js
 var require_hashOfPackage = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/hashOfPackage.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/hashOfPackage.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -39133,9 +39131,9 @@ var require_lib12 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/createPackageHashes.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/createPackageHashes.js
 var require_createPackageHashes = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/createPackageHashes.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/createPackageHashes.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -39177,9 +39175,9 @@ var require_createPackageHashes = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/repoInfo.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/repoInfo.js
 var require_repoInfo = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/repoInfo.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/repoInfo.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getRepoInfo = exports.getRepoInfoNoCache = void 0;
@@ -39236,9 +39234,9 @@ var require_repoInfo = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/index.js
+// ../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/index.js
 var require_lib13 = __commonJS({
-  "../../node_modules/.store/backfill-hasher-npm-6.5.2-eded1d6289/package/lib/index.js"(exports) {
+  "../../node_modules/.store/backfill-hasher-npm-6.5.3-199890ec07/package/lib/index.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
@@ -44750,9 +44748,9 @@ var require_package55 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/hashFile.js
+// ../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/hashFile.js
 var require_hashFile = __commonJS({
-  "../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/hashFile.js"(exports) {
+  "../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/hashFile.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
@@ -44826,9 +44824,9 @@ var require_hashFile = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/CacheStorage.js
+// ../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/CacheStorage.js
 var require_CacheStorage = __commonJS({
-  "../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/CacheStorage.js"(exports) {
+  "../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/CacheStorage.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -44884,9 +44882,9 @@ var require_CacheStorage = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/AzureBlobCacheStorage.js
+// ../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/AzureBlobCacheStorage.js
 var require_AzureBlobCacheStorage = __commonJS({
-  "../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/AzureBlobCacheStorage.js"(exports) {
+  "../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/AzureBlobCacheStorage.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
@@ -44963,22 +44961,24 @@ var require_AzureBlobCacheStorage = __commonJS({
       bufferSize: FOUR_MEGABYTES,
       maxBuffers: 5
     };
-    async function createBlobClient(connectionString, containerName, blobName, credential) {
-      const { BlobServiceClient: BlobServiceClient2 } = await Promise.resolve().then(() => __importStar(require_dist()));
-      const blobServiceClient = credential ? new BlobServiceClient2(connectionString, credential) : BlobServiceClient2.fromConnectionString(connectionString);
-      const containerClient = blobServiceClient.getContainerClient(containerName);
-      const blobClient = containerClient.getBlobClient(blobName);
-      return blobClient;
-    }
-    __name(createBlobClient, "createBlobClient");
     var _AzureBlobCacheStorage = class _AzureBlobCacheStorage extends CacheStorage_1.CacheStorage {
       constructor(options, logger, cwd, incrementalCaching = false) {
         super(logger, cwd, incrementalCaching);
         this.options = options;
+        if ("containerClient" in options) {
+          this.getContainerClient = () => Promise.resolve(options.containerClient);
+        } else {
+          const { connectionString, container, credential } = options;
+          this.getContainerClient = () => Promise.resolve().then(() => __importStar(require_dist())).then(({ BlobServiceClient }) => {
+            const blobServiceClient = credential ? new BlobServiceClient(connectionString, credential) : BlobServiceClient.fromConnectionString(connectionString);
+            const containerClient = blobServiceClient.getContainerClient(container);
+            return containerClient;
+          });
+        }
       }
       async _fetch(hash) {
         try {
-          const blobClient = await createBlobClient(this.options.connectionString, this.options.container, hash, this.options.credential);
+          const blobClient = (await this.getContainerClient()).getBlobClient(hash);
           if (this.options.maxSize) {
             const sizeResponse = await blobClient.getProperties();
             if (sizeResponse.contentLength && sizeResponse.contentLength > this.options.maxSize) {
@@ -45012,7 +45012,7 @@ var require_AzureBlobCacheStorage = __commonJS({
         }
       }
       async _put(hash, filesToCache) {
-        const blobClient = await createBlobClient(this.options.connectionString, this.options.container, hash, this.options.credential);
+        const blobClient = (await this.getContainerClient()).getBlobClient(hash);
         const blockBlobClient = blobClient.getBlockBlobClient();
         const tarStream = tar_fs_1.default.pack(this.cwd, { entries: filesToCache });
         if (this.options.maxSize) {
@@ -45034,9 +45034,9 @@ var require_AzureBlobCacheStorage = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/LocalCacheStorage.js
+// ../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/LocalCacheStorage.js
 var require_LocalCacheStorage = __commonJS({
-  "../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/LocalCacheStorage.js"(exports) {
+  "../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/LocalCacheStorage.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -47081,9 +47081,9 @@ var require_package69 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/NpmCacheStorage.js
+// ../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/NpmCacheStorage.js
 var require_NpmCacheStorage = __commonJS({
-  "../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/NpmCacheStorage.js"(exports) {
+  "../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/NpmCacheStorage.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -47183,9 +47183,9 @@ var require_NpmCacheStorage = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/LocalSkipCacheStorage.js
+// ../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/LocalSkipCacheStorage.js
 var require_LocalSkipCacheStorage = __commonJS({
-  "../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/LocalSkipCacheStorage.js"(exports) {
+  "../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/LocalSkipCacheStorage.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -47225,9 +47225,9 @@ var require_LocalSkipCacheStorage = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/index.js
+// ../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/index.js
 var require_lib14 = __commonJS({
-  "../../node_modules/.store/backfill-cache-npm-5.8.1-446741c412/package/lib/index.js"(exports) {
+  "../../node_modules/.store/backfill-cache-npm-5.9.0-788fdaa99b/package/lib/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getCacheStorageProvider = exports.isCustomProvider = exports.CacheStorage = void 0;
@@ -47276,9 +47276,9 @@ var require_lib14 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/backfill-npm-6.2.3-9950315c64/package/lib/api.js
+// ../../node_modules/.store/backfill-npm-6.2.4-25c6611e73/package/lib/api.js
 var require_api = __commonJS({
-  "../../node_modules/.store/backfill-npm-6.2.3-9950315c64/package/lib/api.js"(exports) {
+  "../../node_modules/.store/backfill-npm-6.2.4-25c6611e73/package/lib/api.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.put = exports.fetch = exports.computeHashOfOutput = exports.computeHash = exports.makeLogger = void 0;
@@ -47358,26 +47358,21 @@ import fs from "fs";
 
 // src/createCacheStorageConfig.ts
 var import_backfill_cache = __toESM(require_lib14(), 1);
-var import_storage_blob = __toESM(require_dist(), 1);
 import { join } from "path";
 import { readFile } from "fs/promises";
 import { lookup } from "mime-types";
 var _CustomAzureCacheStorage = class _CustomAzureCacheStorage extends import_backfill_cache.CacheStorage {
-  constructor({ container, storageAccount, credential }, logger, cwd) {
+  constructor(containerClient, logger, cwd) {
     super(logger, cwd);
+    this.containerClient = containerClient;
     this.logger = logger;
     this.cwd = cwd;
-    const connectionString = createBlobStorageUrl(storageAccount);
-    const blobStorageClient = new import_storage_blob.BlobServiceClient(connectionString, credential);
-    this.containerClient = blobStorageClient.getContainerClient(container);
     const internalCacheFolder = "";
     this.tarStorage = (0, import_backfill_cache.getCacheStorageProvider)(
       {
         provider: "azure-blob",
         options: {
-          connectionString,
-          credential,
-          container
+          containerClient: this.containerClient
         }
       },
       internalCacheFolder,
@@ -47408,23 +47403,23 @@ var _CustomAzureCacheStorage = class _CustomAzureCacheStorage extends import_bac
 };
 __name(_CustomAzureCacheStorage, "CustomAzureCacheStorage");
 var CustomAzureCacheStorage = _CustomAzureCacheStorage;
-function createCacheStorageConfig(remoteCacheClientOptions) {
+function createCacheStorageConfig(containerClient) {
   return {
     name: "Custom Azure Cache Storage",
-    provider: /* @__PURE__ */ __name((logger, cwd) => new CustomAzureCacheStorage(remoteCacheClientOptions, logger, cwd), "provider")
+    provider: /* @__PURE__ */ __name((logger, cwd) => new CustomAzureCacheStorage(containerClient, logger, cwd), "provider")
   };
 }
 __name(createCacheStorageConfig, "createCacheStorageConfig");
 
 // src/AzureRemoteCacheClient.ts
 var _AzureRemoteCacheClient = class _AzureRemoteCacheClient {
-  constructor(remoteCacheClientOptions) {
+  constructor(containerClient) {
     this.logger = (0, import_api.makeLogger)("mute", process.stdout, process.stderr);
     this.config = {
       incrementalCaching: true,
       internalCacheFolder: "",
       // not used by azure-blob
-      cacheStorageConfig: createCacheStorageConfig(remoteCacheClientOptions)
+      cacheStorageConfig: createCacheStorageConfig(containerClient)
     };
   }
   /**

package/dist/{ReporterDecorator-FZKB4MWN.js → ReporterDecorator-VMBTAZRW.js}

@@ -76,7 +76,7 @@ ${list}`
   downloadFolder(options) {
     const { id, path, friendlyName } = options;
     const task = this.context.reporter.addTask(`Downloading from remote cache: ${friendlyName}`);
-    return this.context.telemetryClient.tracer.startActiveSpan("UPLOAD_FOLDER", async () => {
+    return this.context.telemetryClient.tracer.startActiveSpan("DOWNLOAD_FOLDER", async () => {
       try {
         const downloadResult = await this.client.downloadFolder(options);
         const details = bulletedList([`Id: ${id}`, `Path: ${path}`, `Name: ${friendlyName}`]);