allow no sls config

Author: yanglong1010

src/javaIndex.ts

@@ -154,7 +154,7 @@ export class JavaStartupAcceleration {
  info("oss endpoint: " + this.ossEndpoint)
  }
  await this.genDump();
- info("completed");
+ info("all completed");
  }
 
  async enableQuickStart() {
@@ -220,6 +220,7 @@ export class JavaStartupAcceleration {
  error(e.stderr.toString());
  error(e.stdout.toString());
  } finally {
+ info("start to clean");
  /* delete local temp files */
  await remove(tmpDir);
  await remove(tmpZipFilePath);
@@ -256,15 +257,16 @@ export class JavaStartupAcceleration {
 
  let result = await fcClient.post(`/proxy/${tmpServiceName}/${tmpFunctionName}/action`, body, null);
  let data = result.data;
- info("server messages: " + data)
+ info("server messages: " + data);
  if (data.indexOf("success") == 0) {
- info("dumped successfully")
+ info("dumped successfully");
  } else {
  throw new Error("dump encountered error");
  }
  }
 
  private async downloadAccelerationFiles(fcClient, tmpServiceName: string, tmpFunctionName: string) {
+ info("downloading");
  let sharedDir = join(this.artifactPath, this.sharedDirName);
  await ensureDir(sharedDir);
  let localFile = join(sharedDir, ARCHIVE_NAME);
@@ -278,9 +280,11 @@ export class JavaStartupAcceleration {
 
  await this.extractTar(sharedDir, localFile);
  removeSync(localFile);
+ info("download completed");
  }
 
  private async createTempFunction(fcClient, tmpServiceName: string, tmpFunctionName: string, tmpZipFilePath: string) {
+ info("assistant function [" + tmpFunctionName + "] creating");
  await fcClient.createFunction(tmpServiceName, {
  code: {
  zipFile: readFileSync(tmpZipFilePath, 'base64'),
@@ -300,10 +304,11 @@ export class JavaStartupAcceleration {
  SRPATH: this.tmpSrpath
  }
  });
- info("assistant function [" + tmpFunctionName + "] created")
+ info("assistant function [" + tmpFunctionName + "] created");
  }
 
  private static async createTempTrigger(fcClient, tmpServiceName: string, tmpFunctionName: string, tmpTriggerName: string) {
+ info("assistant trigger [" + tmpTriggerName + "] creating");
  await fcClient.createTrigger(tmpServiceName, tmpFunctionName, {
  invocationRole: '',
  qualifier: 'LATEST',
@@ -312,10 +317,11 @@ export class JavaStartupAcceleration {
  triggerName: tmpTriggerName,
  triggerType: 'http'
  });
- info("assistant trigger [" + tmpTriggerName + "] created")
+ info("assistant trigger [" + tmpTriggerName + "] created");
  }
 
  private async createTempService(fcClient, tmpServiceName) {
+ info("assistant service [" + tmpServiceName + "] creating");
  await fcClient.createService(tmpServiceName, {
  description: '用于 Alibaba Dragonwell Acceleration Cache 生成',
  serviceName: tmpServiceName,
@@ -324,7 +330,7 @@ export class JavaStartupAcceleration {
  nasConfig: this.nasConfig,
  vpcConfig: this.vpcConfig,
  });
- info("assistant service [" + tmpServiceName + "] created")
+ info("assistant service [" + tmpServiceName + "] created");
  }
 
  private async getFCClient() {
@@ -350,11 +356,13 @@ export class JavaStartupAcceleration {
  }
 
  private async genZip(dir: string, zipFilePath: string) {
+ info("zip file creating");
  await this.makeZip(dir, zipFilePath);
  info("zip file created");
  }
 
  private async createZipAndUploadToOSS() {
+ info("start to upload");
  const tmpZipFilePath = join(tmpdir(), this.ossKey);
 
  await this.genZip(this.artifactPath, tmpZipFilePath);

src/javaMain.ts

@@ -21,15 +21,15 @@ export default class JavaStartupAccelerationComponent {
  }
  info("parsed args: " + JSON.stringify(args));
 
+ let fcEndpoint = await this.getFCEndpoint();
  let moduleName = args.moduleName;
  let serviceName = await this.getServiceConfig(moduleName, 'name');
  let functionName = await this.getFunctionConfig(moduleName, 'name');
- let fcEndpoint = await this.getFCEndpoint();
  let initializer = await this.getFunctionConfig(moduleName, 'initializer');
  let runtime = await this.getFunctionConfig(moduleName, 'runtime');
  let region = await this.getModulesProps(moduleName, 'region');
- let role = await this.getServiceConfig(moduleName, 'role');
- let logConfig = await this.getServiceConfig(moduleName, 'logConfig');
+ let role = await this.getServiceConfig(moduleName, 'role', false);
+ let logConfig = await this.getServiceConfig(moduleName, 'logConfig', false);
  const access = params?.project?.access || this.defaultAccess;
  const credential = await this.getCredential(access);
  let codeUri = await this.getFunctionConfig(moduleName, 'codeUri');
@@ -43,7 +43,7 @@ export default class JavaStartupAccelerationComponent {
  let uploader = args.uploader;
  let ossUtilUrl, ossEndpoint;
  if (downloader == OSS) {
- ossUtilUrl = await this.getGlobalConfig('ossUtilUrl');
+ ossUtilUrl = await this.getGlobalConfig('ossUtilUrl', false);
  ossEndpoint = await this.getModulesProps(moduleName, 'ossEndpoint', false);
  }
 
@@ -149,62 +149,82 @@ export default class JavaStartupAccelerationComponent {
  }
  }
 
- async getGlobalConfig(key: string) {
+ async getGlobalConfig(key: string, errorIfNotExist: boolean = true) {
  const yaml = await this.getConfig();
  if (yaml) {
  try {
- return await this.replaceReference(yaml[key]);
+ let value = await this.replaceReference(yaml[key]);
+ if (value === undefined) {
+ throw new Error("key " + key + " does not exist");
+ }
+ return value;
  } catch (e) {
- error('read global config [' + key + '] error');
- throw e;
+ error('read global config [' + key + '] error: ' + e.message);
+ if (errorIfNotExist) {
+ throw e;
+ }
  }
  }
+ return null;
  }
 
  async getModulesProps(moduleName: string, key: string, errorIfNotExist: boolean = true) {
  const yaml = await this.getConfig();
  if (yaml) {
  try {
- return await this.replaceReference(yaml['services'][moduleName]['props'][key]);
+ let value = await this.replaceReference(yaml['services'][moduleName]['props'][key]);
+ if (value === undefined) {
+ throw new Error("key " + key + " does not exist");
+ }
+ return value;
  } catch (e) {
+ info('read module prop [' + key + '] error: ' + e.message);
  if (errorIfNotExist) {
  throw e;
- } else {
- info('read module prop [' + key + '] error');
  }
  }
  }
+ return null;
  }
 
- async getServiceConfig(moduleName: string, key: string) {
+ async getServiceConfig(moduleName: string, key: string, errorIfNotExist: boolean = true) {
  const yaml = await this.getConfig();
  if (yaml) {
  try {
- return await this.replaceReference(yaml['services'][moduleName]['props']['service'][key]);
+ let value = await this.replaceReference(yaml['services'][moduleName]['props']['service'][key]);
+ if (value === undefined) {
+ throw new Error("key " + key + " does not exist");
+ }
+ return value;
  } catch (e) {
- error('read module config [' + key + '] error');
- throw e;
+ error('read module config [' + key + '] error: ' + e.message);
+ if (errorIfNotExist) {
+ throw e;
+ }
  }
  }
+ return null;
  }
 
  async getFunctionConfig(moduleName: string, key: string, errorIfNotExist: boolean = true) {
  const yaml = await this.getConfig();
 
- let value = null;
  if (yaml) {
  try {
- value = await this.replaceReference(yaml['services'][moduleName]['props']['function'][key]);
+ let value = await this.replaceReference(yaml['services'][moduleName]['props']['function'][key]);
+ if (value === undefined) {
+ throw new Error("key " + key + " does not exist");
+ }
+ return value;
  } catch (e) {
+ error('read function config [' + key + '] error: ' + e.message);
  if (errorIfNotExist) {
  throw e;
- } else {
- info('function config [' + key + '] does not exist:' + e.message);
  }
  }
  }
 
- return value;
+ return null;
  }
 
  async replaceReference(value) {