fix:provisionConfig support defaultTarget and deploy cn-shanghai-fina…

…nce-1
devsapp · Dec 12, 2024 · f052302 · f052302
1 parent f4d2c7a
commit f052302
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "license": "ISC",
   "dependencies": {
     "@alicloud/fc2": "^2.6.6",
-    "@alicloud/fc20230330": "^4.1.4",
+    "@alicloud/fc20230330": "^4.1.5",
     "@alicloud/pop-core": "^1.7.13",
     "@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.16",
     "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9",

diff --git a/src/interface/cli-config/provision.ts b/src/interface/cli-config/provision.ts
@@ -3,7 +3,8 @@ export interface IProvision {
   alwaysAllocateGPU?: boolean;
   scheduledActions?: IProvisionScheduledAction[];
   targetTrackingPolicies?: IProvisionTargetTrackingPolicy[];
-  target: number;
+  target?: number;
+  defaultTarget?: number;
 }
 
 export interface IProvisionScheduledAction {

diff --git a/src/interface/region.ts b/src/interface/region.ts
@@ -22,6 +22,7 @@ enum Region {
   'ap-south-1' = 'ap-south-1',
   'cn-heyuan-acdr-1' = 'cn-heyuan-acdr-1',
   'cn-wulanchabu' = 'cn-wulanchabu',
+  'cn-shanghai-finance-1' = 'cn-shanghai-finance-1'
 }
 
 export type IRegion = `${Region}`;

diff --git a/src/resources/fc/index.ts b/src/resources/fc/index.ts
@@ -314,7 +314,13 @@ export default class FC extends FC_Client {
     if (this.customEndpoint) {
       ossEndpoint = `oss-${this.region}.aliyuncs.com`;
     }
-
+    if (this.region === 'cn-shanghai-finance-1') {
+      if (process.env.FC_REGION === this.region) {
+        ossEndpoint = `oss-${this.region}-pub-internal.aliyuncs.com`;
+      } else {
+        ossEndpoint = `oss-${this.region}-pub.aliyuncs.com`;
+      }
+    }
     logger.debug(`Uploading code to ${ossEndpoint}`);
 
     const ossClient = new OSS({

diff --git a/src/subCommands/provision/index.ts b/src/subCommands/provision/index.ts
@@ -21,6 +21,7 @@ export default class Provision {
   private scheduledActions: string;
   private targetTrackingPolicies: string;
   private target: number;
+  private defaultTarget: number;
   private qualifier: string;
 
   constructor(inputs: IInputs) {
@@ -35,6 +36,7 @@ export default class Provision {
         'function-name',
         'region',
         'target',
+        'default-target',
         'qualifier',
         'scheduled-actions',
         'target-tracking-policies',
@@ -51,6 +53,7 @@ export default class Provision {
       'function-name': functionName,
       qualifier,
       target,
+      'default-target': defaultTarget,
       region,
       'assume-yes': yes,
       _: subCommands,
@@ -79,6 +82,7 @@ export default class Provision {
     this.scheduledActions = scheduledActions;
     this.targetTrackingPolicies = targetTrackingPolicies;
     this.target = target ? Number(target) : undefined;
+    this.defaultTarget = defaultTarget ? Number(defaultTarget) : undefined;
 
     this.fcSdk = new FC(this.region, inputs.credential, {
       endpoint: inputs.props.endpoint,
@@ -105,14 +109,15 @@ export default class Provision {
       throw new Error('Qualifier not specified, please specify --qualifier');
     }
 
-    if (!_.isNumber(this.target)) {
+    if (!_.isNumber(this.defaultTarget || this.target)) {
       throw new Error(
-        `Target must be a number, got ${this.target}. Please specify a number through --target <number>`,
+        `Target or defaultTarget must be a number, got ${this.target}. Please specify a number through --target <number>`,
       );
     }
 
     const config: IProvision = {
       target: this.target,
+      defaultTarget: this.defaultTarget,
       alwaysAllocateCPU: _.isBoolean(this.alwaysAllocateCPU) ? this.alwaysAllocateCPU : false,
       alwaysAllocateGPU: _.isBoolean(this.alwaysAllocateGPU) ? this.alwaysAllocateGPU : false,
       scheduledActions: [],