test: remove old invoker shims from mock package

aws-amplify · Feb 12, 2021 · ae1e138 · ae1e138
1 parent fa6fa8a
commit ae1e138
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 149 deletions.
diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
@@ -26,20 +26,12 @@
   },
   "dependencies": {
     "@hapi/topo": "^5.0.0",
-<<<<<<< HEAD
     "amplify-appsync-simulator": "1.25.2",
     "amplify-category-function": "2.29.0",
     "amplify-cli-core": "1.16.0",
     "amplify-codegen": "2.21.1",
     "amplify-dynamodb-simulator": "1.17.8",
-=======
-    "amplify-appsync-simulator": "1.25.0",
-    "amplify-category-function": "2.28.4",
-    "amplify-cli-core": "1.14.1",
-    "amplify-codegen": "2.20.5",
-    "amplify-dynamodb-simulator": "1.17.6",
-    "amplify-provider-awscloudformation": "4.36.1",
->>>>>>> feat: load admin ui creds into lambda mock env vars
+    "amplify-provider-awscloudformation": "4.38.0",
     "amplify-storage-simulator": "1.5.1",
     "chokidar": "^3.3.1",
     "detect-port": "^1.3.0",
@@ -57,6 +49,7 @@
     "@types/semver": "^7.1.0",
     "@types/which": "^1.3.2",
     "amplify-function-plugin-interface": "1.6.0",
+    "amplify-nodejs-function-runtime-provider": "1.4.3",
     "aws-appsync": "^2.0.2",
     "aws-sdk": "^2.765.0",
     "aws-sdk-mock": "^5.1.0",

diff --git a/packages/amplify-util-mock/src/__e2e__/utils/index.ts b/packages/amplify-util-mock/src/__e2e__/utils/index.ts
@@ -5,9 +5,11 @@ import * as path from 'path';
 import { v4 } from 'uuid';
 import { processTransformerStacks } from '../../CFNParser/appsync-resource-processor';
 import { configureDDBDataSource, createAndUpdateTable } from '../../utils/dynamo-db';
-import { invoke } from '../../utils/lambda/invoke';
 import { getFunctionDetails } from './lambda-helper';
 import { DynamoDB } from 'aws-sdk';
+import { functionRuntimeContributorFactory } from 'amplify-nodejs-function-runtime-provider';
+
+const invoke = functionRuntimeContributorFactory({}).invoke;
 
 jest.mock('amplify-cli-core', () => ({
   pathManager: {
@@ -73,8 +75,11 @@ async function configureLambdaDataSource(config) {
       d.invoke = payload => {
         logDebug('Invoking lambda with config', lambdaConfig);
         return invoke({
-          ...lambdaConfig,
-          event: payload,
+          srcRoot: lambdaConfig.packageFolder,
+          env: 'test',
+          runtime: 'nodejs',
+          handler: `${functionName}.${lambdaConfig.handler}`,
+          event: JSON.stringify(payload),
         });
       };
     });

diff --git a/packages/amplify-util-mock/src/__e2e__/utils/lambda-helper.ts b/packages/amplify-util-mock/src/__e2e__/utils/lambda-helper.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs-extra';
 
 export function getFunctionDetails(fnName: string) {
   const lambdaFolder = path.join(__dirname, 'lambda_functions');
-  if (!fs.existsSync(path.join(lambdaFolder, `${fnName}.js`))) {
+  if (!fs.existsSync(path.join(lambdaFolder, 'src', `${fnName}.js`))) {
     throw new Error(`Can not find lambda function ${fnName}`);
   }
 

diff --git a/...__/utils/lambda_functions/echoFunction.js → ...tils/lambda_functions/src/echoFunction.js b/...__/utils/lambda_functions/echoFunction.js → ...tils/lambda_functions/src/echoFunction.js
diff --git a/...c/__e2e__/utils/lambda_functions/hello.js → ...e2e__/utils/lambda_functions/src/hello.js b/...c/__e2e__/utils/lambda_functions/hello.js → ...e2e__/utils/lambda_functions/src/hello.js
diff --git a/packages/amplify-util-mock/src/api/api.ts b/packages/amplify-util-mock/src/api/api.ts
@@ -250,7 +250,6 @@ export class APITest {
   }
 
   private async startDynamoDBLocalServer(context) {
-    const { projectPath } = context.amplify.getEnvInfo();
     const dbPath = path.join(await getMockDataDirectory(context), 'dynamodb');
     fs.ensureDirSync(dbPath);
     const mockConfig = await getMockConfig(context);

diff --git a/packages/amplify-util-mock/src/utils/lambda/execute.ts b/packages/amplify-util-mock/src/utils/lambda/execute.ts
diff --git a/packages/amplify-util-mock/src/utils/lambda/invoke.ts b/packages/amplify-util-mock/src/utils/lambda/invoke.ts
diff --git a/packages/amplify-util-mock/src/utils/mock-config-file.ts b/packages/amplify-util-mock/src/utils/mock-config-file.ts
@@ -1,11 +1,8 @@
 import * as path from 'path';
-import * as fs from 'fs';
+import { $TSAny, JSONUtilities } from 'amplify-cli-core';
 
 export function getMockConfig(context) {
   const { projectPath } = context.amplify.getEnvInfo();
   const mockConfigPath = path.join(projectPath, 'amplify', 'mock.json');
-  if (fs.existsSync(mockConfigPath)) {
-    return JSON.parse(fs.readFileSync(mockConfigPath).toString('UTF-8'));
-  }
-  return {};
+  return JSONUtilities.readJson<$TSAny>(mockConfigPath, { throwIfNotExist: false }) ?? {};
 }
diff --git a/packages/amplify-util-mock/tsconfig.json b/packages/amplify-util-mock/tsconfig.json
@@ -10,6 +10,7 @@
     {"path": "../amplify-category-function"},
     {"path": "../amplify-cli-core"},
     {"path": "../amplify-storage-simulator"},
-    {"path": "../amplify-provider-awscloudformation"}
+    {"path": "../amplify-provider-awscloudformation"},
+    {"path": "../amplify-nodejs-function-runtime-provider"}
   ],
 }