Add api.ResolveTTYUrl

Author: QuentinPerez

pkg/api/api.go

@@ -74,6 +74,8 @@ type ScalewayAPI struct {
 	client     *http.Client
 	verbose    bool
 	computeAPI string
+
+	Region string
 	//
 	Logger
 }
@@ -889,6 +891,7 @@ func NewScalewayAPI(organization, token, userAgent, region string, options ...fu
 	default:
 		return nil, fmt.Errorf("%s isn't a valid region", region)
 	}
+	s.Region = region
 	if url := os.Getenv("SCW_COMPUTE_API"); url != "" {
 		s.computeAPI = url
 	}
@@ -2817,3 +2820,12 @@ func (s *ScalewayAPI) DeleteMarketPlaceLocalImage(uuidImage, uuidVersion, uuidLo
 	_, err = s.handleHTTPError([]int{http.StatusNoContent}, resp)
 	return err
 }
+
+// ResolveTTYUrl return an URL to get a tty
+func (s *ScalewayAPI) ResolveTTYUrl() string {
+	switch s.Region {
+	case "par1", "":
+		return "https://tty.scaleway.com/v2/"
+	}
+	return ""
+}

pkg/api/helpers.go

@@ -445,7 +445,7 @@ func CreateServer(api *ScalewayAPI, c *ConfigCreateServer) (string, error) {
 			return "", err
 		}
 		currentVolume := createdServer.Volumes["0"]
-		size := currentVolume.Size.(uint64)
+		size := uint64(currentVolume.Size.(float64))
 
 		var volumePayload ScalewayVolumePutDefinition
 		newName := fmt.Sprintf("%s-%s", createdServer.Hostname, currentVolume.Name)

pkg/commands/attach.go

@@ -18,7 +18,7 @@ func RunAttach(ctx CommandContext, args AttachArgs) error {
 	if err != nil {
 		return err
 	}
-	_, done, err := utils.AttachToSerial(serverID, ctx.API.Token)
+	_, done, err := utils.AttachToSerial(serverID, ctx.API.Token, ctx.API.ResolveTTYUrl())
 	if err != nil {
 		return err
 	}

pkg/commands/run.go

@@ -99,10 +99,10 @@ func addUserData(ctx CommandContext, userdatas []string, serverID string) {
 	}
 }
 
-func runShowBoot(ctx CommandContext, args RunArgs, serverID string, closeTimeout chan struct{}, timeoutExit chan struct{}) error {
+func runShowBoot(ctx CommandContext, args RunArgs, serverID, region string, closeTimeout chan struct{}, timeoutExit chan struct{}) error {
 	// Attach to server serial
 	logrus.Info("Attaching to server console ...")
-	gottycli, done, err := utils.AttachToSerial(serverID, ctx.API.Token)
+	gottycli, done, err := utils.AttachToSerial(serverID, ctx.API.Token, ctx.API.ResolveTTYUrl())
 	if err != nil {
 		close(closeTimeout)
 		return fmt.Errorf("cannot attach to server serial: %v", err)
@@ -242,11 +242,11 @@ func Run(ctx CommandContext, args RunArgs) error {
 		}()
 	}
 	if args.ShowBoot {
-		return runShowBoot(ctx, args, serverID, closeTimeout, timeoutExit)
+		return runShowBoot(ctx, args, serverID, ctx.API.Region, closeTimeout, timeoutExit)
 	} else if args.Attach {
 		// Attach to server serial
 		logrus.Info("Attaching to server console ...")
-		gottycli, done, err := utils.AttachToSerial(serverID, ctx.API.Token)
+		gottycli, done, err := utils.AttachToSerial(serverID, ctx.API.Token, ctx.API.ResolveTTYUrl())
 		close(closeTimeout)
 		if err != nil {
 			return fmt.Errorf("cannot attach to server serial: %v", err)

pkg/utils/utils.go

@@ -191,10 +191,10 @@ func RemoveDuplicates(elements []string) []string {
 }
 
 // AttachToSerial tries to connect to server serial using 'gotty-client' and fallback with a help message
-func AttachToSerial(serverID string, apiToken string) (*gottyclient.Client, chan bool, error) {
+func AttachToSerial(serverID, apiToken, url string) (*gottyclient.Client, chan bool, error) {
 	gottyURL := os.Getenv("SCW_GOTTY_URL")
 	if gottyURL == "" {
-		gottyURL = "https://tty.scaleway.com/v2/"
+		gottyURL = url
 	}
 	URL := fmt.Sprintf("%s?arg=%s&arg=%s", gottyURL, apiToken, serverID)