Merge branch 'main' into postdeploy

Author: kptdobe

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.0.5](https://github.com/adobe/da-admin/compare/v1.0.4...v1.0.5) (2025-12-18)
+
+
+### Bug Fixes
+
+* fix prod worker name ([#227](https://github.com/adobe/da-admin/issues/227)) ([73b05c7](https://github.com/adobe/da-admin/commit/73b05c72aace78c99b8a3f54ea517172fa3120f0))
+
+## [1.0.4](https://github.com/adobe/da-admin/compare/v1.0.3...v1.0.4) (2025-12-18)
+
+
+### Bug Fixes
+
+* GH-221 - Disable anonymous access ([#225](https://github.com/adobe/da-admin/issues/225)) ([df98f3e](https://github.com/adobe/da-admin/commit/df98f3eca7b51ae05db7106a01b7f77f25f3c6c8)), closes [#221](https://github.com/adobe/da-admin/issues/221) [#221](https://github.com/adobe/da-admin/issues/221) [#221](https://github.com/adobe/da-admin/issues/221)
+
+## [1.0.3](https://github.com/adobe/da-admin/compare/v1.0.2...v1.0.3) (2025-12-17)
+
+
+### Bug Fixes
+
+* stalled response ([#226](https://github.com/adobe/da-admin/issues/226)) ([d32fa3e](https://github.com/adobe/da-admin/commit/d32fa3eb470c8fbdbca61e9b9ba7961956ab9bbf))
+
 ## [1.0.2](https://github.com/adobe/da-admin/compare/v1.0.1...v1.0.2) (2025-12-15)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "da-admin",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "",
   "main": "index.js",
   "type": "module",

package.json

@@ -30,9 +30,10 @@ export async function notifyCollab(api, url, env) {
   if (env.COLLAB_SHARED_SECRET) {
     headers.authorization = `token ${env.COLLAB_SHARED_SECRET}`;
   }
-  await env.dacollab.fetch(invURL, {
+  const resp = await env.dacollab.fetch(invURL, {
     // TODO: use POST for state changing operations
     // method: 'POST',
     headers,
   });
+  resp.body.cancel();
 }

src/storage/utils/object.js

@@ -110,7 +110,7 @@ describe('Conditional Headers End-to-End', () => {
     const env = {
       AEM_BUCKET_NAME: 'test-bucket',
       dacollab: {
-        fetch: async () => ({ status: 200 }),
+        fetch: async () => ({ status: 200, body: { cancel: () => {} } }),
       },
     };
     const resp = await handler.default.fetch(req, env);

test/integration/conditional-e2e.test.js

@@ -19,7 +19,10 @@ describe('Source Route', () => {
   it('Test invalidate using service binding', async () => {
     const sb_callbacks = [];
     const dacollab = {
-      fetch: async (url) => sb_callbacks.push(url),
+      fetch: async (url) => {
+        sb_callbacks.push(url);
+        return { body: { cancel: () => {} } };
+      },
     };
     const env = {
       dacollab,

test/routes/source.test.js

@@ -343,7 +343,10 @@ describe('Object copy', () => {
       const collabCalled = [];
       const env = {
         dacollab: {
-          fetch: (x) => { collabCalled.push(x); },
+          fetch: (x) => {
+            collabCalled.push(x);
+            return { body: { cancel: () => {} } };
+          },
         },
       };
       const daCtx = {
@@ -569,7 +572,10 @@ describe('Object copy', () => {
       const collabCalled = [];
       const env = {
         dacollab: {
-          fetch: (x) => { collabCalled.push(x); },
+          fetch: (x) => {
+            collabCalled.push(x);
+            return { body: { cancel: () => {} } };
+          },
         },
       };
       const daCtx = { bucket: 'mybucket', org: 'xorg' };
@@ -631,7 +637,10 @@ describe('Object copy', () => {
       const collabCalled = [];
       const env = {
         dacollab: {
-          fetch: (x) => { collabCalled.push(x); },
+          fetch: (x) => {
+            collabCalled.push(x);
+            return { body: { cancel: () => {} } };
+          },
         },
       };
       const daCtx = { bucket: 'test-bucket', org: 'qqqorg', origin: 'http://qqq' };
@@ -680,7 +689,7 @@ describe('Object copy', () => {
         return null;
       };
 
-      const env = { dacollab: { fetch: () => {} } };
+      const env = { dacollab: { fetch: () => ({ body: { cancel: () => {} } }) } };
       const ctx = {
         bucket: 'root-bucket',
         org: 'foo',
@@ -713,7 +722,7 @@ describe('Object copy', () => {
             DA_JOBS[key] = value;
           },
         },
-        dacollab: { fetch: () => {} },
+        dacollab: { fetch: () => ({ body: { cancel: () => {} } }) },
       };
       s3Mock.on(ListObjectsV2Command)
         .resolves({
@@ -797,7 +806,7 @@ describe('Object copy', () => {
             return DA_JOBS[key];
           },
         },
-        dacollab: { fetch: () => {} },
+        dacollab: { fetch: () => ({ body: { cancel: () => {} } }) },
       };
 
       // Mock getObject to return content type for HEAD requests
@@ -858,7 +867,7 @@ describe('Object copy', () => {
             delete DA_JOBS[key];
           },
         },
-        dacollab: { fetch: () => {} },
+        dacollab: { fetch: () => ({ body: { cancel: () => {} } }) },
       };
 
       // Mock getObject to return content type for HEAD requests

test/storage/object/copy.test.js

@@ -25,7 +25,12 @@ describe('Object delete', () => {
   describe('single context', () => {
     it('Delete a file', async () => {
       const collabCalled = [];
-      const dacollab = { fetch: (u) => collabCalled.push(u) };
+      const dacollab = {
+        fetch: (u) => {
+          collabCalled.push(u);
+          return { body: { cancel: () => {} } };
+        },
+      };
 
       const client = {};
       const env = { dacollab };
@@ -227,8 +232,7 @@ describe('Object delete', () => {
       };
       const env = {
         dacollab: {
-          fetch: () => {
-          },
+          fetch: () => ({ body: { cancel: () => {} } }),
         },
       };
       const mockPostObjectVersion = async () => ({ status: 201 });
@@ -257,8 +261,7 @@ describe('Object delete', () => {
       };
       const env = {
         dacollab: {
-          fetch: () => {
-          },
+          fetch: () => ({ body: { cancel: () => {} } }),
         },
       };
       const mockPostObjectVersion = async () => ({ status: 201 });

test/storage/object/delete.test.js

@@ -21,6 +21,7 @@ describe('Storage Object Utils tests', () => {
       fetch: async (url) => {
         console.log(`invalidate called with ${url}`);
         called.push(url);
+        return { body: { cancel: () => {} } };
       },
     };
     const env = { dacollab };
@@ -53,6 +54,7 @@ describe('Storage Object Utils tests', () => {
           console.log(`invalidate called with ${url}`);
           assert.strictEqual(opts.headers.authorization, 'token example-secret');
           called.push(url);
+          return { body: { cancel: () => {} } };
         },
       },
       COLLAB_SHARED_SECRET: 'example-secret',

test/storage/utils/object.test.js

@@ -6,6 +6,7 @@ keep_vars = true
 # ----------------------------------------------------------------------
 # production environment
 [env.production]
+name = "da-admin"
 services = [
   { binding = "dacollab", service = "da-collab" }
 ]
@@ -29,6 +30,7 @@ AEM_BUCKET_NAME = "aem-content"
 # ----------------------------------------------------------------------
 # stage environment
 [env.stage]
+name = "da-admin-stage"
 services = [
   { binding = "dacollab", service = "da-collab-stage" }
 ]
@@ -52,6 +54,7 @@ AEM_BUCKET_NAME = "aem-content-stage"
 # ----------------------------------------------------------------------
 # ci environment (using stage content)
 [env.ci]
+name = "da-admin-ci"
 services = [
   { binding = "dacollab", service = "da-collab-stage" }
 ]
@@ -76,6 +79,7 @@ AEM_BUCKET_NAME = "aem-content-stage"
 # ----------------------------------------------------------------------
 # dev environment (local)
 [env.dev]
+name = "da-admin-dev"
 services = [
   { binding = "dacollab", service = "da-collab-local" }
 ]
@@ -99,6 +103,7 @@ AEM_BUCKET_NAME = "aem-content-dev"
 # ----------------------------------------------------------------------
 # integration test environment (local)
 [env.it]
+name = "da-admin-it"
 services = [
   { binding = "dacollab", service = "da-collab-local" }
 ]