Merge branch 'master' into gh-2207

packages/cli/src/__tests__/suite/scaffold.ts

@@ -68,7 +68,6 @@ export const scaffoldSuite = [
           type: 'input',
           name: 'helmPath',
           message: 'Enter the path for Helm chart:',
-          default: '',
         },
         output: 'helm test path',
       },
@@ -136,7 +135,6 @@ export const scaffoldSuite = [
           type: 'input',
           name: 'helmPath',
           message: 'Enter the path for Helm chart:',
-          default: '',
         },
         output: 'helm test path',
       },
@@ -204,7 +202,6 @@ export const scaffoldSuite = [
           type: 'input',
           name: 'helmPath',
           message: 'Enter the path for Helm chart:',
-          default: '',
         },
         output: 'helm test path',
       },
@@ -263,7 +260,6 @@ export const scaffoldSuite = [
           type: 'input',
           name: 'helmPath',
           message: 'Enter the path for Helm chart:',
-          default: '',
         },
         output: 'helm test path',
       },
@@ -323,7 +319,6 @@ export const scaffoldSuite = [
           type: 'input',
           name: 'helmPath',
           message: 'Enter the path for Helm chart:',
-          default: '',
         },
         output: 'helm test path',
       },
@@ -390,7 +385,6 @@ export const scaffoldSuite = [
           type: 'input',
           name: 'helmPath',
           message: 'Enter the path for Helm chart:',
-          default: '',
         },
         output: 'helm test path',
       },
@@ -424,7 +418,6 @@ export const scaffoldSuite = [
           type: 'input',
           name: 'helmPath',
           message: 'Enter the path for Helm chart:',
-          default: '',
         },
         output: 'helm test path',
       },

packages/cli/src/command-base.ts

@@ -92,17 +92,6 @@ export default abstract class CommandBase<T extends object> extends Command {
         }
       }
     }
-    if (options['jenkinsfile']) {
-
-      const helmPathPrompt: Question = {
-        type: 'input',
-        name: 'helmPath',
-        message: 'Enter the path for Helm chart:',
-        default: '',
-      };
-      const helmPathAnswer = await this.prompt([helmPathPrompt]);
-      options['helmPath'] = helmPathAnswer['helmPath'];
-    }
   }
 
   private createPromptObject<S>(flag: IFlag<S>) {

packages/cli/src/commands/scaffold.ts

@@ -43,6 +43,11 @@ export class Scaffold extends Base<ScaffoldOptions> {
         'Do you want to create a Jenkinsfile for Helm-based deployment on Kubernetes?',
       required: false,
     }),
+    helmPath: flags.string({
+      name: 'helmPath',
+      description: 'Enter the path for Helm chart:',
+      dependsOn: ['jenkinsfile'],
+    }),
   };
   static readonly args = [
     {name: 'name', description: 'name of the project', required: false},

packages/cli/src/generators/microservice/templates/.dockerignore

@@ -3,3 +3,4 @@ npm-debug.log
 /dist
 # Cache used by TypeScript's incremental build
 *.tsbuildinfo
+mochawesome-report

packages/cli/src/generators/microservice/templates/.eslintignore

@@ -0,0 +1,5 @@
+node_modules/
+dist/
+coverage/
+.eslintrc.js
+mochawesome-report

packages/cli/src/generators/microservice/templates/.mocharc.json

@@ -0,0 +1,6 @@
+{
+  "exit": true,
+  "recursive": true,
+  "require": "source-map-support/register",
+  "reporter": "mochawesome"
+}

packages/cli/src/generators/microservice/templates/.prettierignore

@@ -1,3 +1,5 @@
 dist
 *.json
-coverage
+coverage
+mochawesome-report
+node_modules/

packages/cli/src/generators/microservice/templates/.vscode/launch.json

@@ -0,0 +1,38 @@
+{
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Program",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "program": "${workspaceFolder}/dist/index.js",
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Run Mocha tests",
+      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "runtimeArgs": [
+        "-r",
+        "${workspaceRoot}/node_modules/source-map-support/register"
+      ],
+      "cwd": "${workspaceRoot}",
+      "autoAttachChildProcesses": true,
+      "args": [
+        "--config",
+        "${workspaceRoot}/.mocharc.json",
+        "${workspaceRoot}/dist/__tests__/**/*.js",
+        "-t",
+        "0"
+      ]
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach to Process",
+      "port": 5858
+    }
+  ]
+}

packages/cli/src/generators/microservice/templates/.vscode/settings.json

@@ -0,0 +1,29 @@
+{
+  "editor.rulers": [80],
+  "editor.tabCompletion": "on",
+  "editor.tabSize": 2,
+  "editor.trimAutoWhitespace": true,
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "explicit",
+    "source.fixAll.eslint": "explicit"
+  },
+
+  "files.exclude": {
+    "**/.DS_Store": true,
+    "**/.git": true,
+    "**/.hg": true,
+    "**/.svn": true,
+    "**/CVS": true,
+    "dist": true
+  },
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true,
+
+  "typescript.tsdk": "./node_modules/typescript/lib",
+  "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false,
+  "typescript.preferences.quoteStyle": "single",
+  "eslint.run": "onSave",
+  "eslint.nodePath": "./node_modules",
+  "eslint.validate": ["javascript", "typescript"]
+}

packages/cli/src/generators/microservice/templates/.vscode/tasks.json

@@ -0,0 +1,29 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Watch and Compile Project",
+      "type": "shell",
+      "command": "npm",
+      "args": ["--silent", "run", "build:watch"],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": "$tsc-watch"
+    },
+    {
+      "label": "Build, Test and Lint",
+      "type": "shell",
+      "command": "npm",
+      "args": ["--silent", "run", "test:dev"],
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "problemMatcher": ["$tsc", "$eslint-compact", "$eslint-stylish"]
+    }
+  ]
+}

packages/cli/src/generators/scaffold/templates/.github/workflows/main.yaml

@@ -25,4 +25,13 @@ jobs:
         run: npm run test --workspaces --if-present
 
       - name: Run Lint Checks
-        run: npm run lint --workspaces --if-present
+        run: npm run lint --workspaces --if-present
+
+      - name: lerna-coverage
+        run: "npx lerna run coverage --concurrency 2"
+
+      - name: coverage report
+        id: coverage
+        uses: akshatdubeysf/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

packages/cli/src/generators/scaffold/templates/.prettierrc.tpl

@@ -0,0 +1,7 @@
+{
+  "bracketSpacing": false,
+  "singleQuote": true,
+  "printWidth": 80,
+  "trailingComma": "all",
+  "arrowParens": "avoid"
+}