Merge pull request #27 from souza-dan/remove-unused-references

DEV-15187 - Remove unused references

Author: souza-dan

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Tamr Terraform AWS OpenSearch Repo
 
+## v6.0.0 August 23rd 2022
+* Removes the following input variables from the main module:
+  * `vpc_id`
+* Removes the following input variables from the `cloudwatch-logs` module:
+  * `domain_name`
+  * `log_retention_in_days`
+  * `tags`
+* Removes unused variables from examples
+
 ## v5.0.0 July 29th 2022
 * Removes the following input variables from the main module:
   * `aws_region`

README.md

@@ -50,7 +50,6 @@ No provider.
 |------|-------------|------|---------|:--------:|
 | domain\_name | The name to give to the OpenSearch domain | `string` | n/a | yes |
 | subnet\_ids | List of subnet IDs for the OpenSearch domain to be created in | `list(string)` | n/a | yes |
-| vpc\_id | The ID of the VPC in which to attach the security group | `string` | n/a | yes |
 | arn\_partition | The partition in which the resource is located. A partition is a group of AWS Regions.<br>  Each AWS account is scoped to one partition.<br>  The following are the supported partitions:<br>    aws -AWS Regions<br>    aws-cn - China Regions<br>    aws-us-gov - AWS GovCloud (US) Regions | `string` | `"aws"` | no |
 | ebs\_enabled | Whether EBS volumes are attached to data nodes | `bool` | `true` | no |
 | ebs\_iops | The baseline I/O performance of EBS volumes attached to nodes.<br>  Iops is only valid when volume type is io1 | `number` | `null` | no |

VERSION

@@ -1 +1 @@
-5.0.0
+6.0.0

examples/logs/README.md

@@ -18,7 +18,6 @@ No requirements.
 | subnet\_cidr | n/a | `string` | n/a | yes |
 | vpc\_cidr | n/a | `string` | n/a | yes |
 | create\_new\_service\_role | Whether to create a new IAM service linked role for ES. This only needs to happen once per account. If false, linked\_service\_role is required | `bool` | `false` | no |
-| log\_retention\_in\_days | Specifies the number of days you want to retain log events.<br>  Possible values are: 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 3653, and 0.<br>  If you select 0, the events in the log group are always retained and never expire. | `number` | `0` | no |
 | log\_types | A list of log types that will be published to CloudWatch. Valid values are SEARCH\_SLOW\_LOGS, INDEX\_SLOW\_LOGS, ES\_APPLICATION\_LOGS and AUDIT\_LOGS. | `list(string)` | <pre>[<br>  "ES_APPLICATION_LOGS",<br>  "SEARCH_SLOW_LOGS",<br>  "INDEX_SLOW_LOGS"<br>]</pre> | no |
 | tags | A map of tags to add to all resources created by this example. | `map(string)` | <pre>{<br>  "Author": "Tamr",<br>  "Environment": "Example"<br>}</pre> | no |
 

examples/logs/main.tf

@@ -10,20 +10,22 @@ resource "aws_subnet" "es_subnet" {
 }
 
 module "sg-ports" {
-  #source = "git::https://github.com/Datatamer/terraform-aws-es.git//modules/es-ports?ref=2.0.0"
+  #source = "git::https://github.com/Datatamer/terraform-aws-opensearch.git//modules/es-ports?ref=6.0.0"
   source = "../../modules/es-ports"
 }
 
 module "aws-sg" {
-  source              = "git::[email protected]:Datatamer/terraform-aws-security-groups.git?ref=0.1.0"
+  source              = "git::[email protected]:Datatamer/terraform-aws-security-groups.git?ref=1.0.1"
   vpc_id              = aws_vpc.es_vpc.id
   ingress_cidr_blocks = var.ingress_cidr_blocks
   egress_cidr_blocks = [
     "0.0.0.0/0"
   ]
-  ingress_ports  = module.sg-ports.ingress_ports
-  sg_name_prefix = var.name-prefix
-  tags           = var.tags
+  ingress_ports    = module.sg-ports.ingress_ports
+  sg_name_prefix   = var.name-prefix
+  ingress_protocol = "tcp"
+  egress_protocol  = "all"
+  tags             = var.tags
 }
 
 resource "aws_iam_service_linked_role" "es" {
@@ -37,7 +39,6 @@ module "tamr-es-cluster" {
     aws_cloudwatch_log_group.es-logs
   ]
   source             = "../../"
-  vpc_id             = aws_vpc.es_vpc.id
   domain_name        = format("%s-opensearch", var.name-prefix)
   subnet_ids         = [aws_subnet.es_subnet.id]
   security_group_ids = module.aws-sg.security_group_ids
@@ -49,7 +50,4 @@ module "tamr-es-cluster" {
 #tfsec:ignore:aws-cloudwatch-log-group-customer-key
 resource "aws_cloudwatch_log_group" "es-logs" {
   name = format("%s-%s", var.name-prefix, "example-logs")
-
-  retention_in_days = var.log_retention_in_days
-  tags              = var.tags
 }

examples/logs/variables.tf

@@ -23,16 +23,6 @@ variable "log_types" {
   default     = ["ES_APPLICATION_LOGS", "SEARCH_SLOW_LOGS", "INDEX_SLOW_LOGS"]
 }
 
-variable "log_retention_in_days" {
-  type        = number
-  description = <<EOF
-  Specifies the number of days you want to retain log events.
-  Possible values are: 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 3653, and 0.
-  If you select 0, the events in the log group are always retained and never expire.
-  EOF
-  default     = 0
-}
-
 variable "vpc_cidr" {
   type = string
 }

examples/minimal/main.tf

@@ -10,20 +10,22 @@ resource "aws_subnet" "es_subnet" {
 }
 
 module "sg-ports" {
-  #source = "git::https://github.com/Datatamer/terraform-aws-opensearch.git//modules/es-ports?ref=3.0.0"
+  #source = "git::https://github.com/Datatamer/terraform-aws-opensearch.git//modules/es-ports?ref=6.0.0"
   source = "../../modules/es-ports"
 }
 
 module "aws-sg" {
-  source              = "git::[email protected]:Datatamer/terraform-aws-security-groups.git?ref=0.1.0"
+  source              = "git::[email protected]:Datatamer/terraform-aws-security-groups.git?ref=1.0.1"
   vpc_id              = aws_vpc.es_vpc.id
   ingress_cidr_blocks = var.ingress_cidr_blocks
   egress_cidr_blocks = [
     "0.0.0.0/0"
   ]
-  ingress_ports  = module.sg-ports.ingress_ports
-  sg_name_prefix = var.name-prefix
-  tags           = var.tags
+  ingress_ports    = module.sg-ports.ingress_ports
+  sg_name_prefix   = var.name-prefix
+  ingress_protocol = "tcp"
+  egress_protocol  = "all"
+  tags             = var.tags
 }
 
 resource "aws_iam_service_linked_role" "es" {
@@ -35,11 +37,8 @@ module "tamr-es-cluster" {
   source     = "../../"
   depends_on = [aws_iam_service_linked_role.es]
 
-  vpc_id             = aws_vpc.es_vpc.id
   domain_name        = format("%s-opensearch", var.name-prefix)
   subnet_ids         = [aws_subnet.es_subnet.id]
   security_group_ids = module.aws-sg.security_group_ids
   tags               = var.tags
 }
-
-data "aws_region" "current" {}

main.tf

@@ -31,8 +31,6 @@ module "tamr-es-cluster" {
 module "tamr-es-cloudwatch-log-groups" {
   source = "./modules/cloudwatch-logs"
 
-  domain_name    = var.domain_name
-  tags           = local.effective_tags
   log_types      = var.log_types
   log_group_name = var.log_group_name
 }

modules/aws-es/README.md

@@ -1,18 +1,7 @@
 # AWS OpenSearch Module
-This is a terraform module for a new OpenSearch domain on AWS.
+This is a Terraform module for a new OpenSearch domain on AWS.
 This repo is laid out following the [terraform standard module structure](https://www.terraform.io/docs/modules/index.html#standard-module-structure).
 
-# Examples
-An inline example implementation of the module is implemented in the examples folder.
-This is the most basic example of what it would look like to use this module.
-
-```
-module "tamr-es-cluster" {
-  source     = "git::https://github.com/Datatamer/terraform-aws-opensearch//modules/aws-es?ref=3.0.1"
-  subnet_ids = ["subnet-id"]
-}
-```
-
 # Resources Created
 This modules creates:
 * a new security group with one or two attached rules (HTTP and/or HTTPS enabled)

modules/cloudwatch-logs/README.md

@@ -14,11 +14,8 @@ No requirements.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| domain\_name | The name to give to the ES domain | `string` | `"tamr-es-cluster"` | no |
 | log\_group\_name | The name of an existent CloudWatch Log Group that ElasticSearch will publish logs to | `string` | `""` | no |
-| log\_retention\_in\_days | Specifies the number of days you want to retain log events.<br>  Possible values are: 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 3653, and 0.<br>  If you select 0, the events in the log group are always retained and never expire. | `number` | `0` | no |
 | log\_types | A list of log types that will be published to CloudWatch. Valid values are SEARCH\_SLOW\_LOGS, INDEX\_SLOW\_LOGS, ES\_APPLICATION\_LOGS and AUDIT\_LOGS. | `list(string)` | <pre>[<br>  "ES_APPLICATION_LOGS",<br>  "SEARCH_SLOW_LOGS",<br>  "INDEX_SLOW_LOGS"<br>]</pre> | no |
-| tags | A map of tags to add to CloudWatch resources. | `map(string)` | `{}` | no |
 
 ## Outputs