From 58891f0ce4c3e99160ff716806cf54945cc3348b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=AD=8F=E6=B4=AA?= Date: Fri, 19 Dec 2025 13:54:54 +0800 Subject: [PATCH] fix: scalingConfig targetInstances --- .../deploy/impl/scaling_config_test.ts | 28 +++++++++---------- publish.yaml | 2 +- src/subCommands/deploy/impl/scaling_config.ts | 11 +++----- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/__tests__/ut/commands/deploy/impl/scaling_config_test.ts b/__tests__/ut/commands/deploy/impl/scaling_config_test.ts index ad23c5a..46b426b 100644 --- a/__tests__/ut/commands/deploy/impl/scaling_config_test.ts +++ b/__tests__/ut/commands/deploy/impl/scaling_config_test.ts @@ -74,7 +74,7 @@ describe('ScalingConfig', () => { writable: true, }); - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockResolvedValue(undefined); @@ -114,7 +114,7 @@ describe('ScalingConfig', () => { isProvisionConfigErrorMock.mockReturnValue(false); - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockRejectedValue(new Error('network error')); @@ -160,7 +160,7 @@ describe('ScalingConfig', () => { isProvisionConfigErrorMock.mockReturnValue(true); - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockImplementation(async (fcSdk, command, functionName, qualifier, localConfig) => { @@ -208,7 +208,7 @@ describe('ScalingConfig', () => { isProvisionConfigErrorMock.mockReturnValue(true); - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockRejectedValue(new Error('Failed to create scalingConfig after 60 attempts')); @@ -249,7 +249,7 @@ describe('ScalingConfig', () => { writable: true, }); - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockResolvedValue(undefined); @@ -376,7 +376,7 @@ describe('ScalingConfig', () => { putFunctionScalingConfig: jest.fn().mockResolvedValue(undefined), getFunctionScalingConfig: jest .fn() - .mockResolvedValue({ currentInstances: 1, minInstances: 1 }), + .mockResolvedValue({ currentInstances: 1, targetInstances: 1 }), disableFunctionInvocation: jest.fn().mockResolvedValue(undefined), enableFunctionInvocation: jest.fn().mockResolvedValue(undefined), }; @@ -386,7 +386,7 @@ describe('ScalingConfig', () => { }); // Mock provisionConfigErrorRetry - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockResolvedValue(undefined); @@ -401,7 +401,7 @@ describe('ScalingConfig', () => { { minInstances: 1 }, ); expect(logger.info).toHaveBeenCalledWith( - 'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 1, MinInstances: 1', + 'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 1, TargetInstances: 1', ); expect(result).toBe(true); }); @@ -430,7 +430,7 @@ describe('ScalingConfig', () => { }); // Mock provisionConfigErrorRetry - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockResolvedValue(undefined); @@ -475,7 +475,7 @@ describe('ScalingConfig', () => { }); // Mock provisionConfigErrorRetry - const utils = require('../../../../../src/subCommands/deploy/utils'); + const utils = require('../../../../../src/subCommands/deploy/utils/index'); const provisionConfigErrorRetrySpy = jest .spyOn(utils, 'provisionConfigErrorRetry') .mockResolvedValue(undefined); @@ -644,15 +644,15 @@ describe('ScalingConfig', () => { expect(mockFcSdk.getFunctionScalingConfig).toHaveBeenCalled(); }); - it('should wait until currentInstances reaches minInstances', async () => { + it('should wait until currentInstances reaches targetInstances', async () => { scalingConfig = new ScalingConfig(mockInputs, mockOpts); // Mock fcSdk const mockFcSdk = { getFunctionScalingConfig: jest .fn() - .mockResolvedValueOnce({ currentInstances: 5, minInstances: 10 }) - .mockResolvedValueOnce({ currentInstances: 10, minInstances: 10 }), + .mockResolvedValueOnce({ currentInstances: 5, targetInstances: 10 }) + .mockResolvedValueOnce({ currentInstances: 10, targetInstances: 10 }), disableFunctionInvocation: jest.fn().mockResolvedValue(undefined), enableFunctionInvocation: jest.fn().mockResolvedValue(undefined), }; @@ -665,7 +665,7 @@ describe('ScalingConfig', () => { expect(mockFcSdk.getFunctionScalingConfig).toHaveBeenCalledTimes(2); expect(logger.info).toHaveBeenCalledWith( - 'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 10, MinInstances: 10', + 'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 10, TargetInstances: 10', ); }); diff --git a/publish.yaml b/publish.yaml index 034f1b1..523b084 100644 --- a/publish.yaml +++ b/publish.yaml @@ -3,7 +3,7 @@ Type: Component Name: fc3 Provider: - 阿里云 -Version: 0.1.10 +Version: 0.1.11 Description: 阿里云函数计算全生命周期管理 HomePage: https://github.com/devsapp/fc3 Organization: 阿里云函数计算（FC） diff --git a/src/subCommands/deploy/impl/scaling_config.ts b/src/subCommands/deploy/impl/scaling_config.ts index 245c3c4..ca24c98 100644 --- a/src/subCommands/deploy/impl/scaling_config.ts +++ b/src/subCommands/deploy/impl/scaling_config.ts @@ -105,18 +105,15 @@ export default class ScalingConfig extends Base { for (let index = 0; index < maxRetries; index++) { // eslint-disable-next-line no-await-in-loop const result = await this.fcSdk.getFunctionScalingConfig(this.functionName, qualifier); - const { currentInstances, currentError } = result || {}; + const { currentInstances, currentError, targetInstances } = result || {}; logger.debug( `get ${this.functionName}/${qualifier} scaling config result: ${JSON.stringify(result)}`, ); // 检查是否已达到最小实例数 - if ( - currentInstances === undefined || - (currentInstances && currentInstances === result.minInstances) - ) { + if (currentInstances === undefined || currentInstances === targetInstances) { logger.info( - `ScalingConfig of ${this.functionName}/${qualifier} is ready. CurrentInstances: ${currentInstances}, MinInstances: ${minInstances}`, + `ScalingConfig of ${this.functionName}/${qualifier} is ready. CurrentInstances: ${currentInstances}, TargetInstances: ${targetInstances}`, ); return; } @@ -142,7 +139,7 @@ export default class ScalingConfig extends Base { } logger.info( - `waiting ${this.functionName}/${qualifier} scaling OK: currentInstances: ${currentInstances}, minInstances: ${minInstances}`, + `waiting ${this.functionName}/${qualifier} scaling OK: currentInstances: ${currentInstances}, targetInstances: ${targetInstances}`, ); // eslint-disable-next-line no-await-in-loop