fix: ossMountConfig endpoint and diff

Author: mozhou52

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

@@ -757,7 +757,7 @@ describe('Service', () => {
           {
             mountDir: `/mnt/oss_test-function`,
             bucketName: 'test-oss-bucket',
-            endpoint: 'https://oss-cn-hangzhou.aliyuncs.com',
+            endpoint: 'http://oss-cn-hangzhou-internal.aliyuncs.com',
             bucketPath: `/test-function`,
             readOnly: false,
           },

src/resources/fc/impl/replace-function-config.ts

@@ -16,9 +16,9 @@ export default function (_local: any, _remote: any) {
 
   // 线上配置如果存在，则需要将 auto 资源替换为线上资源配置
   if (remote) {
-    const { remoteNasConfig, remoteVpcConfig, remoteLogConfig, remoteRole } =
+    const { remoteNasConfig, remoteVpcConfig, remoteLogConfig, remoteRole, remoteOssConfig } =
       getRemoteResourceConfig(remote);
-    const { nasAuto, vpcAuto, slsAuto, roleAuto } = computeLocalAuto(local);
+    const { nasAuto, vpcAuto, slsAuto, roleAuto, ossAuto } = computeLocalAuto(local);
     logger.debug(
       `Init local compute local auto, nasAuto: ${nasAuto}; vpcAuto: ${vpcAuto}; slsAuto: ${slsAuto}; roleAuto: ${roleAuto}`,
     );
@@ -73,6 +73,10 @@ export default function (_local: any, _remote: any) {
       _.set(local, 'logConfig', remoteLogConfig);
     }
 
+    if (ossAuto && !_.isEmpty(remoteOssConfig?.mountPoints)){
+      _.set(local, 'ossMountConfig', remoteOssConfig);
+    }
+
     if (!local.role) {
       if (roleAuto) {
         _.set(local, 'role', _.isString(remoteRole) && remoteRole !== '' ? remoteRole : 'auto');

src/resources/fc/impl/utils.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { INasConfig, IVpcConfig, ILogConfig, Runtime } from '../../../interface';
+import { INasConfig, IVpcConfig, ILogConfig, Runtime, IOssMountConfig } from '../../../interface';
 import { isAuto, isAutoVpcConfig } from '../../../utils';
 import logger from '../../../logger';
 import { isDebugMode } from '@serverless-devs/utils';
@@ -24,8 +24,9 @@ export function getRemoteResourceConfig(remote) {
   const remoteNasConfig = _.get(remote, 'nasConfig') as INasConfig;
   const remoteVpcConfig = _.get(remote, 'vpcConfig') as IVpcConfig;
   const remoteLogConfig = _.get(remote, 'logConfig') as ILogConfig;
+  const remoteOssConfig = _.get(remote, 'ossMountConfig') as IOssMountConfig;
   const remoteRole = _.get(remote, 'role');
-  return { remoteNasConfig, remoteVpcConfig, remoteLogConfig, remoteRole };
+  return { remoteNasConfig, remoteVpcConfig, remoteLogConfig, remoteRole, remoteOssConfig };
 }
 
 /**

src/resources/oss/index.ts

@@ -17,7 +17,7 @@ export default class OSS {
       securityToken: credentials.SecurityToken,
       endpoint: ossEndpoint,
       regionId: region,
-      timeout: process.env.OSS_TIMEOUT || 60000,
+      timeout: process.env.OSS_CLIENT_TIMEOUT || 60000,
     });
     this.client = new Oss();
   }

src/subCommands/deploy/impl/function.ts

@@ -375,7 +375,7 @@ ossMountConfig:
   mountPoints:
     - mountDir: /mnt/oss_${functionName}
       bucketName: ${ossBucket}
-      endpoint: ${ossEndpoint}
+      endpoint: http://oss-${region}-internal.aliyuncs.com
       bucketPath: /${functionName}
       readOnly: false\n`),
       );
@@ -385,7 +385,7 @@ ossMountConfig:
           {
             mountDir: `/mnt/oss_${functionName}`,
             bucketName: ossBucket,
-            endpoint: ossEndpoint,
+            endpoint: `http://oss-${region}-internal.aliyuncs.com`,
             bucketPath: `/${functionName}`,
             readOnly: false,
           },