fix: code objectkey value issue

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

Author: Blankll

src/common/iacHelper.ts

@@ -28,8 +28,8 @@ export const getFileSource = (
 
   const hash = crypto.createHash('md5').update(fs.readFileSync(filePath)).digest('hex');
 
-  const objectKey = `${fcName}/${hash}.${filePath.split('.').pop()}`;
-  const source = ossDeployment.Source.asset(filePath, {}, objectKey);
+  const objectKey = `${fcName}/${hash}-${filePath.split('/').pop()}`;
+  const source = ossDeployment.Source.asset(filePath, {}, `${fcName}/${hash}-`);
 
   return { source, objectKey };
 };

src/stack/rosStack/function.ts

@@ -31,6 +31,7 @@ export const resolveFunctions = (
     });
 
   let destinationBucket: oss.Bucket;
+  let artifactsDeployment: ossDeployment.BucketDeployment;
   if (!isEmpty(fileSources)) {
     // creat oss to store code
     destinationBucket = new oss.Bucket(
@@ -42,7 +43,7 @@ export const resolveFunctions = (
       },
       true,
     );
-    new ossDeployment.BucketDeployment(
+    artifactsDeployment = new ossDeployment.BucketDeployment(
       scope,
       `${service}_artifacts_code_deployment`,
       {
@@ -55,18 +56,19 @@ export const resolveFunctions = (
     );
   }
   functions?.forEach((fnc) => {
+    const storeInBucket = readCodeSize(fnc.code) > CODE_ZIP_SIZE_LIMIT;
     let code: RosFunction.CodeProperty = {
       zipFile: resolveCode(fnc.code),
     };
-    if (readCodeSize(fnc.code) > CODE_ZIP_SIZE_LIMIT) {
+    if (storeInBucket) {
       code = {
         ossBucketName: destinationBucket.attrName,
         ossObjectName: fileSources?.find(
           ({ fcName }) => fcName === replaceReference(fnc.name, context),
         )?.objectKey,
       };
     }
-    new fc.RosFunction(
+    const fcn = new fc.RosFunction(
       scope,
       fnc.key,
       {
@@ -80,5 +82,9 @@ export const resolveFunctions = (
       },
       true,
     );
+    if (storeInBucket) {
+      fcn.addDependsOn(destinationBucket as unknown as ros.RosResource);
+      fcn.addDependsOn(artifactsDeployment as unknown as ros.RosResource);
+    }
   });
 };

tests/common/iacHelper.test.ts

@@ -19,7 +19,7 @@ describe('Unit test for iacHelper', () => {
       expect(ossDeployment.Source.asset).toHaveBeenCalledWith(
         `${process.cwd()}/${location}`,
         {},
-        `${fcName}/50861cd99a3a678356030f5f189300af.zip`,
+        `${fcName}/50861cd99a3a678356030f5f189300af-`,
       );
     });
 

tests/fixtures/deployFixture.ts

@@ -641,7 +641,7 @@ export const largeCodeRos = {
           OssBucketName: {
             'Fn::GetAtt': ['my-demo-service_artifacts_bucket', 'Name'],
           },
-          OssObjectName: 'hello_fn/43cb4c356149762dbe507fc1baede172.zip',
+          OssObjectName: 'hello_fn/43cb4c356149762dbe507fc1baede172-large-artifact.zip',
         },
         EnvironmentVariables: {
           NODE_ENV: 'production',
@@ -689,7 +689,7 @@ export const largeCodeRos = {
           sources: [
             {
               bucket: { 'Fn::Sub': expect.stringContaining('assets-${ALIYUN::Region}') },
-              fileName: 'hello_fn/43cb4c356149762dbe507fc1baede172.ziplarge-artifact.zip',
+              fileName: 'hello_fn/43cb4c356149762dbe507fc1baede172-large-artifact.zip',
               objectKey: '2bfeafed8d3df0d44c235271cdf2aa7d908a3c2757af14a67d33d102847f46fd.zip',
             },
           ],