Skip to content

Commit 066ec81

Browse files
authored
Update label to 0.16.0 (#51)
* Update label to 0.16.0 ...for the various improvements since 0.14.1. * Add and use `var.environment` ...may as well add and use it, given we're going to 0.16.0.
1 parent 820e6bb commit 066ec81

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ Available targets:
171171
| ebs_volume_count | Count of EBS volumes that will be attached to the instance | number | `0` | no |
172172
| ebs_volume_size | Size of the EBS volume in gigabytes | number | `10` | no |
173173
| ebs_volume_type | The type of EBS volume. Can be standard, gp2 or io1 | string | `gp2` | no |
174+
| environment | Environment, e.g. 'prod', 'staging', 'dev', 'pre-prod', 'UAT' | string | `` | no |
174175
| evaluation_periods | The number of periods over which data is compared to the specified threshold. | number | `5` | no |
175176
| instance_enabled | Flag to control the instance creation. Set to false if it is necessary to skip instance creation | bool | `true` | no |
176177
| instance_type | The type of the instance | string | `t2.micro` | no |
@@ -311,7 +312,7 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.
311312

312313
## Copyright
313314

314-
Copyright © 2017-2019 [Cloud Posse, LLC](https://cpco.io/copyright)
315+
Copyright © 2017-2020 [Cloud Posse, LLC](https://cpco.io/copyright)
315316

316317

317318

docs/terraform.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
| ebs_volume_count | Count of EBS volumes that will be attached to the instance | number | `0` | no |
2424
| ebs_volume_size | Size of the EBS volume in gigabytes | number | `10` | no |
2525
| ebs_volume_type | The type of EBS volume. Can be standard, gp2 or io1 | string | `gp2` | no |
26+
| environment | Environment, e.g. 'prod', 'staging', 'dev', 'pre-prod', 'UAT' | string | `` | no |
2627
| evaluation_periods | The number of periods over which data is compared to the specified threshold. | number | `5` | no |
2728
| instance_enabled | Flag to control the instance creation. Set to false if it is necessary to skip instance creation | bool | `true` | no |
2829
| instance_type | The type of the instance | string | `t2.micro` | no |

main.tf

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,15 @@ data "aws_ami" "info" {
6464
}
6565

6666
module "label" {
67-
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.14.1"
68-
namespace = var.namespace
69-
stage = var.stage
70-
name = var.name
71-
attributes = var.attributes
72-
delimiter = var.delimiter
73-
enabled = var.instance_enabled
74-
tags = var.tags
67+
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.16.0"
68+
namespace = var.namespace
69+
stage = var.stage
70+
environment = var.environment
71+
name = var.name
72+
attributes = var.attributes
73+
delimiter = var.delimiter
74+
enabled = var.instance_enabled
75+
tags = var.tags
7576
}
7677

7778
resource "aws_iam_instance_profile" "default" {

variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ variable "stage" {
6161
default = ""
6262
}
6363

64+
variable "environment" {
65+
type = string
66+
description = "Environment, e.g. 'prod', 'staging', 'dev', 'pre-prod', 'UAT'"
67+
default = ""
68+
}
69+
6470
variable "name" {
6571
type = string
6672
description = "Name (e.g. `bastion` or `db`)"

0 commit comments

Comments
 (0)