Merge remote-tracking branch 'upstream/master' into master

* upstream/master:
  Updated CHANGELOG
  chore: Fixed formatting
  feat: Allow custom Name tag for security group (terraform-aws-modules#187)
  Updated CHANGELOG
  feat: Add JMX and Node exporter TCP ports for Kafka (terraform-aws-modules#186)
  Updated CHANGELOG
  feat: aws-provider version bump to >= 2.42, < 4.0 (terraform-aws-modules#184)
  Updated CHANGELOG
  feat: Add support for Solr (terraform-aws-modules#181)
  Updated CHANGELOG
  feat: Added optional revoke_rules_on_delete functionality (required for EMR) (terraform-aws-modules#179)
  Updated CHANGELOG
  feat: Updated version requirements to support Terraform 0.13 (terraform-aws-modules#178)
  Updated CHANGELOG
  fix: Fixed MinIO rules formatting
  feat: Adding support for MinIO (terraform-aws-modules#174)

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.27.0
+    rev: v1.31.0
     hooks:
       - id: terraform_fmt
       - id: terraform_docs
   - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v3.1.0
     hooks:
       - id: check-merge-conflict

CHANGELOG.md

@@ -6,20 +6,48 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 
 
+<a name="v3.16.0"></a>
+## [v3.16.0] - 2020-08-20
+
+- chore: Fixed formatting
+- feat: Allow custom Name tag for security group ([#187](https://github.com/terraform-aws-modules/terraform-aws-security-group/issues/187))
+
+
+<a name="v3.15.0"></a>
+## [v3.15.0] - 2020-08-13
+
+- feat: Add JMX and Node exporter TCP ports for Kafka ([#186](https://github.com/terraform-aws-modules/terraform-aws-security-group/issues/186))
+
+
+<a name="v3.14.0"></a>
+## [v3.14.0] - 2020-08-13
+
+- feat: aws-provider version bump to >= 2.42, < 4.0 ([#184](https://github.com/terraform-aws-modules/terraform-aws-security-group/issues/184))
+
+
+<a name="v3.13.0"></a>
+## [v3.13.0] - 2020-07-20
+
+- feat: Add support for Solr ([#181](https://github.com/terraform-aws-modules/terraform-aws-security-group/issues/181))
+
+
+<a name="v3.12.0"></a>
+## [v3.12.0] - 2020-07-03
+
+- feat: Added optional revoke_rules_on_delete functionality (required for EMR) ([#179](https://github.com/terraform-aws-modules/terraform-aws-security-group/issues/179))
+
 
 <a name="v3.11.0"></a>
-## [v3.11.0] - 2020-05-11
+## [v3.11.0] - 2020-06-24
 
-- Revert
+- feat: Updated version requirements to support Terraform 0.13 ([#178](https://github.com/terraform-aws-modules/terraform-aws-security-group/issues/178))
 
 
 <a name="v3.10.0"></a>
-## [v3.10.0] - 2020-05-11
+## [v3.10.0] - 2020-05-13
 
-- Changelog
-- Update source to work for now
-- Changelog
-- Add a backend block to allow terragrunt to use these modules directly
+- fix: Fixed MinIO rules formatting
+- feat: Adding support for MinIO ([#174](https://github.com/terraform-aws-modules/terraform-aws-security-group/issues/174))
 
 
 <a name="v3.9.0"></a>
@@ -429,7 +457,12 @@ All notable changes to this project will be documented in this file.
 - Initial commit
 
 
-[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.11.0...HEAD
+[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.16.0...HEAD
+[v3.16.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.15.0...v3.16.0
+[v3.15.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.14.0...v3.15.0
+[v3.14.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.13.0...v3.14.0
+[v3.13.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.12.0...v3.13.0
+[v3.12.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.11.0...v3.12.0
 [v3.11.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.10.0...v3.11.0
 [v3.10.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.9.0...v3.10.0
 [v3.9.0]: https://github.com/terraform-aws-modules/terraform-aws-security-group/compare/v3.8.0...v3.9.0

examples/complete/main.tf

@@ -179,7 +179,7 @@ module "complete_sg" {
       from_port = 41
       to_port   = 51
       protocol  = 6
-      self      = false
+      self      = true
     },
   ]
 
@@ -300,7 +300,7 @@ module "complete_sg" {
       from_port = 41
       to_port   = 51
       protocol  = 6
-      self      = false
+      self      = true
     },
   ]
 

main.tf

@@ -15,15 +15,16 @@ locals {
 resource "aws_security_group" "this" {
   count = var.create && false == var.use_name_prefix ? 1 : 0
 
-  name        = var.name
-  description = var.description
-  vpc_id      = var.vpc_id
+  name                   = var.name
+  description            = var.description
+  vpc_id                 = var.vpc_id
+  revoke_rules_on_delete = var.revoke_rules_on_delete
 
   tags = merge(
-    var.tags,
     {
       "Name" = format("%s", var.name)
     },
+    var.tags,
   )
 }
 
@@ -33,15 +34,16 @@ resource "aws_security_group" "this" {
 resource "aws_security_group" "this_name_prefix" {
   count = var.create && var.use_name_prefix ? 1 : 0
 
-  name_prefix = "${var.name}-"
-  description = var.description
-  vpc_id      = var.vpc_id
+  name_prefix            = "${var.name}-"
+  description            = var.description
+  vpc_id                 = var.vpc_id
+  revoke_rules_on_delete = var.revoke_rules_on_delete
 
   tags = merge(
-    var.tags,
     {
       "Name" = format("%s", var.name)
     },
+    var.tags,
   )
 
   lifecycle {

modules/README.md

@@ -21,7 +21,9 @@ List of Security Groups implemented as Terraform modules
 * [kibana](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/kibana)
 * [kubernetes-api](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/kubernetes-api)
 * [ldaps](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/ldaps)
+* [logstash](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/logstash)
 * [memcached](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/memcached)
+* [minio](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/minio)
 * [mongodb](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/mongodb)
 * [mssql](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/mssql)
 * [mysql](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/mysql)
@@ -37,6 +39,7 @@ List of Security Groups implemented as Terraform modules
 * [rdp](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/rdp)
 * [redis](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/redis)
 * [redshift](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/redshift)
+* [solr](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/solr)
 * [splunk](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/splunk)
 * [squid](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/squid)
 * [ssh](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/ssh)

modules/_templates/main.tf

@@ -6,12 +6,13 @@ terraform {
 module "sg" {
   source = "../../"
 
-  create          = var.create
-  name            = var.name
-  use_name_prefix = var.use_name_prefix
-  description     = var.description
-  vpc_id          = var.vpc_id
-  tags            = var.tags
+  create                 = var.create
+  name                   = var.name
+  use_name_prefix        = var.use_name_prefix
+  description            = var.description
+  vpc_id                 = var.vpc_id
+  revoke_rules_on_delete = var.revoke_rules_on_delete
+  tags                   = var.tags
 
   ##########
   # Ingress

modules/_templates/variables.tf

@@ -29,6 +29,12 @@ variable "description" {
   default     = "Security Group managed by Terraform"
 }
 
+variable "revoke_rules_on_delete" {
+  description = "Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR."
+  type        = bool
+  default     = false
+}
+
 variable "tags" {
   description = "A mapping of tags to assign to security group"
   type        = map(string)

modules/_templates/versions.tf

@@ -1,7 +1,7 @@
 terraform {
-  required_version = "~> 0.12.6"
+  required_version = ">= 0.12.6, < 0.14"
 
   required_providers {
-    aws = "~> 2.42"
+    aws = ">= 2.42, < 4.0"
   }
 }

modules/activemq/README.md

@@ -18,8 +18,8 @@ All automatic values **activemq module** is using are available [here](https://g
 
 | Name | Version |
 |------|---------|
-| terraform | ~> 0.12.6 |
-| aws | ~> 2.42 |
+| terraform | >= 0.12.6, < 0.14 |
+| aws | >= 2.42, < 4.0 |
 
 ## Providers
 
@@ -92,6 +92,7 @@ No provider.
 | number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no |
 | number\_of\_computed\_ingress\_with\_self | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no |
 | number\_of\_computed\_ingress\_with\_source\_security\_group\_id | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no |
+| revoke\_rules\_on\_delete | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no |
 | tags | A mapping of tags to assign to security group | `map(string)` | `{}` | no |
 | use\_name\_prefix | Whether to use name\_prefix or fixed name. Should be true to able to update security group name after initial creation | `bool` | `true` | no |
 | vpc\_id | ID of the VPC where to create security group | `string` | n/a | yes |

modules/activemq/main.tf

@@ -6,12 +6,13 @@ terraform {
 module "sg" {
   source = "../../"
 
-  create          = var.create
-  name            = var.name
-  use_name_prefix = var.use_name_prefix
-  description     = var.description
-  vpc_id          = var.vpc_id
-  tags            = var.tags
+  create                 = var.create
+  name                   = var.name
+  use_name_prefix        = var.use_name_prefix
+  description            = var.description
+  vpc_id                 = var.vpc_id
+  revoke_rules_on_delete = var.revoke_rules_on_delete
+  tags                   = var.tags
 
   ##########
   # Ingress

modules/activemq/variables.tf

@@ -29,6 +29,12 @@ variable "description" {
   default     = "Security Group managed by Terraform"
 }
 
+variable "revoke_rules_on_delete" {
+  description = "Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR."
+  type        = bool
+  default     = false
+}
+
 variable "tags" {
   description = "A mapping of tags to assign to security group"
   type        = map(string)

modules/activemq/versions.tf

@@ -1,7 +1,7 @@
 terraform {
-  required_version = "~> 0.12.6"
+  required_version = ">= 0.12.6, < 0.14"
 
   required_providers {
-    aws = "~> 2.42"
+    aws = ">= 2.42, < 4.0"
   }
 }

modules/alertmanager/README.md

@@ -18,8 +18,8 @@ All automatic values **alertmanager module** is using are available [here](https
 
 | Name | Version |
 |------|---------|
-| terraform | ~> 0.12.6 |
-| aws | ~> 2.42 |
+| terraform | >= 0.12.6, < 0.14 |
+| aws | >= 2.42, < 4.0 |
 
 ## Providers
 
@@ -92,6 +92,7 @@ No provider.
 | number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no |
 | number\_of\_computed\_ingress\_with\_self | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no |
 | number\_of\_computed\_ingress\_with\_source\_security\_group\_id | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no |
+| revoke\_rules\_on\_delete | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no |
 | tags | A mapping of tags to assign to security group | `map(string)` | `{}` | no |
 | use\_name\_prefix | Whether to use name\_prefix or fixed name. Should be true to able to update security group name after initial creation | `bool` | `true` | no |
 | vpc\_id | ID of the VPC where to create security group | `string` | n/a | yes |

modules/alertmanager/main.tf

@@ -6,12 +6,13 @@ terraform {
 module "sg" {
   source = "../../"
 
-  create          = var.create
-  name            = var.name
-  use_name_prefix = var.use_name_prefix
-  description     = var.description
-  vpc_id          = var.vpc_id
-  tags            = var.tags
+  create                 = var.create
+  name                   = var.name
+  use_name_prefix        = var.use_name_prefix
+  description            = var.description
+  vpc_id                 = var.vpc_id
+  revoke_rules_on_delete = var.revoke_rules_on_delete
+  tags                   = var.tags
 
   ##########
   # Ingress

modules/alertmanager/variables.tf

@@ -29,6 +29,12 @@ variable "description" {
   default     = "Security Group managed by Terraform"
 }
 
+variable "revoke_rules_on_delete" {
+  description = "Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR."
+  type        = bool
+  default     = false
+}
+
 variable "tags" {
   description = "A mapping of tags to assign to security group"
   type        = map(string)

modules/alertmanager/versions.tf

@@ -1,7 +1,7 @@
 terraform {
-  required_version = "~> 0.12.6"
+  required_version = ">= 0.12.6, < 0.14"
 
   required_providers {
-    aws = "~> 2.42"
+    aws = ">= 2.42, < 4.0"
   }
 }

modules/carbon-relay-ng/README.md

@@ -18,8 +18,8 @@ All automatic values **carbon-relay-ng module** is using are available [here](ht
 
 | Name | Version |
 |------|---------|
-| terraform | ~> 0.12.6 |
-| aws | ~> 2.42 |
+| terraform | >= 0.12.6, < 0.14 |
+| aws | >= 2.42, < 4.0 |
 
 ## Providers
 
@@ -92,6 +92,7 @@ No provider.
 | number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no |
 | number\_of\_computed\_ingress\_with\_self | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no |
 | number\_of\_computed\_ingress\_with\_source\_security\_group\_id | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no |
+| revoke\_rules\_on\_delete | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no |
 | tags | A mapping of tags to assign to security group | `map(string)` | `{}` | no |
 | use\_name\_prefix | Whether to use name\_prefix or fixed name. Should be true to able to update security group name after initial creation | `bool` | `true` | no |
 | vpc\_id | ID of the VPC where to create security group | `string` | n/a | yes |

modules/carbon-relay-ng/main.tf

@@ -6,12 +6,13 @@ terraform {
 module "sg" {
   source = "../../"
 
-  create          = var.create
-  name            = var.name
-  use_name_prefix = var.use_name_prefix
-  description     = var.description
-  vpc_id          = var.vpc_id
-  tags            = var.tags
+  create                 = var.create
+  name                   = var.name
+  use_name_prefix        = var.use_name_prefix
+  description            = var.description
+  vpc_id                 = var.vpc_id
+  revoke_rules_on_delete = var.revoke_rules_on_delete
+  tags                   = var.tags
 
   ##########
   # Ingress

modules/carbon-relay-ng/variables.tf

@@ -29,6 +29,12 @@ variable "description" {
   default     = "Security Group managed by Terraform"
 }
 
+variable "revoke_rules_on_delete" {
+  description = "Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR."
+  type        = bool
+  default     = false
+}
+
 variable "tags" {
   description = "A mapping of tags to assign to security group"
   type        = map(string)

modules/carbon-relay-ng/versions.tf

@@ -1,7 +1,7 @@
 terraform {
-  required_version = "~> 0.12.6"
+  required_version = ">= 0.12.6, < 0.14"
 
   required_providers {
-    aws = "~> 2.42"
+    aws = ">= 2.42, < 4.0"
   }
 }