From 6e5ed06bcf8924faf0a50601b92eb99ea938dd0a Mon Sep 17 00:00:00 2001 From: nikitadugar Date: Thu, 26 Mar 2020 18:56:23 +0530 Subject: [PATCH] fix labels managedby variables --- README.md | 13 +++++++------ README.yaml | 2 +- main.tf | 4 +++- variables.tf | 6 ++++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c784ab5..8e583e2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Terraform AWS IAM Role -

+

Terraform module to create Iam role resource on AWS.

@@ -38,7 +38,7 @@
-We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy Bigger problems are always solved by breaking them into smaller manageable problems. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller connected yet manageable pieces within the infrastructure. +We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy Bigger problems are always solved by breaking them into smaller manageable problems. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller connected yet manageable pieces within the infrastructure. This module is basically combination of [Terraform open source](https://www.terraform.io/) and includes automatation tests and examples. It also helps to create and improve your infrastructure with minimalistic code instead of maintaining the whole infrastructure code yourself. @@ -49,7 +49,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c ## Prerequisites -This module has a few dependencies: +This module has a few dependencies: - [Terraform 0.12](https://learn.hashicorp.com/terraform/getting-started/install.html) - [Go](https://golang.org/doc/install) @@ -72,7 +72,7 @@ This module has a few dependencies: Here is an example of how you can use this module in your inventory structure: ```hcl module "iam-role" { - source = "git::https://github.com/clouddrove/terraform-aws-iam-role.git?ref=tags/0.12.1" + source = "git::https://github.com/clouddrove/terraform-aws-iam-role.git?ref=tags/0.12.3" name = "iam-role" application = "clouddrove" @@ -127,6 +127,7 @@ Here is an example of how you can use this module in your inventory structure: | environment | Environment \(e.g. `prod`, `dev`, `staging`\). | string | `""` | no | | force\_detach\_policies | The policy that grants an entity permission to assume the role. | bool | `"false"` | no | | label\_order | Label order, e.g. `name`,`application`. | list | `` | no | +| managedby | ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'. | string | `"anmol@clouddrove.com"` | no | | max\_session\_duration | The maximum session duration \(in seconds\) that you want to set for the specified role. If you do not specify a value for this setting, the default maximum of one hour is applied. This setting can have a value from 1 hour to 12 hours. | number | `"3600"` | no | | name | Name \(e.g. `app` or `cluster`\). | string | `""` | no | | path | The path to the role. | string | `"/"` | no | @@ -148,7 +149,7 @@ Here is an example of how you can use this module in your inventory structure: ## Testing -In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system. +In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system. You need to run the following command in the testing folder: ```hcl @@ -157,7 +158,7 @@ You need to run the following command in the testing folder: -## Feedback +## Feedback If you come accross a bug or have any feedback, please log it in our [issue tracker](https://github.com/clouddrove/terraform-aws-iam-role/issues), or feel free to drop us an email at [hello@clouddrove.com](mailto:hello@clouddrove.com). If you have found it worth your time, go ahead and give us a ★ on [our GitHub](https://github.com/clouddrove/terraform-aws-iam-role)! diff --git a/README.yaml b/README.yaml index 91bf914..79ee8b5 100644 --- a/README.yaml +++ b/README.yaml @@ -37,7 +37,7 @@ usage : |- Here is an example of how you can use this module in your inventory structure: ```hcl module "iam-role" { - source = "git::https://github.com/clouddrove/terraform-aws-iam-role.git?ref=tags/0.12.1" + source = "git::https://github.com/clouddrove/terraform-aws-iam-role.git?ref=tags/0.12.3" name = "iam-role" application = "clouddrove" diff --git a/main.tf b/main.tf index 05ee5eb..bc219e2 100644 --- a/main.tf +++ b/main.tf @@ -8,9 +8,11 @@ module "labels" { source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.12.0" + enabled = var.enabled name = var.name application = var.application environment = var.environment + managedby = var.managedby label_order = var.label_order } @@ -42,7 +44,7 @@ resource "aws_iam_role_policy" "default" { resource "aws_iam_policy_attachment" "default" { count = var.enabled && var.policy_enabled && var.policy_arn != "" ? 1 : 0 name = format("%s-policy", module.labels.id) - roles = [aws_iam_role.default.*.id[0]] + roles = [aws_iam_role.default.*.id[0]] policy_arn = var.policy_arn } \ No newline at end of file diff --git a/variables.tf b/variables.tf index 7863d3b..3843a31 100644 --- a/variables.tf +++ b/variables.tf @@ -42,6 +42,12 @@ variable "tags" { description = "Additional tags (e.g. map(`BusinessUnit`,`XYZ`)." } +variable "managedby" { + type = string + default = "anmol@clouddrove.com" + description = "ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'." +} + # Module : Iam Role # Description : Terraform Iam Role module variables. variable "enabled" {