@hiiretail/gcp-infra-cli 0.96.2 → 0.98.0

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

@@ -4,6 +4,14 @@ terraform {
   source = "git::https://github.com/extenda/terraform-google-project-factory//modules/budget?ref=feat/CNP-25"
 }
 
+# Dependency on the email notification channel(s)
+dependency "notification_channel" {
+  config_path = "../monitoring/notification-channels/"
+  mock_outputs = {
+    notification_channels_email_ids = "notification-channel-dummy-ids"
+  }
+}
+
 # Include all settings from the root terragrunt.hcl file
 include {
   path = find_in_parent_folders("terragrunt_root.hcl")
@@ -20,13 +28,17 @@ locals {
 # - 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
+# If there is no dependency from the notification channels either create it by updating the notification
+# module to atleast 1.0.2 and add atleast one email notification channel.
+# Or if you already know the ID of an email notification channel use that, format would be
+# ["projects/{projectID}/notificationChannels/{ID}"]
 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 + (local.project_vars.locals.amount * <%- overheadPercentage %>))
-    monitoring_notification_channels = <%-JSON.stringify(monitoringNotificationChannels)%>
+    amount                           = floor(local.project_vars.locals.amount + (local.project_vars.locals.amount * <%- overheadPercentage %>))
+    monitoring_notification_channels = dependency.notification_channel.outputs.notification_channels_email_ids
     disable_default_iam_recipients   = true
     alert_spent_percents             = [0.8, 1.0, 1.2]
   }

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

@@ -20,7 +20,7 @@ module.exports = class extends BaseGenerator {
         store: true,
         default: (response) => {
           const defaultTypes = {
-            'postgres-clan': 'POSTGRES_15',
+            'postgres-clan': 'POSTGRES_16',
             mysql: 'MYSQL_5_7',
             mssql: 'SQLSERVER_2017_STANDARD',
           };
@@ -28,7 +28,7 @@ module.exports = class extends BaseGenerator {
         },
         choices: (response) => {
           const tierTypes = {
-            'postgres-clan': ['POSTGRES_13', 'POSTGRES_14', 'POSTGRES_15'],
+            'postgres-clan': ['POSTGRES_13', 'POSTGRES_14', 'POSTGRES_15', 'POSTGRES_16'],
             mysql: ['MYSQL_5_6', 'MYSQL_5_7'],
             mssql: ['SQLSERVER_2017_STANDARD', 'SQLSERVER_2017_ENTERPRISE', 'SQLSERVER_2017_EXPRESS', 'SQLSERVER_2017_WEB'],
           };

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

@@ -13,10 +13,17 @@ locals {
 
   region = "europe-west1"
 
+  #When selecting the number of CPUs and amount of memory, there are some restrictions on the configuration you choose:
+  #vCPUs must be either 1 or an even number between 2 and 96.
+  #Memory must be:
+  #0.9 to 6.5 GB per vCPU
+  #A multiple of 256 MB
+  #At least 3.75 GB (3840 MB)
+  #Example of custom tiers covered by SLA: db-custom-1-3840, db-custom-2-7680
   #Memory size, in GiB | Maximum concurrent connections
   #--------------------+-------------------------------
-  #0.6 (db-f1-micro)   | 25
-  #1.7 (db-g1-small)   | 50
+  #0.6 (db-f1-micro)   | 25     (shared tier, not covered by SLA)
+  #1.7 (db-g1-small)   | 50     (shared tier, not covered by SLA)
   #3.75 up to 6        | 100
   #6 up to 7.5         | 150
   #7.5 up to 15        | 200
@@ -36,6 +43,22 @@ locals {
   #Default: "ZONAL"
   # availability_type = "REGIONAL"
 
+  #Description: The day of week (1-7) for the Cloud SQL instance maintenance.
+  #Type: Integer
+  #Default: 1
+  # maintenance_window_day = 2
+
+  #Description: The hour of day (0-23) maintenance window for the Cloud SQL instance maintenance.
+  #Type: Integer
+  #Default: 23
+  # maintenance_window_hour = 1
+
+  #Description: The update track of maintenance window for the Cloud SQL instance maintenance.Can be either `canary` or `stable`.
+  #Canary will get the maintenance update Week 1 and stable Week 2
+  #Type: String
+  #Default: "canary"
+  maintenance_window_update_track = "stable"
+
   #Description: Enables protection of an Cloud SQL instance from accidental deletion across all surfaces (API, gcloud, Cloud Console and Terraform).
   #Type: bool
   #Default: false
@@ -75,4 +98,5 @@ locals {
     location                       = "europe-west1"
     point_in_time_recovery_enabled = true
   }
+
 }

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

@@ -29,7 +29,7 @@ inputs = merge(
       "authorized_networks" : [],
       "ipv4_enabled" : true,
       "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
+      "ssl_mode" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
     user_labels = local.labels,
   }

package/package.json

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