Fixes
This commit is contained in:
parent
9706d2c386
commit
8d75a278a6
|
@ -16,11 +16,11 @@
|
|||
|
||||
locals {
|
||||
tables = {
|
||||
for k in var.tables : k => lookup(var.tables_options, k, var.table_options_default)
|
||||
for k, v in var.tables : k => v.table_options != null ? v.table_options : var.table_options_defaults
|
||||
}
|
||||
|
||||
access_roles_bindings = {
|
||||
for k in var.access_roles : k => lookup(var.access_roles_binding, k, [])
|
||||
iam_roles_bindings = {
|
||||
for k in var.iam_roles : k => lookup(var.iam_members, k, [])
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ resource "google_bigtable_instance" "default" {
|
|||
}
|
||||
|
||||
resource "google_bigtable_instance_iam_binding" "default" {
|
||||
for_each = local.access_roles_bindings
|
||||
for_each = local.iam_roles_bindings
|
||||
|
||||
project = var.project_id
|
||||
instance = google_bigtable_instance.default.name
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
variable "access_roles" {
|
||||
variable "iam_roles" {
|
||||
description = "Authoritative for a given role. Updates the IAM policy to grant a role to a list of members."
|
||||
type = list(string)
|
||||
default = []
|
||||
}
|
||||
|
||||
variable "access_roles_binding" {
|
||||
variable "iam_members" {
|
||||
description = "Authoritative for a given role. Updates the IAM policy to grant a role to a list of members. Other roles within the IAM policy for the instance are preserved."
|
||||
type = map(list(string))
|
||||
default = {}
|
||||
|
@ -49,7 +49,7 @@ variable "instance_type" {
|
|||
}
|
||||
|
||||
variable "name" {
|
||||
description = "he name of the Cloud Bigtable instance."
|
||||
description = "The name of the Cloud Bigtable instance."
|
||||
type = string
|
||||
}
|
||||
|
||||
|
@ -71,23 +71,18 @@ variable "storage_type" {
|
|||
}
|
||||
|
||||
variable "tables" {
|
||||
description = "Tables to be created in the BigTable instnace."
|
||||
type = list(string)
|
||||
default = []
|
||||
}
|
||||
|
||||
variable "tables_options" {
|
||||
description = "Tables to be created in the BigTable instnace."
|
||||
description = "Tables to be created in the BigTable instance."
|
||||
type = map(object({
|
||||
split_keys = list(string)
|
||||
column_family = string
|
||||
table_options = object({
|
||||
split_keys = list(string)
|
||||
column_family = string
|
||||
})
|
||||
)
|
||||
}))
|
||||
default = {}
|
||||
}
|
||||
|
||||
variable "table_options_default" {
|
||||
description = "Default option of tables created in the BigTable instnace."
|
||||
variable "table_options_defaults" {
|
||||
description = "Default option of tables created in the BigTable instance."
|
||||
type = object({
|
||||
split_keys = list(string)
|
||||
column_family = string
|
||||
|
@ -101,5 +96,4 @@ variable "table_options_default" {
|
|||
variable "zone" {
|
||||
description = "The zone to create the Cloud Bigtable cluster in."
|
||||
type = string
|
||||
default = "europe-west1-b"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue