update metal ip rs/ds to check metro from facility if metro is null

equinix · Nov 17, 2022 · 8d4fe0b · 8d4fe0b
1 parent 3a521d4
commit 8d4fe0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/equinix/data_source_metal_ip_block_ranges.go b/equinix/data_source_metal_ip_block_ranges.go
@@ -76,6 +76,16 @@ func metroMatch(ref string, metro *packngo.Metro) bool {
 	return false
 }
 
+func metroOffacilityMatch(ref string, facility *packngo.Facility) bool {
+	if ref == "" {
+		return true
+	}
+	if facility != nil && facility.Metro != nil && ref == facility.Metro.Code {
+		return true
+	}
+	return false
+}
+
 func dataSourceMetalIPBlockRangesRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 	projectID := d.Get("project_id").(string)
@@ -109,7 +119,7 @@ func dataSourceMetalIPBlockRangesRead(d *schema.ResourceData, meta interface{})
 		} else {
 			targetSlice = &theIPv6s
 		}
-		if targetSlice != nil && facilityMatch(facility, ip.Facility) && metroMatch(metro, ip.Metro) {
+		if targetSlice != nil && facilityMatch(facility, ip.Facility) && metroMatch(metro, ip.Metro) && metroOffacilityMatch(metro, ip.Facility) {
 			*targetSlice = append(*targetSlice, cnStr)
 		}
 	}

diff --git a/equinix/resource_metal_reserved_ip_block.go b/equinix/resource_metal_reserved_ip_block.go
@@ -396,7 +396,7 @@ func loadBlock(d *schema.ResourceData, reservedBlock *packngo.IPAddressReservati
 		},
 		"metro": func(d *schema.ResourceData, k string) error {
 			if reservedBlock.Metro == nil {
-				if reservedBlock.Facility != nil {
+				if reservedBlock.Facility != nil && reservedBlock.Facility.Metro != nil {
 					return d.Set(k, strings.ToLower(reservedBlock.Facility.Metro.Code))
 				}
 				return nil