Skip to content

chore(locality): small fixes #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kindermoumoute merged 1 commit into from
Jun 22, 2020
Merged

chore(locality): small fixes #455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions scw/locality.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,23 @@ 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
}
}
return false
}

// 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)
Expand Down Expand Up @@ -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
}
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand All @@ -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)
}