@hiiretail/gcp-infra-cli 0.95.0 → 0.95.2

package/generators/common-resources/budget/index.js

@@ -10,6 +10,25 @@ module.exports = class extends BaseGenerator {
         name: 'monitoringNotificationChannels',
         message: 'Enter a comma-separated list of monitoring notification channels (format: projects/{project_id}/notificationChannels/{channel_id}). At least one email address must be included. Up to 5 channels are permitted.',
       },
+      {
+        type: 'list',
+        name: 'usingGKE',
+        message: 'Is the clan using GKE?',
+        default: 'false',
+        choices: ['true', 'false'],
+      },
+      {
+        type: 'input',
+        name: 'expectedServiceCount',
+        message: 'How many services will eventually be in use simultanously?',
+      },
+      {
+        type: 'list',
+        name: 'usingInternalTraffic',
+        message: 'Is the clan using internal traffic (service to service communication)?',
+        default: 'true',
+        choices: ['true', 'false'],
+      },
     ];
     return this.prompt(prompts).then((props) => {
       this.answers = props;
@@ -18,6 +37,40 @@ module.exports = class extends BaseGenerator {
 
   writing() {
     const channelsArray = this.answers.monitoringNotificationChannels ? this.answers.monitoringNotificationChannels.split(',').map((channel) => channel.trim()) : [];
+    let overheadPercentage = 0.01;
+    if (this.answers.usingInternalTraffic === 'false'
+      && this.answers.usingGKE === 'false'
+      && this.answers.expectedServiceCount < 8) {
+      overheadPercentage = 0.01;
+    } else if (this.answers.usingInternalTraffic === 'true'
+      && this.answers.usingGKE === 'false'
+      && this.answers.expectedServiceCount < 8) {
+      overheadPercentage = 0.03;
+    } else if (this.answers.usingInternalTraffic === 'true'
+      && this.answers.usingGKE === 'false'
+      && this.answers.expectedServiceCount > 8) {
+      overheadPercentage = 0.04;
+    } else if (this.answers.usingInternalTraffic === 'true'
+      && this.answers.usingGKE === 'true'
+      && this.answers.expectedServiceCount < 8) {
+      overheadPercentage = 0.04;
+    } else if (this.answers.usingInternalTraffic === 'true'
+      && this.answers.usingGKE === 'true'
+      && this.answers.expectedServiceCount > 8) {
+      overheadPercentage = 0.05;
+    } else if (this.answers.usingInternalTraffic === 'false'
+      && this.answers.usingGKE === 'false'
+      && this.answers.expectedServiceCount > 8) {
+      overheadPercentage = 0.03;
+    } else if (this.answers.usingInternalTraffic === 'false'
+      && this.answers.usingGKE === 'true'
+      && this.answers.expectedServiceCount < 8) {
+      overheadPercentage = 0.03;
+    } else if (this.answers.usingInternalTraffic === 'false'
+      && this.answers.usingGKE === 'true'
+      && this.answers.expectedServiceCount > 8) {
+      overheadPercentage = 0.04;
+    }
 
     ['prod', 'staging'].forEach((env) => {
       this.copyDir(
@@ -27,6 +80,7 @@ module.exports = class extends BaseGenerator {
           ...this.answers,
           env,
           monitoringNotificationChannels: channelsArray,
+          overheadPercentage,
         },
       );
     });

package/generators/common-resources/budget/templates/budget/terragrunt.hcl

@@ -15,12 +15,17 @@ locals {
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
+# The amount has a percentage added if one or more of the following is true:
+# - Clan makes use of GKE
+# - Clan makes use of more than 10 services
+# - Clan makes use of service to service communication (internal traffic)
+# where combinations make steps of 3%, 4% or 5% or 1% if none applies
 inputs = merge(
   {
     projects                         = [local.project_vars.locals.project_id]
     display_name                     = "${local.project_vars.locals.project_name}-budget"
     billing_account                  = "01580F-3DD16A-C066A5"
-    amount                           = local.project_vars.locals.amount
+    amount                           = (local.project_vars.locals.amount + (local.project_vars.locals.amount * <%- overheadPercentage %>))
     monitoring_notification_channels = <%-JSON.stringify(monitoringNotificationChannels)%>
     disable_default_iam_recipients   = true
     alert_spent_percents             = [0.8, 1.0, 1.2]

package/generators/common-resources/cloudsql/templates/postgres/instance/spec.hcl

@@ -36,6 +36,11 @@ locals {
   #Default: "ZONAL"
   # availability_type = "REGIONAL"
 
+  #Description: Enables protection of an Cloud SQL instance from accidental deletion across all surfaces (API, gcloud, Cloud Console and Terraform).
+  #Type: bool
+  #Default: false
+  deletion_protection_enabled = true
+
   #Description: The backup_configuration settings subblock for the database setings
   #Type: object({ binary_log_enabled = bool enabled = bool start_time = string })
   #Default: { "binary_log_enabled": null, "enabled": false, "start_time": null }

package/generators/common-resources/cloudsql/templates/postgres/instance/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/terraform-google-modules/terraform-google-sql-db//modules/postgresql?ref=v5.0.0"
+  source = "git::https://github.com/terraform-google-modules/terraform-google-sql-db//modules/postgresql?ref=v20.1.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -31,8 +31,6 @@ inputs = merge(
       "private_network" : "https://www.googleapis.com/compute/v1/projects/${local.project_vars.locals.project_id}/global/networks/${local.project_vars.locals.clan_network}",
       "require_ssl" : false
     }
-    ## Uncomment and apply it before destroy in case of necessary to delete the instance
-    # deletion_protection = false
     user_labels = local.labels,
   }
 )

package/generators/common-resources/cloudsql/templates/postgres/instance-secrets/terragrunt.hcl

@@ -22,8 +22,10 @@ locals {
 dependency "instance" {
   config_path = "../instance"
   mock_outputs = {
-    private_ip_address      = "dummy-ip"
-    generated_user_password = "dummy-password"
+    instance_connection_name  = "dummy-connection-name"
+    generated_user_password   = "dummy-password"
+    public_ip_address         = "dummy-ip"
+    private_ip_address        = "dummy-ip"
   }
 }
 
@@ -32,8 +34,10 @@ inputs = merge(
   {
     project_id = local.project_vars.locals.project_id
     secrets = {
-      postgresql_master_password = dependency.instance.outputs.generated_user_password
-      postgresql_private_address = dependency.instance.outputs.private_ip_address
+      postgresql_instance_connection_name = dependency.instance.outputs.instance_connection_name
+      postgresql_master_password          = dependency.instance.outputs.generated_user_password
+      postgresql_public_address           = dependency.instance.outputs.public_ip_address
+      postgresql_address                  = dependency.instance.outputs.private_ip_address
     }
     labels = local.labels,
   }

package/package.json

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