@hiiretail/gcp-infra-cli 0.64.1 → 0.65.3

package/generators/init/clan-infra/index.js

@@ -46,8 +46,7 @@ module.exports = class extends BaseGenerator {
       {
         type: 'input',
         name: 'foldersToSync',
-        message: 'Provide the name of docs subfolders that you want to sync to the Developer Portal (comma-seperated)',
-        validate: required,
+        message: 'Provide the name of docs subfolders that you want to sync to the Developer Portal (comma-seperated). Leave empty to add it later.',
       },
       {
         type: 'list',
@@ -56,6 +55,12 @@ module.exports = class extends BaseGenerator {
         default: 'false',
         choices: ['true', 'false'],
       },
+      {
+        type: 'input',
+        name: 'serviceName',
+        message: 'Provide the name of your service',
+        validate: required,
+      },
     ];
 
     return this.prompt(prompts).then((props) => {
@@ -64,7 +69,12 @@ module.exports = class extends BaseGenerator {
   }
 
   writing() {
-    const { clan, tribe, group } = this.answers;
+    const {
+      clan,
+      tribe,
+      group,
+      serviceName,
+    } = this.answers;
     const groups = group.startsWith('@') ? group : `@extenda/${group}`;
     const [tribeProd, tribeStaging] = getGcpProjects(this, tribe);
     const [clanProd, clanStaging] = getGcpProjects(this, clan);
@@ -118,7 +128,12 @@ module.exports = class extends BaseGenerator {
       });
     this.copyDir(
       'release-notes',
-      this.destinationPath('docs/release-notes'),
+      this.destinationPath(`docs/${serviceName}/release-notes`),
+      this.answers,
+    );
+    this.copyDir(
+      'release-notes-schema',
+      this.destinationPath('docs/'),
       this.answers,
     );
     this.fs.copy(

package/generators/init/clan-infra/templates/env/secrets/terragrunt.hcl

@@ -19,7 +19,7 @@ include {
 inputs = merge(
   {
    secrets = merge(yamldecode(file("${get_terragrunt_dir()}/secrets.yaml")).secrets,
-   { "clan_slack_channel" = local.common_vars.locals.clan_slack_channels[0] })
+   { "clan_slack_channel" = local.common_vars.locals.clan_slack_channels[0].name })
    project_id = local.project_vars.locals.project_id
    labels = {
       terraform = ""

package/generators/init/clan-infra/templates/github/workflows/release-notes.yml

@@ -1,7 +1,10 @@
 name: Release Notes
-on: pull_request
+on:
   pull_request:
-    paths: docs/release-notes/**
+    paths:
+    - 'docs/**/release-notes/*.yaml'
+    - 'docs/release-notes.schema.json'
+    - '.github/workflows/release-notes.yaml'
 
 jobs:
   yamllint:
@@ -15,17 +18,16 @@ jobs:
         run: sudo pip install yamllint
 
       - name: YAML lint
-        run: yamllint docs/release-notes/
+        run: |
+          for f in docs/**/release-notes/*.yaml; do
+            yamllint docs/release-notes.schema.json -d "$f"
+          done
 
       - name: Install pajv
         run: sudo npm install -g pajv
 
       - name: Validate YAML schema
         run: |
-          for f in docs/release-notes/*.yaml; do
-            pajv -s docs/release-notes/release-notes.schema.json -d "$f"
+          for f in docs/**/release-notes/*.yaml; do
+            pajv -s docs/release-notes.schema.json -d "$f"
           done
-
-
-      # TODO:
-      # - name: Publish

package/generators/maintenance/manage-states/index.js

@@ -8,7 +8,6 @@ const Separator = require('enquirer-separator');
 const { Storage } = require('@google-cloud/storage');
 const BaseGenerator = require('../../../src/BaseGenerator');
 
-
 const getBucketName = (answers) => {
   const dirName = path.basename(process.cwd());
   let bucketName = '';
@@ -22,7 +21,6 @@ const getBucketName = (answers) => {
   return bucketName;
 };
 
-
 const downloadStateFiles = (files, dest) => {
   files.forEach((file) => {
     const destFile = path.join(dest, file.name);
@@ -35,7 +33,6 @@ const downloadStateFiles = (files, dest) => {
   });
 };
 
-
 module.exports = class extends BaseGenerator {
   prompting() {
     const prompts = [

package/generators/resources/cloudsql/index.js

@@ -56,7 +56,6 @@ module.exports = class extends BaseGenerator {
     });
   }
 
-
   writing() {
     const {
       instanceType,
@@ -95,7 +94,6 @@ module.exports = class extends BaseGenerator {
     });
   }
 
-
   end() {
     const {
       instanceType,

package/generators/resources/cloudsql-database/index.js

@@ -26,7 +26,6 @@ module.exports = class extends SecretsGenerator {
     });
   }
 
-
   writing() {
     const {
       instanceType,
@@ -50,7 +49,6 @@ module.exports = class extends SecretsGenerator {
     this.writeSecrets('cloud-sql', 'databases', instanceType, dbName);
   }
 
-
   end() {
     const {
       instanceType,

package/generators/resources/pubsub/append.js

@@ -25,7 +25,6 @@ const appendIncludePull = async (fileContent, originalContentYaml, subscriptionF
 
   const newPullArray = [];
 
-
   newPullArray.push(
     {
       name: `${input.existingTopic}+${input.subscriberName}`,
@@ -61,7 +60,6 @@ const appendNotIncludePush = async (inputs, subscriptionFilePath) => {
   fs.appendFileSync(subscriptionFilePath, `push_subscriptions:\n${yamlPushArray}`);
 };
 
-
 const appendIncludePush = async (fileContent, originalContentYaml, subscriptionFilePath, input) => {
   if (fileContent.includes('push_subscriptions')) {
     const pushArray = Object.values(originalContentYaml.push_subscriptions);
@@ -90,7 +88,6 @@ const appendIncludePush = async (fileContent, originalContentYaml, subscriptionF
   }
 };
 
-
 module.exports = {
   appendNotIncludePull,
   appendIncludePull,

package/generators/resources/pubsub/get-gcp-projects.js

@@ -22,7 +22,6 @@ const getProjectId = (env) => {
   return projectId;
 };
 
-
 const getProdPushEndopint = (pushEndpoint) => {
   let prodPushEndopint = '';
   prodPushEndopint = pushEndpoint.replace('.dev', '.com');

package/generators/resources/pubsub/index.js

@@ -7,6 +7,7 @@ const {
   validSystemName,
   validVersion,
   validSubscriberName,
+  checkExistingTopicPath,
 } = require('./validate');
 const handleSubscribers = require('./handle-subscribers');
 const { getProjectId, getProdPushEndopint } = require('./get-gcp-projects');
@@ -117,7 +118,7 @@ module.exports = class extends BaseGenerator {
         type: 'input',
         name: 'existingTopic',
         message: 'Please provide the name of the existing topic you want to subscribe to',
-        validate: required,
+        validate: (input) => required(input) && checkExistingTopicPath(input),
       },
       {
         when: (response) => response.createResource === 'subscription' && response.pushOrPull === 'push',

package/generators/resources/pubsub/validate.js

@@ -1,3 +1,6 @@
+const fs = require('fs');
+const path = require('path');
+
 const validSystemName = (input) => {
   if (input.replace(/\s/g, '').length === 3) {
     return true;
@@ -24,9 +27,18 @@ const validSubscriberName = (input) => {
   return 'Not supported input for subscriber name';
 };
 
+const checkExistingTopicPath = (input) => {
+  const topicDirPath = path.join(process.cwd(), 'infra', 'staging', 'pubsub', input);
+
+  if (fs.existsSync(topicDirPath)) {
+    return true;
+  }
+  return 'Topic does not exist. Check the spelling';
+};
 
 module.exports = {
   validSystemName,
   validVersion,
   validSubscriberName,
+  checkExistingTopicPath,
 };

package/generators/resources/scheduler/index.js

@@ -72,7 +72,6 @@ module.exports = class extends BaseGenerator {
     });
   }
 
-
   writing() {
     ['prod', 'staging'].forEach((env) => {
       this.copyDir(
@@ -86,7 +85,6 @@ module.exports = class extends BaseGenerator {
     });
   }
 
-
   end() {
     this.log(`
 ${chalk.green('Your job resources have now been created. Please add any other specifications supported by the module if needed')}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-cli",
-  "version": "0.64.1",
+  "version": "0.65.3",
   "description": "Infrastructure as code generator for GCP.",
   "main": "src/cli.js",
   "bin": {
@@ -35,13 +35,13 @@
     "commander": "^5.1.0",
     "enquirer-separator": "^0.1.0",
     "glob": "^7.1.6",
-    "inquirer": "^7.0.1",
+    "inquirer": "^7.3.3",
     "js-yaml": "^4.1.0",
     "npm-api": "^1.0.0",
     "semver": "^7.3.2",
     "sprintf-js": "^1.1.2",
-    "yeoman-environment": "^2.6.0",
-    "yeoman-generator": "^4.2.0"
+    "yeoman-environment": "^2.10.3",
+    "yeoman-generator": "^4.13.0"
   },
   "devDependencies": {
     "eslint": "^6.8.0",
@@ -51,7 +51,7 @@
     "jest-sonar": "^0.2.5",
     "mock-fs": "^4.12.0",
     "yeoman-assert": "^3.1.1",
-    "yeoman-test": "^2.0.0",
+    "yeoman-test": "^2.7.0",
     "sprintf-js": "^1.1.2"
   }
 }

package/CHANGELOG.md

@@ -1,95 +0,0 @@
-# Changelog
-
-### 2021-03-28
-  * Remove Pub/Sub cross-project resource according to Architecture Chapter decision.
-
-### 2021-03-03
-  * Add the generator for creating subscriptions which will subscribe to a topic in a diffrent project
-
-### 2021-03-01
-  * Add terraform state files maintenance utility generator
-
-### 2021-03-01
-  * New generator for solution review board (SRB) documentation, including utilities to
-    create ADRs and C4 diagrams from Structurizr DSL
-
-### 2021-02-02
-  * Add KMS support
-
-### 2020-12-23
-  * Release notes schema and validator
-
-### 2020-12-15
-  * Add more monitoring templates
-
-### 2020-12-11
-  * Add cloudsql into monitoring generator
-
-### 2020-12-11
-  * Add Generator for kafka connect pubsub source
-
-### 2020-11-27
-  * Add Kafka-connect generator
-
-### 2020-11-10
-  * Add elastic cloud generator
-
-### 2020-10-20
-  * Add Confluent cluster generator
-
-### 2020-10-20
-  * Add Kafka topics generator
-
-### 2020-10-13
-  * Add Cloud Storage creation feature
-
-### 2020-09-18
-  * Generator for update module versions
-
-### 2020-09-14
-  * Add generator for Hii Retail IAM
-
-### 2020-08-21
-  * Add Cloud Scheduler generator
-
-### 2020-08-12
-  * Generator for monitoring
-
-### 2020-06-24
-  * Add the firebase generator
-
-### 2020-06-15
-  * Memorystore secrets
-
-### 2020-06-09
-  * Tribe GKE Generator
-
-### 2020-06-09
-  * Add secrets handler
-
-### 2020-06-05
-  * Add organization generator
-
-### 2020-06-04
-  * Create a template for MySQL database
-
-### 2020-06-04
-  * CloudSQL MSSQL Template
-
-### 2020-06-04
-  * Create CloudSQL MySQL templates
-
-### 2020-06-03
-  * Pubsub generator
-
-### 2020-06-03
-  * Add PostgreSQL Database template
-
-### 2020-06-03
-  * Add CloudSQL Postgres Template
-
-### 2020-06-02
-  * Add memorystore generator templates
-
-### 2020-06-01
-  * Add init generator