update stuff

Author: daniel-graham-amplitude

packages/e2e-remote-config/remote-config-test.sh

@@ -1,5 +1,12 @@
+# STAGING
+API_KEY="52fbe5356dc7490756a9c26591f2bb37"
+AMPLITUDE_VERSION="2.22.2"
+SERVER_ZONE="STAGING"
+SERVER_ZONE=$SERVER_ZONE API_KEY=$API_KEY AMPLITUDE_VERSION=$AMPLITUDE_VERSION npx playwright test packages/e2e-remote-config/test/e2e/fetch-remote-config.spec.ts
+
 # API_KEY empty
 API_KEY="657954c4c37e22e8dc2af0413ac01e2b"
+SERVER_ZONE="US"
 API_KEY=$API_KEY AMPLITUDE_VERSION=$AMPLITUDE_VERSION npx playwright test packages/e2e-remote-config/test/e2e/fetch-remote-config.spec.ts
 
 # 2.11.0 -- first mionor version to support remote config for autocapture

packages/e2e-remote-config/test/e2e/fetch-remote-config.spec.ts

@@ -5,41 +5,52 @@ import { test, expect } from '@playwright/test';
 const remoteConfigUrl = 'https://sr-client-cfg.amplitude.com/';
 const amplitudeVersion = process.env.AMPLITUDE_VERSION;
 const apiKey = process.env.API_KEY;
-let redirectedServerUrl = process.env.REMOTE_CONFIG_URL || '';
+const serverZone = process.env.SERVER_ZONE || 'US';
+
+let redirectedServerUrl = null;
+if (serverZone === 'STAGING') {
+  redirectedServerUrl = 'https://sr-client-cfg.stag2.amplitude.com/';
+} else if (serverZone === 'EU') {
+  redirectedServerUrl = 'https://sr-client-cfg.eu.amplitude.com/';
+}
+console.log(`Redirecting to server URL: ${redirectedServerUrl}`);
 
 if (redirectedServerUrl && !redirectedServerUrl?.endsWith('/')) {
   redirectedServerUrl += '/';
 }
 
 const LOCAL_SITE = 'http://localhost:5173';
 
-test.describe(`Fetch remote config sdkVersion=${amplitudeVersion || 'latest'} apiKey=${apiKey || 'default'}`, () => {
+test.describe(`Fetch remote config: remoteConfigUrl=${redirectedServerUrl} sdkVersion=${amplitudeVersion || 'latest'} apiKey=${apiKey || 'default'}`, () => {
   test('should fetch remote config', async ({ page }) => {
     // intercept the fetch request to the remote config
+    let fullRemoteConfigUrl = remoteConfigUrl;
     await page.route(`${remoteConfigUrl}**`, async (route) => {
       if (redirectedServerUrl) {
         // edit the request to redirect to the redirectedServerUrl
         const request = route.request();
         const newUrl = request.url().replace(remoteConfigUrl, redirectedServerUrl);
+        fullRemoteConfigUrl = newUrl;
         await route.continue({ url: newUrl });
       } else {
+        fullRemoteConfigUrl = route.request().url();
         await route.continue();
       }
     });
-    
-    const fetchRemoteConfigPromise = page.waitForResponse(`${remoteConfigUrl}*`);
+    const responsePattern = redirectedServerUrl ? `${redirectedServerUrl}**` : `${remoteConfigUrl}**`;
+    const fetchRemoteConfigPromise = page.waitForResponse(responsePattern);
     let queryParams: Record<string, string> = {};
     if (amplitudeVersion) {
       queryParams.amplitudeVersion = amplitudeVersion;
     }
     if (apiKey) {
       queryParams.apiKey = apiKey;
     }
-    // TODO: parameterize this
-    queryParams.serverZone = 'STAGING';
+    queryParams.serverZone = serverZone;
     await page.goto(`${LOCAL_SITE}/remote-config-test.html?${new URLSearchParams(queryParams).toString()}`);
     const response = await fetchRemoteConfigPromise;
     const body = await response.json();
+    console.log('body', body);
     expect(body.configs.analyticsSDK).toBeDefined();
   });
 });

test-server/remote-config-test.html

@@ -94,7 +94,7 @@ <h3>Event Log</h3>
       const API_ENDPOINTS = {
         US: 'https://api2.amplitude.com/2/httpapi',
         EU: 'https://api.eu.amplitude.com/2/httpapi',
-        STAG: 'https://api.stag2.amplitude.com/2/httpapi',
+        STAGING: 'https://api.stag2.amplitude.com/2/httpapi',
       };
 
       window.SERVER_URL = API_ENDPOINTS[window.SERVER_ZONE?.toUpperCase()];