vpc and volumens docs refactor and new volumen env

Author: bcarranza

terraform-environments/digitalocean/terragrunt-dev/SFO3/terragrunt-dev/0100-vpc/terragrunt.hcl

@@ -7,10 +7,6 @@ terraform {
   source = "github.com/ManagedKube/kubernetes-ops//terraform-modules/digitalocean/vpc?ref=digitalocean-kube-ops"
 }
 
-dependency "project" {
-  config_path = "${get_terragrunt_dir()}/../050-project"
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # Locals are named constants that are reusable within the configuration.
 # ---------------------------------------------------------------------------------------------------------------------
@@ -34,5 +30,4 @@ inputs = {
     vpc_region      = local.region_vars.locals.digitalocean_region
     vpc_description = "Vpc for testing ManageKube in Digital Ocean"
     vpc_ip_range    = "10.10.10.0/24"
-    project_id      = dependency.project.outputs.project_id
 }

terraform-environments/digitalocean/terragrunt-dev/SFO3/terragrunt-dev/0200-volume/terragrunt.hcl

@@ -0,0 +1,37 @@
+# Include all settings from the root terragrunt.hcl file
+include {
+  path = find_in_parent_folders()
+}
+
+terraform {
+  source = "github.com/ManagedKube/kubernetes-ops//terraform-modules/digitalocean/volume?ref=digitalocean-kube-ops"
+}
+
+dependency "project" {
+  config_path = "${get_terragrunt_dir()}/../050-project"
+}
+
+# ---------------------------------------------------------------------------------------------------------------------
+# Locals are named constants that are reusable within the configuration.
+# ---------------------------------------------------------------------------------------------------------------------
+locals {
+  # Load common variables shared across all accounts
+  common_vars = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+
+  # Load region-level variables
+  region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl"))
+
+  # Load environment-level variables
+  environment_vars = read_terragrunt_config(find_in_parent_folders("environment.hcl"))
+}
+
+# ---------------------------------------------------------------------------------------------------------------------
+# MODULE PARAMETERS
+# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
+# ---------------------------------------------------------------------------------------------------------------------
+inputs = {
+    volume_name = "vol-${local.environment_vars.locals.project_name}"
+    volume_region = local.region_vars.locals.digitalocean_region
+    volume_description = "Volumen of ${local.environment_vars.locals.project_name} in region: ${local.region_vars.locals.digitalocean_region}"
+    volume_project_id = dependency.project.outputs.project_id
+}

terraform-modules/digitalocean/volume/README.md

@@ -19,6 +19,7 @@ No modules.
 
 | Name | Type |
 |------|------|
+| [digitalocean_project_resources.project](https://registry.terraform.io/providers/digitalocean/digitalocean/2.19.0/docs/resources/project_resources) | resource |
 | [digitalocean_volume.this](https://registry.terraform.io/providers/digitalocean/digitalocean/2.19.0/docs/resources/volume) | resource |
 
 ## Inputs
@@ -28,6 +29,7 @@ No modules.
 | <a name="input_volume_description"></a> [volume\_description](#input\_volume\_description) | (Optional) A free-form text field up to a limit of 1024 bytes to describe a block storage volume.. | `string` | n/a | yes |
 | <a name="input_volume_initial_filesystem_type"></a> [volume\_initial\_filesystem\_type](#input\_volume\_initial\_filesystem\_type) | (Optional) Initial filesystem type (xfs or ext4) for the block storage volume. | `string` | n/a | yes |
 | <a name="input_volume_name"></a> [volume\_name](#input\_volume\_name) | (Required) A name for the block storage volume. Must be lowercase and be composed only of numbers, letters and -, up to a limit of 64 characters. | `string` | n/a | yes |
+| <a name="input_volume_project_id"></a> [volume\_project\_id](#input\_volume\_project\_id) | (Optional) The id of the project where the vpc will be associated | `string` | n/a | yes |
 | <a name="input_volume_region"></a> [volume\_region](#input\_volume\_region) | (Required) The region that the block storage volume will be created in. | `string` | n/a | yes |
 | <a name="input_volume_size"></a> [volume\_size](#input\_volume\_size) | (Required) The size of the block storage volume in GiB. If updated, can only be expanded. | `number` | `20` | no |
 

terraform-modules/digitalocean/volume/main.tf

@@ -13,4 +13,11 @@ resource "digitalocean_volume" "this" {
   size                    = var.volume_size
   initial_filesystem_type = var.volume_initial_filesystem_type
   description             = var.volume_description
+}
+
+resource "digitalocean_project_resources" "project" {
+  project = var.volume_project_id
+  resources = [
+    digitalocean_volume.this.urn
+  ]
 }

terraform-modules/digitalocean/volume/variables.tf

@@ -25,3 +25,7 @@ variable "volume_description" {
     description = "(Optional) A free-form text field up to a limit of 1024 bytes to describe a block storage volume.."
 }
 
+variable "volume_project_id" {
+   type = string
+   description = "(Optional) The id of the project where the vpc will be associated"
+}

terraform-modules/digitalocean/vpc/README.md

@@ -25,7 +25,6 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_project_id"></a> [project\_id](#input\_project\_id) | (Optional) The id of the project where the vpc will be associated | `string` | n/a | yes |
 | <a name="input_vpc_description"></a> [vpc\_description](#input\_vpc\_description) | (Optional) A free-form text field up to a limit of 255 characters to describe the VPC. | `string` | `"Your new vpc"` | no |
 | <a name="input_vpc_ip_range"></a> [vpc\_ip\_range](#input\_vpc\_ip\_range) | (Optional) The range of IP addresses for the VPC in CIDR notation. | `string` | `"10.10.10.0/24"` | no |
 | <a name="input_vpc_name"></a> [vpc\_name](#input\_vpc\_name) | (Required) A name for the VPC. Must be unique and contain alphanumeric characters, dashes, and periods only. | `string` | n/a | yes |

terraform-modules/digitalocean/vpc/variables.tf

@@ -18,7 +18,3 @@ variable "vpc_ip_range" {
     description = "(Optional) The range of IP addresses for the VPC in CIDR notation."
     default = "10.10.10.0/24"
 }
-variable "project_id" {
-   type = string
-   description = "(Optional) The id of the project where the vpc will be associated"
-}