[Key Vault] Fixing min-max tests by moving test utilities to test/public

sdk/keyvault/keyvault-admin/test/public/accessControlClient.aborts.spec.ts

@@ -5,8 +5,8 @@ import { env, Recorder } from "@azure-tools/test-recorder";
 import { AbortController } from "@azure/abort-controller";
 
 import { KeyVaultAccessControlClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/common";
-import { authenticate } from "../utils/authentication";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { authenticate } from "./utils/authentication";
 
 describe("Aborting KeyVaultAccessControlClient's requests", () => {
   let client: KeyVaultAccessControlClient;

sdk/keyvault/keyvault-admin/test/public/accessControlClient.spec.ts

@@ -13,9 +13,9 @@ import {
   KeyVaultRoleDefinition,
   KnownKeyVaultDataAction,
 } from "../../src";
-import { authenticate } from "../utils/authentication";
-import { supportsTracing } from "../utils/supportsTracing";
-import { getServiceVersion } from "../utils/common";
+import { authenticate } from "./utils/authentication";
+import { supportsTracing } from "./utils/supportsTracing";
+import { getServiceVersion } from "./utils/common";
 
 describe("KeyVaultAccessControlClient", () => {
   let client: KeyVaultAccessControlClient;

sdk/keyvault/keyvault-admin/test/public/backupClient.abort.spec.ts

@@ -5,9 +5,9 @@ import { Recorder } from "@azure-tools/test-recorder";
 import { AbortController } from "@azure/abort-controller";
 
 import { KeyVaultBackupClient } from "../../src";
-import { authenticate } from "../utils/authentication";
-import { testPollerProperties } from "../utils/recorder";
-import { assertThrowsAbortError, getSasToken, getServiceVersion } from "../utils/common";
+import { authenticate } from "./utils/authentication";
+import { testPollerProperties } from "./utils/recorder";
+import { assertThrowsAbortError, getSasToken, getServiceVersion } from "./utils/common";
 
 describe("Aborting KeyVaultBackupClient's requests", () => {
   let client: KeyVaultBackupClient;

sdk/keyvault/keyvault-admin/test/public/backupClient.spec.ts

@@ -7,9 +7,9 @@ chai.use(chaiAsPromised);
 import { isPlaybackMode, Recorder } from "@azure-tools/test-recorder";
 
 import { KeyVaultBackupClient } from "../../src";
-import { authenticate } from "../utils/authentication";
-import { testPollerProperties } from "../utils/recorder";
-import { getSasToken, getServiceVersion } from "../utils/common";
+import { authenticate } from "./utils/authentication";
+import { testPollerProperties } from "./utils/recorder";
+import { getSasToken, getServiceVersion } from "./utils/common";
 import { delay } from "@azure/core-util";
 import { assert } from "chai";
 import { KeyClient } from "@azure/keyvault-keys";

sdk/keyvault/keyvault-admin/test/utils/authentication.ts → sdk/keyvault/keyvault-admin/test/public/utils/authentication.ts

@@ -7,7 +7,7 @@ import { KeyClient } from "@azure/keyvault-keys";
 import { v4 as uuidv4 } from "uuid";
 import { Context } from "mocha";
 
-import { KeyVaultAccessControlClient, KeyVaultBackupClient } from "../../src";
+import { KeyVaultAccessControlClient, KeyVaultBackupClient } from "../../../src";
 import { uniqueString } from "./recorder";
 import { getEnvironmentVariable, getServiceVersion } from "./common";
 

sdk/keyvault/keyvault-admin/test/utils/common.ts → sdk/keyvault/keyvault-admin/test/public/utils/common.ts

@@ -4,7 +4,7 @@
 import { assert } from "chai";
 import { env } from "@azure-tools/test-recorder";
 import { SupportedVersions, supports, TestFunctionWrapper } from "@azure/test-utils";
-import { LATEST_API_VERSION, SUPPORTED_API_VERSIONS } from "../../src/constants";
+import { LATEST_API_VERSION, SUPPORTED_API_VERSIONS } from "../../../src/constants";
 
 export async function assertThrowsAbortError(cb: () => Promise<any>): Promise<void> {
   let passed = false;

sdk/keyvault/keyvault-certificates/test/internal/challengeBasedAuthenticationPolicy.spec.ts

@@ -5,7 +5,7 @@ import { assert } from "chai";
 import { Context } from "mocha";
 import { createSandbox } from "sinon";
 import { env, Recorder } from "@azure-tools/test-recorder";
-import { getServiceVersion } from "../utils/utils.common";
+import { getServiceVersion } from "../public/utils/common";
 
 import {
   AuthenticationChallengeCache,
@@ -14,9 +14,9 @@ import {
   challengeBasedAuthenticationPolicy,
 } from "../../../keyvault-common/src";
 import { CertificateClient } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "../public/utils/recorderUtils";
+import { authenticate } from "../public/utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
 import { WebResource } from "@azure/core-http";
 import { ClientSecretCredential } from "@azure/identity";
 

sdk/keyvault/keyvault-certificates/test/public/CRUD.spec.ts

@@ -15,11 +15,11 @@ import { ClientSecretCredential } from "@azure/identity";
 import { isNode } from "@azure/core-http";
 
 import { CertificateClient } from "../../src";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - create, read, update and delete", () => {
   const prefix = `CRUD${env.CERTIFICATE_NAME || "CertificateName"}`;

sdk/keyvault/keyvault-certificates/test/public/list.spec.ts

@@ -8,11 +8,11 @@ import { env, isPlaybackMode, Recorder, isRecordMode } from "@azure-tools/test-r
 import { isNode } from "@azure/core-http";
 
 import { CertificateClient } from "../../src";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 const { expect } = chai;
 

sdk/keyvault/keyvault-certificates/test/public/lro.create.spec.ts

@@ -7,10 +7,10 @@ import { PollerStoppedError } from "@azure/core-lro";
 import { env, Recorder } from "@azure-tools/test-recorder";
 
 import { CertificateClient, KeyVaultCertificate, DefaultCertificatePolicy } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - LRO - create", () => {
   const certificatePrefix = `lroCreate${env.CERTIFICATE_NAME || "CertificateName"}`;

sdk/keyvault/keyvault-certificates/test/public/lro.delete.spec.ts

@@ -7,10 +7,10 @@ import { PollerStoppedError } from "@azure/core-lro";
 import { env, Recorder } from "@azure-tools/test-recorder";
 
 import { CertificateClient, DeletedCertificate, DefaultCertificatePolicy } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - lro - delete", () => {
   const certificatePrefix = `lroDelete${env.CERTIFICATE_NAME || "CertificateName"}`;

sdk/keyvault/keyvault-certificates/test/public/lro.operation.spec.ts

@@ -11,10 +11,10 @@ import {
   DefaultCertificatePolicy,
   KeyVaultCertificateWithPolicy,
 } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - LRO - certificate operation", () => {
   const certificatePrefix = `lroOperation${env.CERTIFICATE_NAME || "CertificateName"}`;

sdk/keyvault/keyvault-certificates/test/public/lro.recover.spec.ts

@@ -7,11 +7,11 @@ import { env, Recorder } from "@azure-tools/test-recorder";
 import { PollerStoppedError } from "@azure/core-lro";
 
 import { CertificateClient, DeletedCertificate, DefaultCertificatePolicy } from "../../src";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - LRO - recoverDelete", () => {
   const certificatePrefix = `lroRecover${env.CERTIFICATE_NAME || "CertificateName"}`;

sdk/keyvault/keyvault-certificates/test/public/mergeAndImport.spec.ts

@@ -11,10 +11,10 @@ import { ClientSecretCredential } from "@azure/identity";
 
 import { CertificateClient } from "../../src";
 import { base64ToUint8Array, stringToUint8Array } from "../../src/utils";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - merge and import certificates", () => {
   const prefix = `merge${env.CERTIFICATE_NAME || "CertificateName"}`;

sdk/keyvault/keyvault-certificates/test/public/recoverBackupRestore.spec.ts

@@ -7,11 +7,11 @@ import { env, isPlaybackMode, Recorder, isRecordMode } from "@azure-tools/test-r
 import { isNode } from "@azure/core-http";
 
 import { CertificateClient } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { assertThrowsAbortError } from "./utils/common";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - restore certificates and recover backups", () => {
   const prefix = `backupRestore${env.CERTIFICATE_NAME || "CertificateName"}`;

sdk/keyvault/keyvault-certificates/test/utils/utils.common.ts → sdk/keyvault/keyvault-certificates/test/public/utils/common.ts

@@ -4,7 +4,7 @@
 import { env } from "@azure-tools/test-recorder";
 import { assert } from "chai";
 import { SupportedVersions, supports, TestFunctionWrapper } from "@azure/test-utils";
-import { LATEST_API_VERSION, CertificateClientOptions } from "../../src/certificatesModels";
+import { CertificateClientOptions } from "../../../src";
 
 export function getKeyvaultName(): string {
   const keyVaultEnvVarName = "KEYVAULT_NAME";
@@ -43,7 +43,7 @@ export const serviceVersions = ["7.0", "7.1", "7.2", "7.3-preview"] as const;
  * @returns - The service version to test
  */
 export function getServiceVersion(): NonNullable<CertificateClientOptions["serviceVersion"]> {
-  return env.SERVICE_VERSION || LATEST_API_VERSION;
+  return env.SERVICE_VERSION || serviceVersions[serviceVersions.length - 1];
 }
 
 /**

sdk/keyvault/keyvault-certificates/test/utils/lro/restore/operation.ts → sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/operation.ts

@@ -4,7 +4,7 @@
 import { AbortSignalLike } from "@azure/abort-controller";
 import { PollOperationState, PollOperation } from "@azure/core-lro";
 import { OperationOptions } from "@azure/core-http";
-import { KeyVaultCertificate, CertificatePollerOptions } from "../../../../src/certificatesModels";
+import { KeyVaultCertificate, CertificatePollerOptions } from "../../../../../src";
 
 /**
  * Options sent to the beginRestoreCertificateBackup method.

sdk/keyvault/keyvault-certificates/test/utils/lro/restore/poller.ts → sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/poller.ts

@@ -8,7 +8,7 @@ import {
   makeRestoreCertificateBackupPollOperation,
   TestCertificateClientInterface,
 } from "./operation";
-import { KeyVaultCertificate } from "../../../../src/certificatesModels";
+import { KeyVaultCertificate } from "../../../../../src";
 
 export interface RestoreCertificateBackupPollerOptions {
   client: TestCertificateClientInterface;

sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts → sdk/keyvault/keyvault-certificates/test/public/utils/testAuthentication.ts

@@ -2,10 +2,10 @@
 // Licensed under the MIT license.
 
 import { ClientSecretCredential } from "@azure/identity";
-import { CertificateClient } from "../../src";
+import { CertificateClient } from "../../../src";
 import { uniqueString } from "./recorderUtils";
 import { env, record, RecorderEnvironmentSetup } from "@azure-tools/test-recorder";
-import { getServiceVersion } from "./utils.common";
+import { getServiceVersion } from "./common";
 import TestClient from "./testClient";
 import { Context } from "mocha";
 

sdk/keyvault/keyvault-certificates/test/utils/testClient.ts → sdk/keyvault/keyvault-certificates/test/public/utils/testClient.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { CertificateClient, KeyVaultCertificate } from "../../src";
+import { CertificateClient, KeyVaultCertificate } from "../../../src";
 import { PollerLike, PollOperationState } from "@azure/core-lro";
 import { RestoreCertificateBackupPoller } from "./lro/restore/poller";
 import { BeginRestoreCertificateBackupOptions } from "./lro/restore/operation";

sdk/keyvault/keyvault-keys/test/internal/aesCryptography.spec.ts

@@ -10,15 +10,15 @@ import {
   KeyClient,
   KeyVaultKey,
 } from "../../src";
-import { getKey, stringToUint8Array, uint8ArrayToString } from "../utils/crypto";
+import { getKey, stringToUint8Array, uint8ArrayToString } from "../public/utils/crypto";
 import { isNode } from "@azure/core-http";
 import { AesCryptographyProvider } from "../../src/cryptography/aesCryptographyProvider";
-import TestClient from "../utils/testClient";
-import { authenticate } from "../utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
+import { authenticate } from "../public/utils/testAuthentication";
 import { env, Recorder } from "@azure-tools/test-recorder";
 import { RemoteCryptographyProvider } from "../../src/cryptography/remoteCryptographyProvider";
 import { ClientSecretCredential } from "@azure/identity";
-import { getServiceVersion } from "../utils/utils.common";
+import { getServiceVersion } from "../public/utils/common";
 
 describe("AesCryptographyProvider browser tests", function () {
   it("uses the browser replacement when running in the browser", async function (this: Context) {

sdk/keyvault/keyvault-keys/test/internal/challengeBasedAuthenticationPolicy.spec.ts

@@ -13,9 +13,9 @@ import {
   challengeBasedAuthenticationPolicy,
 } from "../../../keyvault-common/src";
 import { KeyClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
-import { getServiceVersion } from "../utils/utils.common";
+import { authenticate } from "../public/utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
+import { getServiceVersion } from "../public/utils/common";
 import { HttpHeaders, isNode, WebResource } from "@azure/core-http";
 import { ClientSecretCredential } from "@azure/identity";
 import sinon from "sinon";

sdk/keyvault/keyvault-keys/test/internal/crypto.spec.ts

@@ -18,7 +18,7 @@ import {
 } from "../../src";
 import { RsaCryptographyProvider } from "../../src/cryptography/rsaCryptographyProvider";
 import { JsonWebKey } from "../../src";
-import { stringToUint8Array } from "../utils/crypto";
+import { stringToUint8Array } from "../public/utils/crypto";
 import { CryptographyProvider } from "../../src/cryptography/models";
 import { RemoteCryptographyProvider } from "../../src/cryptography/remoteCryptographyProvider";
 

sdk/keyvault/keyvault-keys/test/public/recoverBackupRestore.spec.ts → sdk/keyvault/keyvault-keys/test/internal/recoverBackupRestore.spec.ts

@@ -5,11 +5,12 @@ import { assert } from "chai";
 import { Context } from "mocha";
 import { isNode } from "@azure/core-http";
 import { KeyClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
+import { assertThrowsAbortError, getServiceVersion } from "../public/utils/common";
+import { testPollerProperties } from "../public/utils/recorderUtils";
 import { env, Recorder, isRecordMode, isPlaybackMode } from "@azure-tools/test-recorder";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { authenticate } from "../public/utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
+import { RestoreKeyBackupPoller } from "../public/utils/lro/restore/poller";
 
 describe("Keys client - restore keys and recover backups", () => {
   const keyPrefix = `backupRestore${env.KEY_NAME || "KeyName"}`;
@@ -118,10 +119,12 @@ describe("Keys client - restore keys and recover backups", () => {
       // This test implementation of a restore poller only applies for backups that have been recently deleted.
       // Backups might not be ready to be restored in an unknown amount of time.
       // If this is useful to you, please open an issue at: https://github.com/Azure/azure-sdk-for-js/issues
-      const restorePoller = await testClient.beginRestoreKeyBackup(
-        backup as Uint8Array,
-        testPollerProperties
-      );
+      const restorePoller = new RestoreKeyBackupPoller({
+        backup: backup!,
+        client,
+        intervalInMs: testPollerProperties.intervalInMs,
+      });
+
       const restoredKey = await restorePoller.pollUntilDone();
 
       assert.equal(restoredKey.name, keyName);

sdk/keyvault/keyvault-keys/test/internal/serviceVersionParameter.spec.ts

@@ -9,7 +9,7 @@ import { HttpClient, HttpOperationResponse, WebResourceLike, HttpHeaders } from
 import { ClientSecretCredential } from "@azure/identity";
 import { env } from "@azure-tools/test-recorder";
 import { versionsToTest } from "@azure/test-utils";
-import { serviceVersions } from "../utils/utils.common";
+import { serviceVersions } from "../public/utils/common";
 
 describe("The Keys client should set the serviceVersion", () => {
   const keyVaultUrl = `https://keyVaultName.vault.azure.net`;

sdk/keyvault/keyvault-keys/test/internal/transformations.spec.ts

@@ -21,7 +21,7 @@ import {
   getKeyPropertiesFromKeyItem,
   keyRotationTransformations,
 } from "../../src/transformations";
-import { stringToUint8Array } from "../utils/crypto";
+import { stringToUint8Array } from "../public/utils/crypto";
 
 describe("Transformations", () => {
   const releasePolicy = {

sdk/keyvault/keyvault-keys/test/public/crypto.hsm.spec.ts

@@ -7,10 +7,10 @@ import { Recorder } from "@azure-tools/test-recorder";
 import { ClientSecretCredential } from "@azure/identity";
 
 import { CryptographyClient, KeyVaultKey, KeyClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import { stringToUint8Array, uint8ArrayToString } from "../utils/crypto";
-import TestClient from "../utils/testClient";
-import { getServiceVersion, onVersions } from "../utils/utils.common";
+import { authenticate } from "./utils/testAuthentication";
+import { stringToUint8Array, uint8ArrayToString } from "./utils/crypto";
+import TestClient from "./utils/testClient";
+import { getServiceVersion, onVersions } from "./utils/common";
 import { isNode } from "@azure/core-http";
 
 onVersions({ minVer: "7.2" }).describe(