Merge pull request #104 from devsapp/fix-oss-config-auto

fix: ossConfig auto

Author: rsonghuster

__tests__/e2e/model/deploy_and_test_model.py

@@ -125,7 +125,7 @@ def deploy_model(model_id: str, region: str = "cn-hangzhou", storage: str = "nas
                 # 遍历 entrypoint 数组，替换包含 /mnt/ 的路径
                 for i, item in enumerate(entrypoint):
                     if isinstance(item, str) and "/mnt/" in item and not item.startswith("vllm") and not item.isdigit() and item not in ["--port", "--served-model-name", "--trust-remote-code"]:
-                        entrypoint[i] = f"/mnt/serverless-{region}-d5d4cd07-616a-5428-91b7-ec2d0257b3a2"
+                        entrypoint[i] = f"/mnt/serverless-{region}-d70a9a8a-c817-5ed1-a293-4be0908f0a5"
             custom_container_config["entrypoint"] = entrypoint
 
     # 保存配置到临时文件

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

package.json

@@ -3,7 +3,7 @@ Type: Component
 Name: fc3
 Provider:
   - 阿里云
-Version: 0.1.2
+Version: dev
 Description: 阿里云函数计算全生命周期管理
 HomePage: https://github.com/devsapp/fc3
 Organization: 阿里云函数计算（FC）

publish.yaml

@@ -1,25 +1,24 @@
 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: Config;
+  private config: any;
 
   constructor(private region: IRegion, credentials: ICredentials, ossEndpoint: string) {
-    this.config = new Config({
+    this.config = {
       accountID: credentials.AccountID,
       accessKeyId: credentials.AccessKeyID,
       accessKeySecret: credentials.AccessKeySecret,
       securityToken: credentials.SecurityToken,
       endpoint: ossEndpoint,
       regionId: region,
       timeout: process.env.OSS_CLIENT_TIMEOUT || 60000,
-    });
-    this.client = new Oss();
+    };
+    this.client = new Oss(logger);
   }
 
   async deploy(ossMountConfig = 'auto'): Promise<{ ossBucket: string }> {

src/resources/oss/index.ts

@@ -884,6 +884,29 @@
             ],
             "type": "string"
         },
+        "IScalingConfig": {
+            "properties": {
+                "horizontalScalingPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/ScalingPolicy"
+                    },
+                    "type": "array"
+                },
+                "minInstances": {
+                    "type": "number"
+                },
+                "residentPoolId": {
+                    "type": "string"
+                },
+                "scheduledPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/ScheduledPolicy"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "ISessionAffinityConfig": {
             "properties": {
                 "affinityHeaderFieldName": {
@@ -1058,6 +1081,35 @@
             ],
             "type": "object"
         },
+        "ScalingPolicy": {
+            "properties": {
+                "endTime": {
+                    "type": "string"
+                },
+                "maxInstances": {
+                    "type": "number"
+                },
+                "metricTarget": {
+                    "type": "number"
+                },
+                "metricType": {
+                    "type": "string"
+                },
+                "minInstances": {
+                    "type": "number"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "startTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "ScheduledAction": {
             "properties": {
                 "endTime": {
@@ -1089,6 +1141,29 @@
             ],
             "type": "object"
         },
+        "ScheduledPolicy": {
+            "properties": {
+                "endTime": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "scheduleExpression": {
+                    "type": "string"
+                },
+                "startTime": {
+                    "type": "string"
+                },
+                "target": {
+                    "type": "number"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "TargetTrackingPolicy": {
             "properties": {
                 "endTime": {
@@ -1246,7 +1321,15 @@
             ]
         },
         "ossMountConfig": {
-            "$ref": "#/definitions/IOssMountConfig"
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/IOssMountConfig"
+                },
+                {
+                    "const": "auto",
+                    "type": "string"
+                }
+            ]
         },
         "provisionConfig": {
             "$ref": "#/definitions/IProvisionConfig"
@@ -1260,6 +1343,9 @@
         "runtime": {
             "$ref": "#/definitions/IRuntime"
         },
+        "scalingConfig": {
+            "$ref": "#/definitions/IScalingConfig"
+        },
         "sessionAffinity": {
             "type": "string"
         },
@@ -1273,6 +1359,7 @@
                 }
             ]
         },
+        "supplement": {},
         "tags": {
             "items": {
                 "$ref": "#/definitions/ITags"