fix: artifacts upload works now

Signed-off-by: seven <[email protected]>

Author: Blankll

src/stack/deploy.ts

@@ -25,10 +25,7 @@ export const generateRosStackTemplate = (
     rootPath: assembly.directory,
     ...JSON.parse(assetsFileBody.toString('utf-8').trim()),
   };
-  console.log('Assets:', {
-    assembly: assembly,
-    assetFolderPath,
-  });
+
   return { template, assets };
 };
 

src/stack/rosStack/function.ts

@@ -35,9 +35,9 @@ export const resolveFunctions = (
     // creat oss to store code
     destinationBucket = new oss.Bucket(
       scope,
-      replaceReference(`${service}_artifacts_bucket_testb`, context),
+      replaceReference(`${service}_artifacts_bucket`, context),
       {
-        bucketName: `${service}-artifacts-bucket-testb`,
+        bucketName: `${service}-artifacts-bucket`,
         serverSideEncryptionConfiguration: { sseAlgorithm: 'KMS' },
       },
       true,
@@ -49,25 +49,24 @@ export const resolveFunctions = (
         sources: fileSources!.map(({ source }) => source),
         destinationBucket,
         timeout: 3000,
-        logMonitoring: false, // 是否开启日志监控，设为false则不开启
+        logMonitoring: false,
       },
       true,
     );
     artifactsDeployment.addDependency(destinationBucket);
   }
   functions?.forEach((fnc) => {
     const storeInBucket = readCodeSize(fnc.code) > CODE_ZIP_SIZE_LIMIT;
-    const zipcode: fc.RosFunction.CodeProperty = {
-      zipFile: resolveCode('artifacts/artifact.zip'),
+    let code: fc.RosFunction.CodeProperty = {
+      zipFile: resolveCode(fnc.code),
     };
     if (storeInBucket) {
-      // const code = {
-      //   ossBucketName: destinationBucket.attrName,
-      //   ossObjectName: fileSources?.find(
-      //     ({ fcName }) => fcName === replaceReference(fnc.name, context),
-      //   )?.objectKey,
-      // };
-      // console.log('code', code);
+      code = {
+        ossBucketName: destinationBucket.attrName,
+        ossObjectName: fileSources?.find(
+          ({ fcName }) => fcName === replaceReference(fnc.name, context),
+        )?.objectKey,
+      };
     }
     new fc.RosFunction(
       scope,
@@ -79,7 +78,7 @@ export const resolveFunctions = (
         memorySize: replaceReference(fnc.memory, context),
         timeout: replaceReference(fnc.timeout, context),
         environmentVariables: replaceReference(fnc.environment, context),
-        code: zipcode,
+        code,
       },
       true,
     );

tests/fixtures/deployFixture.ts

@@ -481,10 +481,11 @@ export const largeCodeRos = {
         ServiceName: {
           'Fn::GetAtt': ['FCServiceFormy-demo-service_artifacts_code_deployment', 'ServiceName'],
         },
-        Timeout: 300,
+        Timeout: 3000,
       },
       Type: 'ALIYUN::FC::Function',
     },
+
     'FCRoleFormy-demo-service_artifacts_code_deployment': {
       Properties: {
         AssumeRolePolicyDocument: {
@@ -682,6 +683,7 @@ export const largeCodeRos = {
       Type: 'ALIYUN::OSS::Bucket',
     },
     'my-demo-service_artifacts_code_deployment': {
+      DependsOn: ['my-demo-service_artifacts_bucket'],
       Properties: {
         Parameters: {
           destinationBucket: {
@@ -690,7 +692,7 @@ export const largeCodeRos = {
           retainOnCreate: false,
           sources: [
             {
-              bucket: { 'Fn::Sub': expect.stringContaining('assets-${ALIYUN::Region}') },
+              bucket: { 'Fn::Sub': expect.any(String) },
               fileName: 'hello_fn/43cb4c356149762dbe507fc1baede172-large-artifact.zip',
               objectKey: '2bfeafed8d3df0d44c235271cdf2aa7d908a3c2757af14a67d33d102847f46fd.zip',
             },
@@ -699,7 +701,7 @@ export const largeCodeRos = {
         ServiceToken: {
           'Fn::GetAtt': ['FCFunctionFormy-demo-service_artifacts_code_deployment', 'ARN'],
         },
-        Timeout: 300,
+        Timeout: 3000,
       },
       Type: 'ALIYUN::ROS::CustomResource',
     },

tests/stack/deploy.test.ts

@@ -19,19 +19,24 @@ import { cloneDeep, set } from 'lodash';
 
 const mockedRosStackDeploy = jest.fn();
 const mockedResolveCode = jest.fn();
+const mockedPublishAssets = jest.fn();
+
 jest.mock('../../src/common', () => ({
   ...jest.requireActual('../../src/common'),
   rosStackDeploy: (...args: unknown[]) => mockedRosStackDeploy(...args),
+  publishAssets: (...args: unknown[]) => mockedPublishAssets(...args),
   resolveCode: (path: string) => mockedResolveCode(path),
 }));
 
 describe('Unit tests for stack deployment', () => {
   beforeEach(() => {
     mockedResolveCode.mockReturnValueOnce('resolved-code');
+    mockedPublishAssets.mockResolvedValueOnce('published-assets-bucket');
   });
   afterEach(() => {
     mockedRosStackDeploy.mockRestore();
     mockedResolveCode.mockRestore();
+    mockedPublishAssets.mockRestore();
   });
 
   it('should deploy generated stack when iac is valid', async () => {
@@ -95,6 +100,7 @@ describe('Unit tests for stack deployment', () => {
       options,
     );
   });
+
   it('should evaluate service name as pure string when it reference ${ctx.stage}', async () => {
     const options = { stackName: 'my-demo-stack-fc-with-stage-1', stage: 'dev' };
     mockedRosStackDeploy.mockResolvedValueOnce(options.stackName);
@@ -109,11 +115,11 @@ describe('Unit tests for stack deployment', () => {
     );
   });
 
-  it('should create bucket and store code artifact to bucket when code size > 15MB', () => {
+  it('should create bucket and store code artifact to bucket when code size > 15MB', async () => {
     const stackName = 'my-large-code-stack';
     mockedRosStackDeploy.mockResolvedValueOnce(stackName);
 
-    deployStack(
+    await deployStack(
       stackName,
       set(
         cloneDeep(oneFcOneGatewayIac),
@@ -123,16 +129,27 @@ describe('Unit tests for stack deployment', () => {
       { stackName } as ActionContext,
     );
 
-    expect(mockedResolveCode).toHaveBeenCalledTimes(1);
+    expect(mockedPublishAssets).toHaveBeenCalledTimes(1);
+    expect(mockedRosStackDeploy).toHaveBeenCalledTimes(1);
+    expect(mockedPublishAssets).toHaveBeenCalledWith(
+      expect.objectContaining({
+        dockerImages: {},
+        files: expect.any(Object),
+        rootPath: expect.stringContaining('/var/folders/'),
+        version: '7.0.0',
+      }),
+
+      { stackName },
+    );
     expect(mockedRosStackDeploy).toHaveBeenCalledWith(stackName, largeCodeRos, { stackName });
   });
 
   describe('unit test for deploy of databases', () => {
-    it('should deploy elasticsearch serverless when database minimum fields provided', () => {
+    it('should deploy elasticsearch serverless when database minimum fields provided', async () => {
       const stackName = 'my-demo-es-serverless-stack';
       mockedRosStackDeploy.mockResolvedValueOnce(stackName);
 
-      deployStack(stackName, esServerlessMinimumIac, { stackName } as ActionContext);
+      await deployStack(stackName, esServerlessMinimumIac, { stackName } as ActionContext);
 
       expect(mockedRosStackDeploy).toHaveBeenCalledTimes(1);
       expect(mockedRosStackDeploy).toHaveBeenCalledWith(stackName, esServerlessMinimumRos, {