Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: get artefact and metafile paths from Serverless API #2

Merged
merged 1 commit into from
Feb 11, 2022
Merged

fix: get artefact and metafile paths from Serverless API #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions plugin/bundleVisualizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { exec } from 'child_process';
import { readdirSync, statSync } from 'fs';
import { join } from 'path';
import { join, parse } from 'path';
import { FunctionDefinitionHandler } from 'serverless';

import type { ServerlessAnalyzeBundlePlugin } from './serverlessAnalyzeBundle';

Expand Down Expand Up @@ -43,12 +44,10 @@ async function bundleVisualizer(this: ServerlessAnalyzeBundlePlugin): Promise<vo
if (functionName === undefined) {
return;
}
const slsFunction = this.serverless.service.getFunction(functionName);

const functionZipName = this.serverless.service
.getAllFunctionsNames()
.find(fullFunctionName => fullFunctionName.endsWith(functionName));

if (functionZipName === undefined) {
const fullZipPath = slsFunction.package?.artifact;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something like /home/me/projects/foo/.serverless/myfunction.zip

if (fullZipPath === undefined) {
this.serverless.cli.log(
`🤯 Analyze failed: function ${functionName} was not found`,
'ServerlessAnalyzeBundlePlugin',
Expand All @@ -57,6 +56,7 @@ async function bundleVisualizer(this: ServerlessAnalyzeBundlePlugin): Promise<vo

return;
}
const functionZipName = parse(fullZipPath).base;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just the file and ext, e.g. myfunction.zip


this.serverless.cli.log(`⏳ Analyzing function ${functionName}`, 'ServerlessAnalyzeBundlePlugin');

Expand All @@ -65,10 +65,22 @@ async function bundleVisualizer(this: ServerlessAnalyzeBundlePlugin): Promise<vo

await pExec(`unzip .serverless/${functionZipName} -d ${TEMP_DIR_LOCATION}`);

const test = getAllFiles(`${TEMP_DIR_LOCATION}`);
const metafileName = test.filter(
fileName => fileName.includes(`/${functionName}/`) && fileName.endsWith('-meta.json'),
const allFiles = getAllFiles(`${TEMP_DIR_LOCATION}`);
const handlerPath = (slsFunction as FunctionDefinitionHandler).handler.split('.')[0];
const metafileName = allFiles.filter(
fileName => fileName.includes(handlerPath) && fileName.endsWith('-meta.json'),
)[0];

if (!metafileName) {
this.serverless.cli.log(
`🤯 Analyze failed: function ${functionName} metadata was not found`,
'ServerlessAnalyzeBundlePlugin',
{ color: 'red' },
);

return;
}
Comment on lines +74 to +82
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add explicit error handler here, since I was getting uncaught errors prior to fixing this.


await pExec(
[
'node_modules/.bin/esbuild-visualizer',
Expand Down