feat: si-bootstrap stack created for holding the common resources (#24)

feat|fix|refactor: summary title of the PR

- create new stack:
`serverlessInsight-bootstrap-${iamInfo?.accountId}-${context.region}` to
holding common resources like artifacts bucket
- fix the deploy dependencies issue

Refs: #5

---------

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

Author: Blankll

package-lock.json

@@ -49,6 +49,7 @@
     "function"
   ],
   "dependencies": {
+    "@alicloud/ims20190815": "^2.1.4",
     "@alicloud/openapi-client": "^0.4.12",
     "@alicloud/ros-cdk-apigateway": "^1.4.0",
     "@alicloud/ros-cdk-core": "^1.4.0",

package.json

@@ -1,12 +1,12 @@
 #! /usr/bin/env node
 
 import { Command } from 'commander';
-import { lang } from '../lang';
-import { logger, getVersion } from '../common';
+import { constructActionContext, getVersion, logger } from '../common';
 import { validate } from './validate';
 import { deploy } from './deploy';
 import { template } from './template';
 import { destroyStack } from './destroy';
+import { getIamInfo } from '../common';
 
 const program = new Command();
 
@@ -15,13 +15,10 @@ program.name('si').description('CLI for ServerlessInsight').version(getVersion()
 program
   .command('show')
   .description('show string')
-  .argument('<string>', 'string to split')
-  .option('--first', 'display just the first substring')
-  .option('-s, --separator <char>', 'separator character', ',')
-  .action((str, options) => {
-    const limit = options.first ? 1 : undefined;
-    logger.debug({ limit, first: options.first, separator: options.separator }, 'log command info');
-    console.log(`${str} ${options.first} ${options.separator} ${lang.__('hello')}`);
+  .action(async (options) => {
+    const context = constructActionContext({ ...options });
+    const result = await getIamInfo(context);
+    console.log('result:', JSON.stringify(result));
   });
 
 program

src/commands/index.ts

@@ -0,0 +1,21 @@
+import Ims20190815, * as ims20190815 from '@alicloud/ims20190815';
+import * as openApi from '@alicloud/openapi-client';
+import { ActionContext } from '../types';
+
+export const getIamInfo = async (context: ActionContext) => {
+  const imsClient = new Ims20190815(
+    new openApi.Config({
+      accessKeyId: context.accessKeyId,
+      accessKeySecret: context.accessKeySecret,
+    }),
+  );
+  const { body } = await imsClient.getUser(
+    new ims20190815.GetUserRequest({ userAccessKeyId: context.accessKeyId }),
+  );
+  return body?.user
+    ? {
+        ...body.user,
+        accountId: body.user.userPrincipalName?.match(/@(\d+)\.onaliyun\.com/)?.pop(),
+      }
+    : undefined;
+};

src/common/imsClient.ts

@@ -5,3 +5,4 @@ export * from './rosClient';
 export * from './actionContext';
 export * from './iacHelper';
 export * from './constants';
+export * from './imsClient';

src/common/index.ts

@@ -3,7 +3,7 @@ import fs from 'node:fs';
 
 import { ActionContext, ServerlessIac } from '../types';
 import { logger, ProviderEnum, publishAssets, rosStackDeploy } from '../common';
-import { RosStack } from './rosStack';
+import { prepareBootstrapStack, RosStack } from './rosStack';
 import { RfsStack } from './rfsStack';
 import { get } from 'lodash';
 
@@ -48,6 +48,7 @@ export const deployStack = async (
   context: ActionContext,
 ) => {
   const { template, assets } = generateRosStackTemplate(stackName, iac, context);
+  await prepareBootstrapStack(context);
   logger.info(`Deploying stack, publishing assets...`);
   await publishAssets(assets, context);
   logger.info(`Assets published! 🎉`);

src/stack/deploy.ts

@@ -0,0 +1,40 @@
+import { getIamInfo, rosStackDeploy } from '../../common';
+import { ActionContext } from '../../types';
+
+const getBootstrapTemplate = async (context: ActionContext) => {
+  const iamInfo = await getIamInfo(context);
+  const stackName = `serverlessInsight-bootstrap-${iamInfo?.accountId}-${context.region}`;
+
+  const template = {
+    Description: 'ServerlessInsight Bootstrap Stack',
+    Metadata: {
+      'ALIYUN::ROS::Interface': {
+        TemplateTags: ['Bootstrap stack created by ServerlessInsight'],
+      },
+    },
+    ROSTemplateFormatVersion: '2015-09-01',
+    Resources: {
+      ServerlessInsight_artifacts_bucket: {
+        Type: 'ALIYUN::OSS::Bucket',
+        Properties: {
+          BucketName: {
+            'Fn::Sub': 'si-bootstrap-artifacts-${ALIYUN::AccountId}-${ALIYUN::Region}',
+          },
+          AccessControl: 'private',
+          DeletionForce: false,
+          EnableOssHdfsService: false,
+          RedundancyType: 'LRS',
+          ServerSideEncryptionConfiguration: {
+            SSEAlgorithm: 'KMS',
+          },
+        },
+      },
+    },
+  };
+  return { stackName, template };
+};
+
+export const prepareBootstrapStack = async (context: ActionContext) => {
+  const { stackName, template } = await getBootstrapTemplate(context);
+  await rosStackDeploy(stackName, template, context);
+};

src/stack/rosStack/bootstrap.ts

@@ -7,7 +7,6 @@ import {
   resolveCode,
 } from '../../common';
 import * as fc from '@alicloud/ros-cdk-fc3';
-import * as oss from '@alicloud/ros-cdk-oss';
 import { isEmpty } from 'lodash';
 import * as ossDeployment from '@alicloud/ros-cdk-ossdeployment';
 import * as ros from '@alicloud/ros-cdk-core';
@@ -29,31 +28,24 @@ export const resolveFunctions = (
       return { fcName, ...getFileSource(fcName, code) };
     });
 
-  let destinationBucket: oss.Bucket;
-  let artifactsDeployment: ossDeployment.BucketDeployment;
+  const destinationBucketName = ros.Fn.sub(
+    'si-bootstrap-artifacts-${ALIYUN::AccountId}-${ALIYUN::Region}',
+  );
+  const ossDeploymentId = `${service}_artifacts_code_deployment`;
+
   if (!isEmpty(fileSources)) {
-    // creat oss to store code
-    destinationBucket = new oss.Bucket(
-      scope,
-      replaceReference(`${service}_artifacts_bucket`, context),
-      {
-        bucketName: `${service}-artifacts-bucket`,
-        serverSideEncryptionConfiguration: { sseAlgorithm: 'KMS' },
-      },
-      true,
-    );
-    artifactsDeployment = new ossDeployment.BucketDeployment(
+    new ossDeployment.BucketDeployment(
       scope,
-      `${service}_artifacts_code_deployment`,
+      ossDeploymentId,
       {
         sources: fileSources!.map(({ source }) => source),
-        destinationBucket,
+        destinationBucket: destinationBucketName,
         timeout: 3000,
         logMonitoring: false,
+        retainOnCreate: false,
       },
       true,
     );
-    artifactsDeployment.addDependency(destinationBucket);
   }
   functions?.forEach((fnc) => {
     const storeInBucket = readCodeSize(fnc.code) > CODE_ZIP_SIZE_LIMIT;
@@ -62,13 +54,13 @@ export const resolveFunctions = (
     };
     if (storeInBucket) {
       code = {
-        ossBucketName: destinationBucket.attrName,
+        ossBucketName: destinationBucketName,
         ossObjectName: fileSources?.find(
           ({ fcName }) => fcName === replaceReference(fnc.name, context),
         )?.objectKey,
       };
     }
-    new fc.RosFunction(
+    const fcn = new fc.RosFunction(
       scope,
       fnc.key,
       {
@@ -82,5 +74,8 @@ export const resolveFunctions = (
       },
       true,
     );
+    if (storeInBucket) {
+      fcn.addRosDependency(`${service}_artifacts_code_deployment`);
+    }
   });
 };

src/stack/rosStack/function.ts

@@ -8,6 +8,8 @@ import { resloveVars } from './vars';
 import { resolveDatabases } from './database';
 import { resolveEvents } from './event';
 
+export * from './bootstrap';
+
 export class RosStack extends ros.Stack {
   private readonly service: string;
 

src/stack/rosStack/index.ts

@@ -642,7 +642,7 @@ export const largeCodeRos = {
       Properties: {
         Code: {
           OssBucketName: {
-            'Fn::GetAtt': ['my-demo-service_artifacts_bucket', 'Name'],
+            'Fn::Sub': 'si-bootstrap-artifacts-${ALIYUN::AccountId}-${ALIYUN::Region}',
           },
           OssObjectName: 'hello_fn/43cb4c356149762dbe507fc1baede172-large-artifact.zip',
         },
@@ -656,6 +656,7 @@ export const largeCodeRos = {
         Timeout: 10,
       },
       Type: 'ALIYUN::FC3::Function',
+      DependsOn: ['my-demo-service_artifacts_code_deployment'],
     },
     'my-demo-service_apigroup': {
       Properties: {
@@ -669,25 +670,11 @@ export const largeCodeRos = {
       },
       Type: 'ALIYUN::ApiGateway::Group',
     },
-    'my-demo-service_artifacts_bucket': {
-      Properties: {
-        AccessControl: 'private',
-        BucketName: 'my-demo-service-artifacts-bucket',
-        DeletionForce: false,
-        EnableOssHdfsService: false,
-        RedundancyType: 'LRS',
-        ServerSideEncryptionConfiguration: {
-          SSEAlgorithm: 'KMS',
-        },
-      },
-      Type: 'ALIYUN::OSS::Bucket',
-    },
     'my-demo-service_artifacts_code_deployment': {
-      DependsOn: ['my-demo-service_artifacts_bucket'],
       Properties: {
         Parameters: {
           destinationBucket: {
-            'Fn::GetAtt': ['my-demo-service_artifacts_bucket', 'Name'],
+            'Fn::Sub': 'si-bootstrap-artifacts-${ALIYUN::AccountId}-${ALIYUN::Region}',
           },
           retainOnCreate: false,
           sources: [