Password for initial_user for AlloyDB is now rquired
Details: https://github.com/GoogleCloudPlatform/magic-modules/pull/15596 Note: as of now, validation doesn't allow `known after apply` values for passwords
This commit is contained in:
Wiktor Niesiobędzki
@@ -61,13 +61,16 @@ module "alloydb" {
|
||||
project_id = module.project.project_id
|
||||
project_number = var.project_number
|
||||
cluster_name = "db"
|
||||
instance_name = "db"
|
||||
location = var.region
|
||||
initial_user = {
|
||||
password = "changeit"
|
||||
}
|
||||
network_config = {
|
||||
psa_config = {
|
||||
network = module.vpc.id
|
||||
}
|
||||
}
|
||||
instance_name = "db"
|
||||
location = var.region
|
||||
deletion_protection = false
|
||||
}
|
||||
# tftest modules=3 resources=17 inventory=simple.yaml e2e
|
||||
@@ -85,6 +88,9 @@ module "alloydb" {
|
||||
cluster_name = "db"
|
||||
location = var.region
|
||||
instance_name = "db"
|
||||
initial_user = {
|
||||
password = "changeit"
|
||||
}
|
||||
network_config = {
|
||||
psa_config = {
|
||||
network = var.vpc.id
|
||||
@@ -96,6 +102,7 @@ module "alloydb" {
|
||||
node_count = 2
|
||||
}
|
||||
}
|
||||
|
||||
deletion_protection = false
|
||||
}
|
||||
# tftest modules=1 resources=4 inventory=read_pool.yaml e2e
|
||||
@@ -111,6 +118,9 @@ module "alloydb" {
|
||||
cluster_name = "db"
|
||||
location = var.region
|
||||
instance_name = "db"
|
||||
initial_user = {
|
||||
password = "changeit"
|
||||
}
|
||||
network_config = {
|
||||
psa_config = {
|
||||
network = var.vpc.id
|
||||
@@ -120,6 +130,7 @@ module "alloydb" {
|
||||
enabled = true
|
||||
region = "europe-west12"
|
||||
}
|
||||
|
||||
deletion_protection = false
|
||||
}
|
||||
# tftest modules=1 resources=4 inventory=cross_region_replication.yaml e2e
|
||||
@@ -141,9 +152,13 @@ module "alloydb" {
|
||||
cluster_name = "db"
|
||||
location = var.region
|
||||
instance_name = "db"
|
||||
initial_user = {
|
||||
password = "changeit"
|
||||
}
|
||||
network_config = {
|
||||
psc_config = { allowed_consumer_projects = [var.project_number] }
|
||||
}
|
||||
|
||||
deletion_protection = false
|
||||
}
|
||||
# tftest modules=1 resources=2 inventory=psc.yaml e2e
|
||||
@@ -165,6 +180,9 @@ module "alloydb" {
|
||||
idle_in_transaction_session_timeout = "900000"
|
||||
timezone = "'UTC'"
|
||||
}
|
||||
initial_user = {
|
||||
password = "changeit"
|
||||
}
|
||||
network_config = {
|
||||
psa_config = {
|
||||
network = var.vpc.id
|
||||
@@ -180,6 +198,7 @@ module "alloydb" {
|
||||
password = "mypassword"
|
||||
}
|
||||
}
|
||||
|
||||
deletion_protection = false
|
||||
}
|
||||
# tftest modules=1 resources=5 inventory=custom.yaml e2e
|
||||
@@ -243,6 +262,9 @@ module "alloydb" {
|
||||
cluster_name = "primary"
|
||||
location = var.region
|
||||
instance_name = "primary"
|
||||
initial_user = {
|
||||
password = "changeit"
|
||||
}
|
||||
network_config = {
|
||||
psa_config = {
|
||||
network = module.vpc.id
|
||||
@@ -251,6 +273,7 @@ module "alloydb" {
|
||||
encryption_config = {
|
||||
primary_kms_key_name = module.kms.keys.key-regional.id
|
||||
}
|
||||
|
||||
deletion_protection = false
|
||||
}
|
||||
|
||||
@@ -284,6 +307,9 @@ module "alloydb" {
|
||||
cluster_name = "primary"
|
||||
location = var.region
|
||||
instance_name = "primary"
|
||||
initial_user = {
|
||||
password = "changeit"
|
||||
}
|
||||
network_config = {
|
||||
psa_config = {
|
||||
network = var.vpc.id
|
||||
@@ -302,10 +328,11 @@ module "alloydb" {
|
||||
| name | description | type | required | default |
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [cluster_name](variables.tf#L81) | Name of the primary cluster. | <code>string</code> | ✓ | |
|
||||
| [instance_name](variables.tf#L183) | Name of primary instance. | <code>string</code> | ✓ | |
|
||||
| [location](variables.tf#L195) | Region or zone of the cluster and instance. | <code>string</code> | ✓ | |
|
||||
| [network_config](variables.tf#L240) | Network configuration for cluster and instance. Only one between psa_config and psc_config can be used. | <code title="object({ psa_config = optional(object({ network = string allocated_ip_range = optional(string) authorized_external_networks = optional(list(string), []) enable_public_ip = optional(bool, false) enable_outbound_public_ip = optional(bool, false) })) psc_config = optional(object({ allowed_consumer_projects = list(string) })) })">object({…})</code> | ✓ | |
|
||||
| [project_id](variables.tf#L275) | The ID of the project where this instances will be created. | <code>string</code> | ✓ | |
|
||||
| [initial_user](variables.tf#L174) | AlloyDB cluster initial user credentials. | <code title="object({ user = optional(string, "postgres") password = string })">object({…})</code> | ✓ | |
|
||||
| [instance_name](variables.tf#L182) | Name of primary instance. | <code>string</code> | ✓ | |
|
||||
| [location](variables.tf#L194) | Region or zone of the cluster and instance. | <code>string</code> | ✓ | |
|
||||
| [network_config](variables.tf#L239) | Network configuration for cluster and instance. Only one between psa_config and psc_config can be used. | <code title="object({ psa_config = optional(object({ network = string allocated_ip_range = optional(string) authorized_external_networks = optional(list(string), []) enable_public_ip = optional(bool, false) enable_outbound_public_ip = optional(bool, false) })) psc_config = optional(object({ allowed_consumer_projects = list(string) })) })">object({…})</code> | ✓ | |
|
||||
| [project_id](variables.tf#L274) | The ID of the project where this instances will be created. | <code>string</code> | ✓ | |
|
||||
| [annotations](variables.tf#L17) | Map FLAG_NAME=>VALUE for annotations which allow client tools to store small amount of arbitrary data. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [automated_backup_configuration](variables.tf#L23) | Automated backup settings for cluster. | <code title="object({ enabled = optional(bool, false) backup_window = optional(string, "1800s") location = optional(string) weekly_schedule = optional(object({ days_of_week = optional(list(string), [ "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY" ]) start_times = optional(object({ hours = optional(number, 23) }), {}) }), {}) retention_count = optional(number, 7) retention_period = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [availability_type](variables.tf#L58) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | <code>string</code> | | <code>"REGIONAL"</code> |
|
||||
@@ -320,18 +347,17 @@ module "alloydb" {
|
||||
| [encryption_config](variables.tf#L153) | Set encryption configuration. KMS name format: 'projects/[PROJECT]/locations/[REGION]/keyRings/[RING]/cryptoKeys/[KEY_NAME]'. | <code title="object({ primary_kms_key_name = string secondary_kms_key_name = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
| [flags](variables.tf#L162) | Map FLAG_NAME=>VALUE for database-specific tuning. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [gce_zone](variables.tf#L168) | The GCE zone that the instance should serve from. This can ONLY be specified for ZONAL instances. If present for a REGIONAL instance, an error will be thrown. | <code>string</code> | | <code>null</code> |
|
||||
| [initial_user](variables.tf#L174) | AlloyDB cluster initial user credentials. | <code title="object({ user = optional(string, "postgres") password = string })">object({…})</code> | | <code>null</code> |
|
||||
| [labels](variables.tf#L189) | Labels to be attached to all instances. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [machine_config](variables.tf#L201) | AlloyDB machine config. | <code title="object({ cpu_count = optional(number, 2) machine_type = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [maintenance_config](variables.tf#L215) | Set maintenance window configuration. | <code title="object({ enabled = optional(bool, false) day = optional(string, "SUNDAY") start_time = optional(object({ hours = optional(number, 23) }), {}) })">object({…})</code> | | <code>{}</code> |
|
||||
| [prefix](variables.tf#L265) | Optional prefix used to generate instance names. | <code>string</code> | | <code>null</code> |
|
||||
| [project_number](variables.tf#L280) | The project number of the project where this instances will be created. Only used for testing purposes. | <code>string</code> | | <code>null</code> |
|
||||
| [query_insights_config](variables.tf#L286) | Query insights config. | <code title="object({ query_string_length = optional(number, 1024) record_application_tags = optional(bool, true) record_client_address = optional(bool, true) query_plans_per_minute = optional(number, 5) })">object({…})</code> | | <code>{}</code> |
|
||||
| [read_pool](variables.tf#L297) | Map of read pool instances to create in the primary cluster. | <code title="map(object({ display_name = optional(string) node_count = optional(number, 1) flags = optional(map(string)) client_connection_config = optional(object({ require_connectors = optional(bool, false) ssl_config = optional(object({ ssl_mode = string })) })) machine_config = optional(object({ cpu_count = optional(number, 2) machine_type = optional(string) }), {}) network_config = optional(object({ authorized_external_networks = optional(list(string), []) enable_public_ip = optional(bool, false) }), {}) query_insights_config = optional(object({ query_string_length = optional(number, 1024) record_application_tags = optional(bool, true) record_client_address = optional(bool, true) query_plans_per_minute = optional(number, 5) })) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [skip_await_major_version_upgrade](variables.tf#L342) | Set to true to skip awaiting on the major version upgrade of the cluster. | <code>bool</code> | | <code>true</code> |
|
||||
| [subscription_type](variables.tf#L348) | The subscription type of cluster. Possible values are: 'STANDARD' or 'TRIAL'. | <code>string</code> | | <code>"STANDARD"</code> |
|
||||
| [tag_bindings](variables.tf#L354) | Tag bindings for this service, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [users](variables.tf#L361) | Map of users to create in the primary instance (and replicated to other replicas). Set PASSWORD to null if you want to get an autogenerated password. The user types available are: 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'. | <code title="map(object({ password = optional(string) roles = optional(list(string), ["alloydbsuperuser"]) type = optional(string, "ALLOYDB_BUILT_IN") }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [labels](variables.tf#L188) | Labels to be attached to all instances. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [machine_config](variables.tf#L200) | AlloyDB machine config. | <code title="object({ cpu_count = optional(number, 2) machine_type = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [maintenance_config](variables.tf#L214) | Set maintenance window configuration. | <code title="object({ enabled = optional(bool, false) day = optional(string, "SUNDAY") start_time = optional(object({ hours = optional(number, 23) }), {}) })">object({…})</code> | | <code>{}</code> |
|
||||
| [prefix](variables.tf#L264) | Optional prefix used to generate instance names. | <code>string</code> | | <code>null</code> |
|
||||
| [project_number](variables.tf#L279) | The project number of the project where this instances will be created. Only used for testing purposes. | <code>string</code> | | <code>null</code> |
|
||||
| [query_insights_config](variables.tf#L285) | Query insights config. | <code title="object({ query_string_length = optional(number, 1024) record_application_tags = optional(bool, true) record_client_address = optional(bool, true) query_plans_per_minute = optional(number, 5) })">object({…})</code> | | <code>{}</code> |
|
||||
| [read_pool](variables.tf#L296) | Map of read pool instances to create in the primary cluster. | <code title="map(object({ display_name = optional(string) node_count = optional(number, 1) flags = optional(map(string)) client_connection_config = optional(object({ require_connectors = optional(bool, false) ssl_config = optional(object({ ssl_mode = string })) })) machine_config = optional(object({ cpu_count = optional(number, 2) machine_type = optional(string) }), {}) network_config = optional(object({ authorized_external_networks = optional(list(string), []) enable_public_ip = optional(bool, false) }), {}) query_insights_config = optional(object({ query_string_length = optional(number, 1024) record_application_tags = optional(bool, true) record_client_address = optional(bool, true) query_plans_per_minute = optional(number, 5) })) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [skip_await_major_version_upgrade](variables.tf#L341) | Set to true to skip awaiting on the major version upgrade of the cluster. | <code>bool</code> | | <code>true</code> |
|
||||
| [subscription_type](variables.tf#L347) | The subscription type of cluster. Possible values are: 'STANDARD' or 'TRIAL'. | <code>string</code> | | <code>"STANDARD"</code> |
|
||||
| [tag_bindings](variables.tf#L353) | Tag bindings for this service, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [users](variables.tf#L360) | Map of users to create in the primary instance (and replicated to other replicas). Set PASSWORD to null if you want to get an autogenerated password. The user types available are: 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'. | <code title="map(object({ password = optional(string) roles = optional(list(string), ["alloydbsuperuser"]) type = optional(string, "ALLOYDB_BUILT_IN") }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
||||
@@ -177,7 +177,6 @@ variable "initial_user" {
|
||||
user = optional(string, "postgres")
|
||||
password = string
|
||||
})
|
||||
default = null
|
||||
}
|
||||
|
||||
variable "instance_name" {
|
||||
|
||||
Reference in New Issue
Block a user