@hiiretail/gcp-infra-generators 1.5.0 → 1.5.3

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

@@ -11,7 +11,7 @@ module.exports = class extends BaseGenerator {
         message: 'Select Cloud SQL database instance type',
         store: true,
         default: 'postgres-clan',
-        choices: ['postgres-clan', 'mysql', 'mssql'],
+        choices: ['postgres-clan', 'alloydb', 'mysql', 'mssql'],
       },
       {
         type: 'list',
@@ -21,6 +21,7 @@ module.exports = class extends BaseGenerator {
         default: (response) => {
           const defaultTypes = {
             'postgres-clan': 'POSTGRES_17',
+            alloydb: 'POSTGRES_17',
             mysql: 'MYSQL_8_0',
             mssql: 'SQLSERVER_2022_STANDARD',
           };
@@ -29,6 +30,7 @@ module.exports = class extends BaseGenerator {
         choices: (response) => {
           const tierTypes = {
             'postgres-clan': ['POSTGRES_15', 'POSTGRES_16', 'POSTGRES_17'],
+            alloydb: ['POSTGRES_17'],
             mysql: ['MYSQL_5_7', 'MYSQL_8_0'],
             mssql: [
               'SQLSERVER_2019_STANDARD',
@@ -50,6 +52,7 @@ module.exports = class extends BaseGenerator {
         message: 'Enter the disk size for the instance, in GB',
         store: true,
         default: 10,
+        when: (answers) => answers.instanceType !== 'alloydb',
       },
       {
         type: 'list',

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

@@ -0,0 +1,61 @@
+locals {
+  ###################
+  # REQUIRED INPUTS #
+  ###################
+
+  database_version = "<%- instanceDatabaseVersion %>"
+
+  location             = "europe-west1"
+
+  # Description: Primary instance configuration for the AlloyDB cluster.
+  # Type: Map
+  #
+  # machine_type options:
+  #   - "n2-highmem-<machine_cpu_count>"        (N2, 3rd Gen Intel x86/Ice Lake)
+  #   - "c4a-highmem-<machine_cpu_count>-lssd"  (C4A, Google Axion ARM, best price/performance)
+  #   - "c4-highmem-<machine_cpu_count>-lssd"   (C4, 6th Gen Intel x86/Granite Rapids)
+  #
+  # machine_cpu_count must be one of [1, 2, 4, 8, 16, 32, 64, 96, 128] regardless of machine_type.
+  # Not all series support all values (e.g., C4(A) starts at 4 vCPUs). Ensure the combination is valid for the selected machine_type.
+  #
+  # If not specified, the default is "n2-highmem-2" (N2 series, 2 vCPUs).
+  primary_instance = {
+    instance_id       = "primary-instance"
+    machine_type      = "n2-highmem-2"
+    machine_cpu_count = 2
+  }
+
+  ###################
+  # OPTIONAL INPUTS #
+  ###################
+
+  #Description: Enables protection of an AlloyDB cluster from accidental deletion across all surfaces (API, gcloud, Cloud Console and Terraform).
+  #Type: bool
+  #Default: true
+  deletion_protection = true
+
+  #Description: Label configurations for the AlloyDB cluster.
+  #Type: Map
+  #Default: {}
+  #cluster_labels       = {
+  #  environment = "environment-name"
+  #}
+
+  #Description: Read pool instances for the AlloyDB cluster.
+  #Type: List
+  #Default: null
+  # read_pool_instance   = []
+
+  #Description: The automated backup policy configuration.
+  #Type: Map
+  #Default: null
+  automated_backup_policy = {
+    enabled       = <%- enableBackups %>
+    location      = "europe-west1"
+    backup_window = "1800s"
+    weekly_schedule = {
+      days_of_week = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"]
+      start_times  = ["2:00:00:00"]
+    }
+  }
+}

package/dist/generators/common-resources/cloudsql/templates/alloydb/instance/terragrunt.hcl

@@ -0,0 +1,31 @@
+# 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/terraform-google-alloy-db//?ref=v1.0.0"
+}
+
+# Include all settings from the root terragrunt.hcl file
+include {
+  path = find_in_parent_folders("terragrunt_root.hcl")
+}
+
+locals {
+  spec_vars    = read_terragrunt_config("${get_terragrunt_dir()}/spec.hcl")
+  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
+  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+  })
+}
+
+# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
+inputs = merge(
+  local.spec_vars.locals,
+  {
+    cluster_id        = "alloydb-cluster-${local.project_vars.locals.project_name}"
+    project_id        = local.project_vars.locals.project_id
+    network_self_link = "projects/${local.project_vars.locals.project_id}/global/networks/${local.project_vars.locals.clan_network}",
+  }
+)

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

@@ -0,0 +1,43 @@
+# 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-secret-manager//?ref=v0.1.2"
+}
+
+include {
+  path = find_in_parent_folders("terragrunt_root.hcl")
+}
+
+locals {
+  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
+  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+    terraform    = ""
+  })
+}
+
+dependency "instance" {
+  config_path = "../instance"
+  mock_outputs = {
+    generated_user_password   = "dummy-password"
+  }
+}
+
+# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
+inputs = merge(
+  {
+    project_id = local.project_vars.locals.project_id
+    secrets = {
+      alloydb_primary_instance_id = dependency.instance.outputs.primary_instance_id
+      alloydb_primary_instance_ip = dependency.instance.outputs.primary_instance_ip
+      alloydb_master_password     = dependency.instance.outputs.generated_user_password
+    }
+    labels = {
+      terraform = ""
+      cc        = local.common_vars.locals.cost_center
+    }
+  }
+)

package/dist/generators/common-resources/confluent-cluster/index.js

@@ -6,6 +6,13 @@ const { required } = require('../../../src/validators');
 module.exports = class extends BaseGenerator {
   prompting() {
     const prompts = [
+      {
+        type: 'list',
+        name: 'clusterType',
+        message: 'What type of Confluent cluster do you want to create?',
+        choices: ['basic', 'standard', 'enterprise', 'dedicated'],
+        default: 'enterprise',
+      },
       {
         type: 'input',
         name: 'clusterName',
@@ -21,20 +28,24 @@ module.exports = class extends BaseGenerator {
   }
 
   writing() {
-    const { clusterName } = this.answers;
+    const { clusterName, clusterType } = this.answers;
+    const dirName = `confluent-${clusterType}`;
 
     ['prod', 'staging'].forEach((env) => {
-      this.copyDir('confluent', path.join('infra', env, 'confluent'), {
+      this.copyDir('confluent', path.join('infra', env, dirName), {
         ...this.answers,
         env,
         clusterName,
+        clusterType,
       });
     });
   }
 
   end() {
-    const specStageFile = path.join('infra', 'staging', 'confluent');
-    const specProdFile = path.join('infra', 'prod', 'confluent');
+    const { clusterType } = this.answers;
+    const dirName = `confluent-${clusterType}`;
+    const specStageFile = path.join('infra', 'staging', dirName);
+    const specProdFile = path.join('infra', 'prod', dirName);
     this.log(`
 ${chalk.green(`Your Confluent clusters have now been created. To finalize your configuration, please continue
 with manual editing of the generated files.`)}

package/dist/generators/common-resources/confluent-cluster/templates/confluent/spec.hcl

@@ -1,6 +1,6 @@
 locals {
   # Required: The type of Kafka cluster. Accepted values: basic, standard, enterprise, dedicated
-  cluster_type = "enterprise"
+  cluster_type = "<%-clusterType%>"
 
   # Optional variables with defaults shown
   region       = "europe-west1"

package/dist/node_modules/.package-lock.json

@@ -11522,7 +11522,7 @@
     },
     "packages/generators": {
       "name": "@hiiretail/gcp-infra-generators",
-      "version": "1.5.0",
+      "version": "1.5.3",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/storage": "^7.18.0",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-generators",
-  "version": "1.5.0",
+  "version": "1.5.3",
   "description": "Infrastructure as code generator for GCP.",
   "scripts": {
     "build": "node esbuild.js && npm run build:deps",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-generators",
-  "version": "1.5.0",
+  "version": "1.5.3",
   "description": "Infrastructure as code generator for GCP.",
   "scripts": {
     "build": "node esbuild.js && npm run build:deps",