Skip to content

Commit 74d66f1

Browse files
bugfix: Check for empty image in ID mutuality check (closes #85)
- check for empty string rather than (potentially user-supplied) default image - use default image as fallback only after flags have been processed
1 parent b338c51 commit 74d66f1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

driver.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ const (
9797
// NewDriver initializes a new driver instance; see [drivers.Driver.NewDriver]
9898
func NewDriver() *Driver {
9999
return &Driver{
100-
Image: defaultImage,
101100
Type: defaultType,
102101
IsExistingKey: false,
103102
BaseDriver: &drivers.BaseDriver{},
@@ -122,7 +121,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
122121
EnvVar: "HETZNER_IMAGE",
123122
Name: flagImage,
124123
Usage: "Image to use for server creation",
125-
Value: defaultImage,
124+
Value: "",
126125
},
127126
mcnflag.IntFlag{
128127
EnvVar: "HETZNER_IMAGE_ID",
@@ -284,8 +283,10 @@ func (d *Driver) SetConfigFromFlags(opts drivers.DriverOptions) error {
284283
return errors.Errorf("hetzner requires --%v to be set", flagAPIToken)
285284
}
286285

287-
if d.ImageID != 0 && d.Image != defaultImage {
286+
if d.ImageID != 0 && d.Image != "" {
288287
return errors.Errorf("--%v and --%v are mutually exclusive", flagImage, flagImageID)
288+
} else if d.ImageID == 0 && d.Image == "" {
289+
d.Image = defaultImage
289290
}
290291

291292
if d.DisablePublic4 && d.DisablePublic6 && !d.UsePrivateNetwork {

0 commit comments

Comments
 (0)