Skip to content

Commit 2a6486b

Browse files
yanpyanp
authored
Add database name to submodule inputs (#33)
1 parent 06d96c3 commit 2a6486b

File tree

10 files changed

+24
-2
lines changed

10 files changed

+24
-2
lines changed

‎examples/eks/metaflow.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ module "metaflow-metadata-service" {
4949

5050
access_list_cidr_blocks = []
5151
api_basic_auth = true
52+
database_name = module.metaflow-datastore.database_name
5253
database_password = module.metaflow-datastore.database_password
5354
database_username = module.metaflow-datastore.database_username
5455
datastore_s3_bucket_kms_key_arn = module.metaflow-datastore.datastore_s3_bucket_kms_key_arn

‎main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module "metaflow-metadata-service" {
2020

2121
access_list_cidr_blocks = var.access_list_cidr_blocks
2222
api_basic_auth = var.api_basic_auth
23+
database_name = module.metaflow-datastore.database_name
2324
database_password = module.metaflow-datastore.database_password
2425
database_username = module.metaflow-datastore.database_username
2526
datastore_s3_bucket_kms_key_arn = module.metaflow-datastore.datastore_s3_bucket_kms_key_arn
@@ -43,6 +44,7 @@ module "metaflow-ui" {
4344
resource_prefix = local.resource_prefix
4445
resource_suffix = local.resource_suffix
4546

47+
database_name = module.metaflow-datastore.database_name
4648
database_password = module.metaflow-datastore.database_password
4749
database_username = module.metaflow-datastore.database_username
4850
datastore_s3_bucket_kms_key_arn = module.metaflow-datastore.datastore_s3_bucket_kms_key_arn

‎modules/datastore/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ To read more, see [the Metaflow docs](https://docs.metaflow.org/metaflow-on-aws/
3737
|------|-------------|
3838
| <a name="output_METAFLOW_DATASTORE_SYSROOT_S3"></a> [METAFLOW\_DATASTORE\_SYSROOT\_S3](#output\_METAFLOW\_DATASTORE\_SYSROOT\_S3) | Amazon S3 URL for Metaflow DataStore |
3939
| <a name="output_METAFLOW_DATATOOLS_S3ROOT"></a> [METAFLOW\_DATATOOLS\_S3ROOT](#output\_METAFLOW\_DATATOOLS\_S3ROOT) | Amazon S3 URL for Metaflow DataTools |
40+
| <a name="output_database_name"></a> [database\_name](#output\_database\_name) | The database name |
4041
| <a name="output_database_password"></a> [database\_password](#output\_database\_password) | The database password |
4142
| <a name="output_database_username"></a> [database\_username](#output\_database\_username) | The database username |
4243
| <a name="output_datastore_s3_bucket_kms_key_arn"></a> [datastore\_s3\_bucket\_kms\_key\_arn](#output\_datastore\_s3\_bucket\_kms\_key\_arn) | The ARN of the KMS key used to encrypt the Metaflow datastore S3 bucket |

‎modules/datastore/outputs.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ output "METAFLOW_DATASTORE_SYSROOT_S3" {
88
description = "Amazon S3 URL for Metaflow DataStore"
99
}
1010

11+
output "database_name" {
12+
value = var.db_name
13+
description = "The database name"
14+
}
15+
1116
output "database_password" {
1217
value = random_password.this.result
1318
description = "The database password"

‎modules/metadata-service/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ If the `access_list_cidr_blocks` variable is set, only traffic originating from
1717
|------|-------------|------|---------|:--------:|
1818
| <a name="input_access_list_cidr_blocks"></a> [access\_list\_cidr\_blocks](#input\_access\_list\_cidr\_blocks) | List of CIDRs we want to grant access to our Metaflow Metadata Service. Usually this is our VPN's CIDR blocks. | `list(string)` | n/a | yes |
1919
| <a name="input_api_basic_auth"></a> [api\_basic\_auth](#input\_api\_basic\_auth) | Enable basic auth for API Gateway? (requires key export) | `bool` | `true` | no |
20+
| <a name="input_database_name"></a> [database\_name](#input\_database\_name) | The database name | `string` | `"metaflow"` | no |
2021
| <a name="input_database_password"></a> [database\_password](#input\_database\_password) | The database password | `string` | n/a | yes |
2122
| <a name="input_database_username"></a> [database\_username](#input\_database\_username) | The database username | `string` | n/a | yes |
2223
| <a name="input_datastore_s3_bucket_kms_key_arn"></a> [datastore\_s3\_bucket\_kms\_key\_arn](#input\_datastore\_s3\_bucket\_kms\_key\_arn) | The ARN of the KMS key used to encrypt the Metaflow datastore S3 bucket | `string` | n/a | yes |

‎modules/metadata-service/ecs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ resource "aws_ecs_task_definition" "this" {
3333
],
3434
"environment": [
3535
{"name": "MF_METADATA_DB_HOST", "value": "${replace(var.rds_master_instance_endpoint, ":5432", "")}"},
36-
{"name": "MF_METADATA_DB_NAME", "value": "metaflow"},
36+
{"name": "MF_METADATA_DB_NAME", "value": "${var.database_name}"},
3737
{"name": "MF_METADATA_DB_PORT", "value": "5432"},
3838
{"name": "MF_METADATA_DB_PSWD", "value": "${var.database_password}"},
3939
{"name": "MF_METADATA_DB_USER", "value": "${var.database_username}"}

‎modules/metadata-service/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ variable "api_basic_auth" {
99
description = "Enable basic auth for API Gateway? (requires key export)"
1010
}
1111

12+
variable "database_name" {
13+
type = string
14+
default = "metaflow"
15+
description = "The database name"
16+
}
17+
1218
variable "database_password" {
1319
type = string
1420
description = "The database password"

‎modules/ui/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The services are deployed behind an AWS ALB, and the module will output the ALB
1212
| <a name="input_METAFLOW_DATASTORE_SYSROOT_S3"></a> [METAFLOW\_DATASTORE\_SYSROOT\_S3](#input\_METAFLOW\_DATASTORE\_SYSROOT\_S3) | METAFLOW\_DATASTORE\_SYSROOT\_S3 value | `string` | n/a | yes |
1313
| <a name="input_alb_internal"></a> [alb\_internal](#input\_alb\_internal) | Defines whether the ALB is internal | `bool` | `false` | no |
1414
| <a name="input_certificate_arn"></a> [certificate\_arn](#input\_certificate\_arn) | SSL certificate ARN. The certificate will be used by the UI load balancer. | `string` | n/a | yes |
15+
| <a name="input_database_name"></a> [database\_name](#input\_database\_name) | The database name | `string` | `"metaflow"` | no |
1516
| <a name="input_database_password"></a> [database\_password](#input\_database\_password) | The database password | `string` | n/a | yes |
1617
| <a name="input_database_username"></a> [database\_username](#input\_database\_username) | The database username | `string` | n/a | yes |
1718
| <a name="input_datastore_s3_bucket_kms_key_arn"></a> [datastore\_s3\_bucket\_kms\_key\_arn](#input\_datastore\_s3\_bucket\_kms\_key\_arn) | The ARN of the KMS key used to encrypt the Metaflow datastore S3 bucket | `string` | n/a | yes |

‎modules/ui/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ locals {
1717

1818
default_ui_backend_env_vars = {
1919
"MF_METADATA_DB_HOST" = "${replace(var.rds_master_instance_endpoint, ":5432", "")}"
20-
"MF_METADATA_DB_NAME" = "metaflow"
20+
"MF_METADATA_DB_NAME" = "${var.database_name}"
2121
"MF_METADATA_DB_PORT" = "5432"
2222
"MF_METADATA_DB_PSWD" = "${var.database_password}"
2323
"MF_METADATA_DB_USER" = "${var.database_username}"

‎modules/ui/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
variable "database_name" {
2+
type = string
3+
default = "metaflow"
4+
description = "The database name"
5+
}
16

27
variable "database_password" {
38
type = string

0 commit comments

Comments
 (0)