Merge pull request #11 from geekcell/update-templates

Ic3w0lf · web-flow · commit 0230060c2d97 · 2023-06-28T15:22:39.000+02:00
docs: update templates
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,32 @@
+---
+##############################
+## Dependabot configuration ##
+##############################
+
+#
+# Documentation:
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates
+#
+
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 0
+
+  # Maintain dependencies for Terraform Providers
+  - package-ecosystem: "terraform"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 0
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 0
diff --git a/.github/pull_request-template.md b/.github/pull_request-template.md
@@ -5,10 +5,6 @@
 
 ...
 
-## How this PR fixes it
-
-...
-
 ## Readiness Checklist
 
 ### Author/Contributor
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,16 +1,18 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.76.0
+    rev: v1.80.0
     hooks:
       - id: terraform_docs
       - id: terraform_fmt
       - id: terraform_validate
+        args:
+          - --hook-config=--retry-once-with-cleanup=true
         exclude: '^[^/]+$'
       - id: terraform_tflint
         exclude: ^examples/
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
diff --git a/modules/db_event_subscription/main.tf b/modules/db_event_subscription/main.tf
@@ -13,8 +13,11 @@ resource "aws_db_event_subscription" "main" {
 }
 
 module "notification" {
-  source = "github.com/geekcell/terraform-aws-sns-email-notification?ref=v1"
+  source  = "geekcell/sns-email-notification/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
   name            = var.name
   email_addresses = var.recipients
+
+  tags = var.tags
 }
diff --git a/modules/db_proxy/main.tf b/modules/db_proxy/main.tf
@@ -72,12 +72,7 @@ module "db_proxy_secret" {
   source   = "../db_proxy_secret"
 
   # Name
-  name = format(
-    "rds/proxy/%s/cluster/%s/user/%s/credentials",
-    var.name,
-    var.rds_cluster_identifier,
-    each.key
-  )
+  name        = "rds/proxy/${var.name}/cluster/${var.rds_cluster_identifier}/user/${each.key}/credentials"
   description = "AWS RDS Proxy User Credentials."
   username    = each.key
 
diff --git a/modules/db_proxy_secret/main.tf b/modules/db_proxy_secret/main.tf
@@ -27,9 +27,9 @@ resource "aws_secretsmanager_secret_version" "main" {
 }
 
 module "kms" {
-  source = "github.com/geekcell/terraform-aws-kms?ref=v1"
+  source  = "geekcell/kms/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
   alias = var.name
-
-  tags = var.tags
+  tags  = var.tags
 }
diff --git a/modules/rds_cluster/README.md b/modules/rds_cluster/README.md
@@ -57,7 +57,7 @@
 ## Resources
 
 - resource.aws_rds_cluster.main (modules/rds_cluster/main.tf#1)
-- resource.random_password.master_password (modules/rds_cluster/main.tf#105)
-- resource.random_string.master_username (modules/rds_cluster/main.tf#99)
+- resource.random_password.master_password (modules/rds_cluster/main.tf#107)
+- resource.random_string.master_username (modules/rds_cluster/main.tf#101)
 - data source.aws_availability_zones.available (modules/rds_cluster/data.tf#1)
 <!-- END_TF_DOCS -->
diff --git a/modules/rds_cluster/main.tf b/modules/rds_cluster/main.tf
@@ -12,7 +12,7 @@ resource "aws_rds_cluster" "main" {
   # Storage
   allocated_storage = var.allocated_storage
   iops              = var.iops
-  kms_key_id        = module.kms["storage"].key_arn
+  kms_key_id        = module.kms.key_arn
   storage_encrypted = var.storage_encrypted
   storage_type      = var.storage_type
 
@@ -91,9 +91,11 @@ module "autoscaling" {
 }
 
 module "kms" {
-  for_each = toset(["storage"])
-  source   = "github.com/geekcell/terraform-aws-kms?ref=v1"
-  alias    = format("/rds/cluster/%s/%s", var.cluster_identifier, each.key)
+  source  = "geekcell/kms/aws"
+  version = ">= 1.0.0, < 2.0.0"
+
+  alias = "/rds/cluster/${var.cluster_identifier}/storage"
+  tags  = var.tags
 }
 
 resource "random_string" "master_username" {
diff --git a/modules/rds_cluster/variables.tf b/modules/rds_cluster/variables.tf
@@ -159,7 +159,7 @@ variable "replication_source_identifier" {
 
 variable "serverlessv2_scaling_configuration" {
   description = "The scaling configuration of the Aurora Serverless DB cluster."
-  type        = object({
+  type = object({
     max_capacity = optional(number)
     min_capacity = optional(number)
   })
diff --git a/modules/rds_cluster_instance/README.md b/modules/rds_cluster_instance/README.md
@@ -38,6 +38,6 @@
 ## Resources
 
 - resource.aws_rds_cluster_instance.main (modules/rds_cluster_instance/main.tf#1)
-- resource.random_password.master_password (modules/rds_cluster_instance/main.tf#63)
-- resource.random_string.master_username (modules/rds_cluster_instance/main.tf#58)
+- resource.random_password.master_password (modules/rds_cluster_instance/main.tf#64)
+- resource.random_string.master_username (modules/rds_cluster_instance/main.tf#59)
 <!-- END_TF_DOCS -->
diff --git a/modules/rds_cluster_instance/main.tf b/modules/rds_cluster_instance/main.tf
@@ -19,7 +19,7 @@ resource "aws_rds_cluster_instance" "main" {
 
   # Performance Insights
   performance_insights_enabled          = var.performance_insights_enabled
-  performance_insights_kms_key_id       = module.kms["performance_insights"].key_arn
+  performance_insights_kms_key_id       = module.kms.key_arn
   performance_insights_retention_period = var.performance_insights_retention_period
 
   # Network
@@ -49,10 +49,11 @@ module "db_enhanced_monitoring" {
 }
 
 module "kms" {
-  for_each = toset(["performance_insights"])
+  source  = "geekcell/kms/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
-  source = "github.com/geekcell/terraform-aws-kms?ref=v1"
-  alias  = format("alias/rds/cluster/%s/instance/%s/%s", var.identifier, var.identifier, each.key)
+  alias = "alias/rds/cluster/${var.identifier}/instance/${var.identifier}/performance-insights"
+  tags  = var.tags
 }
 
 resource "random_string" "master_username" {
diff --git a/variables.tf b/variables.tf
@@ -205,7 +205,7 @@ variable "serverlessv2_scaling_configuration" {
     min_capacity = null
   }
   description = "The scaling configuration of the Aurora Serverless DB cluster."
-  type        = object({
+  type = object({
     max_capacity = number
     min_capacity = number
   })

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,11 @@ resource "aws_db_event_subscription" "main" {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`module "notification" {`
`16`		`- source = "github.com/geekcell/terraform-aws-sns-email-notification?ref=v1"`
	`16`	`+ source = "geekcell/sns-email-notification/aws"`
	`17`	`+ version = ">= 1.0.0, < 2.0.0"`
`17`	`18`
`18`	`19`	`name = var.name`
`19`	`20`	`email_addresses = var.recipients`
	`21`	`+`
	`22`	`+ tags = var.tags`
`20`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ resource "aws_secretsmanager_secret_version" "main" {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`module "kms" {`
`30`		`- source = "github.com/geekcell/terraform-aws-kms?ref=v1"`
	`30`	`+ source = "geekcell/kms/aws"`
	`31`	`+ version = ">= 1.0.0, < 2.0.0"`
`31`	`32`
`32`	`33`	`alias = var.name`
`33`		`-`
`34`		`- tags = var.tags`
	`34`	`+ tags = var.tags`
`35`	`35`	`}`