Merge pull request #1503 from philips-labs/develop

release

Author: npalm

.github/workflows/lambda-runner-binaries-syncer.yml

@@ -1,7 +1,4 @@
 name: Lambda Syncer
-env:
-  lambda_name: runner-binaries-syncer
-  lambda_path: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer
 on:
   push:
     branches:
@@ -17,7 +14,8 @@ jobs:
     container: node:14
     defaults:
       run:
-        working-directory: ${{ env.lambda_path }}
+        working-directory: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer
+
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies

examples/ubuntu/templates/user-data.sh

@@ -59,7 +59,7 @@ echo export PATH=/home/$USER_NAME/bin:$PATH >>/home/$USER_NAME/.profile
 loginctl enable-linger $USER_NAME
 su -l $USER_NAME -c "systemctl --user enable docker"
 
-${install_config_runner}
+${install_runner}
 
 # config runner for rootless docker
 cd /home/$USER_NAME/actions-runner/
@@ -68,4 +68,4 @@ echo PATH=/home/$USER_NAME/bin:$PATH >>.env
 
 ${post_install}
 
-./svc.sh start
+${start_runner}

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/jest.config.js

@@ -1,4 +1,14 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  collectCoverage: true,
+  collectCoverageFrom: ['src/**/*.{ts,js,jsx}', '!src/**/*local*.ts'],
+  coverageThreshold: {
+    global: {
+      branches: 80,
+      functions: 80,
+      lines: 80,
+      statements: 80
+    }
+  }
 };

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/package.json

@@ -21,18 +21,18 @@
     "@types/request": "^2.48.4",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
-    "@vercel/ncc": "^0.32.0",
-    "aws-sdk": "^2.1040.0",
+    "@vercel/ncc": "^0.33.0",
+    "aws-sdk": "^2.1044.0",
     "eslint": "^7.32.0",
     "eslint-plugin-prettier": "4.0.0",
     "jest": "^27.4.3",
-    "prettier": "2.5.0",
-    "ts-jest": "^27.0.7",
+    "prettier": "2.5.1",
+    "ts-jest": "^27.1.0",
     "ts-node-dev": "^1.1.6",
     "typescript": "^4.5.2"
   },
   "dependencies": {
-    "tslog": "^3.3.0",
-    "axios": "^0.24.0"
+    "axios": "^0.24.0",
+    "tslog": "^3.3.0"
   }
 }

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/lambda.test.ts

@@ -0,0 +1,24 @@
+import { sync } from './syncer/syncer';
+import { handler } from './lambda';
+import { mocked } from 'ts-jest/utils';
+
+jest.mock('./syncer/syncer');
+
+describe('Test download sync wrapper.', () => {
+  it('Test successful download.', async () => {
+    const mock = mocked(sync);
+    mock.mockImplementation(() => {
+      return new Promise((resolve) => {
+        resolve();
+      });
+    });
+    await expect(handler({}, {})).resolves;
+  });
+
+  it('Test wrapper with returning an error. ', async () => {
+    const mock = mocked(sync);
+    mock.mockRejectedValue(new Error(''));
+
+    await expect(handler({}, {})).resolves;
+  });
+});

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/lambda.ts

@@ -1,14 +1,14 @@
-import { handle } from './syncer/handler';
+import { sync } from './syncer/syncer';
 import { logger } from './syncer/logger';
 
 // eslint-disable-next-line
-export const handler = async (event: any, context: any, callback: any): Promise<void> => {
+export async function handler(event: any, context: any): Promise<void> {
   logger.setSettings({ requestId: context.awsRequestId });
   logger.debug(JSON.stringify(event));
+
   try {
-    await handle();
-    callback(null);
+    await sync();
   } catch (e) {
-    callback(e);
+    logger.warn('Ignoring error:', e);
   }
-};
+}

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/local.ts

@@ -1,6 +1,6 @@
-import { handle } from './syncer/handler';
+import { sync } from './syncer/syncer';
 
-handle()
+sync()
   .then()
   .catch((e) => {
     console.log(e);

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/syncer/handler.test.ts renamed to modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/syncer/syncer.test.ts

@@ -1,8 +1,12 @@
-import { handle } from './handler';
+import { sync } from './syncer';
 import listReleases from '../../test/resources/github-list-releases.json';
 import listReleasesEmpty from '../../test/resources/github-list-releases-empty-assets.json';
 import listReleasesNoLinux from '../../test/resources/github-list-releases-no-linux.json';
 import listReleasesNoArm64 from '../../test/resources/github-list-releases-no-arm64.json';
+import { S3 } from 'aws-sdk';
+import axios from 'axios';
+import { request } from 'http';
+import { EventEmitter, PassThrough, Readable } from 'stream';
 
 const mockOctokit = {
   repos: {
@@ -13,9 +17,23 @@ jest.mock('@octokit/rest', () => ({
   Octokit: jest.fn().mockImplementation(() => mockOctokit),
 }));
 
+// mock stream for Axios
+const mockResponse = `{"data": 123}`;
+const mockStream = new PassThrough();
+mockStream.push(mockResponse);
+mockStream.end();
+
+jest.mock('axios');
+const mockedAxios = axios as jest.Mocked<typeof axios>;
+mockedAxios.request.mockResolvedValue({
+  data: mockStream,
+});
+
 const mockS3 = {
   getObjectTagging: jest.fn(),
-  upload: jest.fn(),
+  upload: jest.fn().mockImplementation(() => {
+    return { promise: jest.fn(() => Promise.resolve()) };
+  }),
 };
 jest.mock('aws-sdk', () => ({
   S3: jest.fn().mockImplementation(() => mockS3),
@@ -27,6 +45,8 @@ beforeEach(() => {
   jest.clearAllMocks();
 });
 
+jest.setTimeout(60 * 1000);
+
 describe('Synchronize action distribution.', () => {
   beforeEach(() => {
     process.env.S3_BUCKET_NAME = bucketName;
@@ -47,7 +67,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -71,7 +91,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -90,7 +110,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -108,7 +128,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -134,7 +154,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -155,7 +175,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -183,7 +203,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -203,7 +223,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -221,7 +241,7 @@ describe('Synchronize action distribution.', () => {
       };
     });
 
-    await handle();
+    await sync();
     expect(mockOctokit.repos.listReleases).toBeCalledTimes(1);
     expect(mockS3.getObjectTagging).toBeCalledWith({
       Bucket: bucketName,
@@ -243,15 +263,15 @@ describe('No release assets found.', () => {
       data: listReleasesEmpty,
     }));
 
-    await expect(handle()).rejects.toThrow(errorMessage);
+    await expect(sync()).rejects.toThrow(errorMessage);
   });
 
   it('No linux x64 asset.', async () => {
     mockOctokit.repos.listReleases.mockImplementation(() => ({
       data: [listReleasesNoLinux],
     }));
 
-    await expect(handle()).rejects.toThrow(errorMessage);
+    await expect(sync()).rejects.toThrow(errorMessage);
   });
 });
 
@@ -260,17 +280,17 @@ describe('Invalid config', () => {
   it('No bucket and object key.', async () => {
     delete process.env.S3_OBJECT_KEY;
     delete process.env.S3_BUCKET_NAME;
-    await expect(handle()).rejects.toThrow(errorMessage);
+    await expect(sync()).rejects.toThrow(errorMessage);
   });
   it('No bucket.', async () => {
     delete process.env.S3_BUCKET_NAME;
     process.env.S3_OBJECT_KEY = bucketObjectKey;
-    await expect(handle()).rejects.toThrow(errorMessage);
+    await expect(sync()).rejects.toThrow(errorMessage);
   });
   it('No object key.', async () => {
     delete process.env.S3_OBJECT_KEY;
     process.env.S3_BUCKET_NAME = bucketName;
-    await expect(handle()).rejects.toThrow(errorMessage);
+    await expect(sync()).rejects.toThrow(errorMessage);
   });
 });
 
@@ -287,6 +307,6 @@ describe('Synchronize action distribution for arm64.', () => {
       data: [listReleasesNoArm64],
     }));
 
-    await expect(handle()).rejects.toThrow(errorMessage);
+    await expect(sync()).rejects.toThrow(errorMessage);
   });
 });

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/syncer/handler.ts renamed to modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/syncer/syncer.ts

@@ -103,7 +103,7 @@ async function uploadToS3(s3: S3, cacheObject: CacheObject, actionRunnerReleaseA
     });
 }
 
-export const handle = async (): Promise<void> => {
+export async function sync(): Promise<void> {
   const s3 = new AWS.S3();
 
   const runnerArch = process.env.GITHUB_RUNNER_ARCHITECTURE || 'x64';
@@ -125,8 +125,8 @@ export const handle = async (): Promise<void> => {
   const currentVersion = await getCachedVersion(s3, cacheObject);
   logger.debug('latest: ' + currentVersion);
   if (currentVersion === undefined || currentVersion != actionRunnerReleaseAsset.name) {
-    uploadToS3(s3, cacheObject, actionRunnerReleaseAsset);
+    await uploadToS3(s3, cacheObject, actionRunnerReleaseAsset);
   } else {
     logger.debug('Distribution is up-to-date, no action.');
   }
-};
+}