Skip to content

Commit 97b7d60

Browse files
adamcrewsaknysh
authored andcommitted
Use the latest label module to support the environment attribute (#35)
1 parent 650d5c9 commit 97b7d60

File tree

4 files changed

+137
-84
lines changed

4 files changed

+137
-84
lines changed

README.md

+95-52
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
1-
<!-- This file was automatically generated by the `build-harness`. Make all changes to `README.yaml` and run `make readme` to rebuild this file. -->
1+
<!--
2+
3+
4+
5+
6+
7+
8+
9+
10+
11+
12+
13+
14+
15+
16+
** DO NOT EDIT THIS FILE
17+
**
18+
** This file was automatically generated by the `build-harness`.
19+
** 1) Make all changes to `README.yaml`
20+
** 2) Run `make init` (you only need to do this once)
21+
** 3) Run`make readme` to rebuild this file.
22+
**
23+
** (We maintain HUNDREDS of open source projects. This is how we maintain our sanity.)
24+
**
25+
26+
27+
28+
29+
30+
31+
32+
33+
34+
35+
36+
37+
38+
39+
40+
-->
241
[![README Header][readme_header_img]][readme_header_link]
342

443
[![Cloud Posse][logo]](https://cpco.io/homepage)
@@ -115,7 +154,7 @@ Available targets:
115154
| dedicated_master_count | Number of dedicated master nodes in the cluster | number | `0` | no |
116155
| dedicated_master_enabled | Indicates whether dedicated master nodes are enabled for the cluster | bool | `false` | no |
117156
| dedicated_master_type | Instance type of the dedicated master nodes in the cluster | string | `t2.small.elasticsearch` | no |
118-
| delimiter | Delimiter to be used between `namespace`, `stage`, `name` and `attributes` | string | `-` | no |
157+
| delimiter | Delimiter to be used between `namespace`, `environment`, `stage`, `name` and `attributes` | string | `-` | no |
119158
| dns_zone_id | Route53 DNS Zone ID to add hostname records for Elasticsearch domain and Kibana | string | `` | no |
120159
| ebs_iops | The baseline input/output (I/O) performance of EBS volumes attached to data nodes. Applicable only for the Provisioned IOPS EBS volume type | number | `0` | no |
121160
| ebs_volume_size | EBS volumes for data storage in GB | number | `0` | no |
@@ -124,6 +163,7 @@ Available targets:
124163
| enabled | Set to false to prevent the module from creating any resources | bool | `true` | no |
125164
| encrypt_at_rest_enabled | Whether to enable encryption at rest | bool | `true` | no |
126165
| encrypt_at_rest_kms_key_id | The KMS key ID to encrypt the Elasticsearch domain with. If not specified, then it defaults to using the AWS/Elasticsearch service KMS key | string | `` | no |
166+
| environment | Environment, e.g. 'prod', 'staging', 'dev', 'pre-prod', 'UAT' | string | `` | no |
127167
| iam_actions | List of actions to allow for the IAM roles, _e.g._ `es:ESHttpGet`, `es:ESHttpPut`, `es:ESHttpPost` | list(string) | `<list>` | no |
128168
| iam_authorizing_role_arns | List of IAM role ARNs to permit to assume the Elasticsearch user role | list(string) | `<list>` | no |
129169
| iam_role_arns | List of IAM role ARNs to permit access to the Elasticsearch domain | list(string) | `<list>` | no |
@@ -136,13 +176,13 @@ Available targets:
136176
| log_publishing_index_enabled | Specifies whether log publishing option for INDEX_SLOW_LOGS is enabled or not | bool | `false` | no |
137177
| log_publishing_search_cloudwatch_log_group_arn | ARN of the CloudWatch log group to which log for SEARCH_SLOW_LOGS needs to be published | string | `` | no |
138178
| log_publishing_search_enabled | Specifies whether log publishing option for SEARCH_SLOW_LOGS is enabled or not | bool | `false` | no |
139-
| name | Name of the application | string | - | yes |
140-
| namespace | Namespace (e.g. `eg` or `cp`) | string | `` | no |
179+
| name | Solution name, e.g. 'app' or 'jenkins' | string | `` | no |
180+
| namespace | Namespace, which could be your organization name or abbreviation, e.g. 'eg' or 'cp' | string | `` | no |
141181
| node_to_node_encryption_enabled | Whether to enable node-to-node encryption | bool | `false` | no |
142182
| security_groups | List of security group IDs to be allowed to connect to the cluster | list(string) | `<list>` | no |
143-
| stage | Stage (e.g. `prod`, `dev`, `staging`) | string | `` | no |
183+
| stage | Stage, e.g. 'prod', 'staging', 'dev', OR 'source', 'build', 'test', 'deploy', 'release' | string | `` | no |
144184
| subnet_ids | Subnet IDs | list(string) | - | yes |
145-
| tags | Additional tags (e.g. map(`BusinessUnit`,`XYZ`) | map(string) | `<map>` | no |
185+
| tags | Additional tags (e.g. `map('BusinessUnit','XYZ')` | map(string) | `<map>` | no |
146186
| vpc_id | VPC ID | string | - | yes |
147187
| zone_awareness_enabled | Enable zone awareness for Elasticsearch cluster | bool | `true` | no |
148188

@@ -181,42 +221,47 @@ For additional context, refer to some of these links.
181221

182222
## Help
183223

184-
**Got a question?**
224+
**Got a question?** We got answers.
185225

186226
File a GitHub [issue](https://github.com/cloudposse/terraform-aws-elasticsearch/issues), send us an [email][email] or join our [Slack Community][slack].
187227

188228
[![README Commercial Support][readme_commercial_support_img]][readme_commercial_support_link]
189229

190-
## Commercial Support
191-
192-
Work directly with our team of DevOps experts via email, slack, and video conferencing.
193-
194-
We provide [*commercial support*][commercial_support] for all of our [Open Source][github] projects. As a *Dedicated Support* customer, you have access to our team of subject matter experts at a fraction of the cost of a full-time engineer.
230+
## DevOps Accelerator for Startups
195231

196-
[![E-Mail](https://img.shields.io/badge/email-hello@cloudposse.com-blue.svg)][email]
197232

198-
- **Questions.** We'll use a Shared Slack channel between your team and ours.
199-
- **Troubleshooting.** We'll help you triage why things aren't working.
200-
- **Code Reviews.** We'll review your Pull Requests and provide constructive feedback.
201-
- **Bug Fixes.** We'll rapidly work to fix any bugs in our projects.
202-
- **Build New Terraform Modules.** We'll [develop original modules][module_development] to provision infrastructure.
203-
- **Cloud Architecture.** We'll assist with your cloud strategy and design.
204-
- **Implementation.** We'll provide hands-on support to implement our reference architectures.
233+
We are a [**DevOps Accelerator**][commercial_support]. We'll help you build your cloud infrastructure from the ground up so you can own it. Then we'll show you how to operate it and stick around for as long as you need us.
205234

235+
[![Learn More](https://img.shields.io/badge/learn%20more-success.svg?style=for-the-badge)][commercial_support]
206236

237+
Work directly with our team of DevOps experts via email, slack, and video conferencing.
207238

208-
## Terraform Module Development
209-
210-
Are you interested in custom Terraform module development? Submit your inquiry using [our form][module_development] today and we'll get back to you ASAP.
239+
We deliver 10x the value for a fraction of the cost of a full-time engineer. Our track record is not even funny. If you want things done right and you need it done FAST, then we're your best bet.
211240

241+
- **Reference Architecture.** You'll get everything you need from the ground up built using 100% infrastructure as code.
242+
- **Release Engineering.** You'll have end-to-end CI/CD with unlimited staging environments.
243+
- **Site Reliability Engineering.** You'll have total visibility into your apps and microservices.
244+
- **Security Baseline.** You'll have built-in governance with accountability and audit logs for all changes.
245+
- **GitOps.** You'll be able to operate your infrastructure via Pull Requests.
246+
- **Training.** You'll receive hands-on training so your team can operate what we build.
247+
- **Questions.** You'll have a direct line of communication between our teams via a Shared Slack channel.
248+
- **Troubleshooting.** You'll get help to triage when things aren't working.
249+
- **Code Reviews.** You'll receive constructive feedback on Pull Requests.
250+
- **Bug Fixes.** We'll rapidly work with you to fix any bugs in our projects.
212251

213252
## Slack Community
214253

215254
Join our [Open Source Community][slack] on Slack. It's **FREE** for everyone! Our "SweetOps" community is where you get to talk with others who share a similar vision for how to rollout and manage infrastructure. This is the best place to talk shop, ask questions, solicit feedback, and work together as a community to build totally *sweet* infrastructure.
216255

217256
## Newsletter
218257

219-
Signup for [our newsletter][newsletter] that covers everything on our technology radar. Receive updates on what we're up to on GitHub as well as awesome new projects we discover.
258+
Sign up for [our newsletter][newsletter] that covers everything on our technology radar. Receive updates on what we're up to on GitHub as well as awesome new projects we discover.
259+
260+
## Office Hours
261+
262+
[Join us every Wednesday via Zoom][office_hours] for our weekly "Lunch & Learn" sessions. It's **FREE** for everyone!
263+
264+
[![zoom](https://img.cloudposse.com/fit-in/200x200/https://cloudposse.com/wp-content/uploads/2019/08/Powered-by-Zoom.png")][office_hours]
220265

221266
## Contributing
222267

@@ -241,7 +286,7 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.
241286

242287
## Copyright
243288

244-
Copyright © 2017-2019 [Cloud Posse, LLC](https://cpco.io/copyright)
289+
Copyright © 2017-2020 [Cloud Posse, LLC](https://cpco.io/copyright)
245290

246291

247292

@@ -300,41 +345,39 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
300345
|---|---|---|---|
301346

302347
[osterman_homepage]: https://github.com/osterman
303-
[osterman_avatar]: https://github.com/osterman.png?size=150
348+
[osterman_avatar]: https://img.cloudposse.com/150x150/https://github.com/osterman.png
304349
[aknysh_homepage]: https://github.com/aknysh
305-
[aknysh_avatar]: https://github.com/aknysh.png?size=150
350+
[aknysh_avatar]: https://img.cloudposse.com/150x150/https://github.com/aknysh.png
306351
[goruha_homepage]: https://github.com/goruha
307-
[goruha_avatar]: https://github.com/goruha.png?size=150
352+
[goruha_avatar]: https://img.cloudposse.com/150x150/https://github.com/goruha.png
308353
[sarkis_homepage]: https://github.com/sarkis
309-
[sarkis_avatar]: https://github.com/sarkis.png?size=150
310-
311-
354+
[sarkis_avatar]: https://img.cloudposse.com/150x150/https://github.com/sarkis.png
312355

313356
[![README Footer][readme_footer_img]][readme_footer_link]
314357
[![Beacon][beacon]][website]
315358

316359
[logo]: https://cloudposse.com/logo-300x69.svg
317-
[docs]: https://cpco.io/docs
318-
[website]: https://cpco.io/homepage
319-
[github]: https://cpco.io/github
320-
[jobs]: https://cpco.io/jobs
321-
[hire]: https://cpco.io/hire
322-
[slack]: https://cpco.io/slack
323-
[linkedin]: https://cpco.io/linkedin
324-
[twitter]: https://cpco.io/twitter
325-
[testimonial]: https://cpco.io/leave-testimonial
326-
[newsletter]: https://cpco.io/newsletter
327-
[email]: https://cpco.io/email
328-
[commercial_support]: https://cpco.io/commercial-support
329-
[we_love_open_source]: https://cpco.io/we-love-open-source
330-
[module_development]: https://cpco.io/module-development
331-
[terraform_modules]: https://cpco.io/terraform-modules
332-
[readme_header_img]: https://cloudposse.com/readme/header/img?repo=cloudposse/terraform-aws-elasticsearch
333-
[readme_header_link]: https://cloudposse.com/readme/header/link?repo=cloudposse/terraform-aws-elasticsearch
334-
[readme_footer_img]: https://cloudposse.com/readme/footer/img?repo=cloudposse/terraform-aws-elasticsearch
335-
[readme_footer_link]: https://cloudposse.com/readme/footer/link?repo=cloudposse/terraform-aws-elasticsearch
336-
[readme_commercial_support_img]: https://cloudposse.com/readme/commercial-support/img?repo=cloudposse/terraform-aws-elasticsearch
337-
[readme_commercial_support_link]: https://cloudposse.com/readme/commercial-support/link?repo=cloudposse/terraform-aws-elasticsearch
360+
[docs]: https://cpco.io/docs?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=docs
361+
[website]: https://cpco.io/homepage?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=website
362+
[github]: https://cpco.io/github?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=github
363+
[jobs]: https://cpco.io/jobs?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=jobs
364+
[hire]: https://cpco.io/hire?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=hire
365+
[slack]: https://cpco.io/slack?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=slack
366+
[linkedin]: https://cpco.io/linkedin?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=linkedin
367+
[twitter]: https://cpco.io/twitter?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=twitter
368+
[testimonial]: https://cpco.io/leave-testimonial?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=testimonial
369+
[office_hours]: https://cloudposse.com/office-hours?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=office_hours
370+
[newsletter]: https://cpco.io/newsletter?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=newsletter
371+
[email]: https://cpco.io/email?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=email
372+
[commercial_support]: https://cpco.io/commercial-support?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=commercial_support
373+
[we_love_open_source]: https://cpco.io/we-love-open-source?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=we_love_open_source
374+
[terraform_modules]: https://cpco.io/terraform-modules?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=terraform_modules
375+
[readme_header_img]: https://cloudposse.com/readme/header/img
376+
[readme_header_link]: https://cloudposse.com/readme/header/link?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=readme_header_link
377+
[readme_footer_img]: https://cloudposse.com/readme/footer/img
378+
[readme_footer_link]: https://cloudposse.com/readme/footer/link?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=readme_footer_link
379+
[readme_commercial_support_img]: https://cloudposse.com/readme/commercial-support/img
380+
[readme_commercial_support_link]: https://cloudposse.com/readme/commercial-support/link?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=readme_commercial_support_link
338381
[share_twitter]: https://twitter.com/intent/tweet/?text=terraform-aws-elasticsearch&url=https://github.com/cloudposse/terraform-aws-elasticsearch
339382
[share_linkedin]: https://www.linkedin.com/shareArticle?mini=true&title=terraform-aws-elasticsearch&url=https://github.com/cloudposse/terraform-aws-elasticsearch
340383
[share_reddit]: https://reddit.com/submit/?url=https://github.com/cloudposse/terraform-aws-elasticsearch

docs/terraform.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
| dedicated_master_count | Number of dedicated master nodes in the cluster | number | `0` | no |
1212
| dedicated_master_enabled | Indicates whether dedicated master nodes are enabled for the cluster | bool | `false` | no |
1313
| dedicated_master_type | Instance type of the dedicated master nodes in the cluster | string | `t2.small.elasticsearch` | no |
14-
| delimiter | Delimiter to be used between `namespace`, `stage`, `name` and `attributes` | string | `-` | no |
14+
| delimiter | Delimiter to be used between `namespace`, `environment`, `stage`, `name` and `attributes` | string | `-` | no |
1515
| dns_zone_id | Route53 DNS Zone ID to add hostname records for Elasticsearch domain and Kibana | string | `` | no |
1616
| ebs_iops | The baseline input/output (I/O) performance of EBS volumes attached to data nodes. Applicable only for the Provisioned IOPS EBS volume type | number | `0` | no |
1717
| ebs_volume_size | EBS volumes for data storage in GB | number | `0` | no |
@@ -20,6 +20,7 @@
2020
| enabled | Set to false to prevent the module from creating any resources | bool | `true` | no |
2121
| encrypt_at_rest_enabled | Whether to enable encryption at rest | bool | `true` | no |
2222
| encrypt_at_rest_kms_key_id | The KMS key ID to encrypt the Elasticsearch domain with. If not specified, then it defaults to using the AWS/Elasticsearch service KMS key | string | `` | no |
23+
| environment | Environment, e.g. 'prod', 'staging', 'dev', 'pre-prod', 'UAT' | string | `` | no |
2324
| iam_actions | List of actions to allow for the IAM roles, _e.g._ `es:ESHttpGet`, `es:ESHttpPut`, `es:ESHttpPost` | list(string) | `<list>` | no |
2425
| iam_authorizing_role_arns | List of IAM role ARNs to permit to assume the Elasticsearch user role | list(string) | `<list>` | no |
2526
| iam_role_arns | List of IAM role ARNs to permit access to the Elasticsearch domain | list(string) | `<list>` | no |
@@ -32,13 +33,13 @@
3233
| log_publishing_index_enabled | Specifies whether log publishing option for INDEX_SLOW_LOGS is enabled or not | bool | `false` | no |
3334
| log_publishing_search_cloudwatch_log_group_arn | ARN of the CloudWatch log group to which log for SEARCH_SLOW_LOGS needs to be published | string | `` | no |
3435
| log_publishing_search_enabled | Specifies whether log publishing option for SEARCH_SLOW_LOGS is enabled or not | bool | `false` | no |
35-
| name | Name of the application | string | - | yes |
36-
| namespace | Namespace (e.g. `eg` or `cp`) | string | `` | no |
36+
| name | Solution name, e.g. 'app' or 'jenkins' | string | `` | no |
37+
| namespace | Namespace, which could be your organization name or abbreviation, e.g. 'eg' or 'cp' | string | `` | no |
3738
| node_to_node_encryption_enabled | Whether to enable node-to-node encryption | bool | `false` | no |
3839
| security_groups | List of security group IDs to be allowed to connect to the cluster | list(string) | `<list>` | no |
39-
| stage | Stage (e.g. `prod`, `dev`, `staging`) | string | `` | no |
40+
| stage | Stage, e.g. 'prod', 'staging', 'dev', OR 'source', 'build', 'test', 'deploy', 'release' | string | `` | no |
4041
| subnet_ids | Subnet IDs | list(string) | - | yes |
41-
| tags | Additional tags (e.g. map(`BusinessUnit`,`XYZ`) | map(string) | `<map>` | no |
42+
| tags | Additional tags (e.g. `map('BusinessUnit','XYZ')` | map(string) | `<map>` | no |
4243
| vpc_id | VPC ID | string | - | yes |
4344
| zone_awareness_enabled | Enable zone awareness for Elasticsearch cluster | bool | `true` | no |
4445

main.tf

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
module "label" {
2-
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.14.1"
3-
enabled = var.enabled
4-
namespace = var.namespace
5-
name = var.name
6-
stage = var.stage
7-
delimiter = var.delimiter
8-
attributes = var.attributes
9-
tags = var.tags
2+
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.16.0"
3+
enabled = var.enabled
4+
namespace = var.namespace
5+
name = var.name
6+
stage = var.stage
7+
environment = var.environment
8+
delimiter = var.delimiter
9+
attributes = var.attributes
10+
tags = var.tags
1011
}
1112

1213
module "user_label" {
13-
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.14.1"
14-
enabled = var.enabled
15-
namespace = var.namespace
16-
name = var.name
17-
stage = var.stage
18-
delimiter = var.delimiter
19-
attributes = concat(var.attributes, ["user"])
20-
tags = var.tags
14+
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.16.0"
15+
enabled = var.enabled
16+
namespace = var.namespace
17+
name = var.name
18+
stage = var.stage
19+
environment = var.environment
20+
delimiter = var.delimiter
21+
attributes = concat(var.attributes, ["user"])
22+
tags = var.tags
2123
}
2224

2325
resource "aws_security_group" "default" {

0 commit comments

Comments
 (0)