'scw run --gateway' now creates a server without public ip address (#74)

README.md

@@ -1036,7 +1036,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 #### Features
 
-* No entry
+* `scw run --gateway ...` or `SCW_GATEWAY="..." scw run ...` now creates a server without public ip address ([#74](https://github.com/scaleway/scaleway-cli/issues/74))
 
 #### Fixes
 

api/api.go

@@ -442,6 +442,9 @@ type ScalewayServerDefinition struct {
 	// Volumes are the attached volumes
 	Volumes map[string]string `json:"volumes,omitempty"`
 
+	// DynamicIPRequired is a flag that defines a server with a dynamic ip address attached
+	DynamicIPRequired *bool `json:"dynamic_ip_required,omitempty"`
+
 	// Bootscript is the bootscript used by the server
 	Bootscript *string `json:"bootscript"`
 

api/helpers.go

@@ -231,14 +231,16 @@ func InspectIdentifiers(api *ScalewayAPI, ci chan ScalewayResolvedIdentifier, cj
 }
 
 // CreateServer creates a server using API based on typical server fields
-func CreateServer(api *ScalewayAPI, imageName string, name string, bootscript string, env string, additionalVolumes string) (string, error) {
+func CreateServer(api *ScalewayAPI, imageName string, name string, bootscript string, env string, additionalVolumes string, dynamicIPRequired bool) (string, error) {
 	if name == "" {
 		name = strings.Replace(namesgenerator.GetRandomName(0), "_", "-", -1)
 	}
 
 	var server ScalewayServerDefinition
 	server.Volumes = make(map[string]string)
 
+	server.DynamicIPRequired = &dynamicIPRequired
+
 	server.Tags = []string{}
 	if env != "" {
 		server.Tags = strings.Split(env, " ")
@@ -292,7 +294,7 @@ func CreateServer(api *ScalewayAPI, imageName string, name string, bootscript st
 
 	serverID, err := api.PostServer(server)
 	if err != nil {
-		return "", nil
+		return "", err
 	}
 
 	// For inherited volumes, we prefix the name with server hostname

commands/create.go

@@ -50,7 +50,7 @@ func runCreate(cmd *types.Command, args []string) {
 		cmd.PrintShortUsage()
 	}
 
-	serverID, err := api.CreateServer(cmd.API, args[0], createName, createBootscript, createEnv, createVolume)
+	serverID, err := api.CreateServer(cmd.API, args[0], createName, createBootscript, createEnv, createVolume, true)
 
 	if err != nil {
 		log.Fatalf("Failed to create server: %v", err)

commands/run.go

@@ -71,9 +71,14 @@ func runRun(cmd *types.Command, args []string) {
 		log.Fatalf("Conflicting options: -d and COMMAND")
 	}
 
+	if runGateway == "" {
+		runGateway = os.Getenv("SCW_GATEWAY")
+	}
+
 	// create IMAGE
 	log.Debugf("Creating a new server")
-	serverID, err := api.CreateServer(cmd.API, args[0], runCreateName, runCreateBootscript, runCreateEnv, runCreateVolume)
+	dynamicIPRequired := runGateway == ""
+	serverID, err := api.CreateServer(cmd.API, args[0], runCreateName, runCreateBootscript, runCreateEnv, runCreateVolume, dynamicIPRequired)
 	if err != nil {
 		log.Fatalf("Failed to create server: %v", err)
 	}
@@ -101,9 +106,6 @@ func runRun(cmd *types.Command, args []string) {
 		}
 	} else {
 		// Resolve gateway
-		if runGateway == "" {
-			runGateway = os.Getenv("SCW_GATEWAY")
-		}
 		gateway, err := api.ResolveGateway(cmd.API, runGateway)
 		if err != nil {
 			log.Fatalf("Cannot resolve Gateway '%s': %v", runGateway, err)