fix: ensure settled action result before fetching it [PHX-2608]

lib/cmds/merge_cmds/export.ts

@@ -4,7 +4,7 @@ import Listr from 'listr'
 import path from 'path'
 import type { Argv } from 'yargs'
 import {
-  callCreateChangeset,
+  callCreateChangesetWithResponse,
   getExportMigration
 } from '../../utils/app-actions'
 import { getAppActionId, type Host } from '../../utils/app-actions-config'
@@ -89,7 +89,7 @@ export const callExportAppAction = async ({
       // use wrapTask
       task: async (ctx: Context, task) => {
         task.output = chalk`calculating differences`
-        const actionResponse = await callCreateChangeset({
+        const actionResponse = await callCreateChangesetWithResponse({
           api: ctx.api,
           appDefinitionId: ctx.appDefinitionId,
           appActionId: ctx.createChangesetActionId,
@@ -107,11 +107,8 @@ export const callExportAppAction = async ({
         })
 
         task.output = chalk`fetching differences`
-        // wait for changeset to be settled
-        await new Promise(resolve => setTimeout(resolve, 1000 * 8))
         // eslint-disable-next-line require-atomic-updates
-        ctx.changesetRef = actionResponse
-        // ctx.changesetRef = actionResponse.sys.id
+        ctx.changesetRef = actionResponse.sys.id
       }
     },
     {

package.json

@@ -92,7 +92,7 @@
     "contentful-collection": "^0.0.4",
     "contentful-export": "^7.19.0",
     "contentful-import": "^8.5.35",
-    "contentful-management": "^10.33.0",
+    "contentful-management": "^10.35.3",
     "contentful-migration": "^4.12.5",
     "emojic": "^1.1.11",
     "execa": "^5.0.0",

test/unit/cmds/merge_cmds/export.test.ts

@@ -15,7 +15,7 @@ const mockedClient = {
   },
   environmentAlias: {
     getMany: jest.fn().mockResolvedValue({ items: [] })
-  },
+  }
 } as unknown as PlainClientAPI
 
 describe('merge export command', () => {
@@ -90,7 +90,15 @@ describe('merge export command', () => {
           body: '{"message": {"migration":"console.log(\'hello world\')"}}'
         }
       }),
-      createWithResponse: jest.fn()
+      createWithResponse: jest.fn().mockResolvedValue({
+        statusCode: 200,
+        sys: {
+          id: 'action-id-export-migration'
+        },
+        response: {
+          body: '{"message": {"migration":"console.log(\'hello world\')"}}'
+        }
+      })
     }
 
     await exportCmd.callExportAppAction({
@@ -103,7 +111,10 @@ describe('merge export command', () => {
       spaceId: 'space'
     })
 
-    expect(mockedClient.appActionCall.create).toHaveBeenCalledTimes(2)
+    expect(mockedClient.appActionCall.create).toHaveBeenCalledTimes(1)
+    expect(mockedClient.appActionCall.createWithResponse).toHaveBeenCalledTimes(
+      1
+    )
   })
 
   it('catches the error and shows a pretty output', async () => {