Merge pull request #1010 from wss-git/wss/fix-customContainer-codeuri

Wss/fix custom container codeuri

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/fun",
-  "version": "3.6.16",
+  "version": "3.6.17",
   "description": "(have)Fun with Serverless",
   "engines": {
     "node": ">=8.6.0"

src/bin/fun-package.js

@@ -17,6 +17,7 @@ program
   .option('-b, --oss-bucket <bucket>', 'The name of the oss bucket where Fun uploads local artifacts')
   .option('-o, --output-template-file <filename>', 'The output path of the packaged template file')
   .option('--use-nas', 'Automatically upload local resources to NAS.')
+  .option('--push-registry <pushRegistry>', 'Modify the image upload path')
   .parse(process.argv);
 
 if (program.args.length > 1) {

src/lib/build/template.js

@@ -37,14 +37,21 @@ function updateTemplateResources(originTplContent, buildFuncs, skippedBuildFuncs
       const absCodeDir = path.resolve(baseDir, functionRes.Properties.CodeUri);
       const relativeCodeUri = path.relative(absRootArtifactsDir, absCodeDir);
 
-      functionRes.Properties.CodeUri = relativeCodeUri;
-
+      if (functionRes.Properties.Runtime === 'custom-container') {
+        delete functionRes.Properties.CodeUri;
+      } else {
+        functionRes.Properties.CodeUri = relativeCodeUri;
+      }
     } else { // refer to artifact dir
       const funcArtifactDir = path.join(rootArtifactsDir, serviceName, functionName);
       const absFuncArtifactDir = path.resolve(baseDir, funcArtifactDir);
       const relativeCodeUri = path.relative(absRootArtifactsDir, absFuncArtifactDir);
 
-      functionRes.Properties.CodeUri = relativeCodeUri;
+      if (functionRes.Properties.Runtime === 'custom-container') {
+        delete functionRes.Properties.CodeUri;
+      } else {
+        functionRes.Properties.CodeUri = relativeCodeUri;
+      }
     }
   });
 

src/lib/commands/package.js

@@ -8,6 +8,7 @@ async function pack(options) {
   const bucket = options.ossBucket;
   const useNas = options.useNas;
   const outputTemplateFile = options.outputTemplateFile;
+  const pushRegistry = options.pushRegistry;
 
   if (!tplPath) {
     tplPath = await detectTplPath();
@@ -19,7 +20,7 @@ async function pack(options) {
 
   validateTplName(tplPath);
 
-  await require('../package/package').pack(tplPath, bucket, outputTemplateFile, useNas);
+  await require('../package/package').pack(tplPath, bucket, outputTemplateFile, useNas, pushRegistry);
 }
 
 module.exports = pack;

src/lib/deploy/deploy-by-tpl.js

@@ -10,7 +10,7 @@ const debug = require('debug')('fun:deploy');
 const definition = require('../definition');
 const date = require('date-and-time');
 
-const { execSync } = require('child_process');
+const { getFunctionImage } = require('../package/pushImage');
 const { deployByRos } = require('./deploy-support-ros');
 const { importService } = require('../import/service');
 const { getProfile, mark } = require('../profile');
@@ -939,44 +939,6 @@ async function deployByApi(baseDir, tpl, tplPath, context) {
   }
 }
 
-async function getpushRegistry(image, pushRegistry, region, configImage) {
-  const imageArr = image.split('/');
-  if (pushRegistry === 'acr-internet') {
-    imageArr[0] = `registry.${region}.aliyuncs.com`;
-    image = imageArr.join('/');
-  } else if (pushRegistry === 'acr-vpc') {
-    imageArr[0] = `registry-vpc.${region}.aliyuncs.com`;
-    image = imageArr.join('/');
-  } else if (pushRegistry) {
-    imageArr[0] = pushRegistry;
-    image = imageArr.join('/');
-  }
-  console.log(`docker tag ${configImage} ${image}`);
-  execSync(`docker tag ${configImage} ${image}`, {
-    stdio: 'inherit'
-  });
-  console.log(`docker push ${image}`);
-  execSync(`docker push ${image}`, {
-    stdio: 'inherit'
-  });
-}
-
-async function getFunctionImage({ tpl, pushRegistry, region }) {
-  for (const k of _.keys(tpl)) {
-    const v = tpl[k];
-    if (_.isObject(v)) {
-      if (v.Type === 'Aliyun::Serverless::Function') {
-        const { CustomContainerConfig = {} } = v.Properties || {};
-        let image = CustomContainerConfig.Image;
-        if (image) {
-          await getpushRegistry(image, pushRegistry, region, CustomContainerConfig.Image);
-        }
-      } else {
-        await getFunctionImage({ tpl: v, pushRegistry, region });
-      }
-    }
-  }
-}
 
 async function deploy(tplPath, context) {
   if (!context.useRos) {
@@ -990,7 +952,7 @@ async function deploy(tplPath, context) {
   const profile = await getProfile();
 
   if (context.pushRegistry) {
-    getFunctionImage({ tpl, region: profile.defaultRegion, pushRegistry: context.pushRegistry });
+    await getFunctionImage({ tpl, region: profile.defaultRegion, pushRegistry: context.pushRegistry });
   }
 
   console.log(`using region: ${profile.defaultRegion}`);

src/lib/deploy/deploy-support-ros.js

@@ -495,7 +495,7 @@ async function detectRosHttpTrigger(rosResources) {
         continue;
       }
 
-      await trigger.displayTriggerInfo(serviceName, functionName, triggerName, triggerProp.TriggerType, triggerProperties);
+      await trigger.displayTriggerInfo(serviceName, functionName, triggerName, triggerProp.TriggerType, triggerProperties, '', rosResources);
     }
   }
 }

src/lib/language-service/schema/rosSchema.ts

@@ -176,6 +176,9 @@ export const rosSchema = {
                   },
                   'required': ['Image']
                 },
+                "CodeUri": {
+                  "type": "string"
+                },
                 "Description": {
                   "type": "string"
                 },

src/lib/package/package.js

@@ -18,6 +18,7 @@ const { showPackageNextTips } = require('../build/tips');
 const { ensureFilesModified } = require('../utils/file');
 const { parseMountDirPrefix } = require('../fc');
 const { getTpl, detectNasBaseDir, getNasYmlPath } = require('../tpl');
+const { getFunctionImage } = require('./pushImage');
 const { promptForConfirmContinue, promptForInputContinue } = require('../init/prompt');
 const { validateNasAndVpcConfig, SERVICE_RESOURCE, iterateResources, isNasAutoConfig, isVpcAutoConfig, getUserIdAndGroupId } = require('../definition');
 
@@ -268,7 +269,7 @@ async function processOSSBucket(bucket) {
   return await generateOssBucket(bucket);
 }
 
-async function pack(tplPath, bucket, outputTemplateFile, useNas) {
+async function pack(tplPath, bucket, outputTemplateFile, useNas, pushRegistry) {
   const tpl = await getTpl(tplPath);
   validateNasAndVpcConfig(tpl.Resources);
 
@@ -281,6 +282,10 @@ async function pack(tplPath, bucket, outputTemplateFile, useNas) {
   const ossClient = await getOssClient(bucketName);
 
   const updatedEnvTpl = await processNasPythonPaths(tpl, tplPath);
+  if (pushRegistry) {
+    const profile = await getProfile();
+    await getFunctionImage({ tpl, region: profile.defaultRegion, pushRegistry });
+  }
   const updatedCodeTpl = await uploadAndUpdateFunctionCode({ tpl: updatedEnvTpl, tplPath, baseDir, ossClient, useNas });
   const updatedSlsTpl = await transformSlsAuto(updatedCodeTpl);
   const updatedFlowTpl = await transformFlowDefinition(baseDir, transformCustomDomain(updatedSlsTpl));

src/lib/package/pushImage.js

@@ -0,0 +1,45 @@
+const _ = require('lodash');
+const { execSync } = require('child_process');
+
+async function getpushRegistry(image, pushRegistry, region, configImage) {
+  const imageArr = image.split('/');
+  if (pushRegistry === 'acr-internet') {
+    imageArr[0] = `registry.${region}.aliyuncs.com`;
+    image = imageArr.join('/');
+  } else if (pushRegistry === 'acr-vpc') {
+    imageArr[0] = `registry-vpc.${region}.aliyuncs.com`;
+    image = imageArr.join('/');
+  } else if (pushRegistry) {
+    imageArr[0] = pushRegistry;
+    image = imageArr.join('/');
+  }
+  console.log(`docker tag ${configImage} ${image}`);
+  execSync(`docker tag ${configImage} ${image}`, {
+    stdio: 'inherit'
+  });
+  console.log(`docker push ${image}`);
+  execSync(`docker push ${image}`, {
+    stdio: 'inherit'
+  });
+}
+
+async function getFunctionImage({ tpl, pushRegistry, region }) {
+  for (const k of _.keys(tpl)) {
+    const v = tpl[k];
+    if (_.isObject(v)) {
+      if (v.Type === 'Aliyun::Serverless::Function') {
+        const { CustomContainerConfig = {} } = v.Properties || {};
+        let image = CustomContainerConfig.Image;
+        if (image) {
+          await getpushRegistry(image, pushRegistry, region, CustomContainerConfig.Image);
+        }
+      } else {
+        await getFunctionImage({ tpl: v, pushRegistry, region });
+      }
+    }
+  }
+}
+
+module.exports = {
+  getFunctionImage, getpushRegistry
+};

src/lib/package/template.js

@@ -616,9 +616,14 @@ async function uploadAndUpdateFunctionCode({ tpl, tplPath, useNas, baseDir, ossC
     const codeUriCache = new Map();
 
     for (const {serviceName, serviceRes, functionName, functionRes} of definition.findFunctionsInTpl(updatedTplContent)) {
+      const runtime = (functionRes.Properties || {}).Runtime;
+      if (runtime === 'custom-container') {
+        delete (functionRes.Properties || {}).CodeUri;
+        continue;
+      }
+
       if (isOssUrl((functionRes.Properties || {}).CodeUri)) { continue; }
 
-      const runtime = (functionRes.Properties || {}).Runtime;
       const codeUri = (functionRes.Properties || {}).CodeUri;
       const absCodeUri = path.resolve(baseDir, codeUri);
 

src/lib/validate/schema/function.js

@@ -151,6 +151,9 @@ const functionSchema = {
             'CAPort': {
               'type': 'integer'
             },
+            'CodeUri': {
+              'type': 'string'
+            },
             'InstanceConcurrency': {
               'type': 'integer',
               'minimum': 1,