Merge pull request #33 from mattermost/fix/variables_issues

Fix tags variable type.

Author: stafot

.github/workflows/notify-release.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: make notify
+      - run: sh ./scripts/notify.sh
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
       - uses: mattermost/action-mattermost-notify@1.0.2

.gitignore

@@ -9,3 +9,4 @@ coverage.out
 .vscode
 .idea
 build/_output/
+terraform/aws/database-factory-postgresql/.terraform.lock.hcl

terraform/aws/database-factory-postgresql/README.md

@@ -36,10 +36,9 @@ No resources.
 | <a name="input_environment"></a> [environment](#input\_environment) | The name of the environment which will deploy to and will be added as a tag | `string` | `""` | no |
 | <a name="input_final_snapshot_identifier_prefix"></a> [final\_snapshot\_identifier\_prefix](#input\_final\_snapshot\_identifier\_prefix) | The prefix name of your final DB snapshot when this DB instance is deleted | `string` | `"final"` | no |
 | <a name="input_instance_type"></a> [instance\_type](#input\_instance\_type) | The instance type of the RDS instance | `string` | `""` | no |
-| <a name="input_lambda_arn"></a> [lambda\_arn](#input\_lambda\_arn) | Lambda logs-to-opensearch ARN | `string` | `""` | no |
 | <a name="input_lambda_name"></a> [lambda\_name](#input\_lambda\_name) | Lambda which ships logs to opensearch | `string` | `"logs-to-opensearch"` | no |
 | <a name="input_max_postgresql_connections"></a> [max\_postgresql\_connections](#input\_max\_postgresql\_connections) | n/a | `string` | `""` | no |
-| <a name="input_max_postgresql_connections_map"></a> [max\_postgresql\_connections\_map](#input\_max\_postgresql\_connections\_map) | n/a | `map(any)` | <pre>{<br>  "db.r5.12xlarge": "40285",<br>  "db.r5.16xlarge": "53715",<br>  "db.r5.24xlarge": "80575",<br>  "db.r5.2xlarge": "6710",<br>  "db.r5.4xlarge": "13425",<br>  "db.r5.8xlarge": "26855",<br>  "db.r5.large": "1675",<br>  "db.r5.xlarge": "3355",<br>  "db.t3.medium": "415"<br>}</pre> | no |
+| <a name="input_max_postgresql_connections_map"></a> [max\_postgresql\_connections\_map](#input\_max\_postgresql\_connections\_map) | n/a | `map(any)` | <pre>{<br>  "db.r5.12xlarge": "40285",<br>  "db.r5.16xlarge": "53715",<br>  "db.r5.24xlarge": "80575",<br>  "db.r5.2xlarge": "6710",<br>  "db.r5.4xlarge": "13425",<br>  "db.r5.8xlarge": "26855",<br>  "db.r5.large": "1675",<br>  "db.r5.xlarge": "3355",<br>  "db.r6g.2xlarge": "6958",<br>  "db.r6g.large": "1722",<br>  "db.r6g.xlarge": "3479",<br>  "db.t3.medium": "415",<br>  "db.t3.small": "198"<br>}</pre> | no |
 | <a name="input_memory_alarm_limit"></a> [memory\_alarm\_limit](#input\_memory\_alarm\_limit) | Limit to trigger memory alarm. Number in Bytes (100MB) | `string` | `"100000000"` | no |
 | <a name="input_memory_cache_proportion"></a> [memory\_cache\_proportion](#input\_memory\_cache\_proportion) | Proportion of memory that is used for cache. By default it is 75%. A change in this variable should be reflected in database factory vertical scaling main.go as well. | `number` | `0.75` | no |
 | <a name="input_monitoring_interval"></a> [monitoring\_interval](#input\_monitoring\_interval) | The interval, in seconds, between points when Enhanced Monitoring metrics are collected for the DB instance | `number` | `60` | no |
@@ -50,7 +49,7 @@ No resources.
 | <a name="input_predefined_metric_type"></a> [predefined\_metric\_type](#input\_predefined\_metric\_type) | A predefined metric type | `string` | `"RDSReaderAverageDatabaseConnections"` | no |
 | <a name="input_preferred_backup_window"></a> [preferred\_backup\_window](#input\_preferred\_backup\_window) | The daily time range during which automated backups are created if automated backups are enabled using the BackupRetentionPeriod parameter | `string` | `"02:00-03:00"` | no |
 | <a name="input_preferred_maintenance_window"></a> [preferred\_maintenance\_window](#input\_preferred\_maintenance\_window) | The window to perform maintenance in | `string` | `"sat:09:00-sat:11:00"` | no |
-| <a name="input_ram_memory_bytes"></a> [ram\_memory\_bytes](#input\_ram\_memory\_bytes) | The RAM memory of each instance type in Bytes. A change in this variable should be reflected in database factory vertical scaling main.go as well. | `map(any)` | <pre>{<br>  "db.r5.12xlarge": "412316860416",<br>  "db.r5.16xlarge": "549755813888",<br>  "db.r5.24xlarge": "824633720832",<br>  "db.r5.2xlarge": "68719476736",<br>  "db.r5.4xlarge": "137438953472",<br>  "db.r5.8xlarge": "274877906944",<br>  "db.r5.large": "17179869184",<br>  "db.r5.xlarge": "34359738368",<br>  "db.t3.medium": "4294967296"<br>}</pre> | no |
+| <a name="input_ram_memory_bytes"></a> [ram\_memory\_bytes](#input\_ram\_memory\_bytes) | The RAM memory of each instance type in Bytes. A change in this variable should be reflected in database factory vertical scaling main.go as well. | `map(any)` | <pre>{<br>  "db.r5.12xlarge": "412316860416",<br>  "db.r5.16xlarge": "549755813888",<br>  "db.r5.24xlarge": "824633720832",<br>  "db.r5.2xlarge": "68719476736",<br>  "db.r5.4xlarge": "137438953472",<br>  "db.r5.8xlarge": "274877906944",<br>  "db.r5.large": "17179869184",<br>  "db.r5.xlarge": "34359738368",<br>  "db.r6g.2xlarge": "68719476736",<br>  "db.r6g.large": "17179869184",<br>  "db.r6g.xlarge": "34359738368",<br>  "db.t3.medium": "4294967296",<br>  "db.t3.small": "2147483648"<br>}</pre> | no |
 | <a name="input_random_page_cost"></a> [random\_page\_cost](#input\_random\_page\_cost) | Sets the planner's estimate of the cost of a non-sequentially-fetched disk page. The default is 4.0. This value can be overridden for tables and indexes in a particular tablespace by setting the tablespace parameter of the same name. | `number` | `1.1` | no |
 | <a name="input_replica_min"></a> [replica\_min](#input\_replica\_min) | Number of replicas to deploy initially with the RDS Cluster. This is managed by the database factory app. | `number` | `3` | no |
 | <a name="input_replica_scale_connections"></a> [replica\_scale\_connections](#input\_replica\_scale\_connections) | Needs to be set when predefined\_metric\_type is RDSReaderAverageDatabaseConnections | `number` | `100000` | no |

terraform/aws/database-factory-postgresql/main.tf

@@ -21,7 +21,6 @@ module "rds_setup" {
   db_id                            = var.db_id
   environment                      = var.environment
   port                             = var.port
-  name                             = "mattermost-cloud-${var.environment}-dbfactory"
   engine                           = var.engine
   engine_version                   = var.engine_version
   username                         = var.username
@@ -57,7 +56,6 @@ module "rds_setup" {
   tcp_keepalives_interval          = var.tcp_keepalives_interval
   random_page_cost                 = var.random_page_cost
   multitenant_tag                  = var.multitenant_tag
-  lambda_arn                       = var.lambda_arn
   lambda_name                      = var.lambda_name
   cwl_endpoint                     = var.cwl_endpoint
 

terraform/aws/database-factory-postgresql/variables.tf

@@ -186,7 +186,10 @@ variable "max_postgresql_connections" {
 
 variable "max_postgresql_connections_map" {
   default = {
+    "db.t3.small"    = "198"
     "db.t3.medium"   = "415"
+    "db.t4g.small"   = "198"
+    "db.t4g.medium"  = "415"
     "db.r5.large"    = "1675"
     "db.r5.xlarge"   = "3355"
     "db.r5.2xlarge"  = "6710"
@@ -195,13 +198,19 @@ variable "max_postgresql_connections_map" {
     "db.r5.12xlarge" = "40285"
     "db.r5.16xlarge" = "53715"
     "db.r5.24xlarge" = "80575"
+    "db.r6g.2xlarge" = "6958"
+    "db.r6g.xlarge"  = "3479"
+    "db.r6g.large"   = "1722"
   }
   type = map(any)
 }
 
 variable "ram_memory_bytes" {
   default = {
+    "db.t3.small"    = "2147483648"
     "db.t3.medium"   = "4294967296"
+    "db.t4g.small"   = "2147483648"
+    "db.t4g.medium"  = "4294967296"
     "db.r5.large"    = "17179869184"
     "db.r5.xlarge"   = "34359738368"
     "db.r5.2xlarge"  = "68719476736"
@@ -210,6 +219,9 @@ variable "ram_memory_bytes" {
     "db.r5.12xlarge" = "412316860416"
     "db.r5.16xlarge" = "549755813888"
     "db.r5.24xlarge" = "824633720832"
+    "db.r6g.large"   = "17179869184"
+    "db.r6g.xlarge"  = "34359738368"
+    "db.r6g.2xlarge" = "68719476736"
   }
   type        = map(any)
   description = "The RAM memory of each instance type in Bytes. A change in this variable should be reflected in database factory vertical scaling main.go as well."
@@ -251,12 +263,6 @@ variable "tcp_keepalives_interval" {
   type        = number
 }
 
-variable "lambda_arn" {
-  default     = ""
-  description = "Lambda logs-to-opensearch ARN"
-  type        = string
-}
-
 variable "lambda_name" {
   default     = "logs-to-opensearch"
   description = "Lambda which ships logs to opensearch"

terraform/aws/database-factory/main.tf

@@ -21,7 +21,6 @@ module "rds_setup" {
   db_id                            = var.db_id
   environment                      = var.environment
   port                             = var.port
-  name                             = "mattermost-cloud-${var.environment}-dbfactory"
   engine                           = var.engine
   engine_version                   = var.engine_version
   username                         = var.username

terraform/aws/modules/rds-aurora-postgresql/README.md

@@ -57,7 +57,6 @@ No modules.
 | <a name="input_environment"></a> [environment](#input\_environment) | The name of the environment which will deploy to and will be added as a tag | `string` | n/a | yes |
 | <a name="input_final_snapshot_identifier_prefix"></a> [final\_snapshot\_identifier\_prefix](#input\_final\_snapshot\_identifier\_prefix) | The prefix name of your final DB snapshot when this DB instance is deleted | `string` | n/a | yes |
 | <a name="input_instance_type"></a> [instance\_type](#input\_instance\_type) | The instance type of the RDS instance | `string` | n/a | yes |
-| <a name="input_lambda_arn"></a> [lambda\_arn](#input\_lambda\_arn) | Lambda logs-to-opensearch ARN | `string` | `""` | no |
 | <a name="input_lambda_name"></a> [lambda\_name](#input\_lambda\_name) | Lambda which ships logs to opensearch | `string` | `"logs-to-opensearch"` | no |
 | <a name="input_max_postgresql_connections"></a> [max\_postgresql\_connections](#input\_max\_postgresql\_connections) | n/a | `string` | n/a | yes |
 | <a name="input_max_postgresql_connections_map"></a> [max\_postgresql\_connections\_map](#input\_max\_postgresql\_connections\_map) | n/a | `map(any)` | n/a | yes |
@@ -82,7 +81,7 @@ No modules.
 | <a name="input_replica_scale_out_cooldown"></a> [replica\_scale\_out\_cooldown](#input\_replica\_scale\_out\_cooldown) | Cooldown in seconds before allowing further scaling operations after a scale out | `number` | n/a | yes |
 | <a name="input_skip_final_snapshot"></a> [skip\_final\_snapshot](#input\_skip\_final\_snapshot) | Determines whether a final DB snapshot is created before the DB instance is deleted | `bool` | n/a | yes |
 | <a name="input_storage_encrypted"></a> [storage\_encrypted](#input\_storage\_encrypted) | Specifies whether the DB cluster is encrypted | `bool` | n/a | yes |
-| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to assign to the resource | `list(string)` | n/a | yes |
+| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to assign to the resource | `map(any)` | n/a | yes |
 | <a name="input_tcp_keepalives_count"></a> [tcp\_keepalives\_count](#input\_tcp\_keepalives\_count) | Maximum number of TCP keepalive retransmits.Specifies the number of TCP keepalive messages that can be lost before the server's connection to the client is considered dead. A value of 0 (the default) selects the operating system's default. | `number` | n/a | yes |
 | <a name="input_tcp_keepalives_idle"></a> [tcp\_keepalives\_idle](#input\_tcp\_keepalives\_idle) | Time between issuing TCP keepalives.Specifies the amount of time with no network activity after which the operating system should send a TCP keepalive message to the client. If this value is specified without units, it is taken as seconds. A value of 0 (the default) selects the operating system's default. | `number` | n/a | yes |
 | <a name="input_tcp_keepalives_interval"></a> [tcp\_keepalives\_interval](#input\_tcp\_keepalives\_interval) | Time between TCP keepalive retransmits. Specifies the amount of time after which a TCP keepalive message that has not been acknowledged by the client should be retransmitted. If this value is specified without units, it is taken as seconds. A value of 0 (the default) selects the operating system's default. | `number` | n/a | yes |

terraform/aws/modules/rds-aurora-postgresql/main.tf

@@ -293,5 +293,5 @@ resource "aws_cloudwatch_log_subscription_filter" "rds-cluster-cloudwatch-logs-t
   name            = format("rds-cluster-multitenant-%s-%s-subscription-filter", split("-", var.vpc_id)[1], local.database_id)
   log_group_name  = format("/aws/rds/cluster/rds-cluster-multitenant-%s-%s/postgresql", split("-", var.vpc_id)[1], local.database_id)
   filter_pattern  = "[date, time, message]"
-  destination_arn = var.lambda_arn
+  destination_arn = "arn:aws:lambda:${local.account_details}:function:${var.lambda_name}"
 }

terraform/aws/modules/rds-aurora-postgresql/variables.tf

@@ -18,11 +18,6 @@ variable "environment" {
   type        = string
 }
 
-//variable "name" {
-//  description = ""
-//  type = string
-//}
-
 variable "engine" {
   description = "The database engine to use"
   type        = string
@@ -95,7 +90,7 @@ variable "enabled_cloudwatch_logs_exports" {
 
 variable "tags" {
   description = "A map of tags to assign to the resource"
-  type        = list(string)
+  type        = map(any)
 }
 
 variable "instance_type" {
@@ -201,11 +196,6 @@ variable "multitenant_tag" {
   description = "The tag that will be applied and identify the type of multitenant DB cluster(multitenant-rds-dbproxy or multitenant-rds)."
 }
 
-variable "lambda_arn" {
-  default     = ""
-  description = "Lambda logs-to-opensearch ARN"
-  type        = string
-}
 
 variable "lambda_name" {
   default     = "logs-to-opensearch"

terraform/aws/modules/rds-aurora/README.md

@@ -69,7 +69,7 @@ No modules.
 | <a name="input_replica_scale_out_cooldown"></a> [replica\_scale\_out\_cooldown](#input\_replica\_scale\_out\_cooldown) | Cooldown in seconds before allowing further scaling operations after a scale out | `number` | n/a | yes |
 | <a name="input_skip_final_snapshot"></a> [skip\_final\_snapshot](#input\_skip\_final\_snapshot) | Determines whether a final DB snapshot is created before the DB instance is deleted | `bool` | n/a | yes |
 | <a name="input_storage_encrypted"></a> [storage\_encrypted](#input\_storage\_encrypted) | Specifies whether the DB cluster is encrypted | `bool` | n/a | yes |
-| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to assign to the resource | `list(string)` | n/a | yes |
+| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to assign to the resource | `map(any)` | n/a | yes |
 | <a name="input_username"></a> [username](#input\_username) | Username for the master DB user | `string` | n/a | yes |
 | <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The VPC ID of the database cluster | `string` | n/a | yes |