feat: enable fc container runtime (#51)

feat: enable fc container runtime

Refs: #40

---------

Signed-off-by: seven <[email protected]>

Author: Blankll

samples/aliyun-poc-domain.yml

@@ -0,0 +1,21 @@
+version: 0.0.1
+
+provider:
+  name: aliyun
+  region: cn-hongkong
+
+
+service: insight-poc-domain
+
+tags:
+  owner: geek-fun
+
+buckets:
+  insight_poc_bucket:
+    name: insight-poc-domain
+    website:
+      code: dist
+      domain: meke-ui.serverlessinsight.com
+      index: index.html
+      error_page: 404.html
+      error_code: 404

samples/aliyun-poc-fc-gpu.yml

@@ -13,7 +13,7 @@ stages:
   dev:
     node_env: development
   prod:
-    region: cn-shanghai
+    region: cn-hangzhou
 
 service: insight-poc-gpu
 

src/commands/deploy.ts

@@ -1,16 +1,26 @@
 import { deployStack } from '../stack';
-import { constructActionContext, logger } from '../common';
+import { constructActionContext, getIacLocation, logger } from '../common';
 import { parseYaml } from '../parser';
 
 export const deploy = async (
   stackName: string,
-  options: { location: string; parameters: { [key: string]: string }; stage: string | undefined },
+  options: {
+    location: string;
+    parameters?: { [key: string]: string };
+    stage?: string;
+    region?: string;
+    provider?: string;
+    accessKeyId?: string;
+    accessKeySecret?: string;
+    securityToken?: string;
+  },
 ) => {
-  const context = constructActionContext({ ...options, stackName });
   logger.info('Validating yaml...');
-  const iac = parseYaml(context.iacLocation);
+  const iac = parseYaml(getIacLocation(options.location));
   logger.info('Yaml is valid! 🎉');
 
+  const context = constructActionContext({ ...options, stackName, iacProvider: iac.provider });
+
   logger.info('Deploying stack...');
   await deployStack(stackName, iac, context);
 

src/commands/index.ts

@@ -28,14 +28,19 @@ program
   .option('-s, --stage <stage>', 'specify the stage')
   .action((stackName, { file, stage }) => {
     logger.debug('log command info');
-    validate(file, stage);
+    validate(stackName, { stage, location: file });
   });
 
 program
   .command('deploy <stackName>')
   .description('deploy serverless Iac yaml')
   .option('-f, --file <path>', 'specify the yaml file')
   .option('-s, --stage <stage>', 'specify the stage')
+  .option('-r, --region <region>', 'specify the region')
+  .option('-pr, --provider <provider>', 'specify the provider')
+  .option('-ak, --accessKeyId <accessKeyId>', 'specify the AccessKeyId')
+  .option('-as, --accessKeySecret <accessKeySecret>', 'specify the AccessKeySecret')
+  .option('-at, --securityToken <securityToken>', 'specify the SecurityToken')
   .option(
     '-p, --parameter <key=value>',
     'override parameters',
@@ -46,9 +51,23 @@ program
     },
     {},
   )
-  .action(async (stackName, { file, parameter, stage }) => {
-    await deploy(stackName, { location: file, parameters: parameter, stage });
-  });
+  .action(
+    async (
+      stackName,
+      { stage, parameter, file, region, provider, accessKeyId, accessKeySecret, securityToken },
+    ) => {
+      await deploy(stackName, {
+        stage,
+        parameters: parameter,
+        location: file,
+        region,
+        provider,
+        accessKeyId,
+        accessKeySecret,
+        securityToken,
+      });
+    },
+  );
 
 program
   .command('template <stackName>')

src/commands/validate.ts

@@ -1,8 +1,11 @@
 import { constructActionContext, logger } from '../common';
 import { parseYaml } from '../parser';
 
-export const validate = (location: string | undefined, stage: string | undefined) => {
-  const context = constructActionContext({ location, stage });
+export const validate = (
+  stackName: string,
+  options: { location: string | undefined; stage: string | undefined },
+) => {
+  const context = constructActionContext({ stackName, ...options });
   parseYaml(context.iacLocation);
   logger.info('Yaml is valid! 🎉');
 };

src/common/actionContext.ts

@@ -1,4 +1,4 @@
-import { ActionContext } from '../types';
+import { ActionContext, ServerlessIac } from '../types';
 import path from 'node:path';
 import { ProviderEnum } from './providerEnum';
 
@@ -12,28 +12,32 @@ export const getIacLocation = (location?: string): string => {
         path.resolve(projectRoot, 'serverless-insight.yml');
 };
 
-export const constructActionContext = (config?: {
+export const constructActionContext = (config: {
+  stage?: string;
+  stackName?: string;
   region?: string;
   provider?: string;
-  account?: string;
   accessKeyId?: string;
   accessKeySecret?: string;
   securityToken?: string;
   location?: string;
   parameters?: { [key: string]: string };
-  stage?: string;
-  stackName?: string;
+  iacProvider?: ServerlessIac['provider'];
 }): ActionContext => {
   return {
-    stage: config?.stage ?? 'default',
-    stackName: config?.stackName ?? '',
+    stage: config.stage ?? 'default',
+    stackName: config.stackName ?? '',
+    provider: (config.provider ?? config.iacProvider?.name ?? ProviderEnum.ALIYUN) as ProviderEnum,
     region:
-      config?.region ?? process.env.ROS_REGION_ID ?? process.env.ALIYUN_REGION ?? 'cn-hangzhou',
-    accessKeyId: config?.accessKeyId ?? (process.env.ALIYUN_ACCESS_KEY_ID as string),
-    accessKeySecret: config?.accessKeySecret ?? (process.env.ALIYUN_ACCESS_KEY_SECRET as string),
-    securityToken: config?.securityToken ?? process.env.ALIYUN_SECURITY_TOKEN,
-    iacLocation: getIacLocation(config?.location),
-    parameters: Object.entries(config?.parameters ?? {}).map(([key, value]) => ({ key, value })),
-    provider: config?.provider as ProviderEnum,
+      config.region ??
+      config.iacProvider?.region ??
+      process.env.ROS_REGION_ID ??
+      process.env.ALIYUN_REGION ??
+      'cn-hangzhou',
+    accessKeyId: config.accessKeyId ?? (process.env.ALIYUN_ACCESS_KEY_ID as string),
+    accessKeySecret: config.accessKeySecret ?? (process.env.ALIYUN_ACCESS_KEY_SECRET as string),
+    securityToken: config.securityToken ?? process.env.ALIYUN_SECURITY_TOKEN,
+    iacLocation: getIacLocation(config.location),
+    parameters: Object.entries(config.parameters ?? {}).map(([key, value]) => ({ key, value })),
   };
 };

tests/commands/deploy.test.ts

@@ -18,6 +18,9 @@ describe('unit test for deploy command', () => {
     });
 
     expect(mockedDeployStack).toHaveBeenCalledTimes(1);
-    expect(mockedDeployStack).toHaveBeenCalledWith(stackName, expect.any(Object), defaultContext);
+    expect(mockedDeployStack).toHaveBeenCalledWith(stackName, expect.any(Object), {
+      ...defaultContext,
+      region: 'cn-chengdu',
+    });
   });
 });

tests/fixtures/deployFixture.ts

@@ -1407,6 +1407,7 @@ export const defaultContext = {
   iacLocation: expect.stringContaining('tests/fixtures/serverless-insight.yml'),
   parameters: [],
   region: 'cn-hangzhou',
+  provider: 'aliyun',
   securityToken: 'account id',
   stackName: 'my-demo-stack',
   stage: 'default',