fix: readOnly、bucketPath、mountDir、rules

Author: liuzewen99

__tests__/e2e/nodejs/s_oss_config_auto.yaml

@@ -30,4 +30,4 @@ resources:
       handler: index.handler
       memorySize: 128
       timeout: 60
-      ossMountConfig: auto|rules=[{"allowedOrigin":"*","allowedMethod":"GET","allowedHeader":"*","exposeHeader":"Content-Length","maxAgeSeconds":30}]
+      ossMountConfig: auto|readOnly=true|mountDir=/mnt/test-oss-bucket|bucketPath=/|rules=[{"allowedOrigin":"*","allowedMethod":["GET","POST","PUT","DELETE","HEAD"],"allowedHeader":"*","exposeHeader":"Content-Length","maxAgeSeconds":30}]

__tests__/ut/commands/deploy/impl/function_test.ts

@@ -736,7 +736,12 @@ describe('Service', () => {
 
       // Mock OSS
       const mockOss = {
-        deploy: jest.fn().mockResolvedValue({ ossBucket: 'test-oss-bucket' }),
+        deploy: jest.fn().mockResolvedValue({
+          ossBucket: 'test-oss-bucket',
+          readOnly: false,
+          mountDir: '/mnt/test-oss-bucket',
+          bucketPath: '/',
+        }),
       };
 
       // Mock the OSS constructor to return our mock instance
@@ -759,6 +764,7 @@ describe('Service', () => {
             bucketName: 'test-oss-bucket',
             endpoint: 'http://oss-cn-hangzhou-internal.aliyuncs.com',
             readOnly: false,
+            bucketPath: '/',
           },
         ],
       });

package.json

@@ -29,7 +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.7",
+    "@serverless-cd/srm-aliyun-oss": "^0.0.1-beta.8",
     "@serverless-devs/diff": "^0.0.3-beta.6",
     "@serverless-devs/downloads": "^0.0.7",
     "@serverless-devs/load-component": "^0.0.9",

src/resources/oss/index.ts

@@ -21,15 +21,23 @@ export default class OSS {
     this.client = new Oss(logger);
   }
 
-  async deploy(ossMountConfig = 'auto'): Promise<{ ossBucket: string }> {
+  async deploy(ossMountConfig = 'auto'): Promise<{
+    ossBucket: string;
+    readOnly?: boolean;
+    mountDir?: string;
+    bucketPath?: string;
+  }> {
     logger.debug(`init oss: ${JSON.stringify(this.config)}`);
     const result = await this.client.initOss(this.config, ossMountConfig);
     const ossBucket = result?.ossBucket || '';
+    const readOnly = result?.readOnly || false;
+    const mountDir = result?.mountDir || `/mnt/${ossBucket}`;
+    const bucketPath = result?.bucketPath || `/`;
     if (isAppCenter()) {
       logger.info(`created oss region: ${this.region};`);
     } else {
       logger.spin('creating', 'oss', `region: ${this.region}; ossBucket: ${ossBucket}`);
     }
-    return { ossBucket };
+    return { ossBucket, readOnly, mountDir, bucketPath };
   }
 }

src/subCommands/deploy/impl/function.ts

@@ -373,25 +373,29 @@ logConfig:
       }
       logger.info(`ossAuto code to ${ossEndpoint}`);
       const oss = new OSS(region, credential as ICredentials, ossEndpoint);
-      const { ossBucket } = await oss.deploy(this.inputs.props.ossMountConfig as string);
+      const { ossBucket, readOnly, mountDir, bucketPath } = await oss.deploy(
+        this.inputs.props.ossMountConfig as string,
+      );
 
       logger.write(
         yellow(`Created oss resource succeeded, please replace ossMountConfig: auto in yaml with:
 ossMountConfig:
   mountPoints:
-    - mountDir: /mnt/${ossBucket}
+    - mountDir: ${mountDir}
       bucketName: ${ossBucket}
       endpoint: http://oss-${region}-internal.aliyuncs.com
-      readOnly: false\n`),
+      readOnly: ${readOnly}
+      bucketPath: ${bucketPath}\n`),
       );
       this.createResource.oss = { ossBucket };
       _.set(this.local, 'ossMountConfig', {
         mountPoints: [
           {
-            mountDir: `/mnt/${ossBucket}`,
+            mountDir,
             bucketName: ossBucket,
             endpoint: `http://oss-${region}-internal.aliyuncs.com`,
-            readOnly: false,
+            readOnly,
+            bucketPath,
           },
         ],
       });