Merge branch 'main' into feat/add-maintenance-version

terraform-google-modules · Jan 23, 2025 · 4d0e557 · 4d0e557
2 parents b7ea3f6 + 1f96fcc
commit 4d0e557
Show file tree

Hide file tree

Showing 29 changed files with 99 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [25.0.2](https://github.com/terraform-google-modules/terraform-google-sql-db/compare/v25.0.1...v25.0.2) (2025-01-16)
+
+
+### Bug Fixes
+
+* to avoid password reset for existing additional users for MySQL module ([#692](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/692)) ([3352a8b](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/3352a8bdb2a2f0e6d60153a78bd86ef8d98faf45))
+
 ## [25.0.1](https://github.com/terraform-google-modules/terraform-google-sql-db/compare/v25.0.0...v25.0.1) (2025-01-04)
 
 

diff --git a/examples/mssql-failover-replica/main.tf b/examples/mssql-failover-replica/main.tf
@@ -24,7 +24,7 @@ locals {
 
 module "mssql1" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   region = local.region_1
 
@@ -56,7 +56,7 @@ module "mssql1" {
 
 module "mssql2" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   master_instance_name = module.mssql1.instance_name
 

diff --git a/examples/mssql-public/main.tf b/examples/mssql-public/main.tf
@@ -16,7 +16,7 @@
 
 module "mssql" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.name
   random_instance_name = true

diff --git a/examples/mysql-backup-create-service-account/main.tf b/examples/mysql-backup-create-service-account/main.tf
@@ -16,7 +16,7 @@
 
 module "mysql" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = "example-mysql-public"
   database_version     = "MYSQL_8_0"
@@ -45,7 +45,7 @@ resource "google_storage_bucket" "backup" {
 
 module "backup" {
   source  = "terraform-google-modules/sql-db/google//modules/backup"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   region                = "us-central1"
   project_id            = var.project_id

diff --git a/examples/mysql-ha/main.tf b/examples/mysql-ha/main.tf
@@ -33,7 +33,7 @@ locals {
 
 module "mysql" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.mysql_ha_name
   random_instance_name = true

diff --git a/examples/mysql-private/main.tf b/examples/mysql-private/main.tf
@@ -39,7 +39,7 @@ module "network-safer-mysql-simple" {
 
 module "private-service-access" {
   source  = "terraform-google-modules/sql-db/google//modules/private_service_access"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   project_id      = var.project_id
   vpc_network     = module.network-safer-mysql-simple.network_name
@@ -48,7 +48,7 @@ module "private-service-access" {
 
 module "safer-mysql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/safer_mysql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
 
   name                 = var.db_name

diff --git a/examples/mysql-psc/main.tf b/examples/mysql-psc/main.tf
@@ -27,7 +27,7 @@ locals {
 
 module "mysql" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.mysql_ha_name
   random_instance_name = true

diff --git a/examples/mysql-public/main.tf b/examples/mysql-public/main.tf
@@ -20,7 +20,7 @@ resource "random_id" "name" {
 
 module "mysql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.db_name
   random_instance_name = true

diff --git a/examples/postgresql-backup-provided-service-account/main.tf b/examples/postgresql-backup-provided-service-account/main.tf
@@ -16,7 +16,7 @@
 
 module "postgresql" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = "example-postgres"
   random_instance_name = true
@@ -56,7 +56,7 @@ resource "google_monitoring_notification_channel" "email" {
 
 module "backup" {
   source  = "terraform-google-modules/sql-db/google//modules/backup"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   region                      = "us-central1"
   project_id                  = var.project_id

diff --git a/examples/postgresql-ha/main.tf b/examples/postgresql-ha/main.tf
@@ -32,7 +32,7 @@ locals {
 
 module "pg" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.pg_ha_name
   random_instance_name = true

diff --git a/examples/postgresql-psc/main.tf b/examples/postgresql-psc/main.tf
@@ -26,7 +26,7 @@ locals {
 
 module "pg" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.pg_psc_name
   random_instance_name = true

diff --git a/examples/postgresql-public-iam/main.tf b/examples/postgresql-public-iam/main.tf
@@ -17,7 +17,7 @@
 
 module "postgresql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.db_name
   random_instance_name = true

diff --git a/examples/postgresql-public/main.tf b/examples/postgresql-public/main.tf
@@ -17,7 +17,7 @@
 
 module "postgresql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   name                 = var.db_name
   random_instance_name = true

diff --git a/examples/postgresql-with-cross-region-failover/main.tf b/examples/postgresql-with-cross-region-failover/main.tf
@@ -46,7 +46,7 @@ data "google_compute_zones" "available_region2" {
 
 module "pg1" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
 
   name                 = var.pg_name_1
@@ -155,7 +155,7 @@ module "pg1" {
 
 module "pg2" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
 
   # Comment this parameter to promote instance 2 as primary instance.

diff --git a/examples/private_service_access/main.tf b/examples/private_service_access/main.tf
@@ -23,7 +23,7 @@ resource "google_compute_network" "default" {
 
 module "test_psa" {
   source  = "terraform-google-modules/sql-db/google//modules/private_service_access"
-  version = "~> 24.0"
+  version = "~> 25.0"
 
   project_id      = var.project_id
   vpc_network     = google_compute_network.default.name

diff --git a/modules/mssql/metadata.yaml b/modules/mssql/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
       sourceType: git
       dir: /modules/mssql
-    version: 25.0.1
+    version: 25.0.2
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"

diff --git a/modules/mssql/versions.tf b/modules/mssql/versions.tf
@@ -36,7 +36,7 @@ terraform {
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:mssql/v25.0.1"
+    module_name = "blueprints/terraform/terraform-google-sql-db:mssql/v25.0.2"
   }
 
 }
diff --git a/modules/mysql/metadata.display.yaml b/modules/mysql/metadata.display.yaml
@@ -89,6 +89,9 @@ spec:
               value: MYSQL_8_4
             - label: MYSQL_8_0
               value: MYSQL_8_0
+          altDefaults:
+            - type: ALTERNATE_TYPE_DC
+              value: MYSQL_8_0
         db_charset:
           name: db_charset
           title: Db Charset
@@ -105,24 +108,29 @@ spec:
         deletion_protection:
           name: deletion_protection
           title: Deletion Protection
+          altDefaults:
+            - type: ALTERNATE_TYPE_DC
+              value: false
         deletion_protection_enabled:
           name: deletion_protection_enabled
           title: Deletion Protection Enabled
           altDefaults:
             - type: ALTERNATE_TYPE_DC
-              value: true
+              value: false
         deny_maintenance_period:
           name: deny_maintenance_period
           title: Deny Maintenance Period
         disk_autoresize:
           name: disk_autoresize
           title: Disk Autoresize
+          level: 1
           altDefaults:
             - type: ALTERNATE_TYPE_DC
               value: true
         disk_autoresize_limit:
           name: disk_autoresize_limit
           title: Disk Autoresize Limit
+          level: 1
         disk_size:
           name: disk_size
           title: Disk Size
@@ -201,6 +209,7 @@ spec:
         pricing_plan:
           name: pricing_plan
           title: Pricing Plan
+          level: 1
         project_id:
           name: project_id
           title: Project Id
@@ -229,6 +238,7 @@ spec:
         root_password:
           name: root_password
           title: Root Password
+          level: 1
         secondary_zone:
           name: secondary_zone
           title: Secondary Zone
@@ -254,9 +264,12 @@ spec:
         user_name:
           name: user_name
           title: User Name
+          level: 1
         user_password:
           name: user_password
           title: User Password
+          level: 1
         zone:
           name: zone
           title: Zone
+          level: 1
diff --git a/modules/mysql/metadata.yaml b/modules/mysql/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
       sourceType: git
       dir: /modules/mysql
-    version: 25.0.1
+    version: 25.0.2
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"
@@ -101,17 +101,17 @@ spec:
         description: The name of the default user
         varType: string
         defaultValue: default
+      - name: user_password
+        description: The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable.
+        varType: string
+        defaultValue: ""
       - name: user_host
         description: The host for the default user
         varType: string
         defaultValue: "%"
       - name: root_password
         description: MySQL password for the root user.
         varType: string
-      - name: user_password
-        description: The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable.
-        varType: string
-        defaultValue: ""
       - name: deletion_protection
         description: Used to block Terraform from deleting a SQL Instance.
         varType: bool

diff --git a/modules/mysql/variables.tf b/modules/mysql/variables.tf
@@ -73,13 +73,18 @@ variable "enable_default_user" {
   default     = true
 }
 
-
 variable "user_name" {
   description = "The name of the default user"
   type        = string
   default     = "default"
 }
 
+variable "user_password" {
+  description = "The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable."
+  type        = string
+  default     = ""
+}
+
 variable "user_host" {
   description = "The host for the default user"
   type        = string
@@ -92,12 +97,6 @@ variable "root_password" {
   default     = null
 }
 
-variable "user_password" {
-  description = "The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable."
-  type        = string
-  default     = ""
-}
-
 variable "deletion_protection" {
   description = "Used to block Terraform from deleting a SQL Instance."
   type        = bool

diff --git a/modules/mysql/versions.tf b/modules/mysql/versions.tf
@@ -36,10 +36,10 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v25.0.1"
+    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v25.0.2"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v25.0.1"
+    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v25.0.2"
   }
 
 }