replace ci prefix only at rewriting part

Signed-off-by: Tianle Huang <[email protected]>
opensearch-project · Mar 1, 2022 · b6a6c0f · b6a6c0f
1 parent 9cb1ffb
commit b6a6c0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/deployment/lambdas/cf-url-rewriter/cf-url-rewriter.ts b/deployment/lambdas/cf-url-rewriter/cf-url-rewriter.ts
@@ -3,8 +3,6 @@ import { httpsGet } from './https-get';
 
 export async function handler(event: CloudFrontRequestEvent, context: Context, callback: CloudFrontRequestCallback) {
     const request = event.Records[0].cf.request;
-    // Incoming URLs from ci.opensearch.org will have a '/ci/123/' prefix, remove the prefix path from requests into S3.
-    request.uri = request.uri.replace(/^\/ci\/...\//, '\/');
 
     if (request.uri.includes("/latest/")) {
 
@@ -24,6 +22,8 @@ export async function handler(event: CloudFrontRequestEvent, context: Context, c
         }
 
     } else {
+        // Incoming URLs from ci.opensearch.org will have a '/ci/123/' prefix, remove the prefix path from requests into S3.
+        request.uri = request.uri.replace(/^\/ci\/...\//, '\/');
         callback(null, request);
     }
 }

diff --git a/deployment/test/lambdas/cf-url-rewriter/cf-url-rewriter.test.ts b/deployment/test/lambdas/cf-url-rewriter/cf-url-rewriter.test.ts
@@ -42,14 +42,14 @@ test('handler with latest url and with ci keyword and valid latest field', async
 
     await handler(event, context, callback);
 
-    expect(httpsGet).toBeCalledWith('https://test.cloudfront.net/bundle-build-dashboards/1.2.0/index.json');
+    expect(httpsGet).toBeCalledWith('https://test.cloudfront.net/ci/dbc/bundle-build-dashboards/1.2.0/index.json');
 
     expect(callback).toHaveBeenCalledWith(
         null,
         {
             "headers": {
                 "cache-control": [{ "key": "Cache-Control", "value": "max-age=3600" }],
-                "location": [{ "key": "Location", "value": "/bundle-build-dashboards/1.2.0/123/linux/x64/" }]
+                "location": [{ "key": "Location", "value": "/ci/dbc/bundle-build-dashboards/1.2.0/123/linux/x64/" }]
             },
             "status": "302",
             "statusDescription": "Moved temporarily"