From 710883b4bf96bbfef09d2d68cae442303ed87165 Mon Sep 17 00:00:00 2001 From: IPONWEB GitHub Admin <24291495+iponweb-github-admin@users.noreply.github.com> Date: Tue, 14 Apr 2020 02:42:16 +0300 Subject: [PATCH] Fix service role creation and mark name as mandatory (#46) * Fix service role creation and mark name as mandatory * count fix * Update docs/terraform.md Co-Authored-By: Maxim Mironenko * fix readme Co-authored-by: ikochnev Co-authored-by: IlyaKochnev <58564259+IlyaKochnev@users.noreply.github.com> Co-authored-by: Maxim Mironenko Co-authored-by: Maxim Mironenko --- README.md | 5 +++++ main.tf | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c87581..12f1520 100644 --- a/README.md +++ b/README.md @@ -255,6 +255,10 @@ We deliver 10x the value for a fraction of the cost of a full-time engineer. Our 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. +## Discourse Forums + +Participate in our [Discourse Forums][discourse]. Here you'll find answers to commonly asked questions. Most questions will be related to the enormous number of projects we support on our GitHub. Come here to collaborate on answers, find solutions, and get ideas about the products and services we value. It only takes a minute to get started! Just sign in with SSO using your GitHub account. + ## Newsletter 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. @@ -370,6 +374,7 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply [testimonial]: https://cpco.io/leave-testimonial?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=testimonial [office_hours]: https://cloudposse.com/office-hours?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=office_hours [newsletter]: https://cpco.io/newsletter?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=newsletter + [discourse]: https://ask.sweetops.com/?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=discourse [email]: https://cpco.io/email?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=email [commercial_support]: https://cpco.io/commercial-support?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-elasticsearch&utm_content=commercial_support [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 diff --git a/main.tf b/main.tf index bf9427c..971137a 100644 --- a/main.tf +++ b/main.tf @@ -66,13 +66,14 @@ resource "aws_security_group_rule" "egress" { } data "aws_iam_role" "default" { - count = var.enabled ? 1 : 0 + count = var.enabled && var.create_iam_service_linked_role == 0 ? 1 : 0 name = "AWSServiceRoleForAmazonElasticsearchService" + } # https://github.com/terraform-providers/terraform-provider-aws/issues/5218 resource "aws_iam_service_linked_role" "default" { - count = var.enabled && length(data.aws_iam_role.default.*.id) == 0 ? 1 : 0 + count = var.enabled && var.create_iam_service_linked_role && length(data.aws_iam_role.default.*.id) == 0 ? 1 : 0 aws_service_name = "es.amazonaws.com" description = "AWSServiceRoleForAmazonElasticsearchService Service-Linked Role" }