fixes.

Author: arthuraliiev

cmd/compute/blockstorage/blockstorage_list.go

@@ -10,6 +10,7 @@ import (
 	exocmd "github.com/exoscale/cli/cmd"
 	"github.com/exoscale/cli/pkg/globalstate"
 	"github.com/exoscale/cli/pkg/output"
+	"github.com/exoscale/cli/utils"
 	v3 "github.com/exoscale/egoscale/v3"
 )
 
@@ -54,20 +55,10 @@ func (c *blockStorageListCmd) CmdRun(_ *cobra.Command, _ []string) error {
 	client := globalstate.EgoscaleV3Client
 	ctx := exocmd.GContext
 
-	resp, err := client.ListZones(ctx)
+	zones, err := utils.AllZonesV3(ctx, client, c.Zone)
 	if err != nil {
 		return err
 	}
-	zones := resp.Zones
-
-	if c.Zone != "" {
-		endpoint, err := client.GetZoneAPIEndpoint(ctx, c.Zone)
-		if err != nil {
-			return err
-		}
-
-		zones = []v3.Zone{{APIEndpoint: endpoint}}
-	}
 
 	output := make(blockStorageListOutput, 0)
 	for _, zone := range zones {

cmd/compute/private_network/private_network_list.go

@@ -53,19 +53,10 @@ func (c *privateNetworkListCmd) CmdRun(_ *cobra.Command, _ []string) error {
 	client := globalstate.EgoscaleV3Client
 	ctx := exocmd.GContext
 
-	resp, err := client.ListZones(ctx)
+	zones, err := utils.AllZonesV3(ctx, client, c.Zone)
 	if err != nil {
 		return err
 	}
-	zones := resp.Zones
-
-	if c.Zone != "" {
-		endpoint, err := client.GetZoneAPIEndpoint(ctx, c.Zone)
-		if err != nil {
-			return err
-		}
-		zones = []v3.Zone{{APIEndpoint: endpoint}}
-	}
 
 	out := make(privateNetworkListOutput, 0)
 	res := make(chan privateNetworkListItemOutput)

utils/utils.go

@@ -43,7 +43,7 @@ func AllZonesV3(ctx context.Context, client *v3.Client, zoneName v3.ZoneName) ([
 		if err != nil {
 			return nil, fmt.Errorf("get zone api endpoint: find zone: %w", err)
 		}
-		zones = []v3.Zone{{APIEndpoint: zone.APIEndpoint}}
+		zones = []v3.Zone{zone}
 	}
 
 	return zones, nil
@@ -228,7 +228,6 @@ func ForEveryZone(zones []v3.Zone, f func(zone v3.Zone) error) error {
 	meg := new(multierror.Group)
 
 	for _, zone := range zones {
-		zone := zone
 		meg.Go(func() error {
 			return f(zone)
 		})