chore: Change description for tier in mysql and cloud sql (#724)

Co-authored-by: Imran Nayer <[email protected]>

Author: amrkk123

modules/mysql/README.md

@@ -98,7 +98,7 @@ module "mysql-db" {
 | replica\_database\_version | The read replica database version to use. This var should only be used during a database update. The update sequence 1. read-replica 2. master, setting this to an updated version will cause the replica to update, then you may update the master with the var database\_version and remove this field after update is complete | `string` | `""` | no |
 | root\_password | MySQL password for the root user. | `string` | `null` | no |
 | secondary\_zone | The preferred zone for the secondary/failover instance, it should be something like: `us-central1-a`, `us-east1-c`. | `string` | `null` | no |
-| tier | The tier for the master instance. | `string` | `"db-n1-standard-1"` | no |
+| tier | The tier for the master instance, for ADC its defualt value will be db-perf-optimized-N-8 which is tier value for edtion ENTERPRISE\_PLUS, if user wants to change the edition, he should chose compatible tier. | `string` | `"db-n1-standard-1"` | no |
 | update\_timeout | The optional timout that is applied to limit long database updates. | `string` | `"30m"` | no |
 | user\_deletion\_policy | The deletion policy for the user. Setting ABANDON allows the resource to be abandoned rather than deleted. This is useful for Postgres, where users cannot be deleted from the API if they have been granted SQL roles. Possible values are: "ABANDON". | `string` | `null` | no |
 | user\_host | The host for the default user | `string` | `"%"` | no |

modules/mysql/metadata.yaml

@@ -186,7 +186,7 @@ spec:
         description: Users can upgrade a read replica instance to a stand-alone Cloud SQL instance with the help of instance_type. To promote, users have to set the instance_type property as CLOUD_SQL_INSTANCE and remove/unset master_instance_name and replica_configuration from instance configuration. This operation might cause your instance to restart.
         varType: string
       - name: tier
-        description: The tier for the master instance.
+        description: The tier for the master instance, for ADC its defualt value will be db-perf-optimized-N-8 which is tier value for edtion ENTERPRISE_PLUS, if user wants to change the edition, he should chose compatible tier.
         varType: string
         defaultValue: db-n1-standard-1
       - name: zone
@@ -912,6 +912,7 @@ spec:
       - level: Project
         roles:
           - roles/cloudkms.admin
+          - roles/cloudkms.autokeyAdmin
           - roles/cloudkms.cryptoKeyEncrypterDecrypter
           - roles/cloudscheduler.admin
           - roles/cloudsql.admin

modules/mysql/variables.tf

@@ -178,7 +178,7 @@ variable "instance_type" {
 
 // Master
 variable "tier" {
-  description = "The tier for the master instance."
+  description = "The tier for the master instance, for ADC its defualt value will be db-perf-optimized-N-8 which is tier value for edtion ENTERPRISE_PLUS, if user wants to change the edition, he should chose compatible tier."
   type        = string
   default     = "db-n1-standard-1"
 }

modules/postgresql/README.md

@@ -169,7 +169,7 @@ module "pg" {
 | region | The region of the Cloud SQL resources | `string` | `"us-central1"` | no |
 | root\_password | Initial root password during creation | `string` | `null` | no |
 | secondary\_zone | The preferred zone for the replica instance, it should be something like: `us-central1-a`, `us-east1-c`. | `string` | `null` | no |
-| tier | The tier for the Cloud SQL instance. | `string` | `"db-f1-micro"` | no |
+| tier | The tier for the Cloud SQL instance, for ADC its defualt value will be db-perf-optimized-N-8 which is tier value for edtion ENTERPRISE\_PLUS, if user wants to change the edition, he should chose compatible tier. | `string` | `"db-f1-micro"` | no |
 | update\_timeout | The optional timout that is applied to limit long database updates. | `string` | `"30m"` | no |
 | use\_autokey | Enable the use of autokeys from Google Cloud KMS for CMEK. This requires autokey already configured in the project. | `bool` | `false` | no |
 | user\_deletion\_policy | The deletion policy for the user. Setting ABANDON allows the resource to be abandoned rather than deleted. This is useful for Postgres, where users cannot be deleted from the API if they have been granted SQL roles. Possible values are: "ABANDON". | `string` | `null` | no |

modules/postgresql/metadata.yaml

@@ -163,7 +163,7 @@ spec:
         varType: bool
         defaultValue: false
       - name: tier
-        description: The tier for the Cloud SQL instance.
+        description: The tier for the Cloud SQL instance, for ADC its defualt value will be db-perf-optimized-N-8 which is tier value for edtion ENTERPRISE_PLUS, if user wants to change the edition, he should chose compatible tier.
         varType: string
         defaultValue: db-f1-micro
       - name: zone
@@ -404,7 +404,13 @@ spec:
         description: The roles required by default database instance service account for integration with GCP services
         varType: list(string)
         defaultValue: []
+      - name: use_autokey
+        description: Enable the use of autokeys from Google Cloud KMS for CMEK. This requires autokey already configured in the project.
+        varType: bool
+        defaultValue: false
     outputs:
+      - name: additional_user_passwords_map
+        description: Map of auto generated passwords for the additional users
       - name: additional_users
         description: List of maps of additional users and passwords
         type:
@@ -902,6 +908,7 @@ spec:
       - level: Project
         roles:
           - roles/cloudkms.admin
+          - roles/cloudkms.autokeyAdmin
           - roles/cloudkms.cryptoKeyEncrypterDecrypter
           - roles/cloudscheduler.admin
           - roles/cloudsql.admin

modules/postgresql/variables.tf

@@ -171,7 +171,7 @@ variable "random_instance_name" {
 }
 
 variable "tier" {
-  description = "The tier for the Cloud SQL instance."
+  description = "The tier for the Cloud SQL instance, for ADC its defualt value will be db-perf-optimized-N-8 which is tier value for edtion ENTERPRISE_PLUS, if user wants to change the edition, he should chose compatible tier."
   type        = string
   default     = "db-f1-micro"
 }