region: add ams1

Author: Quentin Perez

README.md

@@ -182,7 +182,7 @@ Options:
  -q, --quiet=false            Enable quiet mode
  --sensitive=false            Show sensitive data in outputs, i.e. API Token/Organization
  -v, --version=false          Print version information and quit
- --region=par1                Change the default region
+ --region=par1                Change the default region (e.g. ams1)
 
 Commands:
     help      help of the scw command line
@@ -1203,6 +1203,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 ### master (unreleased)
 
+* Region: add `ams1`, you can start a server at Amsterdam with `scw --region="ams1" run yakkety`
 * API: Support multi-zone
 * API: Add ZoneID field in server location
 * `scw image -a -f type=volume` fix unmarshal error on size field

pkg/api/api.go

@@ -35,8 +35,11 @@ var (
 	AccountAPI     = "https://account.scaleway.com/"
 	MetadataAPI    = "http://169.254.42.42/"
 	MarketplaceAPI = "https://api-marketplace.scaleway.com"
-	URLPublicDNS   = ".pub.cloud.scaleway.com"
-	URLPrivateDNS  = ".priv.cloud.scaleway.com"
+	ComputeAPIPar1 = "https://api.scaleway.com/"
+	ComputeAPIAms1 = "https://cp-ams1.scaleway.com"
+
+	URLPublicDNS  = ".pub.cloud.scaleway.com"
+	URLPrivateDNS = ".priv.cloud.scaleway.com"
 )
 
 func init() {
@@ -887,7 +890,9 @@ func NewScalewayAPI(organization, token, userAgent, region string, options ...fu
 	}
 	switch region {
 	case "par1", "":
-		s.computeAPI = "https://api.scaleway.com/"
+		s.computeAPI = ComputeAPIPar1
+	case "ams1":
+		s.computeAPI = ComputeAPIAms1
 	default:
 		return nil, fmt.Errorf("%s isn't a valid region", region)
 	}
@@ -1101,6 +1106,30 @@ func (s *ScalewayAPI) handleHTTPError(goodStatusCode []int, resp *http.Response)
 	return body, nil
 }
 
+func (s *ScalewayAPI) fetchServers(api string, query url.Values, out chan<- ScalewayServers) func() error {
+	return func() error {
+		resp, err := s.GetResponsePaginate(api, "servers", query)
+		if resp != nil {
+			defer resp.Body.Close()
+		}
+		if err != nil {
+			return err
+		}
+
+		body, err := s.handleHTTPError([]int{http.StatusOK}, resp)
+		if err != nil {
+			return err
+		}
+		var servers ScalewayServers
+
+		if err = json.Unmarshal(body, &servers); err != nil {
+			return err
+		}
+		out <- servers
+		return nil
+	}
+}
+
 // GetServers gets the list of servers from the ScalewayAPI
 func (s *ScalewayAPI) GetServers(all bool, limit int) (*[]ScalewayServer, error) {
 	query := url.Values{}
@@ -1115,32 +1144,34 @@ func (s *ScalewayAPI) GetServers(all bool, limit int) (*[]ScalewayServer, error)
 	if all && limit == 0 {
 		s.Cache.ClearServers()
 	}
-	resp, err := s.GetResponsePaginate(s.computeAPI, "servers", query)
-	if resp != nil {
-		defer resp.Body.Close()
-	}
-	if err != nil {
-		return nil, err
+	var (
+		g    errgroup.Group
+		apis = []string{
+			ComputeAPIPar1,
+			ComputeAPIAms1,
+		}
+	)
+
+	serverChan := make(chan ScalewayServers, 2)
+	for _, api := range apis {
+		g.Go(s.fetchServers(api, query, serverChan))
 	}
 
-	body, err := s.handleHTTPError([]int{http.StatusOK}, resp)
-	if err != nil {
+	if err := g.Wait(); err != nil {
 		return nil, err
 	}
+	close(serverChan)
 	var servers ScalewayServers
-	if err = json.Unmarshal(body, &servers); err != nil {
-		return nil, err
+
+	for server := range serverChan {
+		servers.Servers = append(servers.Servers, server.Servers...)
 	}
+
 	for i, server := range servers.Servers {
-		// FIXME arch, owner, title
 		servers.Servers[i].DNSPublic = server.Identifier + URLPublicDNS
 		servers.Servers[i].DNSPrivate = server.Identifier + URLPrivateDNS
 		s.Cache.InsertServer(server.Identifier, server.Location.ZoneID, server.Arch, server.Organization, server.Name)
 	}
-	// FIXME: when API limit is ready, remove the following code
-	if limit > 0 && limit < len(servers.Servers) {
-		servers.Servers = servers.Servers[0:limit]
-	}
 	return &servers.Servers, nil
 }
 
@@ -2177,7 +2208,7 @@ func (s *ScalewayAPI) GetImageID(needle, arch string) (*ScalewayImageIdentifier,
 		}, nil
 	}
 	if len(images) == 0 {
-		return nil, fmt.Errorf("No such image: %s", needle)
+		return nil, fmt.Errorf("No such image (zone %s, arch %s) : %s", s.Region, arch, needle)
 	}
 	return nil, showResolverResults(needle, images)
 }
@@ -2841,6 +2872,8 @@ func (s *ScalewayAPI) ResolveTTYUrl() string {
 	switch s.Region {
 	case "par1", "":
 		return "https://tty.scaleway.com/v2/"
+	case "ams1":
+		return "https://tty-ams1.scaleway.com"
 	}
 	return ""
 }

pkg/cli/cmd_help.go

@@ -43,7 +43,7 @@ Options:
  -q, --quiet=false            Enable quiet mode
  --sensitive=false            Show sensitive data in outputs, i.e. API Token/Organization
  -v, --version=false          Print version information and quit
- --region=par1                Change the default region	
+ --region=par1                Change the default region (e.g. ams1)
 
 Commands:
 {{range .}}{{if not .Hidden}}    {{.Name | printf "%-9s"}} {{.Description}}

pkg/cli/main.go

@@ -32,7 +32,7 @@ var (
 	flVersion   = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")
 	flQuiet     = flag.Bool([]string{"q", "-quiet"}, false, "Enable quiet mode")
 	flSensitive = flag.Bool([]string{"-sensitive"}, false, "Show sensitive data in outputs, i.e. API Token/Organization")
-	flRegion    = flag.String([]string{"-region"}, "par1", "Change the default region")
+	flRegion    = flag.String([]string{"-region"}, "par1", "Change the default region (e.g. ams1)")
 )
 
 // Start is the entrypoint