Merge pull request #40 from dfds/blueprint-updates

Github Actions update blueprints for RDS module
dfds · Jun 28, 2024 · 79930cc · 79930cc
2 parents 2c12492 + a43dfac
commit 79930cc
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 74 deletions.
diff --git a/aws-rds-postgresql/generic/terraform/module.tf b/aws-rds-postgresql/generic/terraform/module.tf
@@ -15,7 +15,7 @@ provider "aws" {
 
 
 module "db_instance" {
-  source = "git::https://github.com/dfds/terraform-aws-rds.git?ref=1.3.1"
+  source = "git::https://github.com/dfds/terraform-aws-rds.git?ref=2.0.0"
 
   #     Provide a cost centre for the resource.
   #     Valid Values: .

diff --git a/aws-rds-postgresql/generic/terragrunt/test/database/terragrunt.hcl b/aws-rds-postgresql/generic/terragrunt/test/database/terragrunt.hcl
@@ -1,5 +1,5 @@
 terraform {
-  source = "git::https://github.com/dfds/terraform-aws-rds.git//?ref=1.3.1"
+  source = "git::https://github.com/dfds/terraform-aws-rds.git//?ref=2.0.0"
 }
 
 # Include all settings from the parent terragrunt.hcl file
@@ -14,77 +14,77 @@ include "env" {
 
 inputs = {
 
-#     Provide a cost centre for the resource.
-#     Valid Values: .
-#     Notes: This set the dfds.cost_centre tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
-cost_centre = "example"
+  #     Provide a cost centre for the resource.
+  #     Valid Values: .
+  #     Notes: This set the dfds.cost_centre tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
+  cost_centre = "example"
 
-#     Specify data classification.
-#     Valid Values: public, private, confidential, restricted
-#     Notes: This set the dfds.data.classification tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
-data_classification = "example"
+  #     Specify data classification.
+  #     Valid Values: public, private, confidential, restricted
+  #     Notes: This set the dfds.data.classification tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
+  data_classification = "example"
 
-#     Specify the staging environment.
-#     Valid Values: "dev", "test", "staging", "uat", "training", "prod".
-#     Notes: The value will set configuration defaults according to DFDS policies.
-environment = "example"
+  #     Specify the staging environment.
+  #     Valid Values: "dev", "test", "staging", "uat", "training", "prod".
+  #     Notes: The value will set configuration defaults according to DFDS policies.
+  environment = "example"
 
-#     Specify the name of the RDS instance to create.
-#     Valid Values: .
-#     Notes: .
-identifier = "example"
+  #     Specify the name of the RDS instance to create.
+  #     Valid Values: .
+  #     Notes: .
+  identifier = "example"
 
-#     [Experiemental Feature] Specify whether or not to deploy the instance as multi-az database cluster.
-#     Valid Values: .
-#     Notes:
-#     - This feature is currently in beta and is subject to change.
-#     - It creates a DB cluster with a primary DB instance and two readable standby DB instances,
-#     - Each DB instance in a different Availability Zone (AZ).
-#     - Provides high availability, data redundancy and increases capacity to serve read workloads
-#     - Proxy is not supported for cluster instances.
-#     - For smaller workloads we recommend considering using a single instance instead of a cluster.
-is_cluster = false
+  #     [Experiemental Feature] Specify whether or not to deploy the instance as multi-az database cluster.
+  #     Valid Values: .
+  #     Notes:
+  #     - This feature is currently in beta and is subject to change.
+  #     - It creates a DB cluster with a primary DB instance and two readable standby DB instances,
+  #     - Each DB instance in a different Availability Zone (AZ).
+  #     - Provides high availability, data redundancy and increases capacity to serve read workloads
+  #     - Proxy is not supported for cluster instances.
+  #     - For smaller workloads we recommend considering using a single instance instead of a cluster.
+  is_cluster = false
 
-#     Specify whether or not to enable access from Kubernetes pods.
-#     Valid Values: .
-#     Notes: Enabling this will create the following resources:
-#       - IAM role for service account (IRSA)
-#       - IAM policy for service account (IRSA)
-#       - Peering connection from EKS Cluster requires a VPC peering deployed in the AWS account.
-is_kubernetes_app_enabled = false
+  #     Specify whether or not to enable access from Kubernetes pods.
+  #     Valid Values: .
+  #     Notes: Enabling this will create the following resources:
+  #       - IAM role for service account (IRSA)
+  #       - IAM policy for service account (IRSA)
+  #       - Peering connection from EKS Cluster requires a VPC peering deployed in the AWS account.
+  is_kubernetes_app_enabled = false
 
-#     Specify whether or not to include proxy.
-#     Valid Values: .
-#     Notes: Proxy helps managing database connections. See [documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-proxy-planning.html) for more information.
-is_proxy_included = false
+  #     Specify whether or not to include proxy.
+  #     Valid Values: .
+  #     Notes: Proxy helps managing database connections. See [documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-proxy-planning.html) for more information.
+  is_proxy_included = false
 
-#     Specify whether or not this instance is publicly accessible.
-#     Valid Values: .
-#     Notes:
-#     - Setting this to true will do the followings:
-#       - Assign a public IP address and the host name of the DB instance will resolve to the public IP address.
-#       - Access from within the VPC can be achived by using the private IP address of the assigned Network Interface.
-#       - Create a security group rule to allow inbound traffic from the specified CIDR blocks.
-#         - It is required to set `public_access_ip_whitelist` to allow access from specific IP addresses.
-is_publicly_accessible = false
+  #     Specify whether or not this instance is publicly accessible.
+  #     Valid Values: .
+  #     Notes:
+  #     - Setting this to true will do the followings:
+  #       - Assign a public IP address and the host name of the DB instance will resolve to the public IP address.
+  #       - Access from within the VPC can be achived by using the private IP address of the assigned Network Interface.
+  #       - Create a security group rule to allow inbound traffic from the specified CIDR blocks.
+  #         - It is required to set `public_access_ip_whitelist` to allow access from specific IP addresses.
+  is_publicly_accessible = false
 
-#     Specify service availability.
-#     Valid Values: low, medium, high
-#     Notes: This set the dfds.service.availability tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
-service_availability = "example"
+  #     Specify service availability.
+  #     Valid Values: low, medium, high
+  #     Notes: This set the dfds.service.availability tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
+  service_availability = "example"
 
-#     Provide a list of VPC subnet IDs.
-#     Valid Values: .
-#     Notes: IDs of the subnets must be in the same VPC as the RDS instance. Example: ["subnet-aaaaaaaaaaa", "subnet-bbbbbbbbbbb", "subnet-cccccccccc"]
-subnet_ids = "example"
+  #     Provide a list of VPC subnet IDs.
+  #     Valid Values: .
+  #     Notes: IDs of the subnets must be in the same VPC as the RDS instance. Example: ["subnet-aaaaaaaaaaa", "subnet-bbbbbbbbbbb", "subnet-cccccccccc"]
+  subnet_ids = "example"
 
-#     Specify Username for the master DB user.
-#     Valid Values: .
-#     Notes: .
-username = "example"
+  #     Specify Username for the master DB user.
+  #     Valid Values: .
+  #     Notes: .
+  username = "example"
 
-#     Specify the VPC ID.
-#     Valid Values: .
-#     Notes: .
-vpc_id = "example"
+  #     Specify the VPC ID.
+  #     Valid Values: .
+  #     Notes: .
+  vpc_id = "example"
 }
diff --git a/aws-rds-postgresql/generic/terragrunt/test/env.hcl b/aws-rds-postgresql/generic/terragrunt/test/env.hcl
@@ -1,19 +1,19 @@
 inputs = {
-    #     Specify the staging environment.
-    #     Valid Values: "dev", "test", "staging", "uat", "training", "prod".
-    #     Notes: The value will set configuration defaults according to DFDS policies.
-    environment = "test"
+  #     Specify the staging environment.
+  #     Valid Values: "dev", "test", "staging", "uat", "training", "prod".
+  #     Notes: The value will set configuration defaults according to DFDS policies.
+  environment = "test"
 
-    #     Provide a cost centre for the resource.
-    #     Valid Values: .
-    #     Notes: This set the dfds.cost_centre tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
-    cost_centre = "example"
+  #     Provide a cost centre for the resource.
+  #     Valid Values: .
+  #     Notes: This set the dfds.cost_centre tag. See recommendations [here](https://wiki.dfds.cloud/en/playbooks/standards/tagging_policy).
+  cost_centre = "example"
 }
 
 generate "provider" {
-  path = "provider.tf"
+  path      = "provider.tf"
   if_exists = "overwrite_terragrunt"
-  contents = <<EOF
+  contents  = <<EOF
 provider "aws" {
   region = "eu-central-1"
 }