Version 3.9.2

- allow specification of existing public IP (closes #88, thanks @ItsReddi)
- fix server being assigned a public IP even when explicitly disabled (closes #90, thanks @makmarius)
- fix version display (closes #92, thanks @makmarius)
- add instrumented builds

Author: JonasProgrammer

.goreleaser.yml

@@ -6,5 +6,14 @@ builds:
     goarch:
       - amd64
       - arm64
-    env:
+    env: &default-env
       - CGO_ENABLED=0
+  - id: instrumented
+    goos:
+      - linux
+      - windows
+    goarch:
+      - amd64
+    env: *default-env
+    tags: instrumented
+    binary: docker-machine-driver-hetzner_instrumented

README.md

@@ -15,8 +15,8 @@ You can find sources and pre-compiled binaries [here](https://github.com/JonasPr
 
 ```bash
 # Download the binary (this example downloads the binary for linux amd64)
-$ wget https://github.com/JonasProgrammer/docker-machine-driver-hetzner/releases/download/3.9.0/docker-machine-driver-hetzner_3.9.0_linux_amd64.tar.gz
-$ tar -xvf docker-machine-driver-hetzner_3.9.0_linux_amd64.tar.gz
+$ wget https://github.com/JonasProgrammer/docker-machine-driver-hetzner/releases/download/3.9.2/docker-machine-driver-hetzner_3.9.2_linux_amd64.tar.gz
+$ tar -xvf docker-machine-driver-hetzner_3.9.2_linux_amd64.tar.gz
 
 # Make it executable and copy the binary in a directory accessible with your $PATH
 $ chmod +x docker-machine-driver-hetzner

driver.go

@@ -325,6 +325,8 @@ func (d *Driver) setConfigFromFlagsImpl(opts drivers.DriverOptions) error {
 		return d.flagFailure("--%v and --%v are mutually exclusive", flagPrimary6, flagDisablePublic6)
 	}
 
+	instrumented(d)
+
 	return nil
 }
 
@@ -438,7 +440,7 @@ func (d *Driver) Create() error {
 		return err
 	}
 
-	srv, _, err := d.getClient().Server.Create(context.Background(), *srvopts)
+	srv, _, err := d.getClient().Server.Create(context.Background(), instrumented(*srvopts))
 	if err != nil {
 		return errors.Wrap(err, "could not create server")
 	}
@@ -531,7 +533,7 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
 		PlacementGroup: pgrp,
 	}
 
-	err = d.setPublicNetIfRequired(srvopts)
+	err = d.setPublicNetIfRequired(&srvopts)
 	if err != nil {
 		return nil, err
 	}
@@ -571,7 +573,7 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
 	return &srvopts, nil
 }
 
-func (d *Driver) setPublicNetIfRequired(srvopts hcloud.ServerCreateOpts) error {
+func (d *Driver) setPublicNetIfRequired(srvopts *hcloud.ServerCreateOpts) error {
 	pip4, err := d.getPrimaryIPv4()
 	if err != nil {
 		return err
@@ -583,8 +585,8 @@ func (d *Driver) setPublicNetIfRequired(srvopts hcloud.ServerCreateOpts) error {
 
 	if d.DisablePublic4 || d.DisablePublic6 || pip4 != nil || pip6 != nil {
 		srvopts.PublicNet = &hcloud.ServerCreatePublicNet{
-			EnableIPv4: !d.DisablePublic4,
-			EnableIPv6: !d.DisablePublic6,
+			EnableIPv4: !d.DisablePublic4 || pip4 != nil,
+			EnableIPv6: !d.DisablePublic6 || pip6 != nil,
 			IPv4:       pip4,
 			IPv6:       pip6,
 		}
@@ -604,7 +606,7 @@ func (d *Driver) createNetworks() ([]*hcloud.Network, error) {
 		}
 		networks = append(networks, network)
 	}
-	return networks, nil
+	return instrumented(networks), nil
 }
 
 func (d *Driver) createFirewalls() ([]*hcloud.ServerCreateFirewall, error) {
@@ -619,7 +621,7 @@ func (d *Driver) createFirewalls() ([]*hcloud.ServerCreateFirewall, error) {
 		}
 		firewalls = append(firewalls, &hcloud.ServerCreateFirewall{Firewall: *firewall})
 	}
-	return firewalls, nil
+	return instrumented(firewalls), nil
 }
 
 func (d *Driver) createVolumes() ([]*hcloud.Volume, error) {
@@ -634,7 +636,7 @@ func (d *Driver) createVolumes() ([]*hcloud.Volume, error) {
 		}
 		volumes = append(volumes, volume)
 	}
-	return volumes, nil
+	return instrumented(volumes), nil
 }
 
 func (d *Driver) createRemoteKeys() error {
@@ -711,7 +713,7 @@ func (d *Driver) makeKey(name string, pubkey string, labels map[string]string) (
 		Labels:    labels,
 	}
 
-	key, _, err := d.getClient().SSHKey.Create(context.Background(), keyopts)
+	key, _, err := d.getClient().SSHKey.Create(context.Background(), instrumented(keyopts))
 	if err != nil {
 		return nil, errors.Wrap(err, "could not create ssh key")
 	} else if key == nil {
@@ -916,7 +918,7 @@ func (d *Driver) Kill() error {
 }
 
 func (d *Driver) getClient() *hcloud.Client {
-	return hcloud.NewClient(hcloud.WithToken(d.AccessToken), hcloud.WithApplication("docker-machine-driver", Version))
+	return hcloud.NewClient(hcloud.WithToken(d.AccessToken), hcloud.WithApplication("docker-machine-driver", version))
 }
 
 func (d *Driver) copySSHKeyPair(src string) error {
@@ -958,7 +960,7 @@ func (d *Driver) getType() (*hcloud.ServerType, error) {
 		return stype, errors.Wrap(err, "could not get type by name")
 	}
 	d.cachedType = stype
-	return stype, nil
+	return instrumented(stype), nil
 }
 
 func (d *Driver) getImage() (*hcloud.Image, error) {
@@ -982,7 +984,7 @@ func (d *Driver) getImage() (*hcloud.Image, error) {
 	}
 
 	d.cachedImage = image
-	return image, nil
+	return instrumented(image), nil
 }
 
 func (d *Driver) getKey() (*hcloud.SSHKey, error) {
@@ -995,7 +997,7 @@ func (d *Driver) getKey() (*hcloud.SSHKey, error) {
 		return stype, errors.Wrap(err, "could not get sshkey by ID")
 	}
 	d.cachedKey = stype
-	return stype, nil
+	return instrumented(stype), nil
 }
 
 func (d *Driver) getRemoteKeyWithSameFingerprint(publicKeyBytes []byte) (*hcloud.SSHKey, error) {
@@ -1010,7 +1012,7 @@ func (d *Driver) getRemoteKeyWithSameFingerprint(publicKeyBytes []byte) (*hcloud
 	if err != nil {
 		return remoteKey, errors.Wrap(err, "could not get sshkey by fingerprint")
 	}
-	return remoteKey, nil
+	return instrumented(remoteKey), nil
 }
 
 func (d *Driver) getServerHandle() (*hcloud.Server, error) {
@@ -1074,15 +1076,15 @@ func (d *Driver) getAutoPlacementGroup() (*hcloud.PlacementGroup, error) {
 		d.labelName(labelAutoCreated):  "true",
 	})
 
-	return grp, err
+	return instrumented(grp), err
 }
 
 func (d *Driver) makePlacementGroup(name string, labels map[string]string) (*hcloud.PlacementGroup, error) {
-	grp, _, err := d.getClient().PlacementGroup.Create(context.Background(), hcloud.PlacementGroupCreateOpts{
+	grp, _, err := d.getClient().PlacementGroup.Create(context.Background(), instrumented(hcloud.PlacementGroupCreateOpts{
 		Name:   name,
 		Labels: labels,
 		Type:   "spread",
-	})
+	}))
 
 	if grp.PlacementGroup != nil {
 		d.dangling = append(d.dangling, func() {
@@ -1097,7 +1099,7 @@ func (d *Driver) makePlacementGroup(name string, labels map[string]string) (*hcl
 		return nil, fmt.Errorf("could not create placement group: %w", err)
 	}
 
-	return grp.PlacementGroup, nil
+	return instrumented(grp.PlacementGroup), nil
 }
 
 func (d *Driver) getPlacementGroup() (*hcloud.PlacementGroup, error) {
@@ -1193,7 +1195,7 @@ func (d *Driver) resolvePrimaryIP(raw string) (*hcloud.PrimaryIP, error) {
 	}
 
 	if ip != nil {
-		return ip, nil
+		return instrumented(ip), nil
 	}
 
 	return nil, fmt.Errorf("primary IP not found: %v", raw)

flag_failure.go

@@ -1,4 +1,4 @@
-//go:build !flag_debug
+//go:build !flag_debug && !instrumented
 
 package main
 

flag_failure_debug.go

@@ -1,4 +1,4 @@
-//go:build flag_debug
+//go:build flag_debug || instrumented
 
 package main
 

go.mod

@@ -4,26 +4,26 @@ go 1.18
 
 require (
 	github.com/docker/machine v0.16.2
-	github.com/hetznercloud/hcloud-go v1.35.1
+	github.com/hetznercloud/hcloud-go v1.37.0
 	github.com/pkg/errors v0.9.1
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
+	golang.org/x/crypto v0.3.0
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/docker/docker v20.10.17+incompatible // indirect
+	github.com/docker/docker v20.10.21+incompatible // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
-	github.com/prometheus/client_golang v1.12.2 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/moby/term v0.0.0-20221120202655-abb19827d345 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
-	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	golang.org/x/net v0.2.0 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/term v0.2.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )