Tags and providers (#40)

* Tags * tags * tags * Bump providers * Auto Format * Add to contributors and rm extra space * Auto Format Co-authored-by: cloudpossebot <11232728+cloudpossebot@users.noreply.github.com>
cloudposse · Nov 25, 2021 · 373b971 · 373b971
1 parent 5f5c4e1
commit 373b971
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -116,16 +116,16 @@ lists under "All Permissions" as the maximal set of permissions required, so you
 Include this module in your existing terraform code:
 
 ```hcl
-  module "datadog_integration" {
-    source = "cloudposse/datadog-integration/aws"
-    # Cloud Posse recommends pinning every module to a specific version
-    # version     = "x.x.x"
-
-    namespace                  = "eg"
-    stage                      = "test"
-    name                       = "datadog"
-    integrations               = ["all"]
-  }
+module "datadog_integration" {
+  source = "cloudposse/datadog-integration/aws"
+  # Cloud Posse recommends pinning every module to a specific version
+  # version     = "x.x.x"
+
+  namespace                  = "eg"
+  stage                      = "test"
+  name                       = "datadog"
+  integrations               = ["all"]
+}
 ```
 
 The DataDog integration will be linked with your configured datadog account via the provider's `api_key`.
@@ -157,16 +157,15 @@ Available targets:
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.0 |
-| <a name="requirement_datadog"></a> [datadog](#requirement\_datadog) | >= 2.13 |
-| <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.3 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
+| <a name="requirement_datadog"></a> [datadog](#requirement\_datadog) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.0 |
-| <a name="provider_datadog"></a> [datadog](#provider\_datadog) | >= 2.13 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
+| <a name="provider_datadog"></a> [datadog](#provider\_datadog) | >= 3.0 |
 
 ## Modules
 
@@ -380,8 +379,8 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
 ### Contributors
 
 <!-- markdownlint-disable -->
-|  [![Sergey Vasilyev][s2504s_avatar]][s2504s_homepage]<br/>[Sergey Vasilyev][s2504s_homepage] | [![Erik Osterman][osterman_avatar]][osterman_homepage]<br/>[Erik Osterman][osterman_homepage] | [![Andriy Knysh][aknysh_avatar]][aknysh_homepage]<br/>[Andriy Knysh][aknysh_homepage] | [![PePe Amengual][jamengual_avatar]][jamengual_homepage]<br/>[PePe Amengual][jamengual_homepage] |
-|---|---|---|---|
+|  [![Sergey Vasilyev][s2504s_avatar]][s2504s_homepage]<br/>[Sergey Vasilyev][s2504s_homepage] | [![Erik Osterman][osterman_avatar]][osterman_homepage]<br/>[Erik Osterman][osterman_homepage] | [![Andriy Knysh][aknysh_avatar]][aknysh_homepage]<br/>[Andriy Knysh][aknysh_homepage] | [![PePe Amengual][jamengual_avatar]][jamengual_homepage]<br/>[PePe Amengual][jamengual_homepage] | [![RB][nitrocode_avatar]][nitrocode_homepage]<br/>[RB][nitrocode_homepage] |
+|---|---|---|---|---|
 <!-- markdownlint-restore -->
 
   [s2504s_homepage]: https://github.com/s2504s
@@ -392,6 +391,8 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
   [aknysh_avatar]: https://img.cloudposse.com/150x150/https://github.com/aknysh.png
   [jamengual_homepage]: https://github.com/jamengual
   [jamengual_avatar]: https://img.cloudposse.com/150x150/https://github.com/jamengual.png
+  [nitrocode_homepage]: https://github.com/nitrocode
+  [nitrocode_avatar]: https://img.cloudposse.com/150x150/https://github.com/nitrocode.png
 
 [![README Footer][readme_footer_img]][readme_footer_link]
 [![Beacon][beacon]][website]

diff --git a/README.yaml b/README.yaml
@@ -80,16 +80,16 @@ usage: |-
   Include this module in your existing terraform code:
 
   ```hcl
-    module "datadog_integration" {
-      source = "cloudposse/datadog-integration/aws"
-      # Cloud Posse recommends pinning every module to a specific version
-      # version     = "x.x.x"
-
-      namespace                  = "eg"
-      stage                      = "test"
-      name                       = "datadog"
-      integrations               = ["all"]
-    }
+  module "datadog_integration" {
+    source = "cloudposse/datadog-integration/aws"
+    # Cloud Posse recommends pinning every module to a specific version
+    # version     = "x.x.x"
+
+    namespace                  = "eg"
+    stage                      = "test"
+    name                       = "datadog"
+    integrations               = ["all"]
+  }
   ```
 
   The DataDog integration will be linked with your configured datadog account via the provider's `api_key`.
@@ -111,3 +111,5 @@ contributors:
     github: "aknysh"
   - name: "PePe Amengual"
     github: "jamengual"
+  - name: "RB"
+    github: "nitrocode"
diff --git a/docs/terraform.md b/docs/terraform.md
@@ -4,16 +4,15 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.0 |
-| <a name="requirement_datadog"></a> [datadog](#requirement\_datadog) | >= 2.13 |
-| <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.3 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
+| <a name="requirement_datadog"></a> [datadog](#requirement\_datadog) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.0 |
-| <a name="provider_datadog"></a> [datadog](#provider\_datadog) | >= 2.13 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
+| <a name="provider_datadog"></a> [datadog](#provider\_datadog) | >= 3.0 |
 
 ## Modules
 

diff --git a/iam_policy_all.tf b/iam_policy_all.tf
@@ -109,6 +109,7 @@ resource "aws_iam_policy" "all" {
   count  = local.all_count
   name   = module.all_label.id
   policy = join("", data.aws_iam_policy_document.all.*.json)
+  tags   = module.all_label.tags
 }
 
 resource "aws_iam_role_policy_attachment" "all" {

diff --git a/iam_policy_core.tf b/iam_policy_core.tf
@@ -38,6 +38,7 @@ resource "aws_iam_policy" "core" {
   count  = local.core_count
   name   = module.core_label.id
   policy = join("", data.aws_iam_policy_document.core.*.json)
+  tags   = module.core_label.tags
 }
 
 resource "aws_iam_role_policy_attachment" "core" {

diff --git a/main.tf b/main.tf
@@ -58,6 +58,7 @@ resource "aws_iam_role" "default" {
   count              = local.enabled ? 1 : 0
   name               = module.this.id
   assume_role_policy = join("", data.aws_iam_policy_document.assume_role.*.json)
+  tags               = module.this.tags
 }
 
 # https://docs.datadoghq.com/integrations/amazon_web_services/?tab=roledelegation#resource-collection

diff --git a/versions.tf b/versions.tf
@@ -4,15 +4,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 2.0"
-    }
-    local = {
-      source  = "hashicorp/local"
-      version = ">= 1.3"
+      version = ">= 3.0"
     }
     datadog = {
       source  = "datadog/datadog"
-      version = ">= 2.13"
+      version = ">= 3.0"
     }
   }
 }