Remove core-http from perf tests (#26276)

### Packages impacted by this PR `@azure-tests/perf-storage-blob` `@azure-tests/perf-core-rest-pipeline` `@azure/test-utils-perf` ### Issues associated with this PR #24525 ### Describe the problem that is addressed by this PR Remove last references to `core-http` from the tree as it will soon be deprecated.
Azure · Jun 20, 2023 · 2d25e3d · 2d25e3d
1 parent 3db56eb
commit 2d25e3d
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 315 deletions.
diff --git a/sdk/core/perf-tests/core-rest-pipeline/package.json b/sdk/core/perf-tests/core-rest-pipeline/package.json
@@ -8,7 +8,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@azure/core-http": "^3.0.0",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/core-auth": "^1.3.0",
     "@azure/test-utils-perf": "^1.0.0",
@@ -17,7 +16,6 @@
   },
   "devDependencies": {
     "@types/node": "^16.0.0",
-    "@types/uuid": "^8.0.0",
     "@types/express": "^4.17.13",
     "concurrently": "^6.2.1",
     "cross-env": "^7.0.3",

diff --git a/sdk/core/perf-tests/core-rest-pipeline/test/core-http.spec.ts b/sdk/core/perf-tests/core-rest-pipeline/test/core-http.spec.ts
diff --git a/sdk/core/perf-tests/core-rest-pipeline/test/index.spec.ts b/sdk/core/perf-tests/core-rest-pipeline/test/index.spec.ts
@@ -1,14 +1,12 @@
 import { createPerfProgram } from "@azure/test-utils-perf";
 import { BearerTokenAuthenticationPolicyChallengeTest } from "./bearerTokenChallengeAuthenticationPolicy/wwwChallenge.spec";
-import { CoreHTTPTest } from "./core-http.spec";
 import { CoreRestPipelineTest } from "./core-rest-pipeline.spec";
 import { FetchTest } from "./fetch.spec";
 import { HttpRequestTest } from "./http-request.spec";
 import { UndiciRequestTest } from "./undici-request.spec";
 
 const perfProgram = createPerfProgram(
   BearerTokenAuthenticationPolicyChallengeTest,
-  CoreHTTPTest,
   CoreRestPipelineTest,
   FetchTest,
   HttpRequestTest,

diff --git a/sdk/storage/perf-tests/storage-blob/package.json b/sdk/storage/perf-tests/storage-blob/package.json
@@ -8,9 +8,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@azure/core-http": "^3.0.0",
     "@azure/core-rest-pipeline": "^1.1.0",
-    "@azure/storage-blob": "^12.12.0-beta.2",
+    "@azure/core-util": "^1.3.2",
+    "@azure/storage-blob": "^12.20.0",
     "@azure/test-utils-perf": "^1.0.0",
     "dotenv": "^16.0.0",
     "uuid": "^8.3.0"

diff --git a/sdk/storage/perf-tests/storage-blob/test/core-http.spec.ts b/sdk/storage/perf-tests/storage-blob/test/core-http.spec.ts
diff --git a/sdk/storage/perf-tests/storage-blob/test/dowloadWithSAS.spec.ts b/sdk/storage/perf-tests/storage-blob/test/dowloadWithSAS.spec.ts
@@ -10,7 +10,7 @@ import {
   BlobClient,
 } from "@azure/storage-blob";
 import { getValueInConnString } from "./utils/utils";
-import { generateUuid } from "@azure/core-http";
+import { randomUUID } from "@azure/core-util";
 
 interface StorageBlobDownloadTestOptions {
   size: number;
@@ -27,7 +27,7 @@ export class StorageBlobDownloadWithSASTest extends StorageBlobTest<StorageBlobD
     },
   };
 
-  static blobName = generateUuid();
+  static blobName = randomUUID();
   blockBlobClient: BlockBlobClient;
   blobClientFromSAS: BlobClient;
   sasUrl: string;

diff --git a/sdk/storage/perf-tests/storage-blob/test/download.spec.ts b/sdk/storage/perf-tests/storage-blob/test/download.spec.ts
@@ -4,7 +4,7 @@
 import { drainStream, PerfOptionDictionary } from "@azure/test-utils-perf";
 import { StorageBlobTest } from "./storageTest.spec";
 import { BlockBlobClient } from "@azure/storage-blob";
-import { generateUuid } from "@azure/core-http";
+import { randomUUID } from "@azure/core-util";
 
 interface StorageBlobDownloadTestOptions {
   size: number;
@@ -21,7 +21,7 @@ export class StorageBlobDownloadTest extends StorageBlobTest<StorageBlobDownload
     },
   };
 
-  static blobName = generateUuid();
+  static blobName = randomUUID();
   blockBlobClient: BlockBlobClient;
 
   constructor() {

diff --git a/sdk/storage/perf-tests/storage-blob/test/index.spec.ts b/sdk/storage/perf-tests/storage-blob/test/index.spec.ts
@@ -7,7 +7,6 @@ import { StorageBlobUploadTest } from "./upload.spec";
 import { StorageBlobUploadFileTest } from "./uploadFromFile.spec";
 import { StorageBlobListTest } from "./listBlobs.spec";
 import { StorageBlobDownloadWithSASTest } from "./dowloadWithSAS.spec";
-import { CoreHTTPDownloadWithSASTest } from "./core-http.spec";
 import { NodeFetchDownloadWithSASTest } from "./node-fetch.spec";
 import { CoreHTTPSDownloadWithSASTest } from "./core-rest-pipeline.spec";
 
@@ -17,7 +16,6 @@ const perfProgram = createPerfProgram(
   StorageBlobUploadFileTest,
   StorageBlobListTest,
   StorageBlobDownloadWithSASTest,
-  CoreHTTPDownloadWithSASTest,
   CoreHTTPSDownloadWithSASTest,
   NodeFetchDownloadWithSASTest
 );

diff --git a/sdk/storage/perf-tests/storage-blob/test/listBlobs.spec.ts b/sdk/storage/perf-tests/storage-blob/test/listBlobs.spec.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { generateUuid } from "@azure/core-http";
+import { randomUUID } from "@azure/core-util";
 import { PerfOptionDictionary, executeParallel } from "@azure/test-utils-perf";
 import { StorageBlobTest } from "./storageTest.spec";
 interface StorageBlobListTestOptions {
@@ -22,7 +22,7 @@ export class StorageBlobListTest extends StorageBlobTest<StorageBlobListTestOpti
     await super.globalSetup();
     await executeParallel(
       async (_count: number, _parallelIndex: number) => {
-        await this.containerClient.uploadBlockBlob(generateUuid(), Buffer.alloc(0), 0);
+        await this.containerClient.uploadBlockBlob(randomUUID(), Buffer.alloc(0), 0);
       },
       this.parsedOptions.count.value!,
       32

diff --git a/sdk/storage/perf-tests/storage-blob/test/storageTest.spec.ts b/sdk/storage/perf-tests/storage-blob/test/storageTest.spec.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { generateUuid } from "@azure/core-http";
+import { randomUUID } from "@azure/core-util";
 import { PerfTest, getEnvVar } from "@azure/test-utils-perf";
 import {
   BlobServiceClient,
@@ -18,7 +18,7 @@ export abstract class StorageBlobTest<TOptions> extends PerfTest<TOptions> {
   blobServiceClient: BlobServiceClient;
   containerClient: ContainerClient;
   sharedKeyCredential: StorageSharedKeyCredential;
-  static containerName = generateUuid();
+  static containerName = randomUUID();
 
   constructor() {
     super();
@@ -27,10 +27,13 @@ export abstract class StorageBlobTest<TOptions> extends PerfTest<TOptions> {
       getValueInConnString(connectionString, "AccountName"),
       getValueInConnString(connectionString, "AccountKey")
     );
-    this.blobServiceClient = BlobServiceClient.fromConnectionString(
-      connectionString,
-      this.configureClientOptionsCoreV1({})
-    );
+    this.blobServiceClient = BlobServiceClient.fromConnectionString(connectionString);
+    const options = this.configureClientOptions({ additionalPolicies: [] });
+
+    const pipeline = this.blobServiceClient["storageClientContext"].pipeline;
+    for (const { policy } of options.additionalPolicies ?? []) {
+      pipeline.addPolicy(policy, { afterPhase: "Sign" });
+    }
     this.containerClient = this.blobServiceClient.getContainerClient(StorageBlobTest.containerName);
   }
 

diff --git a/sdk/storage/perf-tests/storage-blob/test/upload.spec.ts b/sdk/storage/perf-tests/storage-blob/test/upload.spec.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { generateUuid } from "@azure/core-http";
+import { randomUUID } from "@azure/core-util";
 import { PerfOptionDictionary } from "@azure/test-utils-perf";
 import { StorageBlobTest } from "./storageTest.spec";
 
@@ -24,7 +24,7 @@ export class StorageBlobUploadTest extends StorageBlobTest<StorageBlobUploadTest
 
   constructor() {
     super();
-    this.blobName = generateUuid();
+    this.blobName = randomUUID();
     this.buffer = Buffer.alloc(this.parsedOptions.size.value!);
   }
 

diff --git a/sdk/test-utils/perf/package.json b/sdk/test-utils/perf/package.json
@@ -60,9 +60,8 @@
   "private": true,
   "dependencies": {
     "@azure/abort-controller": "^1.0.0",
-    "@azure/core-http": "^3.0.0",
     "@azure/core-rest-pipeline": "^1.1.0",
-    "@azure/core-util": "^1.1.0",
+    "@azure/core-util": "^1.3.2",
     "tslib": "^2.2.0",
     "node-fetch": "^2.6.6",
     "minimist": "^1.2.8",

diff --git a/sdk/test-utils/perf/src/batchPerfTest.ts b/sdk/test-utils/perf/src/batchPerfTest.ts
@@ -2,12 +2,7 @@
 // Licensed under the MIT license.
 
 import { AbortSignalLike, AbortController } from "@azure/abort-controller";
-import {
-  TestProxyHttpClient,
-  TestProxyHttpClientV1,
-  testProxyHttpPolicy,
-} from "./testProxyHttpClient";
-import { HttpClient } from "@azure/core-http";
+import { TestProxyHttpClient, testProxyHttpPolicy } from "./testProxyHttpClient";
 import { PerfTestBase } from "./perfTestBase";
 import { AdditionalPolicyConfig } from "@azure/core-client";
 
@@ -19,7 +14,6 @@ export abstract class BatchPerfTest<
 > extends PerfTestBase<TOptions> {
   private readonly testProxy!: string;
   public testProxyHttpClient!: TestProxyHttpClient;
-  public testProxyHttpClientV1!: TestProxyHttpClientV1;
 
   public constructor() {
     super();
@@ -32,25 +26,6 @@ export abstract class BatchPerfTest<
 
   public abstract runBatch(abortSignal?: AbortSignalLike): Promise<number>;
 
-  /**
-   * configureClientOptionsCoreV1
-   *
-   * For core-v1 - libraries depending on core-http
-   * Apply this method on the client options to get the proxy tool support
-   *
-   * Note: httpClient must be part of the options bag, it is required for the perf framework to update the underlying client properly
-   */
-  public configureClientOptionsCoreV1<T>(options: T & { httpClient?: HttpClient }): T {
-    if (this.testProxy) {
-      this.testProxyHttpClientV1 = new TestProxyHttpClientV1(
-        this.testProxy,
-        this.parsedOptions["insecure"].value
-      );
-      options.httpClient = this.testProxyHttpClientV1;
-    }
-    return options;
-  }
-
   /**
    * configureClientOptions
    *
@@ -167,11 +142,9 @@ export abstract class BatchPerfTest<
     // => call the run method
     // => stop record
     // => start playback
-    let recorder: TestProxyHttpClientV1 | TestProxyHttpClient;
+    let recorder: TestProxyHttpClient;
     if (this.testProxyHttpClient) {
       recorder = this.testProxyHttpClient;
-    } else if (this.testProxyHttpClientV1) {
-      recorder = this.testProxyHttpClientV1;
     } else {
       throw new Error(
         "testProxyClient is not set, please make sure the client/options are configured properly."
@@ -193,8 +166,6 @@ export abstract class BatchPerfTest<
   private async stopPlayback() {
     if (this.testProxyHttpClient) {
       await this.testProxyHttpClient.stopPlayback();
-    } else if (this.testProxyHttpClientV1) {
-      await this.testProxyHttpClientV1.stopPlayback();
     }
   }
 }
diff --git a/sdk/test-utils/perf/src/index.ts b/sdk/test-utils/perf/src/index.ts
@@ -5,7 +5,6 @@ export { PerfTest } from "./perfTest";
 export { BatchPerfTest } from "./batchPerfTest";
 export { EventPerfTest } from "./eventPerfTest";
 export * from "./options";
-export * from "./policy";
 export * from "./program";
 export * from "./parallel";
 export { getEnvVar, drainStream } from "./utils/utils";
diff --git a/sdk/test-utils/perf/src/policy.ts b/sdk/test-utils/perf/src/policy.ts