lint

np-guard · Jan 4, 2024 · 9bfb790 · 9bfb790
1 parent cc65300
commit 9bfb790
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/drawio/drawio_test.go b/pkg/drawio/drawio_test.go
@@ -332,7 +332,7 @@ func createNetworkSubnetGrouping() SquareTreeNodeInterface {
 		{0, 6, 6, 2, 3},
 		{0, 7, 8, 1, 2},
 	}
-	return createNetworkSubnetGroupingGeneric(1, groupsIndexes)
+	return createNetworkSubnetGroupingGeneric(groupsIndexes)
 }
 
 func createNetworkSubnetGroupingMultiVpc() SquareTreeNodeInterface {
@@ -353,10 +353,10 @@ func createNetworkSubnetGroupingMultiVpc() SquareTreeNodeInterface {
 		{2, 16, 17, 0, 1},
 		{2, 17, 18, 0, 1},
 	}
-	return createNetworkSubnetGroupingGeneric(1, groupsIndexes)
+	return createNetworkSubnetGroupingGeneric(groupsIndexes)
 }
 
-func createNetworkSubnetGroupingGeneric(nVpcs int, groupsIndexes []groupIndexes) SquareTreeNodeInterface {
+func createNetworkSubnetGroupingGeneric(groupsIndexes []groupIndexes) SquareTreeNodeInterface {
 	network := NewNetworkTreeNode()
 	zones := &[][]SquareTreeNodeInterface{}
 	cloud1 := NewCloudTreeNode(network, "IBM Cloud")

diff --git a/pkg/drawio/subnetsLayout.go b/pkg/drawio/subnetsLayout.go
@@ -498,6 +498,10 @@ func (ly *subnetsLayout) calcZoneOrder() {
 		}
 	}
 	zoneOrders = append(zoneOrders, zoneOrder)
+	ly.setZonesCol(zoneOrders)
+}
+
+func (ly *subnetsLayout) setZonesCol(zoneOrders [][]TreeNodeInterface) {
 	// zoneOrders of the same VPCs must be together
 	// sorting the zoneOrders by their VPCs:
 	vpcToOrders := map[TreeNodeInterface][][]TreeNodeInterface{}