ready for next provider update

Author: scotttyso

README.md

@@ -17,12 +17,12 @@ A Terraform module to configure Intersight Infrastructure Pools.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.3.0 |
-| <a name="requirement_intersight"></a> [intersight](#requirement\_intersight) | >=1.0.47 |
+| <a name="requirement_intersight"></a> [intersight](#requirement\_intersight) | >=1.0.49 |
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_intersight"></a> [intersight](#provider\_intersight) | 1.0.47 |
+| <a name="provider_intersight"></a> [intersight](#provider\_intersight) | 1.0.49 |
 ## Modules
 
 No modules.
@@ -38,8 +38,6 @@ No modules.
 | Name | Description |
 |------|-------------|
 | <a name="output_data_pools"></a> [data\_pools](#output\_data\_pools) | Moid's of the Pools that were not defined locally. |
-| <a name="output_name_prefix"></a> [name\_prefix](#output\_name\_prefix) | Name Prefix Outputs. |
-| <a name="output_name_suffix"></a> [name\_suffix](#output\_name\_suffix) | Name Suffix Outputs. |
 | <a name="output_ip"></a> [ip](#output\_ip) | Moids of the IP Pools. |
 | <a name="output_iqn"></a> [iqn](#output\_iqn) | Moids of the IQN Pools. |
 | <a name="output_mac"></a> [mac](#output\_mac) | Moids of the MAC Pools. |

ip.tf

@@ -77,7 +77,7 @@ resource "intersight_ippool_reservation" "map" {
   dynamic "pool" {
     for_each = { for v in [each.value.pool_name] : v => v if each.value.allocation_type == "dynamic" }
     content {
-      moid = contains(local.pools.ip.moids, pool.value) ? intersight_ippool_pool.map[pool.value].moid : local.pools_data["ip"][pool.value].moid
+      moid = contains(local.pools.ip.moids, pool.value) ? intersight_ippool_pool.map[pool.value].moid : local.pools_data.ip[pool.value].moid
     }
   }
 }

iqn.tf

@@ -39,7 +39,7 @@ resource "intersight_iqnpool_reservation" "map" {
   dynamic "pool" {
     for_each = { for v in [each.value.pool_name] : v => v if each.value.allocation_type == "dynamic" }
     content {
-      moid = contains(local.pools.iqn.moids, pool.value) ? intersight_iqnpool_pool.map[pool.value].moid : local.pools_data["iqn"][pool.value].moid
+      moid = contains(local.pools.iqn.moids, pool.value) ? intersight_iqnpool_pool.map[pool.value].moid : local.pools_data.iqn[pool.value].moid
     }
   }
 }

locals.tf

@@ -76,14 +76,12 @@ locals {
   #
   # Intersight Pool - Reservations
   #____________________________________________________________
-  reservations_loop_1 = flatten([for org in local.org_keys : [
-    for r in flatten([for v in flatten([for e in lookup(lookup(var.model[org], "profiles", {}), "server", []
-      ) : e.targets if lookup(e, "ignore_reservations", true) == false]) : lookup(v, "reservations", [])]
-      ) : merge(local.defaults.reservations, r, {
-        org       = length(regexall("/", r.pool_name)) > 0 ? element(split("/", r.pool_name), 0) : org
-        pool_name = length(regexall("/", r.pool_name)) > 0 ? element(split("/", r.pool_name), 1) : r.pool_name
-    })
-  ]])
+  reservations_loop_1 = flatten([for org in keys(var.orgs) : [for s in lookup(lookup(lookup(var.model, org, {}), "profiles", {}), "server", []) : [
+    for t in s.targets : [for r in lookup(t, "reservations", []) : merge(local.defaults.reservations, r, {
+      org       = length(regexall("/", r.pool_name)) > 0 ? element(split("/", r.pool_name), 0) : org
+      pool_name = length(regexall("/", r.pool_name)) > 0 ? element(split("/", r.pool_name), 1) : r.pool_name
+    })]] if lookup(s, "ignore_reservations", false) == false]
+  ])
   reservations = [for v in local.reservations_loop_1 : merge(v, {
     pool_name = "${v.org}/${local.npfx[v.org][v.identity_type]}${v.pool_name}${local.nsfx[v.org][v.identity_type]}"
   })]

mac.tf

@@ -37,7 +37,7 @@ resource "intersight_macpool_reservation" "map" {
   dynamic "pool" {
     for_each = { for v in [each.value.pool_name] : v => v if each.value.allocation_type == "dynamic" }
     content {
-      moid = contains(local.pools.mac.moids, pool.value) ? intersight_macpool_pool.map[pool.value].moid : local.pools_data["mac"][pool.value].moid
+      moid = contains(local.pools.mac.moids, pool.value) ? intersight_macpool_pool.map[pool.value].moid : local.pools_data.mac[pool.value].moid
     }
   }
 }

outputs.tf

@@ -8,20 +8,6 @@ output "data_pools" {
   value       = { for e in sort(keys(local.pools_data)) : e => { for k, v in local.pools_data[e] : k => v.moid } }
 }
 
-#__________________________________________________________
-#
-# Name Prefix/Suffix Outputs
-#__________________________________________________________
-
-output "name_prefix" {
-  description = "Name Prefix Outputs."
-  value       = local.name_prefix
-}
-output "name_suffix" {
-  description = "Name Suffix Outputs."
-  value       = local.name_suffix
-}
-
 #__________________________________________________________
 #
 # Pools Outputs
@@ -63,5 +49,5 @@ output "wwpn" {
 
 output "reservations" {
   description = "Moids of the Pool Reservations."
-  value       = { for v in local.pool_types : v => local.reservation_results[v] if length(local.reservation_results[v]) > 0 }
+  value       = { for k in keys(local.reservation_results) : k => local.reservation_results[k] if length(local.reservation_results[k]) > 0 }
 }

provider.tf

@@ -8,7 +8,7 @@ terraform {
   required_providers {
     intersight = {
       source  = "CiscoDevNet/intersight"
-      version = ">=1.0.47"
+      version = ">=1.0.49"
     }
   }
   required_version = ">=1.3.0"

uuid.tf

@@ -38,7 +38,7 @@ resource "intersight_uuidpool_reservation" "map" {
   dynamic "pool" {
     for_each = { for v in [each.value.pool_name] : v => v if each.value.allocation_type == "dynamic" }
     content {
-      moid = contains(local.pools.uuid.moids, pool.value) ? intersight_uuidpool_pool.map[pool.value].moid : local.pools_data["uuid"][pool.value].moid
+      moid = contains(local.pools.uuid.moids, pool.value) ? intersight_uuidpool_pool.map[pool.value].moid : local.pools_data.uuid[pool.value].moid
     }
   }
 }

wwnn.tf

@@ -39,7 +39,7 @@ resource "intersight_fcpool_reservation" "wwnn" {
   dynamic "pool" {
     for_each = { for v in [each.value.pool_name] : v => v if each.value.allocation_type == "dynamic" }
     content {
-      moid = contains(local.pools.wwnn.moids, pool.value) ? intersight_fcpool_pool.wwnn[pool.value].moid : local.pools_data["wwnn"][pool.value].moid
+      moid = contains(local.pools.wwnn.moids, pool.value) ? intersight_fcpool_pool.wwnn[pool.value].moid : local.pools_data.wwnn[pool.value].moid
     }
   }
 }

wwpn.tf

@@ -39,7 +39,7 @@ resource "intersight_fcpool_reservation" "wwpn" {
   dynamic "pool" {
     for_each = { for v in [each.value.pool_name] : v => v if each.value.allocation_type == "dynamic" }
     content {
-      moid = contains(local.pools.wwpn.moids, pool.value) ? intersight_fcpool_pool.wwpn[pool.value].moid : local.pools_data["wwpn"][pool.value].moid
+      moid = contains(local.pools.wwpn.moids, pool.value) ? intersight_fcpool_pool.wwpn[pool.value].moid : local.pools_data.wwpn[pool.value].moid
     }
   }
 }