fix: cli tests randomly fail

.github/workflows/build.yml

@@ -3,7 +3,7 @@ on:
   pull_request: {}
   workflow_call: {}
 jobs:
-  build:
+  unit-tests:
     runs-on: ubuntu-latest
     env:
       CI: "true"
@@ -13,8 +13,7 @@ jobs:
       - uses: ./.github/actions/build
       - name: Run tests
         run: pnpm test
-  test-runtime:
-    needs: [build]
+  deploy-runtime:
     concurrency: pr-test-runtime
     runs-on: ubuntu-latest
     permissions:
@@ -35,8 +34,35 @@ jobs:
         run: pnpm -r --filter tests-runtime run deploy:runtime
         env:
           EVENTUAL_LOCAL: "1"
+      - name: Upload deployment output as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: deployment-output
+          path: ./apps/tests/aws-runtime/cdk.out/outputs.json
+  test-runtime:
+    needs: [deploy-runtime]
+    concurrency: pr-test-runtime
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/build
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
+          aws-region: us-east-1
+          role-duration-seconds: 3600
+      - name: Download artifact with variable
+        id: deployment-output
+        uses: actions/download-artifact@v3
+        with:
+          name: deployment-output
+          path: deployment
       - run: |
-          echo "TEST_ROLE_ARN=$(node -p 'JSON.parse(require("fs").readFileSync("./apps/tests/aws-runtime/cdk.out/outputs.json"))["eventual-tests"].roleArn')" >> $GITHUB_ENV
+          echo "TEST_ROLE_ARN=$(node -p 'JSON.parse(require("fs").readFileSync("${{ steps.deployment-output.outputs.download-path }}/outputs.json"))["eventual-tests"].roleArn')" >> $GITHUB_ENV
       - name: Configure Test Role Credentials
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
@@ -47,14 +73,86 @@ jobs:
           aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ env.AWS_SESSION_TOKEN  }}
           role-skip-session-tagging: true
-      - name: Run Local Tests
-        run: pnpm -r --filter tests-runtime run test:local-start
+          role-session-name: ${{ github.job	}}
       - name: Run Runtime Tests
         run: pnpm -r --filter tests-runtime run test:runtime
+        env:
+          OUTPUTS_FILE: "${{ steps.deployment-output.outputs.download-path }}/outputs.json"
+  test-local:
+    needs: [deploy-runtime]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/build
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
+          aws-region: us-east-1
+          role-duration-seconds: 3600
+      - name: Download artifact with variable
+        id: deployment-output
+        uses: actions/download-artifact@v3
+        with:
+          name: deployment-output
+          path: deployment
+      - run: |
+          echo "TEST_ROLE_ARN=$(node -p 'JSON.parse(require("fs").readFileSync("${{ steps.deployment-output.outputs.download-path }}/outputs.json"))["eventual-tests"].roleArn')" >> $GITHUB_ENV
+      - name: Configure Test Role Credentials
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          role-to-assume: ${{ env.TEST_ROLE_ARN }}
+          aws-region: us-east-1
+          role-duration-seconds: 3600
+          aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
+          aws-session-token: ${{ env.AWS_SESSION_TOKEN  }}
+          role-skip-session-tagging: true
+          role-session-name: ${{ github.job	}}
+      - name: Run Local Tests
+        run: pnpm -r --filter tests-runtime run test:local-start
+  test-cli:
+    needs: [test-runtime]
+    runs-on: ubuntu-latest
+    env:
+      CI: "true"
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/build
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
+          aws-region: us-east-1
+          role-duration-seconds: 3600
+      - name: Download artifact with variable
+        id: deployment-output
+        uses: actions/download-artifact@v3
+        with:
+          name: deployment-output
+          path: deployment
+      - run: |
+          echo "TEST_ROLE_ARN=$(node -p 'JSON.parse(require("fs").readFileSync("${{ steps.deployment-output.outputs.download-path }}/outputs.json"))["eventual-tests"].roleArn')" >> $GITHUB_ENV
+      - name: Configure Test Role Credentials
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          role-to-assume: ${{ env.TEST_ROLE_ARN }}
+          aws-region: us-east-1
+          role-duration-seconds: 3600
+          aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
+          aws-session-token: ${{ env.AWS_SESSION_TOKEN  }}
+          role-skip-session-tagging: true
+          role-session-name: ${{ github.job	}}
       - name: Run CLI Tests
         run: pnpm -r --filter tests-runtime run test:cli
   test-create:
-    needs: [build]
     runs-on: ubuntu-latest
     permissions:
       contents: write

apps/tests/aws-runtime-cdk/src/chaos-extension.ts

@@ -84,7 +84,7 @@ export class ChaosExtension extends Construct {
   /**
    * Grant the ability to read and write the SSM parameter used by the chaos extension.
    *
-   * This is required to use the {@link SSMChaosClient}.
+   * This is required to use the {@link ChaosClient}.
    */
   public grantReadWrite(grantable: IGrantable) {
     this.ssm.grantRead(grantable);

apps/tests/aws-runtime/package.json

@@ -5,7 +5,7 @@
   "version": "0.0.0",
   "main": "lib/test-service.js",
   "scripts": {
-    "test:runtime": "NODE_OPTIONS=--experimental-vm-modules OUTPUTS_FILE=cdk.out/outputs.json jest --passWithNoTests",
+    "test:runtime": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",
     "test:local": "NODE_OPTIONS=--experimental-vm-modules TEST_LOCAL=1 jest --passWithNoTests",
     "test:cli": "./scripts/test-cli",
     "test:create": "./scripts/test-create",

apps/tests/aws-runtime/scripts/test-cli

@@ -14,6 +14,8 @@ npx eventual start workflow sleepy -f
 
 npx eventual list executions
 
+mkdir -p .eventual
+
 npx eventual list executions --workflow sleepy --json > .eventual/out.json
 
 execution_id=$(node -p 'JSON.parse(require("fs").readFileSync(".eventual/out.json").toString("utf8")).executions[0].id')

packages/@eventual/aws-cdk/src/command-service.ts

@@ -185,6 +185,8 @@ export class CommandService<Service = any> {
           this.props.build.system.eventualService.systemCommandHandler,
         functionNameSuffix: "system-command",
         serviceName: this.props.serviceName,
+        // the logs command is the outlier here. Was often timing out at 3 seconds.
+        defaults: { timeout: Duration.seconds(30) },
       }
     );
 

packages/@eventual/cli/src/commands/logs.ts

@@ -81,8 +81,13 @@ export const logs = (yargs: Argv) =>
         };
 
         do {
-          const fetchResult = await fetchLogs(logFilter, logCursor);
-          logCursor = updateLogCursor(logCursor, fetchResult, follow);
+          try {
+            const fetchResult = await fetchLogs(logFilter, logCursor);
+            logCursor = updateLogCursor(logCursor, fetchResult, follow);
+          } catch (err) {
+            console.error(err);
+            throw err;
+          }
 
           if (follow) {
             spinner.start("Watching logs");
@@ -105,20 +110,20 @@ export const logs = (yargs: Argv) =>
               ? new Date(logCursor.startTime).toISOString()
               : undefined,
             workflowName: logFilter.workflowName,
+            maxResults: 1000,
           });
 
           const functionEvents = output.events ?? [];
 
-          // Print out the interleaved logs
           if (functionEvents.length) {
             spinner.stop();
             functionEvents.forEach((ev) => {
-              console.log(
+              process.stdout.write(
                 `${
                   logFilter.executionId ? "" : `[${chalk.blue(ev.source)}] `
                 }${chalk.red(new Date(ev.time!).toLocaleString())} ${
                   ev.message
-                }`
+                }\n`
               );
             });
           }