fix: fixing function build issue + e2e tests (#1750)

fix #1747

Author: kaustavghosh06

packages/amplify-e2e-tests/.gitignore

@@ -1 +1,2 @@
-/lib
+/lib
+.env

packages/amplify-e2e-tests/__tests__/function.test.ts

@@ -0,0 +1,33 @@
+require('../src/aws-matchers/'); // custom matcher for assertion
+import { initProjectWithProfile, deleteProject, amplifyPushAuth } from '../src/init';
+import { addHelloWorldFunction, functionBuild } from '../src/categories/function';
+import { createNewProjectDir, deleteProjectDir, getProjectMeta, getFunction } from '../src/utils';
+
+describe('amplify add function', () => {
+  let projRoot: string;
+  beforeEach(() => {
+    projRoot = createNewProjectDir();
+    jest.setTimeout(1000 * 60 * 60); // 1 hour
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('init a project and add  simple function', async () => {
+    await initProjectWithProfile(projRoot, {});
+    await addHelloWorldFunction(projRoot, {});
+    await functionBuild(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    const meta = getProjectMeta(projRoot);
+    const { Arn: functionArn, Name: functionName, Region: region } = Object.keys(
+      meta.function
+    ).map(key => meta.function[key])[0].output;
+    expect(functionArn).toBeDefined();
+    expect(functionName).toBeDefined();
+    expect(region).toBeDefined();
+    const cloudFunction = await getFunction(functionName, region);
+    expect(cloudFunction.Configuration.FunctionArn).toEqual(functionArn);
+  });
+});

packages/amplify-e2e-tests/src/categories/function.ts

@@ -0,0 +1,62 @@
+
+import * as nexpect from 'nexpect';
+import { join } from 'path';
+import * as fs from 'fs';
+
+import { getCLIPath, isCI, getEnvVars } from '../utils';
+const defaultSettings = {
+  projectName: 'CLI Function test',
+};
+
+
+export function addHelloWorldFunction(
+  cwd: string,
+  settings: any,
+  verbose: boolean = !isCI()
+) {
+  return new Promise((resolve, reject) => {
+    nexpect
+      .spawn(getCLIPath(), ['add', 'function'], { cwd, stripColors: true, verbose })
+      .wait('Provide a friendly name for your resource to be used as a label')
+      .sendline('\r')
+      .wait('Provide the AWS Lambda function name')
+      .sendline('\r')
+      .wait('Choose the function template that you want to use')
+      .sendline('\r')
+      .wait('Do you want to access other resources created in this project')
+      .sendline('n')
+      .wait('Do you want to edit the local lambda function now')
+      .sendline('n')
+      .sendEof()
+      // tslint:disable-next-line
+      .run(function(err: Error) {
+        if (!err) {
+          resolve();
+        } else {
+          reject(err);
+        }
+      })
+  })
+}
+
+export function functionBuild(
+  cwd: string,
+  settings: any,
+  verbose: boolean = !isCI()
+) {
+  return new Promise((resolve, reject) => {
+    nexpect
+      .spawn(getCLIPath(), ['function', 'build'], { cwd, stripColors: true, verbose })
+      .wait('Are you sure you want to continue building the resources?')
+      .sendline('Y')
+      .sendEof()
+      // tslint:disable-next-line
+      .run(function(err: Error) {
+        if (!err) {
+          resolve();
+        } else {
+          reject(err);
+        }
+      })
+  })
+}

packages/amplify-e2e-tests/src/utils/index.ts

@@ -3,7 +3,7 @@ import { mkdirSync } from 'fs';
 import * as rimraf from 'rimraf';
 import { config } from 'dotenv';
 export { default  as getProjectMeta } from './projectMeta';
-export { getUserPool, getUserPoolClients, getBot } from './sdk-calls'
+export { getUserPool, getUserPoolClients, getBot, getFunction } from './sdk-calls'
 
 // run dotenv config to update env variable
 config();

packages/amplify-e2e-tests/src/utils/sdk-calls.ts

@@ -41,4 +41,9 @@ const getBot = async (botName: string, region: string) => {
   return await service.getBot({ name: botName, versionOrAlias: '$LATEST' }).promise();
 };
 
-export { getUserPool, getUserPoolClients, getBot };
+const getFunction = async (functionName: string, region: string) => {
+  const service = new AWS.Lambda({ region });
+  return await service.getFunction({ FunctionName: functionName }).promise();
+};
+
+export { getUserPool, getUserPoolClients, getBot, getFunction };

packages/amplify-provider-awscloudformation/lib/build-resources.js

@@ -22,7 +22,7 @@ async function buildResource(context, resource) {
   const distDir = path.normalize(path.join(backEndDir, category, resourceName, 'dist'));
 
   let zipFilename = resource.distZipFilename;
-  let zipFilePath = zipFilename ? path.normalize(path.join(distDir, zipFilename)) : '';
+  let zipFilePath = zipFilename ? path.normalize(path.join(distDir, 'latest-build.zip')) : '';
 
   if (
     !resource.lastBuildTimeStamp ||