Merge pull request #330 from lifeomic/no-task/handle-config-entrypoint

No task/handle config entrypoint

src/lambda.ts

@@ -73,11 +73,12 @@ export async function destroyLambdaExecutionEnvironment (environment: ExecutionE
  }
 }
 
-async function getEntrypoint (docker: Docker, imageName: string): Promise<string[]> {
- const image = await (await docker.getImage(imageName)).inspect();
+export async function getEntrypoint (docker: Docker, imageName: string): Promise<string[]> {
+ const image = await docker.getImage(imageName).inspect();
+ const entryPoint = image.ContainerConfig.Entrypoint ?? image.Config.Entrypoint;
 
- if (image.ContainerConfig.Entrypoint) {
- return flatten([image.ContainerConfig.Entrypoint]);
+ if (entryPoint) {
+ return flatten([entryPoint]);
  } else {
  const parentImageName = image.Parent;
  assert(parentImageName, `The image ${imageName} has no entrypoint and no parent image`);

test/lambda/entrypoint.test.js

@@ -0,0 +1,59 @@
+const test = require('ava');
+const sinon = require('sinon');
+const Dockerode = require('dockerode');
+const { getEntrypoint } = require('../../src/lambda');
+
+test.afterEach(() => {
+ sinon.restore();
+});
+
+test.serial('should fail to get entrypoint', async (test) => {
+ const imageName = 'image';
+ const errorMessage = `The image ${imageName} has no entrypoint and no parent image`;
+ const containerStub = sinon.createStubInstance(Dockerode.Container, {
+ inspect: sinon.stub().resolves({ Image: imageName })
+ });
+ const imageStub = sinon.createStubInstance(Dockerode.Image, {
+ inspect: sinon.stub().resolves({
+ Config: {},
+ ContainerConfig: {}
+ })
+ });
+ const dockerStub = sinon.createStubInstance(Dockerode, {
+ getContainer: sinon.stub().resolves(containerStub),
+ getImage: sinon.stub().returns(imageStub)
+ });
+
+ const error = await test.throwsAsync(getEntrypoint(dockerStub, imageName));
+
+ test.is(error.message, errorMessage);
+});
+
+test.serial('should not fail to get entrypoint', async (test) => {
+ const imageName = 'image';
+ const containerStub = sinon.createStubInstance(Dockerode.Container, {
+ inspect: sinon.stub().resolves({ Image: imageName })
+ });
+ const imageInspectStub = sinon.stub();
+ imageInspectStub.onFirstCall().resolves({
+ Config: {},
+ ContainerConfig: {},
+ Parent: `parent-${imageName}`
+ });
+ imageInspectStub.onSecondCall().resolves({
+ Config: {
+ Entrypoint: ['hello', 'entrypoint']
+ },
+ ContainerConfig: {}
+ });
+
+ const imageStub = sinon.createStubInstance(Dockerode.Image, {
+ inspect: imageInspectStub
+ });
+ const dockerStub = sinon.createStubInstance(Dockerode, {
+ getContainer: sinon.stub().resolves(containerStub),
+ getImage: sinon.stub().returns(imageStub)
+ });
+
+ await test.notThrowsAsync(getEntrypoint(dockerStub, imageName));
+});