From 4884584cccc23de3ce87287cd902a7eadf5ad811 Mon Sep 17 00:00:00 2001 From: Olivier CANO Date: Mon, 22 Jun 2020 16:56:38 +0200 Subject: [PATCH] chore(locality): small fixes - Log info unknown zone - Stringer interface on zone / region types --- scw/locality.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scw/locality.go b/scw/locality.go index 69278d28d..9cf72987b 100644 --- a/scw/locality.go +++ b/scw/locality.go @@ -35,9 +35,9 @@ var ( ) // Exists checks whether a zone exists -func (zone *Zone) Exists() bool { +func (zone Zone) Exists() bool { for _, z := range AllZones { - if z == *zone { + if z == zone { return true } } @@ -45,13 +45,13 @@ func (zone *Zone) Exists() bool { } // String returns a Zone as a string -func (zone *Zone) String() string { - return string(*zone) +func (zone Zone) String() string { + return string(zone) } // Region returns the parent Region for the Zone. // Manipulates the string directly to allow unlisted zones formatted as xx-yyy-z. -func (zone *Zone) Region() (Region, error) { +func (zone Zone) Region() (Region, error) { zoneStr := zone.String() if !validation.IsZone(zoneStr) { return "", fmt.Errorf("invalid zone '%v'", zoneStr) @@ -79,9 +79,9 @@ var ( ) // Exists checks whether a region exists -func (region *Region) Exists() bool { +func (region Region) Exists() bool { for _, r := range AllRegions { - if r == *region { + if r == region { return true } } @@ -122,7 +122,7 @@ func ParseZone(zone string) (Zone, error) { newZone := Zone(zone) if !newZone.Exists() { - logger.Warningf("%s is an unknown zone", newZone) + logger.Infof("%s is an unknown zone\n", newZone) } return newZone, nil } @@ -168,7 +168,7 @@ func ParseRegion(region string) (Region, error) { newRegion := Region(region) if !newRegion.Exists() { - logger.Warningf("%s is an unknown region", newRegion) + logger.Infof("%s is an unknown region\n", newRegion) } return newRegion, nil } @@ -193,6 +193,6 @@ func (region *Region) UnmarshalJSON(input []byte) error { } // String returns a Region as a string -func (region *Region) String() string { - return string(*region) +func (region Region) String() string { + return string(region) }