Commit 96de19ff authored by Bryant Biggs's avatar Bryant Biggs Committed by GitHub

fix: mark sensitive outputs to support Terraform 0.15.x (#329)

parent a8532472
...@@ -94,7 +94,7 @@ jobs: ...@@ -94,7 +94,7 @@ jobs:
- name: Install pre-commit dependencies - name: Install pre-commit dependencies
run: | run: |
pip install pre-commit pip install pre-commit
curl -L "$(curl -s https://api.github.com/repos/terraform-docs/terraform-docs/releases/latest | grep -o -E "https://.+?-v0.12.0-linux-amd64" | head -n1)" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/ curl -L "$(curl -s https://api.github.com/repos/terraform-docs/terraform-docs/releases/latest | grep -o -E "https://.+?-v0.12\..+?-linux-amd64" | head -n1)" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/
curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/bin/ curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/bin/
- name: Execute pre-commit - name: Execute pre-commit
# Run all pre-commit checks on max version supported # Run all pre-commit checks on max version supported
......
repos: repos:
- repo: git://github.com/antonbabenko/pre-commit-terraform - repo: git://github.com/antonbabenko/pre-commit-terraform
rev: v1.48.0 rev: v1.50.0
hooks: hooks:
- id: terraform_fmt - id: terraform_fmt
- id: terraform_validate - id: terraform_validate
......
...@@ -2,13 +2,6 @@ ...@@ -2,13 +2,6 @@
Terraform module which creates RDS resources on AWS. Terraform module which creates RDS resources on AWS.
These types of resources are supported:
- [DB Instance](https://www.terraform.io/docs/providers/aws/r/db_instance.html)
- [DB Subnet Group](https://www.terraform.io/docs/providers/aws/r/db_subnet_group.html)
- [DB Parameter Group](https://www.terraform.io/docs/providers/aws/r/db_parameter_group.html)
- [DB Option Group](https://www.terraform.io/docs/providers/aws/r/db_option_group.html)
Root module calls these modules which can also be used separately to create independent resources: Root module calls these modules which can also be used separately to create independent resources:
- [db_instance](https://github.com/terraform-aws-modules/terraform-aws-rds/tree/master/modules/db_instance) - creates RDS DB instance - [db_instance](https://github.com/terraform-aws-modules/terraform-aws-rds/tree/master/modules/db_instance) - creates RDS DB instance
......
...@@ -46,6 +46,7 @@ output "this_db_instance_name" { ...@@ -46,6 +46,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db.this_db_instance_username value = module.db.this_db_instance_username
sensitive = true
} }
output "this_db_instance_password" { output "this_db_instance_password" {
......
...@@ -46,6 +46,7 @@ output "this_db_instance_name" { ...@@ -46,6 +46,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db.this_db_instance_username value = module.db.this_db_instance_username
sensitive = true
} }
output "this_db_instance_password" { output "this_db_instance_password" {
...@@ -133,6 +134,7 @@ output "db_default_instance_name" { ...@@ -133,6 +134,7 @@ output "db_default_instance_name" {
output "db_default_instance_username" { output "db_default_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db_default.this_db_instance_username value = module.db_default.this_db_instance_username
sensitive = true
} }
output "db_default_instance_password" { output "db_default_instance_password" {
......
...@@ -46,6 +46,7 @@ output "this_db_instance_name" { ...@@ -46,6 +46,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db.this_db_instance_username value = module.db.this_db_instance_username
sensitive = true
} }
output "this_db_instance_password" { output "this_db_instance_password" {
......
...@@ -46,6 +46,7 @@ output "this_db_instance_name" { ...@@ -46,6 +46,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db.this_db_instance_username value = module.db.this_db_instance_username
sensitive = true
} }
output "this_db_instance_password" { output "this_db_instance_password" {
...@@ -133,6 +134,7 @@ output "db_default_instance_name" { ...@@ -133,6 +134,7 @@ output "db_default_instance_name" {
output "db_default_instance_username" { output "db_default_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db_default.this_db_instance_username value = module.db_default.this_db_instance_username
sensitive = true
} }
output "db_default_instance_password" { output "db_default_instance_password" {
......
...@@ -46,6 +46,7 @@ output "this_db_instance_name" { ...@@ -46,6 +46,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db.this_db_instance_username value = module.db.this_db_instance_username
sensitive = true
} }
output "this_db_instance_password" { output "this_db_instance_password" {
......
...@@ -47,6 +47,7 @@ output "master_db_instance_name" { ...@@ -47,6 +47,7 @@ output "master_db_instance_name" {
output "master_db_instance_username" { output "master_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.master.this_db_instance_username value = module.master.this_db_instance_username
sensitive = true
} }
output "master_db_instance_password" { output "master_db_instance_password" {
...@@ -119,6 +120,7 @@ output "replica_db_instance_name" { ...@@ -119,6 +120,7 @@ output "replica_db_instance_name" {
output "replica_db_instance_username" { output "replica_db_instance_username" {
description = "The replica username for the database" description = "The replica username for the database"
value = module.replica.this_db_instance_username value = module.replica.this_db_instance_username
sensitive = true
} }
output "replica_db_instance_port" { output "replica_db_instance_port" {
......
...@@ -47,6 +47,7 @@ output "master_db_instance_name" { ...@@ -47,6 +47,7 @@ output "master_db_instance_name" {
output "master_db_instance_username" { output "master_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.master.this_db_instance_username value = module.master.this_db_instance_username
sensitive = true
} }
output "master_db_instance_password" { output "master_db_instance_password" {
...@@ -119,6 +120,7 @@ output "replica_db_instance_name" { ...@@ -119,6 +120,7 @@ output "replica_db_instance_name" {
output "replica_db_instance_username" { output "replica_db_instance_username" {
description = "The replica username for the database" description = "The replica username for the database"
value = module.replica.this_db_instance_username value = module.replica.this_db_instance_username
sensitive = true
} }
output "replica_db_instance_port" { output "replica_db_instance_port" {
......
...@@ -46,6 +46,7 @@ output "this_db_instance_name" { ...@@ -46,6 +46,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db.this_db_instance_username value = module.db.this_db_instance_username
sensitive = true
} }
output "this_db_instance_password" { output "this_db_instance_password" {
......
...@@ -76,6 +76,7 @@ output "this_db_instance_name" { ...@@ -76,6 +76,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = local.this_db_instance_username value = local.this_db_instance_username
sensitive = true
} }
output "this_db_instance_port" { output "this_db_instance_port" {
......
...@@ -56,6 +56,7 @@ output "this_db_instance_name" { ...@@ -56,6 +56,7 @@ output "this_db_instance_name" {
output "this_db_instance_username" { output "this_db_instance_username" {
description = "The master username for the database" description = "The master username for the database"
value = module.db_instance.this_db_instance_username value = module.db_instance.this_db_instance_username
sensitive = true
} }
output "this_db_instance_password" { output "this_db_instance_password" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment