@hiiretail/gcp-infra-cli 0.65.2 → 0.65.6

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/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/resources/cloudsql/index.js

@@ -46,8 +46,8 @@ module.exports = class extends BaseGenerator {
         type: 'list',
         name: 'enableBackups',
         message: 'Enable Databases backup?',
-        default: true,
-        choices: [true, false],
+        default: 'true',
+        choices: ['true', 'false'],
       },
     ];
 

package/generators/resources/scheduler/templates/scheduler/terragrunt.hcl

@@ -1,7 +1,7 @@
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-scheduler//?ref=v0.1.1"
+  source = "git::https://github.com/extenda/tf-module-gcp-scheduler//?ref=v0.1.3"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -34,7 +34,7 @@ inputs = merge(
           job_schedule    = "<%-schedule%>"
           <% if (target == 'http') { %>
           uri         = "<%-uri%>"
-          http_method = "<%-httpMethod%>";
+          http_method = "<%-httpMethod%>"
           <% } else { %>
           pubsub_topic_name = "projects/${local.project_vars.locals.project_id}/topics/${dependency.topic.outputs.topic}"
           data              = "${base64encode("<%-data%>")}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-cli",
-  "version": "0.65.2",
+  "version": "0.65.6",
   "description": "Infrastructure as code generator for GCP.",
   "main": "src/cli.js",
   "bin": {