@nathapp/na-cli 1.0.0-rc.19 → 1.0.0-rc.21

package/dist/utils/template.js

@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTemplate = exports.render = void 0;
+exports.generateTemplate = exports.render = exports.K8S_REGISTRY_HOST = exports.TEMPLATE_NAME = void 0;
 var ejs = require("ejs");
 var fs = require("fs");
 var inquirer = require("inquirer");
@@ -56,15 +56,63 @@ var chalk_1 = require("chalk");
 var yargs = require("yargs");
 var path = require("path");
 var _a = require("../../package.json"), name = _a.name, version = _a.version;
+/**TEMPLATE ENUM NAME */
+var TEMPLATE_NAME;
+(function (TEMPLATE_NAME) {
+    TEMPLATE_NAME["DB_SCHEMA"] = "db-schema";
+    TEMPLATE_NAME["K8S_DEPLOYMENT"] = "k8s-deployment";
+    TEMPLATE_NAME["K8S_DEPLOY_CHART"] = "k8s-helm-chart";
+    TEMPLATE_NAME["MXW_BASE_API"] = "mxw-base-api-express";
+    TEMPLATE_NAME["TS_LIBRARY"] = "ts-library";
+})(TEMPLATE_NAME = exports.TEMPLATE_NAME || (exports.TEMPLATE_NAME = {}));
+var K8S_REGISTRY_HOST;
+(function (K8S_REGISTRY_HOST) {
+    K8S_REGISTRY_HOST["ALIYUN"] = "aliyun";
+    K8S_REGISTRY_HOST["AWS"] = "aws";
+    K8S_REGISTRY_HOST["DOCKER_HUB"] = "dockerhub";
+    K8S_REGISTRY_HOST["CUSTOM"] = "custom";
+})(K8S_REGISTRY_HOST = exports.K8S_REGISTRY_HOST || (exports.K8S_REGISTRY_HOST = {}));
+var ALIYUN_REGION = [{
+        value: "cn-hongkong",
+        name: "HongKong",
+    },
+    {
+        value: "ap-southest-1",
+        name: "Singapore"
+    },
+    {
+        value: "ap-southest-3",
+        name: "Kuala Lumpur"
+    }];
+var AWS_REGION = [{
+        value: "ap-southeast-2",
+        name: "Syndey",
+    }];
 function render(content, data) {
     return ejs.render(content, data);
 }
 exports.render = render;
 function generateTemplate(templateDir, targetDirectory) {
     return __awaiter(this, void 0, void 0, function () {
-        var templateChoices, QUESTIONS;
+        var templateChoices, template_specific, should_ask_install, should_ask_author, QUESTIONS;
         return __generator(this, function (_a) {
             templateChoices = fs.readdirSync(templateDir);
+            template_specific = function (answer, templateName) {
+                var projectChoice = answer["template"];
+                return projectChoice == templateName;
+            };
+            should_ask_install = function (answer) {
+                var projectChoice = answer["template"];
+                return projectChoice !== TEMPLATE_NAME.DB_SCHEMA &&
+                    projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
+                    projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART;
+            };
+            should_ask_author = function (answer) {
+                var projectChoice = answer["template"];
+                return !yargs.argv['author'] && projectChoice !== TEMPLATE_NAME.DB_SCHEMA
+                    && projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
+                    projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART;
+            };
             QUESTIONS = [
                 {
                     name: 'template',
@@ -89,26 +137,87 @@ function generateTemplate(templateDir, targetDirectory) {
                     name: 'author',
                     type: 'input',
                     message: 'Author:',
-                    when: function () { return !yargs.argv['author']; }
+                    when: function (answer) { return should_ask_author(answer); }
                 },
                 {
                     name: "run_install",
                     type: "confirm",
                     message: "Do you want to run npm install after template created?",
-                    when: function (answer) {
-                        var projectChoice = answer["template"];
-                        return projectChoice !== "db-schema" && projectChoice !== "k8s-deployment";
-                    }
+                    when: function (answer) { return should_ask_install(answer); }
                 },
                 {
                     name: "db_master",
                     type: "input",
                     message: "what is the master database name?",
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.DB_SCHEMA); }
+                },
+                /** TEMPLATE_NAME.K8S_DEPLOY_CHART */
+                {
+                    name: "k8s_chart_registry_host",
+                    type: "list",
+                    message: "what is the registry host?",
+                    choices: [K8S_REGISTRY_HOST.ALIYUN, K8S_REGISTRY_HOST.AWS, K8S_REGISTRY_HOST.DOCKER_HUB, K8S_REGISTRY_HOST.CUSTOM],
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                },
+                {
+                    name: "k8s_chart_aws_account_id",
+                    type: "input",
+                    message: "please enter AWS Account ID?",
+                    when: function (answer) {
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.AWS;
+                    }
+                },
+                {
+                    name: "k8s_chart_custom_registry_host",
+                    type: "input",
+                    message: "please enter custom registry host",
+                    when: function (answer) {
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.CUSTOM;
+                    }
+                },
+                {
+                    name: "k8s_chart_registry_region",
+                    type: "list",
+                    message: "what is the registry region?",
+                    choices: function (answer) {
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        if (registryHost == K8S_REGISTRY_HOST.ALIYUN)
+                            return ALIYUN_REGION;
+                        else if (registryHost == K8S_REGISTRY_HOST.AWS)
+                            return AWS_REGION;
+                        return ["none"];
+                    },
                     when: function (answer) {
-                        var projectChoice = answer["template"];
-                        return projectChoice == "db-schema";
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && (registryHost == K8S_REGISTRY_HOST.ALIYUN || registryHost == K8S_REGISTRY_HOST.AWS);
                     }
                 },
+                {
+                    name: "k8s_image_name",
+                    type: "input",
+                    message: "what is the image name include namespace (eg: bitnami/kafka)?",
+                    when: function (answer) {
+                        console.log("answer:", JSON.stringify(answer));
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART);
+                    }
+                },
+                {
+                    name: "k8s_image_version",
+                    type: "input",
+                    message: "what is the image version?",
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                },
+                {
+                    name: "k8s_chart_kind",
+                    type: "list",
+                    message: "what is the chart kind?",
+                    choices: ["Deployment", "StatefulSet", "CronJob"],
+                    default: "Deployment",
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                },
+                /** END TEMPLATE_NAME.K8S_DEPLOY_CHART */
             ];
             console.log("Welcome to ".concat(name, " version ").concat(version));
             return [2 /*return*/, inquirer.prompt(QUESTIONS)
@@ -126,9 +235,8 @@ function generateTemplate(templateDir, targetDirectory) {
                     var templatePath = path.join(templateDir, projectChoice);
                     var targetPath = path.join(targetDirectory, projectName);
                     var templateConfig = getTemplateConfig(templatePath);
-                    var params = {
-                        masterDbName: masterDbName,
-                    };
+                    var k8sChartParms = getK8sDeployChartParams(answers);
+                    var params = __assign({ masterDbName: masterDbName }, k8sChartParms);
                     var options = {
                         projectName: projectName,
                         templateName: projectChoice,
@@ -233,4 +341,25 @@ function createDirectoryContents(targetDirectory, projectTemplatePath, projectNa
         }
     });
 }
+function getK8sDeployChartParams(answer) {
+    var params = {};
+    // @ts-ignore
+    var projectChoice = answer['template'];
+    if (projectChoice != TEMPLATE_NAME.K8S_DEPLOY_CHART || !answer) {
+        return params;
+    }
+    if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.ALIYUN) {
+        params.containerRegistry = "registry-intl.".concat(answer.k8s_chart_registry_region, ".aliyuncs.com/").concat(answer.k8s_image_name);
+    }
+    else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.AWS) {
+        params.containerRegistry = "".concat(answer.k8s_chart_aws_account_id.replace("-", ""), ".dkr.ecr.").concat(answer.k8s_chart_registry_region, ".amazonaws.com/").concat(answer.k8s_image_name);
+    }
+    else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.CUSTOM) {
+        params.containerRegistry = "".concat(answer.k8s_chart_custom_registry_host, "/").concat(answer.k8s_image_name);
+    }
+    params.chartName = answer.name;
+    params.containerVersion = answer.k8s_image_version;
+    params.chartKind = answer.k8s_chart_kind;
+    return params;
+}
 //# sourceMappingURL=template.js.map

package/dist/utils/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/utils/template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/utils/template.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/na-cli",
-  "version": "1.0.0-rc.19",
+  "version": "1.0.0-rc.21",
   "main": "dist/index.js",
   "scripts": {
     "start": "npm run build && node dist/index.js",

package/src/utils/template.ts

@@ -26,6 +26,40 @@ export interface TemplateData {
     author?: string
 }
 
+/**TEMPLATE ENUM NAME */
+export enum TEMPLATE_NAME {
+    DB_SCHEMA = "db-schema",
+    K8S_DEPLOYMENT = "k8s-deployment",
+    K8S_DEPLOY_CHART = "k8s-helm-chart",
+    MXW_BASE_API = "mxw-base-api-express",
+    TS_LIBRARY = "ts-library"
+}
+
+export enum K8S_REGISTRY_HOST {
+    ALIYUN = "aliyun",
+    AWS = "aws",
+    DOCKER_HUB = "dockerhub",
+    CUSTOM = "custom"
+}
+
+const ALIYUN_REGION = [{
+    value: "cn-hongkong",
+    name: "HongKong",
+},
+{
+    value: "ap-southest-1",
+    name: "Singapore"
+},
+{
+    value: "ap-southest-3",
+    name: "Kuala Lumpur"
+}]
+
+const AWS_REGION = [{
+    value: "ap-southeast-2",
+    name: "Syndey",
+}]
+
 export function render(content: string, data: TemplateData) {
     return ejs.render(content, data);
 }
@@ -34,6 +68,25 @@ export async function generateTemplate(templateDir: string, targetDirectory: str
 
     const templateChoices = fs.readdirSync(templateDir);
 
+    const template_specific = (answer: any, templateName: string) => {
+        const projectChoice = answer["template"]
+        return projectChoice == templateName
+    }
+
+    const should_ask_install = (answer: any) => {
+        const projectChoice = answer["template"]
+        return projectChoice !== TEMPLATE_NAME.DB_SCHEMA &&
+            projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
+            projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART
+    }
+
+    const should_ask_author = (answer: any) => {
+        const projectChoice = answer["template"]
+        return !yargs.argv['author'] && projectChoice !== TEMPLATE_NAME.DB_SCHEMA
+            && projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
+            projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART
+    }
+
     const QUESTIONS = [
         {
             name: 'template',
@@ -56,26 +109,89 @@ export async function generateTemplate(templateDir: string, targetDirectory: str
             name: 'author',
             type: 'input',
             message: 'Author:',
-            when: () => !yargs.argv['author']
+            when: (answer: any) => should_ask_author(answer)
         },
         {
             name: "run_install",
             type: "confirm",
             message: "Do you want to run npm install after template created?",
-            when: (answer: any)=> {
-                const projectChoice = answer["template"]
-                return projectChoice !== "db-schema" && projectChoice !== "k8s-deployment"
-            }
+            when: (answer: any) => should_ask_install(answer)
         },
         {
             name: "db_master",
             type: "input",
             message: "what is the master database name?",
-            when: (answer: any)=> {
-                const projectChoice = answer["template"]
-                return projectChoice == "db-schema" 
+            when: (answer: any) => template_specific(answer, TEMPLATE_NAME.DB_SCHEMA)
+        },
+
+
+        /** TEMPLATE_NAME.K8S_DEPLOY_CHART */
+        {
+            name: "k8s_chart_registry_host",
+            type: "list",
+            message: "what is the registry host?",
+            choices: [K8S_REGISTRY_HOST.ALIYUN, K8S_REGISTRY_HOST.AWS, K8S_REGISTRY_HOST.DOCKER_HUB, K8S_REGISTRY_HOST.CUSTOM],
+            when: (answer: any) => template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART)
+        },
+        {
+            name: "k8s_chart_aws_account_id",
+            type: "input",
+            message: "please enter AWS Account ID?",
+            when: (answer: any) => {
+                const registryHost = answer?.k8s_chart_registry_host
+                return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.AWS
+            }
+        },
+        {
+            name: "k8s_chart_custom_registry_host",
+            type: "input",
+            message: "please enter custom registry host",
+            when: (answer: any) => {
+                const registryHost = answer?.k8s_chart_registry_host
+                return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.CUSTOM
+            }
+        },
+        {
+            name: "k8s_chart_registry_region",
+            type: "list",
+            message: "what is the registry region?",
+            choices: (answer: any) => {
+                const registryHost = answer?.k8s_chart_registry_host
+                if (registryHost == K8S_REGISTRY_HOST.ALIYUN)
+                    return ALIYUN_REGION
+                else if (registryHost == K8S_REGISTRY_HOST.AWS)
+                    return AWS_REGION
+                return ["none"]
+            },
+            when: (answer: any) => {
+                const registryHost = answer?.k8s_chart_registry_host
+                return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && (registryHost == K8S_REGISTRY_HOST.ALIYUN || registryHost == K8S_REGISTRY_HOST.AWS)
             }
-        },        
+        },
+        {
+            name: "k8s_image_name",
+            type: "input",
+            message: "what is the image name include namespace (eg: bitnami/kafka)?",
+            when: (answer: any) => {
+                console.log("answer:", JSON.stringify(answer))
+                return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART)
+            }
+        },
+        {
+            name: "k8s_image_version",
+            type: "input",
+            message: "what is the image version?",
+            when: (answer: any) => template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART)
+        },
+        {
+            name: "k8s_chart_kind",
+            type: "list",
+            message: "what is the chart kind?",
+            choices: ["Deployment", "StatefulSet", "CronJob"],
+            default: "Deployment",
+            when: (answer: any) => template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART)
+        },
+        /** END TEMPLATE_NAME.K8S_DEPLOY_CHART */
     ];
 
     console.log(`Welcome to ${name} version ${version}`);
@@ -95,8 +211,11 @@ export async function generateTemplate(templateDir: string, targetDirectory: str
             const targetPath = path.join(targetDirectory, projectName);
             const templateConfig = getTemplateConfig(templatePath);
 
-            const params = { 
+            const k8sChartParms = getK8sDeployChartParams(answers);
+
+            const params = {
                 masterDbName,
+                ...k8sChartParms,
             }
 
             const options: CliOptions = {
@@ -228,4 +347,27 @@ function createDirectoryContents(targetDirectory: string, projectTemplatePath: s
             createDirectoryContents(targetDirectory, path.join(projectTemplatePath, file), path.join(projectName, file), config, author, params);
         }
     });
+}
+
+
+function getK8sDeployChartParams(answer: any) {
+    const params: any = {}
+    // @ts-ignore
+    const projectChoice = answer['template'];
+    if (projectChoice != TEMPLATE_NAME.K8S_DEPLOY_CHART || !answer) {
+        return params;
+    }
+
+    if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.ALIYUN) {
+        params.containerRegistry = `registry-intl.${answer.k8s_chart_registry_region}.aliyuncs.com/${answer.k8s_image_name}`
+    } else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.AWS) {
+        params.containerRegistry = `${answer.k8s_chart_aws_account_id.replace("-", "")}.dkr.ecr.${answer.k8s_chart_registry_region}.amazonaws.com/${answer.k8s_image_name}`
+    } else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.CUSTOM) {
+        params.containerRegistry = `${answer.k8s_chart_custom_registry_host}/${answer.k8s_image_name}`
+    }
+
+    params.chartName = answer.name;
+    params.containerVersion = answer.k8s_image_version;
+    params.chartKind = answer.k8s_chart_kind;
+    return params
 }

package/templates/db-schema/.gitlab-ci.yml

@@ -0,0 +1,139 @@
+# Project must implement Makefile for commands (test, pre-build, build, name, version, image, version-major, version-minor, version-patch)
+# command:
+#   - test: run script inspection
+#   - build: alias to version-patch
+#   - pre-build: build prerelease tag
+#   - name: display project name
+#   - version: display project version
+#   - image: display project name and version (e.g. hello-world:1.0.0)
+#   - version-major: build major release tag
+#   - version-minor: build minor release tag
+#   - version-patch: build patch release tag
+#
+stages:
+  - test
+  # run script inspection
+  - build
+  # create tag
+  - release
+  # mark release commit as verified
+
+run-test:
+  stage: test
+  image: registry-intl.cn-hongkong.aliyuncs.com/gkci/docker:18-ci
+  services:
+    - docker:18-dind
+  script:
+    - make run-test
+  rules:
+    - if: '$CI_COMMIT_MESSAGE =~ /release-rc-by-devbot/ || $CI_COMMIT_MESSAGE =~ /release-by-devbot/'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_REF_PROTECTED == "true"'
+    - if: '$CI_COMMIT_MESSAGE =~ /run-test/'
+    - if: '($CI_COMMIT_MESSAGE =~ /run-major-release/ || $CI_COMMIT_MESSAGE =~ /run-minor-release/ || $CI_COMMIT_MESSAGE =~ /run-patch-release/ || $CI_COMMIT_MESSAGE =~ /run-release/) && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    # NOT triggerred by bot
+    # merge request
+    # commit to protected branch
+    # commit message contains `run-test` keyword
+    # commit message contains `run-major-release`, `run-minor-release`, `run-patch-release`, or `run-release` keywords and commit branch is default branch (master)
+
+run-build-major:
+  stage: build
+  image: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:10.20.0-alpine-ci
+  artifacts:
+    paths:
+      - package.json
+  script:
+    - make version-major
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_MESSAGE =~ /== release-by-devbot/'
+      when: never
+    - if: '$CI_COMMIT_MESSAGE =~ /run-major-release/ && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    # NOT merge requests and not triggerred by bot
+    # commit message contains `run-major-release` keyword and commit branch is default branch (master)
+
+run-build-minor:
+  stage: build
+  image: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:10.20.0-alpine-ci
+  artifacts:
+    paths:
+      - package.json
+  script:
+    - make version-minor
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_MESSAGE =~ /== release-by-devbot/'
+      when: never
+    - if: '$CI_COMMIT_MESSAGE =~ /run-minor-release/ && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    # NOT merge requests and not triggerred by bot
+    # commit message contains `run-minor-release` keyword and commit branch is default branch (master)
+
+run-build-patch:
+  stage: build
+  image: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:10.20.0-alpine-ci
+  artifacts:
+    paths:
+      - package.json
+  script:
+    - make version-patch
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_MESSAGE =~ /== release-by-devbot/'
+      when: never
+    - if: '($CI_COMMIT_MESSAGE =~ /run-patch-release/ || $CI_COMMIT_MESSAGE =~ /run-release/) && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    # NOT merge requests and not triggerred by bot
+    # commit message contains `run-patch-release` or `run-release` keywords and commit branch is default branch (master)
+
+run-commit:
+  stage: release
+  image: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:10.20.0-alpine-ci
+  before_script:
+    - git config --global user.name "$GITLAB_USER_NAME"
+    - git config --global user.email "$GITLAB_USER_EMAIL"
+  script:
+    - git add -A
+    - git commit -m "$(make version)" -m "Bumped by $GITLAB_USER_NAME == release-by-devbot ($CI_COMMIT_SHORT_SHA) =="
+    - git tag -a "$(make version)" -m "Bumped by $GITLAB_USER_NAME"
+    - (rm 7*.sql 2>/dev/null) || true
+    - (rm 8*.sql 2>/dev/null) || true
+    - echo > DEV_MODE.txt
+    - (git add -A && git commit -m "$(make version) - cleanup" -m "== cleanup-by-devbot ($CI_COMMIT_SHORT_SHA) ==") || true
+    - git push "https://${GITLAB_USER_NAME}:${CI_GIT_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_BRANCH}"
+    - git push "https://${GITLAB_USER_NAME}:${CI_GIT_TOKEN}@${CI_REPOSITORY_URL#*@}" --tags
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_MESSAGE =~ /== release-by-devbot/'
+      when: never
+    - if: '($CI_COMMIT_MESSAGE =~ /run-major-release/ || $CI_COMMIT_MESSAGE =~ /run-minor-release/ || $CI_COMMIT_MESSAGE =~ /run-patch-release/ || $CI_COMMIT_MESSAGE =~ /run-release/) && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    # NOT merge requests and not triggerred by bot
+    # commit message contains `run-major-release`, `run-minor-release`, `run-patch-release`, or `run-release` keywords and commit branch is default branch (master)
+
+run-release:
+  stage: release
+  image: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:10.20.0-alpine-ci
+  script:
+    - echo "Release version $(make version)"
+  rules:
+    - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
+      when: never
+    - if: '$CI_COMMIT_TAG != null'
+    # NOT commit branch is NON default branch (master)
+    # tag was created
+
+run-tag:
+  stage: release
+  image: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:10.20.0-alpine-ci
+  before_script:
+    - git config --global user.name "$GITLAB_USER_NAME"
+    - git config --global user.email "$GITLAB_USER_EMAIL"
+  script:
+    - make pre-build
+    - git add -A
+    - git commit -m "$(make version)" -m "Bumped by $GITLAB_USER_NAME == release-by-devbot ($CI_COMMIT_SHORT_SHA) =="
+    - git tag -a "$(make version)" -m "Bumped by $GITLAB_USER_NAME"
+    - git push "https://${GITLAB_USER_NAME}:${CI_GIT_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_BRANCH}"
+    - git push "https://${GITLAB_USER_NAME}:${CI_GIT_TOKEN}@${CI_REPOSITORY_URL#*@}" --tags
+  rules:
+    - if: '$CI_COMMIT_MESSAGE =~ /release-rc-by-devbot/ || $CI_COMMIT_MESSAGE =~ /release-by-devbot/'
+      when: never
+    - if: '$CI_COMMIT_MESSAGE =~ /run-tag/'
+    # NOT triggerred by bot
+    # commit message contains `run-tag` keyword

package/templates/db-schema/Email-Templates/Individual/README.md

@@ -0,0 +1 @@
+## EMAIL Templates

package/templates/db-schema/Makefile

@@ -144,7 +144,7 @@ run-exp-init-data:
 	fi;
 
 run-exp-grant:
-	@export PASSWORD='@team#Einnity1957'; \
+	@export PASSWORD='MyAppP@ssw0rd!!'; \
 	export SCHEMAS=`make --no-print-directory -f$(MAKEFILE) schemas | \
 		awk -F"." 'BEGIN{first=1} \
 			{ \

package/templates/db-schema/README.md

@@ -103,4 +103,4 @@ Developer need to set prefix for all the rollback file with prefix (`8xx_RB`) an
 Init data script have to define with prefix (`890` or `990`)
 
 ---
-devbot chat: 13
+devbot chat: 0

package/templates/k8s-deployment/services/charts/sample-nginx/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-name: admin-api
-description: Admin Api
+name: sample-api
+description: Sample Api
 
 # A chart can be either an 'application' or a 'library' chart.
 #