Merge pull request #107 from devsapp/fix-userAgent

fix: userAgent and Convert a running instance to an elastic instance

Author: rsonghuster

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

@@ -122,6 +122,7 @@ jest.mock('../../../src/utils', () => ({
   tableShow: jest.fn(),
   calculateCRC64: jest.fn(),
   getFileSize: jest.fn(),
+  isAppCenter: jest.fn(),
 }));
 
 describe('Layer', () => {
@@ -264,6 +265,7 @@ describe('Layer', () => {
         _: ['list'],
         region: 'cn-hangzhou',
       });
+      (require('../../../src/utils').isAppCenter as jest.Mock).mockReturnValue(false);
     });
 
     it('should list layers successfully', async () => {
@@ -394,6 +396,7 @@ describe('Layer', () => {
         'layer-name': 'test-layer',
         'version-id': '1',
       });
+      (require('../../../src/utils').isAppCenter as jest.Mock).mockReturnValue(false);
     });
 
     it('should get layer info successfully', async () => {
@@ -457,6 +460,7 @@ describe('Layer', () => {
         region: 'cn-hangzhou',
         'layer-name': 'test-layer',
       });
+      (require('../../../src/utils').isAppCenter as jest.Mock).mockReturnValue(false);
     });
 
     it('should list layer versions successfully', async () => {
@@ -508,6 +512,7 @@ describe('Layer', () => {
         code: './code',
         'compatible-runtime': 'nodejs12,nodejs14',
       });
+      (require('../../../src/utils').isAppCenter as jest.Mock).mockReturnValue(false);
     });
 
     it('should publish layer successfully', async () => {
@@ -650,6 +655,7 @@ describe('Layer', () => {
         'layer-name': 'test-layer',
         'assume-yes': true,
       });
+      (require('../../../src/utils').isAppCenter as jest.Mock).mockReturnValue(false);
     });
 
     it('should remove all layer versions successfully', async () => {
@@ -728,6 +734,7 @@ describe('Layer', () => {
         'layer-name': 'test-layer',
         'version-id': '1',
       });
+      (require('../../../src/utils').isAppCenter as jest.Mock).mockReturnValue(false);
     });
 
     it('should download layer successfully', async () => {
@@ -795,6 +802,7 @@ describe('Layer', () => {
         'layer-name': 'test-layer',
         public: true,
       });
+      (require('../../../src/utils').isAppCenter as jest.Mock).mockReturnValue(false);
     });
 
     it('should set layer acl successfully', async () => {

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

@@ -19,6 +19,7 @@ jest.mock('../../../../src/resources/fc', () => {
 // Mock utils
 jest.mock('../../../../src/utils', () => ({
   promptForConfirmOrDetails: jest.fn(),
+  isAppCenter: jest.fn(),
 }));
 
 describe('Scaling', () => {

__tests__/ut/commands/layer_test.ts

@@ -16,6 +16,7 @@ jest.mock('../../../src/logger', () => ({
 }));
 jest.mock('../../../src/utils', () => ({
   promptForConfirmOrDetails: jest.fn(),
+  isAppCenter: jest.fn(),
 }));
 
 describe('Session', () => {

__tests__/ut/commands/scaling/index_test.ts

@@ -29,6 +29,7 @@ jest.mock('../../../src/logger', () => {
 
 jest.mock('../../../src/utils', () => ({
   promptForConfirmOrDetails: jest.fn(),
+  isAppCenter: jest.fn(),
 }));
 
 describe('Version', () => {

__tests__/ut/commands/session_test.ts

@@ -4,7 +4,7 @@ import _ from 'lodash';
 import logger from '../../logger';
 import FC from '../../resources/fc';
 import commandsHelp from '../../commands-help/alias';
-import { promptForConfirmOrDetails, tableShow } from '../../utils';
+import { isAppCenter, promptForConfirmOrDetails, tableShow } from '../../utils';
 
 const commandsList = Object.keys(commandsHelp.subCommands);
 
@@ -70,11 +70,12 @@ export default class Alias {
     this.versionId = versionId;
     this.additionalVersionWeight = additionalVersionWeight;
 
+    const function_ai = isAppCenter() ? 'function_ai;' : '';
     this.fcSdk = new FC(this.region, inputs.credential, {
       endpoint: inputs.props.endpoint,
       userAgent: `${
         inputs.userAgent ||
-        `Component:fc3;Nodejs:${process.version};OS:${process.platform}-${process.arch}`
+        `${function_ai}Component:fc3;Nodejs:${process.version};OS:${process.platform}-${process.arch}`
       }command:alias`,
     });
   }

__tests__/ut/commands/version_test.ts

@@ -112,11 +112,12 @@ export class DefaultBuilder extends Builder {
     logger.debug(`${region}`);
     checkRegion(region);
     const credential = (await this.inputs.getCredential()) as ICredentials;
+    const function_ai = isAppCenter() ? 'function_ai;' : '';
     const fcSdk = new FC(region, credential, {
       endpoint: this.getProps().endpoint,
       userAgent: `${
         this.inputs.userAgent ||
-        `Component:fc3;Nodejs:${process.version};OS:${process.platform}-${process.arch}`
+        `${function_ai}Component:fc3;Nodejs:${process.version};OS:${process.platform}-${process.arch}`
       }command:build-publish-layer`,
     });
     let buildDir: string = this.getBuildDir();

src/subCommands/alias/index.ts

@@ -1,18 +1,20 @@
 import { ICredentials } from '@serverless-devs/component-interface';
 import { IInputs } from '../../../interface';
 import FC from '../../../resources/fc';
+import { isAppCenter } from '../../../utils';
 
 export default abstract class Base {
   readonly fcSdk: FC;
   needDeploy: boolean | undefined;
 
   constructor(readonly inputs: IInputs, needDeploy: boolean | undefined) {
     this.needDeploy = needDeploy;
+    const function_ai = isAppCenter() ? 'function_ai;' : '';
     this.fcSdk = new FC(inputs.props.region, inputs.credential as ICredentials, {
       endpoint: inputs.props.endpoint,
       userAgent: `${
         inputs.userAgent ||
-        `Component:fc3;Nodejs:${process.version};OS:${process.platform}-${process.arch}`
+        `${function_ai}Component:fc3;Nodejs:${process.version};OS:${process.platform}-${process.arch}`
       }command:deploy`,
     });
   }

src/subCommands/build/impl/defaultBuilder.ts

@@ -6,6 +6,7 @@ import { IInputs } from '../../../interface';
 import logger from '../../../logger';
 import Base from './base';
 import { sleep } from '../../../utils';
+import ScalingConfig from './scaling_config';
 // import Logs from '../../logs';
 
 interface IOpts {
@@ -17,6 +18,7 @@ export default class ProvisionConfig extends Base {
   remote: any;
   ProvisionMode: string;
   readonly functionName: string;
+  scalingConfig: ScalingConfig;
 
   constructor(inputs: IInputs, opts: IOpts) {
     super(inputs, opts.yes);
@@ -28,6 +30,9 @@ export default class ProvisionConfig extends Base {
     this.ProvisionMode = _.get(this.local, 'mode', 'sync');
     _.unset(this.local, 'mode');
     logger.debug(`need deploy provisionConfig: ${JSON.stringify(provisionConfig)}`);
+    this.scalingConfig = new ScalingConfig(inputs, {
+      yes: opts.yes,
+    });
   }
 
   async before() {
@@ -46,7 +51,11 @@ export default class ProvisionConfig extends Base {
 
     if (!_.isEmpty(localConfig)) {
       if (this.needDeploy) {
-        await this.fcSdk.putFunctionProvisionConfig(this.functionName, qualifier, localConfig);
+        await this.scalingConfig.provisionConfigErrorRetry(
+          'ProvisionConfig',
+          qualifier,
+          localConfig,
+        );
 
         if (this.ProvisionMode === 'sync' || this.ProvisionMode === 'drain') {
           await this.waitForProvisionReady(qualifier, localConfig);