Skip to content

Commit 5627c7c

Browse files
authored
Terraform 0.15 support by marking outputs as sensitive (#3)
* Terraform 0.15 support by marking outputs as sensitive * Update readme and changelog. Run make hooks / validate
1 parent d601181 commit 5627c7c

File tree

6 files changed

+54
-25
lines changed

6 files changed

+54
-25
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*.tfstate
66
*.tfstate.*
77

8+
*.terraform.lock.hcl
9+
810
# Crash log files
911
crash.log
1012

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v3.3.0
3+
rev: v3.4.0
44
hooks:
55
- id: check-added-large-files
66
args: ['--maxkb=500']
@@ -18,7 +18,7 @@ repos:
1818
args: ['--allow-missing-credentials']
1919
- id: trailing-whitespace
2020
- repo: git://github.com/antonbabenko/pre-commit-terraform
21-
rev: v1.44.0
21+
rev: v1.48.0
2222
hooks:
2323
- id: terraform_fmt
2424
- id: terraform_docs

CHANGELOG.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,19 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
<a name="unreleased"></a>
6-
## [Unreleased]
5+
<a name="2.0.0"></a>
6+
## [2.0.0] - 2021-04-19
7+
8+
- Add support for Terraform 0.15 by setting sensitive outputs to have the sensitive=true flag. (https://www.terraform.io/upgrade-guides/0-15.html#sensitive-output-values)
9+
- Terraform version requirement bumped to 0.14.5 in order to support sensitive values
10+
11+
<a name="1.0.2"></a>
12+
## [1.0.2] - 2020-11-09
13+
14+
- Update module to remove 0.14 limit
15+
16+
<a name="1.0.1"></a>
17+
## [1.0.1] - 2020-08-06
718

819
- Update module versions to support v3 provider
920
- add CHANGELOG.md
@@ -15,5 +26,6 @@ All notable changes to this project will be documented in this file.
1526
- Add initial module configuration
1627
- Initial commit
1728

18-
19-
[Unreleased]: https://github.com/marcincuber/terraform-aws-ssm-parameters/compare/1.0.0...HEAD
29+
[2.0.0]: https://github.com/marcincuber/terraform-aws-ssm-parameters/compare/1.0.2...2.0.0
30+
[1.0.2]: https://github.com/marcincuber/terraform-aws-ssm-parameters/compare/1.0.1...1.0.2
31+
[1.0.1]: https://github.com/marcincuber/terraform-aws-ssm-parameters/compare/1.0.0...1.0.1

README.md

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ Terraform module creating encrypted and non-encrypted AWS SSM parameters
55

66
## Terraform versions
77

8-
Terraform 0.12. Pin module version to `~> v1.0`. Submit pull-requests to `master` branch.
8+
Terraform 0.14.5. Pin module version to `~> v2.0`.
9+
Terraform 0.12 - 0.14.4. Pin module version to `~> v1.0`.
10+
Submit pull-requests to `master` branch.
911

1012
## Usage
1113

@@ -42,7 +44,8 @@ module "ssm-parameters" {
4244

4345
## Assumptions
4446

45-
Module is to be used with Terraform > 0.12.
47+
Module v1.0 is to be used with Terraform > 0.12.
48+
Module v2.0+ is to be used with Terraform > 0.14.5
4649

4750
## Examples
4851

@@ -57,35 +60,45 @@ Module managed by [Marcin Cuber](https://github.com/marcincuber) [LinkedIn](http
5760

5861
| Name | Version |
5962
|------|---------|
60-
| terraform | >= 0.12.6 |
61-
| aws | >= 2.41 |
63+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.5 |
64+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.41 |
6265

6366
## Providers
6467

6568
| Name | Version |
6669
|------|---------|
67-
| aws | >= 2.41 |
70+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.41 |
71+
72+
## Modules
73+
74+
No modules.
75+
76+
## Resources
77+
78+
| Name | Type |
79+
|------|------|
80+
| [aws_ssm_parameter.parameters](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
81+
| [aws_ssm_parameter.secure_parameters](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
6882

6983
## Inputs
7084

7185
| Name | Description | Type | Default | Required |
7286
|------|-------------|------|---------|:--------:|
73-
| advanced\_tier | List of parameter names that should have tier set to Advanced | `list(string)` | `[]` | no |
74-
| kms\_key\_id | The KMS key to use for encryption | `string` | `""` | no |
75-
| name\_prefix | Path used for each SSM parameter created by the module | `any` | n/a | yes |
76-
| parameters | Non-encrypted parameters | `map(any)` | `{}` | no |
77-
| prevent\_overwrite | List of parameter names to prevent overwrite for | `list(string)` | `[]` | no |
78-
| secure\_parameters | Secure parameters | `map(any)` | `{}` | no |
79-
| tags | n/a | `map(any)` | `{}` | no |
87+
| <a name="input_advanced_tier"></a> [advanced\_tier](#input\_advanced\_tier) | List of parameter names that should have tier set to Advanced | `list(string)` | `[]` | no |
88+
| <a name="input_kms_key_id"></a> [kms\_key\_id](#input\_kms\_key\_id) | The KMS key to use for encryption | `string` | `""` | no |
89+
| <a name="input_name_prefix"></a> [name\_prefix](#input\_name\_prefix) | Path used for each SSM parameter created by the module | `any` | n/a | yes |
90+
| <a name="input_parameters"></a> [parameters](#input\_parameters) | Non-encrypted parameters | `map(any)` | `{}` | no |
91+
| <a name="input_prevent_overwrite"></a> [prevent\_overwrite](#input\_prevent\_overwrite) | List of parameter names to prevent overwrite for | `list(string)` | `[]` | no |
92+
| <a name="input_secure_parameters"></a> [secure\_parameters](#input\_secure\_parameters) | Secure parameters | `map(any)` | `{}` | no |
93+
| <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(any)` | `{}` | no |
8094

8195
## Outputs
8296

8397
| Name | Description |
8498
|------|-------------|
85-
| parameter\_path | n/a |
86-
| parameters | n/a |
87-
| secure\_parameters | n/a |
88-
99+
| <a name="output_parameter_path"></a> [parameter\_path](#output\_parameter\_path) | n/a |
100+
| <a name="output_parameters"></a> [parameters](#output\_parameters) | n/a |
101+
| <a name="output_secure_parameters"></a> [secure\_parameters](#output\_secure\_parameters) | n/a |
89102
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
90103

91104
## License

outputs.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ output "parameter_path" {
33
}
44

55
output "parameters" {
6-
value = aws_ssm_parameter.parameters
6+
value = aws_ssm_parameter.parameters
7+
sensitive = true
78
}
89

910
output "secure_parameters" {
10-
value = aws_ssm_parameter.secure_parameters
11+
value = aws_ssm_parameter.secure_parameters
12+
sensitive = true
1113
}

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 0.14.5"
33

44
required_providers {
55
aws = ">= 2.41"

0 commit comments

Comments
 (0)