Remove IP adress if machine didn't exist #64

ctrlok · 2017-04-09T10:17:40Z

Hi, while I try to fix #63 I found some bug: if docker-machine fail create instance it still create ip address. And that address not deleted with docker-machine rm.

QuentinPerez · 2017-04-09T12:16:37Z

driver/scaleway.go

@@ -360,6 +357,9 @@ func (d *Driver) Remove() (err error) {
 	if !d.IPPersistant {
 		err = cl.DeleteIP(d.IPID)
 	}
+	if errRemove != nil {
+		return


err = errRemove before returning

done, thanks!

ctrlok · 2017-04-09T12:57:03Z

Thanks for merging.
BTW, maybe it will be better to use mcnutils.MultiError like in original plugins? Example

ctrlok · 2017-04-09T13:58:28Z

@QuentinPerez actually, I have some problems with this changes.
_, err = cl.GetServer(d.ServerID) will return no error if d.ServerID is an empty string.

dump

(bench-3) (*api.ScalewayServer)(0xc4200e9340)({
(bench-3)  Arch: (string) "",
(bench-3)  Identifier: (string) "",
(bench-3)  Name: (string) "",
(bench-3)  CreationDate: (string) "",
(bench-3)  ModificationDate: (string) "",
(bench-3)  Image: (api.ScalewayImage) {
(bench-3)   Identifier: (string) "",
(bench-3)   Name: (string) "",
(bench-3)   CreationDate: (string) "",
(bench-3)   ModificationDate: (string) "",
(bench-3)   RootVolume: (api.ScalewayVolume) {
(bench-3)    Identifier: (string) "",
(bench-3)    Size: (interface {}) <nil>,
(bench-3)    CreationDate: (string) "",
(bench-3)    ModificationDate: (string) "",
(bench-3)    Organization: (string) "",
(bench-3)    Name: (string) "",
(bench-3)    Server: (*struct { Identifier string "json:\"id,omitempty\""; Name string "json:\"name,omitempty\"" })(<nil>),
(bench-3)    VolumeType: (string) "",
(bench-3)    ExportURI: (string) ""
(bench-3)   },
(bench-3)   Public: (bool) false,
(bench-3)   DefaultBootscript: (*api.ScalewayBootscript)(<nil>),
(bench-3)   Organization: (string) "",
(bench-3)   Arch: (string) ""
(bench-3)  },
(bench-3)  DynamicIPRequired: (*bool)(<nil>),
(bench-3)  PublicAddress: (api.ScalewayIPAddress) {
(bench-3)   Identifier: (string) "",
(bench-3)   IP: (string) "",
(bench-3)   Dynamic: (*bool)(<nil>)
(bench-3)  },
(bench-3)  State: (string) "",
(bench-3)  StateDetail: (string) "",
(bench-3)  PrivateIP: (string) "",
(bench-3)  Bootscript: (*api.ScalewayBootscript)(<nil>),
(bench-3)  Hostname: (string) "",
(bench-3)  Tags: ([]string) <nil>,
(bench-3)  Volumes: (map[string]api.ScalewayVolume) <nil>,
(bench-3)  SecurityGroup: (api.ScalewaySecurityGroup) {
(bench-3)   Identifier: (string) "",
(bench-3)   Name: (string) ""
(bench-3)  },
(bench-3)  Organization: (string) "",
(bench-3)  CommercialType: (string) "",
(bench-3)  Location: (struct { Platform string "json:\"platform_id,omitempty\""; Chassis string "json:\"chassis_id,omitempty\""; Cluster string "json:\"cluster_id,omitempty\""; Hypervisor string "json:\"hypervisor_id,omitempty\""; Blade string "json:\"blade_id,omitempty\""; Node string "json:\"node_id,omitempty\""; ZoneID string "json:\"zone_id,omitempty\"" }) {
(bench-3)   Platform: (string) "",
(bench-3)   Chassis: (string) "",
(bench-3)   Cluster: (string) "",
(bench-3)   Hypervisor: (string) "",
(bench-3)   Blade: (string) "",
(bench-3)   Node: (string) "",
(bench-3)   ZoneID: (string) ""
(bench-3)  },
(bench-3)  IPV6: (*api.ScalewayIPV6Definition)(<nil>),
(bench-3)  EnableIPV6: (bool) false,
(bench-3)  DNSPublic: (string) (len=23) ".pub.cloud.scaleway.com",
(bench-3)  DNSPrivate: (string) (len=24) ".priv.cloud.scaleway.com"
(bench-3) })

I think it is becouse s.GetResponsePaginate will return no error, but list of servers. I will made PR to cli about this.

ctrlok · 2017-04-10T09:47:31Z

@QuentinPerez thanks!
please, update vendored cli package to fix the issue.

QuentinPerez · 2017-04-10T10:58:40Z

@ctrlok done :)

Remove IP adress if machine didn't exist

bfce384

QuentinPerez reviewed Apr 9, 2017

View reviewed changes

fix error returning

cab5de5

QuentinPerez merged commit 5599f14 into scaleway:master Apr 9, 2017

ctrlok mentioned this pull request Apr 9, 2017

Fix no error when getting server without ID in api scaleway/scaleway-cli#454

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove IP adress if machine didn't exist #64

Remove IP adress if machine didn't exist #64

ctrlok commented Apr 9, 2017

QuentinPerez Apr 9, 2017

ctrlok Apr 9, 2017

ctrlok commented Apr 9, 2017

ctrlok commented Apr 9, 2017

ctrlok commented Apr 10, 2017

QuentinPerez commented Apr 10, 2017

Remove IP adress if machine didn't exist #64

Remove IP adress if machine didn't exist #64

Conversation

ctrlok commented Apr 9, 2017

QuentinPerez Apr 9, 2017

Choose a reason for hiding this comment

ctrlok Apr 9, 2017

Choose a reason for hiding this comment

ctrlok commented Apr 9, 2017

ctrlok commented Apr 9, 2017

ctrlok commented Apr 10, 2017

QuentinPerez commented Apr 10, 2017