Skip to content

Commit d866722

Browse files
evooq-laurentgreut
andauthored
fix: remove experiments from terraform config (#16)
Co-authored-by: Yoan Blanc <yblanc@edgelab.ch>
1 parent 38d321b commit d866722

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ In particular:
1717

1818
```hcl
1919
module "my_database" {
20-
source = "git@github.com:edgelaboratories/terraform-mysql-db?ref=v0.2.2"
20+
source = "git@github.com:edgelaboratories/terraform-mysql-db?ref=v0.2.3"
2121
2222
database = "my-database"
2323
@@ -42,7 +42,7 @@ You can provide extra permissions for `all-privileges` or `read-only` roles with
4242

4343
```hcl
4444
module "my_database" {
45-
source = "git@github.com:edgelaboratories/terraform-mysql-db?ref=v0.2.2"
45+
source = "git@github.com:edgelaboratories/terraform-mysql-db?ref=v0.2.3"
4646
4747
database = "my-database"
4848
@@ -53,6 +53,7 @@ module "my_database" {
5353
5454
vault_roles_extra_statements = {
5555
all-privileges = ["GRANT XA_RECOVER_ADMIN ON *.* TO '{{name}}'@'%';"]
56+
read-only = []
5657
}
5758
}
5859
```

provider.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
terraform {
2-
experiments = [module_variable_optional_attrs]
3-
42
required_providers {
53
mysql = {
64
source = "winebarrel/mysql"

variables.tf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ variable "vault_role_default_ttl" {
3737
}
3838

3939
variable "vault_roles_extra_statements" {
40-
type = object({
41-
all-privileges = optional(list(string)),
42-
read-only = optional(list(string)),
43-
})
44-
40+
type = map(any)
4541
default = {}
4642
}

vault.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "vault_database_secret_backend_role" "this" {
1616
[
1717
"CREATE USER '{{name}}'@'%' IDENTIFIED BY '{{password}}';",
1818
"GRANT ${each.value} ON `${var.database}`.* TO '{{name}}'@'%';",
19-
], coalesce(var.vault_roles_extra_statements[each.key], []),
19+
], lookup(var.vault_roles_extra_statements, each.key, []),
2020
)
2121

2222
default_ttl = var.vault_role_default_ttl

0 commit comments

Comments
 (0)