Skip to content

Commit c023dd1

Browse files
JonasProgrammerJonasProgrammer
committed
chore: Switch to std lib errors package
1 parent 97012db commit c023dd1

14 files changed

+117
-87
lines changed

‎driver/cleanup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package driver
33
import (
44
"context"
55
"fmt"
6+
67
"github.com/docker/machine/libmachine/log"
78
"github.com/hetznercloud/hcloud-go/v2/hcloud"
8-
"github.com/pkg/errors"
99
)
1010

1111
func (d *Driver) destroyDangling() {
@@ -44,7 +44,7 @@ func (d *Driver) destroyServer() error {
4444

4545
srv, err := d.getServerHandleNullable()
4646
if err != nil {
47-
return errors.Wrap(err, "could not get server handle")
47+
return fmt.Errorf("could not get server handle: %w", err)
4848
}
4949

5050
if srv == nil {
@@ -54,7 +54,7 @@ func (d *Driver) destroyServer() error {
5454

5555
res, _, err := d.getClient().Server.DeleteWithResult(context.Background(), srv)
5656
if err != nil {
57-
return errors.Wrap(err, "could not delete server")
57+
return fmt.Errorf("could not delete server: %w", err)
5858
}
5959

6060
// failure to remove a placement group is not a hard error
@@ -64,7 +64,7 @@ func (d *Driver) destroyServer() error {
6464

6565
// wait for the server to actually be deleted
6666
if err = d.waitForAction(res.Action); err != nil {
67-
return errors.Wrap(err, "could not wait for deletion")
67+
return fmt.Errorf("could not wait for deletion: %w", err)
6868
}
6969
}
7070

‎driver/driver.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package driver
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"net"
78
"strconv"
@@ -12,7 +13,6 @@ import (
1213
"github.com/docker/machine/libmachine/mcnflag"
1314
"github.com/docker/machine/libmachine/state"
1415
"github.com/hetznercloud/hcloud-go/v2/hcloud"
15-
"github.com/pkg/errors"
1616
)
1717

1818
// Driver contains hetzner-specific data to implement [drivers.Driver]
@@ -328,7 +328,7 @@ func flagI64(opts drivers.DriverOptions, key string) (int64, error) {
328328

329329
ret, err := strconv.ParseInt(raw, 10, 64)
330330
if err != nil {
331-
return 0, errors.Wrapf(err, "could not parse int64 for %v", key)
331+
return 0, fmt.Errorf("could not parse int64 for %v: %w", key, err)
332332
}
333333

334334
return ret, nil
@@ -439,17 +439,17 @@ func (d *Driver) PreCreateCheck() error {
439439
}
440440

441441
if serverType, err := d.getType(); err != nil {
442-
return errors.Wrap(err, "could not get type")
442+
return fmt.Errorf("could not get type: %w", err)
443443
} else if d.ImageArch != "" && serverType.Architecture != d.ImageArch {
444444
log.Warnf("supplied architecture %v differs from server architecture %v", d.ImageArch, serverType.Architecture)
445445
}
446446

447447
if _, err := d.getImage(); err != nil {
448-
return errors.Wrap(err, "could not get image")
448+
return fmt.Errorf("could not get image: %w", err)
449449
}
450450

451451
if _, err := d.getLocationNullable(); err != nil {
452-
return errors.Wrap(err, "could not get location")
452+
return fmt.Errorf("could not get location: %w", err)
453453
}
454454

455455
if _, err := d.getPlacementGroup(); err != nil {
@@ -465,7 +465,7 @@ func (d *Driver) PreCreateCheck() error {
465465
}
466466

467467
if d.UsePrivateNetwork && len(d.Networks) == 0 {
468-
return errors.Errorf("No private network attached.")
468+
return fmt.Errorf("no private network attached")
469469
}
470470

471471
return nil
@@ -494,12 +494,12 @@ func (d *Driver) Create() error {
494494
srv, _, err := d.getClient().Server.Create(context.Background(), instrumented(*srvopts))
495495
if err != nil {
496496
time.Sleep(time.Duration(d.WaitOnError) * time.Second)
497-
return errors.Wrap(err, "could not create server")
497+
return fmt.Errorf("could not create server: %w", err)
498498
}
499499

500500
log.Infof(" -> Creating server %s[%d] in %s[%d]", srv.Server.Name, srv.Server.ID, srv.Action.Command, srv.Action.ID)
501501
if err = d.waitForAction(srv.Action); err != nil {
502-
return errors.Wrap(err, "could not wait for action")
502+
return fmt.Errorf("could not wait for action: %w", err)
503503
}
504504

505505
d.ServerID = srv.Server.ID
@@ -530,12 +530,12 @@ func (d *Driver) GetSSHHostname() (string, error) {
530530
// GetURL retrieves the URL of the docker daemon on the machine; see [drivers.Driver.GetURL]
531531
func (d *Driver) GetURL() (string, error) {
532532
if err := drivers.MustBeRunning(d); err != nil {
533-
return "", errors.Wrap(err, "could not execute drivers.MustBeRunning")
533+
return "", fmt.Errorf("could not execute drivers.MustBeRunning: %w", err)
534534
}
535535

536536
ip, err := d.GetIP()
537537
if err != nil {
538-
return "", errors.Wrap(err, "could not get IP")
538+
return "", fmt.Errorf("could not get IP: %w", err)
539539
}
540540

541541
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
@@ -545,7 +545,7 @@ func (d *Driver) GetURL() (string, error) {
545545
func (d *Driver) GetState() (state.State, error) {
546546
srv, _, err := d.getClient().Server.GetByID(context.Background(), d.ServerID)
547547
if err != nil {
548-
return state.None, errors.Wrap(err, "could not get server by ID")
548+
return state.None, fmt.Errorf("could not get server by ID: %w", err)
549549
}
550550
if srv == nil {
551551
return state.None, errors.New("server not found")
@@ -588,7 +588,7 @@ func (d *Driver) Remove() error {
588588
if !d.IsExistingKey && d.KeyID != 0 {
589589
key, err := d.getKeyNullable()
590590
if err != nil {
591-
return errors.Wrap(err, "could not get ssh key")
591+
return fmt.Errorf("could not get ssh key: %w", err)
592592
}
593593
if key == nil {
594594
log.Infof(" -> SSH key does not exist anymore")
@@ -598,7 +598,7 @@ func (d *Driver) Remove() error {
598598
log.Infof(" -> Destroying SSHKey %s[%d]...", key.Name, key.ID)
599599

600600
if _, err := d.getClient().SSHKey.Delete(context.Background(), key); err != nil {
601-
return errors.Wrap(err, "could not delete ssh key")
601+
return fmt.Errorf("could not delete ssh key: %w", err)
602602
}
603603
}
604604

@@ -609,15 +609,15 @@ func (d *Driver) Remove() error {
609609
func (d *Driver) Restart() error {
610610
srv, err := d.getServerHandle()
611611
if err != nil {
612-
return errors.Wrap(err, "could not get server handle")
612+
return fmt.Errorf("could not get server handle: %w", err)
613613
}
614614
if srv == nil {
615615
return errors.New("server not found")
616616
}
617617

618618
act, _, err := d.getClient().Server.Reboot(context.Background(), srv)
619619
if err != nil {
620-
return errors.Wrap(err, "could not reboot server")
620+
return fmt.Errorf("could not reboot server: %w", err)
621621
}
622622

623623
log.Infof(" -> Rebooting server %s[%d] in %s[%d]...", srv.Name, srv.ID, act.Command, act.ID)
@@ -629,12 +629,12 @@ func (d *Driver) Restart() error {
629629
func (d *Driver) Start() error {
630630
srv, err := d.getServerHandle()
631631
if err != nil {
632-
return errors.Wrap(err, "could not get server handle")
632+
return fmt.Errorf("could not get server handle: %w", err)
633633
}
634634

635635
act, _, err := d.getClient().Server.Poweron(context.Background(), srv)
636636
if err != nil {
637-
return errors.Wrap(err, "could not power on server")
637+
return fmt.Errorf("could not power on server: %w", err)
638638
}
639639

640640
log.Infof(" -> Starting server %s[%d] in %s[%d]...", srv.Name, srv.ID, act.Command, act.ID)
@@ -646,12 +646,12 @@ func (d *Driver) Start() error {
646646
func (d *Driver) Stop() error {
647647
srv, err := d.getServerHandle()
648648
if err != nil {
649-
return errors.Wrap(err, "could not get server handle")
649+
return fmt.Errorf("could not get server handle: %w", err)
650650
}
651651

652652
act, _, err := d.getClient().Server.Shutdown(context.Background(), srv)
653653
if err != nil {
654-
return errors.Wrap(err, "could not shutdown server")
654+
return fmt.Errorf("could not shutdown server: %w", err)
655655
}
656656

657657
log.Infof(" -> Shutting down server %s[%d] in %s[%d]...", srv.Name, srv.ID, act.Command, act.ID)
@@ -663,12 +663,12 @@ func (d *Driver) Stop() error {
663663
func (d *Driver) Kill() error {
664664
srv, err := d.getServerHandle()
665665
if err != nil {
666-
return errors.Wrap(err, "could not get server handle")
666+
return fmt.Errorf("could not get server handle: %w", err)
667667
}
668668

669669
act, _, err := d.getClient().Server.Poweroff(context.Background(), srv)
670670
if err != nil {
671-
return errors.Wrap(err, "could not poweroff server")
671+
return fmt.Errorf("could not poweroff server: %w", err)
672672
}
673673

674674
log.Infof(" -> Powering off server %s[%d] in %s[%d]...", srv.Name, srv.ID, act.Command, act.ID)

‎driver/driver_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package driver
22

33
import (
4-
"github.com/docker/machine/commands/commandstest"
5-
"github.com/docker/machine/libmachine/drivers"
6-
"github.com/hetznercloud/hcloud-go/v2/hcloud"
74
"os"
85
"strconv"
96
"strings"
107
"testing"
8+
9+
"github.com/docker/machine/commands/commandstest"
10+
"github.com/docker/machine/libmachine/drivers"
11+
"github.com/hetznercloud/hcloud-go/v2/hcloud"
1112
)
1213

1314
var defaultFlags = map[string]interface{}{

‎driver/flag_failure.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
package driver
44

55
import (
6+
"fmt"
7+
68
"github.com/docker/machine/libmachine/drivers"
7-
"github.com/pkg/errors"
89
)
910

1011
func (d *Driver) flagFailure(format string, args ...interface{}) error {
11-
return errors.Errorf(format, args...)
12+
return fmt.Errorf(format, args...)
1213
}
1314

1415
func (d *Driver) setConfigFromFlags(opts drivers.DriverOptions) error {

‎driver/flag_failure_debug.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88

99
"github.com/docker/machine/libmachine/drivers"
10-
"github.com/pkg/errors"
1110
)
1211

1312
var lastOpts drivers.DriverOptions
@@ -23,7 +22,7 @@ func (d *Driver) flagFailure(format string, args ...interface{}) error {
2322
}
2423

2524
combined := append([]interface{}{line1, line2}, args...)
26-
return errors.Errorf("%s\n%s\n"+format, combined...)
25+
return fmt.Errorf("%s\n%s\n"+format, combined...)
2726
}
2827

2928
func (d *Driver) setConfigFromFlags(opts drivers.DriverOptions) error {

‎driver/flag_processing.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package driver
22

33
import (
4+
"fmt"
5+
"strings"
6+
47
"github.com/docker/machine/libmachine/drivers"
58
"github.com/docker/machine/libmachine/log"
69
"github.com/hetznercloud/hcloud-go/v2/hcloud"
7-
"github.com/pkg/errors"
8-
"strings"
910
)
1011

1112
var legacyDefaultImages = [...]string{
@@ -33,7 +34,7 @@ func (d *Driver) setImageArch(arch string) error {
3334
case string(hcloud.ArchitectureX86):
3435
d.ImageArch = hcloud.ArchitectureX86
3536
default:
36-
return errors.Errorf("unknown architecture %v", arch)
37+
return fmt.Errorf("unknown architecture %v", arch)
3738
}
3839
return nil
3940
}
@@ -112,7 +113,7 @@ func (d *Driver) setLabelsFromFlags(opts drivers.DriverOptions) error {
112113
for _, label := range opts.StringSlice(flagKeyLabel) {
113114
split := strings.SplitN(label, "=", 2)
114115
if len(split) != 2 {
115-
return errors.Errorf("key label %v is not in key=value format", label)
116+
return fmt.Errorf("key label %v is not in key=value format", label)
116117
}
117118
d.keyLabels[split[0]] = split[1]
118119
}

0 commit comments

Comments
 (0)