corrections

plus3it · Oct 31, 2023 · 282ae71 · 282ae71
1 parent 22f0c77
commit 282ae71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_vpc_ipam"></a> [vpc\_ipam](#input\_vpc\_ipam) | Object of inputs for all IPAM configuration resources | <pre>object({<br>    ipam = optional(object({<br>      operating_regions = list(object({<br>        region_name = string<br>      }))<br>      tags        = optional(map(string))<br>      cascade     = optional(bool)<br>      description = optional(string)<br>    }))<br>    pools = optional(list(object({<br>      name                              = optional(string)<br>      address_family                    = optional(string)<br>      allocation_default_netmask_length = optional(number)<br>      allocation_max_netmask_length     = optional(number)<br>      allocation_min_netmask_length     = optional(number)<br>      allocation_resource_tags          = optional(map(string))<br>      auto_import                       = optional(bool)<br>      aws_service                       = optional(bool)<br>      description                       = optional(string)<br>      ipam_scope_id                     = optional(string)<br>      locale                            = optional(string)<br>      publicly_advertisable             = optional(bool)<br>      public_ip_source                  = optional(string)<br>      source_ipam_pool_id               = optional(string)<br>      tags                              = optional(map(string))<br>    })))<br>    pool_cidrs = optional(list(object({<br>      cidr                                 = optional(string)<br>      cidr_authorization_context_message   = optional(string)<br>      cidr_authorization_context_signature = optional(string)<br>      ipam_pool_id                         = string<br>      netmask_length                       = optional(number)<br>    })))<br>    pool_cidr_allocations = optional(list(object({<br>      cidr             = optional(string)<br>      description      = optional(string)<br>      disallowed_cidrs = optional(list(string))<br>      ipam_pool_id     = string<br>      netmask_length   = optional(number)<br>    })))<br>    preview_next_cidr = optional(object({<br>      disallowed_cidrs = optional(list(string))<br>      ipam_pool_id     = string<br>      netmask_length   = optional(number)<br>    }))<br>    scopes = optional(list(object({<br>      name        = optional(string)<br>      ipam_id     = optional(string)<br>      description = optional(string)<br>      tags        = optional(map(string))<br>    })))<br>  })</pre> | <pre>{<br>  "ipam": {<br>    "operating_regions": [<br>      {}<br>    ]<br>  },<br>  "pool_cidr_allocations": [<br>    {}<br>  ],<br>  "pool_cidrs": [<br>    {}<br>  ],<br>  "pools": [<br>    {}<br>  ],<br>  "preview_next_cidr": {},<br>  "scopes": [<br>    {}<br>  ]<br>}</pre> | no |
+| <a name="input_vpc_ipam"></a> [vpc\_ipam](#input\_vpc\_ipam) | Object of inputs for all IPAM configuration resources | <pre>object({<br>    ipam = optional(object({<br>      operating_regions = list(object({<br>        region_name = string<br>      }))<br>      tags        = optional(map(string))<br>      cascade     = optional(bool)<br>      description = optional(string)<br>    }))<br>    pools = optional(list(object({<br>      name                              = optional(string)<br>      address_family                    = optional(string)<br>      allocation_default_netmask_length = optional(number)<br>      allocation_max_netmask_length     = optional(number)<br>      allocation_min_netmask_length     = optional(number)<br>      allocation_resource_tags          = optional(map(string))<br>      auto_import                       = optional(bool)<br>      aws_service                       = optional(bool)<br>      description                       = optional(string)<br>      ipam_scope_id                     = optional(string)<br>      locale                            = optional(string)<br>      publicly_advertisable             = optional(bool)<br>      public_ip_source                  = optional(string)<br>      source_ipam_pool_id               = optional(string)<br>      tags                              = optional(map(string))<br>    })))<br>    pool_cidrs = optional(list(object({<br>      cidr                                 = optional(string)<br>      cidr_authorization_context_message   = optional(string)<br>      cidr_authorization_context_signature = optional(string)<br>      ipam_pool_id                         = string<br>      netmask_length                       = optional(number)<br>    })))<br>    pool_cidr_allocations = optional(list(object({<br>      cidr             = optional(string)<br>      description      = optional(string)<br>      disallowed_cidrs = optional(list(string))<br>      ipam_pool_id     = string<br>      netmask_length   = optional(number)<br>    })))<br>    preview_next_cidr = optional(object({<br>      disallowed_cidrs = optional(list(string))<br>      ipam_pool_id     = string<br>      netmask_length   = optional(number)<br>    }))<br>    scopes = optional(list(object({<br>      name        = optional(string)<br>      ipam_id     = optional(string)<br>      description = optional(string)<br>      tags        = optional(map(string))<br>    })))<br>  })</pre> | n/a | yes |
 
 ## Outputs
 

diff --git a/main.tf b/main.tf
@@ -17,18 +17,17 @@ resource "aws_vpc_ipam" "this" {
 resource "aws_vpc_ipam_pool" "this" {
   for_each = { for pool in coalesce(var.vpc_ipam.pools, []) : pool.name => pool }
 
-  address_family = each.value.address_family
-  #expects lowercase (need conditional)
+  address_family                    = try(lower(each.value.address_family), null)
   allocation_default_netmask_length = each.value.allocation_default_netmask_length
   allocation_max_netmask_length     = each.value.allocation_max_netmask_length
   allocation_min_netmask_length     = each.value.allocation_min_netmask_length
   allocation_resource_tags          = each.value.allocation_resource_tags
   auto_import                       = each.value.auto_import
-  aws_service                       = each.value.aws_service
+  aws_service                       = try(lower(each.value.aws_service), null)
   description                       = each.value.description
   ipam_scope_id                     = each.value.ipam_scope_id
   #could be output of aws_vpc_ipam or aws_vpc_ipam_scope - try statement?
-  locale                = each.value.locale
+  locale                = try(lower(each.value.locale), null)
   publicly_advertisable = each.value.publicly_advertisable
   public_ip_source      = each.value.public_ip_source
   source_ipam_pool_id   = each.value.source_ipam_pool_id

diff --git a/variables.tf b/variables.tf
@@ -52,27 +52,4 @@ variable "vpc_ipam" {
       tags        = optional(map(string))
     })))
   })
-  default = {
-    ipam = {
-      operating_regions = [{
-
-      }]
-    }
-    pools = [{
-
-    }]
-    pool_cidrs = [{
-
-    }]
-
-    pool_cidr_allocations = [{
-
-    }]
-    preview_next_cidr = {
-
-    }
-    scopes = [{
-
-    }]
-  }
 }