fix: support ossAuto

Author: mozhou52

__tests__/e2e/nodejs/s_auto.yaml

@@ -20,10 +20,12 @@ resources:
         initializer:
           handler: index.initializer
           timeout: 10
+      role: acs:ram::${config('AccountID')}:role/aliyunaliyunfcdefaultrole
 
       vpcConfig: auto
       nasConfig: auto
       logConfig: auto
+      ossMountConfig: auto
 
       asyncInvokeConfig:
         destinationConfig:

package-lock.json

@@ -29,6 +29,7 @@
     "@serverless-cd/srm-aliyun-pop-core": "^0.0.8-beta.1",
     "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9",
     "@serverless-cd/srm-aliyun-sls20201230": "0.0.5-beta.3",
+    "@serverless-cd/srm-aliyun-oss": "^0.0.1-beta.2",
     "@serverless-devs/diff": "^0.0.3-beta.6",
     "@serverless-devs/downloads": "^0.0.7",
     "@serverless-devs/load-component": "^0.0.9",

package.json

@@ -36,11 +36,12 @@ export function computeLocalAuto(local) {
   const nasAuto = isAuto(local.nasConfig);
   const vpcAuto = isAutoVpcConfig(local.vpcConfig) || (!local.vpcConfig && nasAuto);
   const slsAuto = isAuto(local.logConfig);
+  const ossAuto = isAuto(local.ossMountConfig);
   // auto 是在 preDeploy 和 plan 之间的阶段设置的，用于提示
   // 如果用户设置了 auto 会在 handlePreRun 方法变成 arn
   const roleAuto =
     isAuto(local.role) || (_.isNil(local.role) && !_.isEmpty(local?.ossMountConfig?.mountPoints));
-  return { nasAuto, vpcAuto, slsAuto, roleAuto };
+  return { nasAuto, vpcAuto, slsAuto, roleAuto, ossAuto };
 }
 
 /**

src/resources/fc/impl/utils.ts

@@ -0,0 +1,35 @@
+import { ICredentials } from '@serverless-devs/component-interface';
+import Oss from '@serverless-cd/srm-aliyun-oss';
+import { Config } from '@alicloud/openapi-client';
+import { IRegion } from '../../interface';
+import logger from '../../logger';
+import { isAppCenter } from '../../utils/index';
+
+export default class OSS {
+  readonly client: Oss;
+  private config;
+
+  constructor(private region: IRegion, credentials: ICredentials, ossEndpoint: string) {
+    this.config = new Config({
+      accountID: credentials.AccountID,
+      accessKeyId: credentials.AccessKeyID,
+      accessKeySecret: credentials.AccessKeySecret,
+      securityToken: credentials.SecurityToken,
+      endpoint: ossEndpoint,
+      regionId: region,
+      readTimeout: 7200000,
+    });
+    this.client = new Oss();
+  }
+
+  async deploy(): Promise<{ ossBucket: string }> {
+    logger.debug(`init oss: ${JSON.stringify(this.config)}`);
+    const { ossBucket } = await this.client.initOss(this.config);
+    if (isAppCenter()) {
+      logger.info(`created oss region: ${this.region};`);
+    } else {
+      logger.spin('creating', 'oss', `region: ${this.region}; ossBucket: ${ossBucket}`);
+    }
+    return { ossBucket };
+  }
+}

src/resources/oss/index.ts

@@ -19,6 +19,7 @@ import VPC_NAS from '../../../resources/vpc-nas';
 import Base from './base';
 import { ICredentials } from '@serverless-devs/component-interface';
 import { calculateCRC64, getFileSize } from '../../../utils';
+import OSS from '../../../resources/oss';
 
 type IType = 'code' | 'config' | boolean;
 interface IOpts {
@@ -337,9 +338,9 @@ export default class Service extends Base {
     const { credential } = this.inputs;
     const { functionName } = this.local;
 
-    const { nasAuto, vpcAuto, slsAuto, roleAuto } = FC.computeLocalAuto(this.local);
+    const { nasAuto, vpcAuto, slsAuto, roleAuto, ossAuto } = FC.computeLocalAuto(this.local);
     logger.debug(
-      `Deploy auto compute local auto, nasAuto: ${nasAuto}; vpcAuto: ${vpcAuto}; slsAuto: ${slsAuto}; roleAuto: ${roleAuto}`,
+      `Deploy auto compute local auto, nasAuto: ${nasAuto}; vpcAuto: ${vpcAuto}; slsAuto: ${slsAuto}; roleAuto: ${roleAuto}; ossAuto: ${ossAuto}`,
     );
 
     if (slsAuto) {
@@ -364,6 +365,34 @@ logConfig:
       });
     }
 
+    if (ossAuto) {
+      const ossEndpoint = `https://oss-${region}.aliyuncs.com`;
+      const oss = new OSS(region, credential as ICredentials, ossEndpoint);
+      const { ossBucket } = await oss.deploy();
+      logger.write(
+        yellow(`Created oss resource succeeded, please replace ossMountConfig: auto in yaml with:
+ossMountConfig:
+  mountPoints:
+    - mountDir: /mnt/oss_${functionName}
+      bucketName: ${ossBucket}
+      endpoint: ${ossEndpoint}
+      bucketPath: /${functionName}
+      readOnly: false\n`),
+      );
+      this.createResource.oss = { ossBucket };
+      _.set(this.local, 'ossMountConfig', {
+        mountPoints: [
+          {
+            mountDir: `/mnt/oss_${functionName}`,
+            bucketName: ossBucket,
+            endpoint: ossEndpoint,
+            bucketPath: `/${functionName}`,
+            readOnly: false,
+          },
+        ],
+      });
+    }
+
     if (roleAuto) {
       const client = new RamClient(credential as ICredentials);
       const arn = await client.initFcDefaultServiceRole();
@@ -406,7 +435,7 @@ vpcConfig:
       if (nasAuto) {
         const modelConfig = supplement?.modelConfig || annotations?.modelConfig;
         let serverAddr = `${mountTargetDomain}:/${functionName}${
-          isEmpty(modelConfig) ? '' : `/${  modelConfig.id}`
+          isEmpty(modelConfig) ? '' : `/${modelConfig.id}`
         }`;
         if (serverAddr.length > 128) {
           serverAddr = serverAddr.substring(0, 128);