Merge pull request #1038 from wss-git/wss/add-policy-to-user

feat(deploy/ros-codeuri): deploy support ros codeyuri
alibaba · Dec 4, 2020 · 4c40112 · 4c40112
2 parents bae5304 + fdc652c
commit 4c40112
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 59 deletions.
diff --git a/src/lib/deploy/deploy-by-tpl.js b/src/lib/deploy/deploy-by-tpl.js
@@ -973,7 +973,7 @@ async function deploy(tplPath, context) {
       console.log(yellow(`missing --stack-name parameter, using default stackName '${dirName}'`));
     }
     const stackName = context.stackName || DEFAULT_STACK_NAME;
-    await deployByRos(baseDir, stackName, tpl, context.assumeYes, context.parameterOverride);
+    await deployByRos(baseDir, stackName, tpl, context.assumeYes, context.parameterOverride, tplPath);
   } else {
 
     await deployByApi(baseDir, tpl, tplPath, context);

diff --git a/src/lib/deploy/deploy-support-ros.js b/src/lib/deploy/deploy-support-ros.js
@@ -12,6 +12,8 @@ const promiseRetry = require('../retry');
 const { getProfile } = require('../profile');
 const { green, red, yellow } = require('colors');
 const { promptForConfirmContinue } = require('../init/prompt');
+const { transformRosYmlCodeUri } = require('../package/template');
+const { outputTemplateFile } = require('../import/utils');
 
 const log = require('single-line-log').stdout;
 const Table = require('cli-table3');
@@ -661,13 +663,16 @@ function transformAsyncConfiguration (resources = {}, region, accountId) {
   });
 }
 
-async function deployByRos(baseDir, stackName, tpl, assumeYes, parameterOverride = {}) {
+async function deployByRos(baseDir, stackName, tpl, assumeYes, parameterOverride = {}, tplPath) {
   const profile = await getProfile();
   const region = profile.defaultRegion;
   const { accountId } = profile;
 
   transformAsyncConfiguration(tpl.Resources, region, accountId);
-
+  if (!tpl.Transform) {
+    await transformRosYmlCodeUri({ baseDir, tpl, tplPath });
+    outputTemplateFile(path.join(process.cwd(), 'template.packaged.yml'), tpl);
+  }
   const rosClient = await client.getRosClient();
 
   let { stackId, stackStatus } = await findRosStack(rosClient, region, stackName);

diff --git a/src/lib/fc.js b/src/lib/fc.js
@@ -954,6 +954,7 @@ async function checkAlreadyConfirmedForCustomSpringBoot(runtime, codeUri) {
 async function nasAutoConfigurationIfNecessary({ stage, tplPath, runtime, codeUri, nasConfig, vpcConfig, useNas = false, assumeYes,
   compressedSize = 0,
   nasFunctionName,
+  isRosCodeUri,
   nasServiceName
 }) {
 
@@ -964,7 +965,7 @@ async function nasAutoConfigurationIfNecessary({ stage, tplPath, runtime, codeUr
   const tipOssUploadCodeSize = Math.floor(ossUploadCodeSize / 1024 / 1024);
   const maxCodeSize = packageStage ? ossUploadCodeSize : 52428800;
 
-  if (!_.includes(SUPPORT_RUNTIMES, runtime) || (!useNas && compressedSize < maxCodeSize)) { return { stop, tplChanged }; }
+  if (isRosCodeUri || !_.includes(SUPPORT_RUNTIMES, runtime) || (!useNas && compressedSize < maxCodeSize)) { return { stop, tplChanged }; }
 
   if (compressedSize > maxCodeSize) {
     if (packageStage) {

diff --git a/src/lib/language-service/schema/ros/ALIYUN-FC-Function.json b/src/lib/language-service/schema/ros/ALIYUN-FC-Function.json
@@ -46,14 +46,16 @@
         },
         "Code": {
           "type": "object"
+        },
+        "CodeUri": {
+          "type": "string"
         }
       },
       "required": [
         "FunctionName",
         "Runtime",
         "ServiceName",
-        "Handler",
-        "Code"
+        "Handler"
       ],
       "additionalProperties": false,
       "document": {

diff --git a/src/lib/oss.js b/src/lib/oss.js
@@ -0,0 +1,55 @@
+const { getProfile } = require('./profile');
+const { getOssClient } = require('./client');
+const { promptForConfirmContinue, promptForInputContinue } = require('./init/prompt');
+const { yellow } = require('colors');
+
+const _ = require('lodash');
+
+
+async function bucketExist(ossClient, bucketName) {
+  let bucketExist = false;
+
+  try {
+    await ossClient.getBucketLocation(bucketName);
+    bucketExist = true;
+  } catch (ex) {
+
+    if (!ex.code || !_.includes(['AccessDenied', 'NoSuchBucket'], ex.code)) {
+      throw ex;
+    }
+  }
+  return bucketExist;
+}
+
+
+async function generateOssBucket(bucketName) {
+  const ossClient = await getOssClient();
+
+  if (await bucketExist(ossClient, bucketName)) {
+    console.log(yellow(`using oss-bucket: ${bucketName}`));
+    return bucketName;
+  }
+
+  console.log(yellow(`using oss-bucket: ${bucketName}`));
+
+  if (process.stdin.isTTY && !await promptForConfirmContinue('Auto generate OSS bucket for you?')) {
+    bucketName = (await promptForInputContinue('Input OSS bucket name:')).input;
+  }
+
+  await ossClient.putBucket(bucketName);
+
+  return bucketName;
+}
+
+async function processOSSBucket(bucket) {
+  if (!bucket) {
+    const profile = await getProfile();
+    const defalutBucket = `fun-gen-${profile.defaultRegion}-${profile.accountId}`;
+    return await generateOssBucket(defalutBucket);
+  }
+  return await generateOssBucket(bucket);
+}
+
+module.exports = {
+  processOSSBucket
+};
diff --git a/src/lib/package/package.js b/src/lib/package/package.js
@@ -13,13 +13,14 @@ const _ = require('lodash');
 const { getProfile } = require('../profile');
 const { isEmptyDir } = require('../nas/cp/file');
 const { getOssClient } = require('../client');
-const { green, yellow } = require('colors');
+const { green } = require('colors');
 const { showPackageNextTips } = require('../build/tips');
 const { ensureFilesModified } = require('../utils/file');
 const { parseMountDirPrefix } = require('../fc');
+const { transformRosYmlCodeUri } = require('./template');
 const { getTpl, detectNasBaseDir, getNasYmlPath } = require('../tpl');
 const { getFunctionImage } = require('./pushImage');
-const { promptForConfirmContinue, promptForInputContinue } = require('../init/prompt');
+const { processOSSBucket } = require('../oss');
 const { validateNasAndVpcConfig, SERVICE_RESOURCE, iterateResources, isNasAutoConfig, isVpcAutoConfig, getUserIdAndGroupId } = require('../definition');
 
 const {
@@ -40,6 +41,7 @@ const {
   generateRosTemplateForDefaultOutputs,
   generateRosTemplateForDefaultResources
 } = require('./template');
+const utils = require('../import/utils');
 
 async function processNasAutoToRosTemplate({ tpl, baseDir, tplPath,
   ossClient,
@@ -227,51 +229,11 @@ async function transformSlsAuto(tpl) {
   return cloneTpl;
 }
 
-async function bucketExist(ossClient, bucketName) {
-  let bucketExist = false;
-
-  try {
-    await ossClient.getBucketLocation(bucketName);
-    bucketExist = true;
-  } catch (ex) {
-
-    if (!ex.code || !_.includes(['AccessDenied', 'NoSuchBucket'], ex.code)) {
-      throw ex;
-    }
-  }
-  return bucketExist;
-}
-
-async function generateOssBucket(bucketName) {
-  const ossClient = await getOssClient();
-
-  if (await bucketExist(ossClient, bucketName)) {
-    console.log(yellow(`using oss-bucket: ${bucketName}`));
-    return bucketName;
-  }
-
-  console.log(yellow(`using oss-bucket: ${bucketName}`));
-
-  if (process.stdin.isTTY && !await promptForConfirmContinue('Auto generate OSS bucket for you?')) {
-    bucketName = (await promptForInputContinue('Input OSS bucket name:')).input;
-  }
-
-  await ossClient.putBucket(bucketName);
-
-  return bucketName;
-}
-async function processOSSBucket(bucket) {
-  if (!bucket) {
-    const profile = await getProfile();
-    const defalutBucket = `fun-gen-${profile.defaultRegion}-${profile.accountId}`;
-    return await generateOssBucket(defalutBucket);
-  }
-  return await generateOssBucket(bucket);
-}
-
 async function pack(tplPath, bucket, outputTemplateFile, useNas, pushRegistry) {
   const tpl = await getTpl(tplPath);
-  validateNasAndVpcConfig(tpl.Resources);
+  if (tpl.Transform) {
+    validateNasAndVpcConfig(tpl.Resources);
+  }
 
   const baseDir = path.dirname(tplPath);
 
@@ -281,6 +243,23 @@ async function pack(tplPath, bucket, outputTemplateFile, useNas, pushRegistry) {
 
   const ossClient = await getOssClient(bucketName);
 
+  let packedYmlPath;
+
+  if (outputTemplateFile) {
+    packedYmlPath = path.resolve(process.cwd(), outputTemplateFile);
+  } else {
+    packedYmlPath = path.join(process.cwd(), 'template.packaged.yml');
+  }
+
+  if (!tpl.Transform) {
+    await transformRosYmlCodeUri({ baseDir, tpl, tplPath, bucketName, ossClient });
+    path.join(process.cwd(), 'template.packaged.yml');
+    utils.outputTemplateFile(packedYmlPath, tpl);
+    console.log(green('\nPackage success'));
+    showPackageNextTips(packedYmlPath);
+    return;
+  }
+
   const updatedEnvTpl = await processNasPythonPaths(tpl, tplPath);
   if (pushRegistry) {
     const profile = await getProfile();
@@ -291,14 +270,6 @@ async function pack(tplPath, bucket, outputTemplateFile, useNas, pushRegistry) {
   const updatedFlowTpl = await transformFlowDefinition(baseDir, transformCustomDomain(updatedSlsTpl));
   const updatedTpl = await processNasAutoToRosTemplate({ ossClient, baseDir, tplPath, tpl: updatedFlowTpl, bucketName });
 
-  let packedYmlPath;
-
-  if (outputTemplateFile) {
-    packedYmlPath = path.resolve(process.cwd(), outputTemplateFile);
-  } else {
-    packedYmlPath = path.join(process.cwd(), 'template.packaged.yml');
-  }
-
   util.outputTemplateFile(packedYmlPath, updatedTpl);
 
   console.log(green('\nPackage success'));

diff --git a/src/lib/package/template.js b/src/lib/package/template.js
@@ -13,6 +13,8 @@ const { getTpl } = require('../tpl');
 const { green, yellow } = require('colors');
 const { generateRandomZipPath } = require('../utils/path');
 const { generateNasPythonPaths, mergeEnvs } = require('../../lib/install/env');
+const { processOSSBucket } = require('../oss');
+const { getOssClient } = require('../client');
 
 const _ = require('lodash');
 
@@ -504,6 +506,7 @@ async function zipCodeToOss({ ossClient, codeUri, runtime, ignore, tplPath, nasC
   zipName = 'code.zip',
   prefix = '',
   useNas = false,
+  isRosCodeUri = false,
   zlibOptions = {}
 }) {
 
@@ -527,6 +530,7 @@ async function zipCodeToOss({ ossClient, codeUri, runtime, ignore, tplPath, nasC
 
   const rs = await fc.nasAutoConfigurationIfNecessary({ stage: 'package', tplPath, compressedSize, useNas,
     nasConfig, runtime, codeUri,
+    isRosCodeUri,
     nasServiceName: serviceName,
     nasFunctionName: functionName
   });
@@ -727,8 +731,46 @@ async function transformFlowDefinition(baseDir, tpl) {
   return updatedTplContent;
 }
 
+async function transformRosYmlCodeUri ({ baseDir, tpl, tplPath, bucketName, ossClient }) {
+  if (!ossClient) {
+    bucketName = await processOSSBucket();
+    ossClient = await getOssClient(bucketName);
+  }
+
+  for (const key of Object.keys(tpl.Resources)) {
+    const { Type, Properties: properties } = tpl.Resources[key];
+    if (Type === 'ALIYUN::FC::Function' && properties.Runtime !== 'custom-container' && !properties.Code) {
+      if (!properties.CodeUri) {
+        throw new Error(`ALIYUN::FC::Function Code is empty.`);
+      }
+
+      const ignore = await fc.generateFunIngore(baseDir, properties.CodeUri);
+      const oss = await zipCodeToOss({
+        tplPath,
+        ignore,
+        ossClient,
+        codeUri: properties.CodeUri,
+        runtime: properties.Runtime,
+        isRosCodeUri: true
+      });
+
+      if (!oss.objectName) {
+        throw new Error(`Codeuri ${properties.CodeUri} upload to oss error.`);
+      }
+      tpl.Resources[key].Properties.Code = {
+        OssBucketName: bucketName,
+        OssObjectName: oss.objectName
+      };
+      delete tpl.Resources[key].Properties.CodeUri;
+    }
+  }
+  return tpl;
+}
+
 module.exports = {
   zipToOss,
+  zipCodeToOss,
+  transformRosYmlCodeUri,
   uploadNasService,
   processNasPythonPaths,
   transformFlowDefinition,