[App Config] Fix App Config Tests

sdk/appconfiguration/app-configuration/package.json

@@ -123,7 +123,6 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.8",
     "mocha": "^10.0.0",
-    "nock": "^13.5.4",
     "rimraf": "^5.0.5",
     "sinon": "^17.0.0",
     "tsx": "^4.7.1",

sdk/appconfiguration/app-configuration/samples-dev/listLabels.ts

@@ -23,13 +23,13 @@ export async function main() {
 
   // let's create the setting
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "sample value",
     label: "production",
   });
 
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "sample value",
     label: "developmentA",
     tags: {
@@ -38,7 +38,7 @@ export async function main() {
   });
 
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "value",
     label: "developmentB",
     tags: {
@@ -92,7 +92,7 @@ export async function main() {
     }
   }
 
-  cleanupSampleValues(["sample key"], client);
+  cleanupSampleValues(["listLabelsSample"], client);
 }
 
 async function cleanupSampleValues(keys: string[], client: AppConfigurationClient) {

sdk/appconfiguration/app-configuration/samples/v1/javascript/listLabels.js

@@ -21,13 +21,13 @@ async function main() {
 
   // let's create the setting
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "sample value",
     label: "production",
   });
 
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "sample value",
     label: "developmentA",
     tags: {
@@ -36,7 +36,7 @@ async function main() {
   });
 
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "value",
     label: "developmentB",
     tags: {
@@ -90,7 +90,7 @@ async function main() {
     }
   }
 
-  cleanupSampleValues(["sample key"], client);
+  cleanupSampleValues(["listLabelsSample"], client);
 }
 
 async function cleanupSampleValues(keys, client) {

sdk/appconfiguration/app-configuration/samples/v1/typescript/src/listLabels.ts

@@ -22,13 +22,13 @@ export async function main() {
 
   // let's create the setting
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "sample value",
     label: "production",
   });
 
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "sample value",
     label: "developmentA",
     tags: {
@@ -37,7 +37,7 @@ export async function main() {
   });
 
   await client.addConfigurationSetting({
-    key: "sample key",
+    key: "listLabelsSample",
     value: "value",
     label: "developmentB",
     tags: {
@@ -91,7 +91,7 @@ export async function main() {
     }
   }
 
-  cleanupSampleValues(["sample key"], client);
+  cleanupSampleValues(["listLabelsSample"], client);
 }
 
 async function cleanupSampleValues(keys: string[], client: AppConfigurationClient) {

sdk/appconfiguration/app-configuration/test/internal/node/http.spec.ts

@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
 import { SyncTokens, parseSyncToken } from "../../../src/internal/synctokenpolicy";
 import {
   assertThrowsRestError,
@@ -15,8 +12,13 @@ import { Context } from "mocha";
 import { InternalAppConfigurationClientOptions } from "../../../src/appConfigurationClient";
 import { Recorder } from "@azure-tools/test-recorder";
 import { assert } from "chai";
-import nock from "nock";
 import { NoOpCredential } from "@azure-tools/test-credential";
+import {
+  createHttpHeaders,
+  HttpClient,
+  PipelineRequest,
+  SendRequest,
+} from "@azure/core-rest-pipeline";
 
 describe("http request related tests", function () {
   describe("unit tests", () => {
@@ -116,61 +118,17 @@ describe("http request related tests", function () {
   describe("request/reply tests for sync token headers", () => {
     let client: AppConfigurationClient;
     let syncTokens: SyncTokens;
-    let scope: nock.Scope;
-
-    beforeEach(function (this: Context) {
-      if (nock == null || nock.recorder == null) {
-        this.skip();
-        return;
-      }
 
+    beforeEach(async function (this: Context) {
       syncTokens = new SyncTokens();
-
-      // Use NoOpCredential for nock tests to avoid interception for credential request
-      client =
-        createAppConfigurationClientForTests({
-          syncTokens: syncTokens,
-          testCredential: new NoOpCredential(),
-        } as InternalAppConfigurationClientOptions) || this.skip();
-
-      nock.recorder.clear();
-      nock.restore();
-      nock.cleanAll();
-      if (!nock.isActive()) {
-        nock.activate();
-      }
-
-      // Add authorization request headers to match GET requests with NoOpCredential
-      scope = nock(/.*/, {
-        reqheaders: {
-          authorization: /.*/,
-        },
-      });
-    });
-
-    afterEach(function (this: Context) {
-      if (nock == null || nock.recorder == null) {
-        return;
-      }
-
-      if (!this.currentTest?.isPending()) {
-        assert.ok(scope.isDone());
-      }
-      nock.recorder.clear();
-      nock.restore();
-      nock.cleanAll();
     });
 
     it("policy is setup properly to send sync tokens", async function () {
-      syncTokens.addSyncTokenFromHeaderValue(`hello=world;sn=1`);
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return { headers: createHttpHeaders(), status: 418, request };
+      });
 
-      const policyScope = nock(/.*/, {
-        reqheaders: {
-          "sync-token": "hello=world",
-        },
-      })
-        .get(/.*/)
-        .reply(418);
+      syncTokens.addSyncTokenFromHeaderValue(`hello=world;sn=1`);
 
       await assertThrowsRestError(
         async () =>
@@ -179,12 +137,16 @@ describe("http request related tests", function () {
           }),
         418,
       );
-
-      assert.ok(policyScope.isDone());
     });
 
     it("addConfigurationSetting", async () => {
-      scope.put(/.*/).reply(200, "", { "sync-token": "addConfigurationSetting=value;sn=1" });
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "addConfigurationSetting=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       await client.addConfigurationSetting({
         key: "doesntmatter",
@@ -194,7 +156,13 @@ describe("http request related tests", function () {
     });
 
     it("getConfigurationSetting", async () => {
-      scope.get(/.*/).reply(200, "", { "sync-token": "getConfigurationSetting=value;sn=1" });
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "getConfigurationSetting=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       await client.getConfigurationSetting({
         key: "doesntmatter",
@@ -204,7 +172,13 @@ describe("http request related tests", function () {
     });
 
     it("setConfigurationSetting", async () => {
-      scope.put(/.*/).reply(200, "", { "sync-token": "setConfigurationSetting=value;sn=1" });
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "setConfigurationSetting=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       await client.setConfigurationSetting({
         key: "doesntmatter",
@@ -214,7 +188,13 @@ describe("http request related tests", function () {
     });
 
     it("deleteConfigurationSetting", async () => {
-      scope.delete(/.*/).reply(200, "", { "sync-token": "deleteConfigurationSetting=value;sn=1" });
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "deleteConfigurationSetting=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       await client.deleteConfigurationSetting({
         key: "doesntmatter",
@@ -224,7 +204,13 @@ describe("http request related tests", function () {
     });
 
     it("listConfigurationSetting", async () => {
-      scope.get(/.*/).reply(200, "", { "sync-token": "listConfigurationSetting=value;sn=1" });
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "listConfigurationSetting=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       const iterator = client.listConfigurationSettings({
         keyFilter: "doesntmatter",
@@ -235,7 +221,13 @@ describe("http request related tests", function () {
     });
 
     it("listRevisions", async () => {
-      scope.get(/.*/).reply(200, "", { "sync-token": "listRevisions=value;sn=1" });
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "listRevisions=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       const iterator = client.listRevisions({
         keyFilter: "doesntmatter",
@@ -246,9 +238,13 @@ describe("http request related tests", function () {
     });
 
     it("setReadOnly (clear and set)", async () => {
-      scope.put(/.*/).reply(200, "", { "sync-token": "setReadOnly=value;sn=1" });
-
-      scope.delete(/.*/).reply(200, "", { "sync-token": "clearReadOnly=value;sn=1" });
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "setReadOnly=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       await client.setReadOnly(
         {
@@ -260,6 +256,13 @@ describe("http request related tests", function () {
       assert.equal(syncTokens.getSyncTokenHeaderValue(), "setReadOnly=value");
 
       syncTokens.addSyncTokenFromHeaderValue(undefined); // clear out any previous sync tokens
+      client = createMockSyncTokenClient(syncTokens, async (request: PipelineRequest) => {
+        return {
+          headers: createHttpHeaders({ "sync-token": "clearReadOnly=value;sn=1" }),
+          status: 200,
+          request,
+        };
+      });
 
       await client.setReadOnly(
         {
@@ -312,3 +315,18 @@ function splitAndSort(syncTokens: string | undefined): string {
 
   return syncTokens.split(",").sort().join(",");
 }
+
+function createMockSyncTokenClient(
+  syncTokens: SyncTokens,
+  sendRequest: SendRequest,
+): AppConfigurationClient {
+  const fakeHttpClient: HttpClient = {
+    sendRequest,
+  };
+
+  // Use NoOpCredential to avoid interception for credential request
+  return new AppConfigurationClient("https://example.com", new NoOpCredential(), {
+    syncTokens: syncTokens,
+    httpClient: fakeHttpClient,
+  } as InternalAppConfigurationClientOptions);
+}