@nathapp/na-cli 1.0.0-rc.15 → 1.0.0-rc.17

package/src/utils/template.ts

@@ -62,7 +62,20 @@ export async function generateTemplate(templateDir: string, targetDirectory: str
             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"
+            }
         },
+        {
+            name: "db_master",
+            type: "input",
+            message: "what is the master database name?",
+            when: (answer: any)=> {
+                const projectChoice = answer["template"]
+                return projectChoice == "db-schema" 
+            }
+        },        
     ];
 
     console.log(`Welcome to ${name} version ${version}`);
@@ -76,11 +89,16 @@ export async function generateTemplate(templateDir: string, targetDirectory: str
             // @ts-ignore
             const author = answers['author'];
             // @ts-ignore
-            const runInstall = answers['run_install'];
+            const runInstall = answers['run_install'] || false;
+            const masterDbName = answers['db_master'] || "master";
             const templatePath = path.join(templateDir, projectChoice);
             const targetPath = path.join(targetDirectory, projectName);
             const templateConfig = getTemplateConfig(templatePath);
 
+            const params = { 
+                masterDbName,
+            }
+
             const options: CliOptions = {
                 projectName,
                 templateName: projectChoice,
@@ -93,7 +111,7 @@ export async function generateTemplate(templateDir: string, targetDirectory: str
                 return;
             }
 
-            createDirectoryContents(targetDirectory, templatePath, projectName, templateConfig, author);
+            createDirectoryContents(targetDirectory, templatePath, projectName, templateConfig, author, params);
 
             if (runInstall && !postProcess(options)) {
                 return;
@@ -183,7 +201,7 @@ function postProcessNode(options: CliOptions) {
 
 const SKIP_FILES = ['node_modules', '.template.json'];
 
-function createDirectoryContents(targetDirectory: string, projectTemplatePath: string, projectName: string, config: TemplateConfig, author?: string) {
+function createDirectoryContents(targetDirectory: string, projectTemplatePath: string, projectName: string, config: TemplateConfig, author?: string, params?: any) {
     const filesToCreate = fs.readdirSync(projectTemplatePath);
 
     filesToCreate.forEach(file => {
@@ -199,7 +217,7 @@ function createDirectoryContents(targetDirectory: string, projectTemplatePath: s
 
             if (file === '.npmignore-rename') file = '.npmignore';
 
-            contents = render(contents, { projectName, author });
+            contents = render(contents, { ...params, projectName, author });
 
             const writePath = path.join(targetDirectory, projectName, file);
             fs.writeFileSync(writePath, contents, 'utf8');
@@ -207,7 +225,7 @@ function createDirectoryContents(targetDirectory: string, projectTemplatePath: s
             fs.mkdirSync(path.join(targetDirectory, projectName, file));
 
             // recursive call
-            createDirectoryContents(targetDirectory, path.join(projectTemplatePath, file), path.join(projectName, file), config, author);
+            createDirectoryContents(targetDirectory, path.join(projectTemplatePath, file), path.join(projectName, file), config, author, params);
         }
     });
 }

package/templates/db-schema/001_Schema.sql

@@ -0,0 +1 @@
+CREATE DATABASE IF NOT EXISTS <%= masterDbName %> DEFAULT CHARACTER SET utf8;

package/templates/db-schema/910_DB_Grant_User.sql.example

@@ -0,0 +1,9 @@
+DROP USER IF EXISTS 'app_service'@'%';
+
+CREATE USER 'app_service'@'%' IDENTIFIED BY 'Password123';
+
+-- Can grant table permission depend on usage
+GRANT USAGE ON *.* TO 'app_service'@'%';
+GRANT EXECUTE ON `sample_database`.* TO 'app_service'@'%';
+GRANT SELECT, UPDATE ON `sample_database`.`table1` TO 'app_service'@'%';
+GRANT SELECT, INSERT, UPDATE ON `sample_database`.`table2` TO 'app_service'@'%';

package/templates/db-schema/990_SAMPLE_Init_Data.sql.example

@@ -0,0 +1,27 @@
+
+DELIMITER $$ 
+DROP PROCEDURE IF EXISTS `<%= masterDbName %>`.`sp_pipeline` $$ 
+CREATE PROCEDURE `<%= masterDbName %>`.`sp_pipeline` () SQL SECURITY INVOKER 
+BEGIN
+
+    SELECT 'USE sample_database;';
+
+    SELECT '\nTRUNCATE TABLE sample_database.user;';
+	IF EXISTS (SELECT 1 FROM sample_database.user) THEN
+        SELECT 'INSERT INTO sample_database.user (id, name, cdate) VALUES';
+        SELECT CONCAT(''
+            , '(', CASE WHEN id IS NULL THEN 'NULL' ELSE id END
+            , ', ', CASE WHEN name IS NULL THEN 'NULL' ELSE CONCAT('''', name, '''') END
+            , ', UTC_TIMESTAMP'
+            , CASE WHEN (SELECT MAX(id) FROM sample_database.user) = id THEN ');' ELSE '),' END
+            )
+        FROM sample_database.user
+        ORDER BY id;
+    END IF;
+
+END $$
+
+CALL `<%= masterDbName %>`.`sp_pipeline`();  
+
+DROP PROCEDURE IF EXISTS `<%= masterDbName %>`.`sp_pipeline` $$ 
+DELIMITER ;

package/templates/db-schema/DEV_MODE.txt

@@ -0,0 +1 @@
+

package/templates/db-schema/Dockerfile

@@ -0,0 +1,3 @@
+FROM registry-intl.cn-hongkong.aliyuncs.com/gkci/node:10.20.0-alpine-ci
+WORKDIR /sql/
+ADD . .

package/templates/db-schema/GET_VERSION.sql

@@ -0,0 +1,47 @@
+CREATE DATABASE IF NOT EXISTS `<%= masterDbName %>` DEFAULT CHARACTER SET utf8;
+USE `<%= masterDbName %>`;
+
+CREATE TABLE IF NOT EXISTS `release_version` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `patch_id` varchar(30) NOT NULL COMMENT 'Tag ID in gitlab',
+  `release_desc` varchar(100) NOT NULL COMMENT 'release description',
+  `patch_start_date` datetime DEFAULT NULL,
+  `patch_end_date` datetime DEFAULT NULL,
+  `rollback_date` varchar(500) DEFAULT NULL COMMENT 'System Notes',
+  `rollback` tinyint(3) unsigned DEFAULT '0' COMMENT '0:No Rollback, 1:Rollback',
+  `status` tinyint(3) unsigned DEFAULT '0' COMMENT '0-Pending, 1-Successful, 4-Failed, 3-InProgress',
+  `cby` varchar(50) DEFAULT 'SYS',
+  `cdate` datetime NOT NULL,
+  `mby` varchar(50) DEFAULT NULL,
+  `mdate` datetime DEFAULT NULL,
+  `remarks` varchar(200) DEFAULT NULL COMMENT 'patching remarks',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `patch_id_UNIQUE` (`patch_id` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='For database object patching purposes';
+
+DELIMITER $$
+DROP PROCEDURE IF EXISTS `sp_get_version`$$
+CREATE PROCEDURE `sp_get_version`(
+	IN p_target_version varchar(30)
+)
+SQL SECURITY INVOKER
+BEGIN
+    DECLARE latest varchar(30);
+
+    SELECT patch_id INTO latest
+    FROM release_version
+    ORDER BY cdate DESC LIMIT 1;
+
+    IF latest IS NOT NULL THEN
+        IF latest != p_target_version THEN
+            IF EXISTS(SELECT 1 FROM release_version WHERE patch_id = p_target_version) THEN
+                SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Duplicated target version';
+            END IF;
+        END IF;
+    END IF;
+
+    SELECT IFNULL(latest, '') AS `version`;
+END$$
+DELIMITER ;
+
+CALL sp_get_version('{{VERSION}}');