Keep old default image detection in case it is passed from legacy data

JonasProgrammer · JonasProgrammer · commit 913904b88a70 · 2022-08-13T01:30:10.000+02:00
diff --git a/driver.go b/driver.go
@@ -283,7 +283,7 @@ func (d *Driver) SetConfigFromFlags(opts drivers.DriverOptions) error {
 		return errors.Errorf("hetzner requires --%v to be set", flagAPIToken)
 	}
 
-	if d.ImageID != 0 && d.Image != "" {
+	if d.ImageID != 0 && d.Image != "" && d.Image != defaultImage /* support legacy behaviour */ {
 		return errors.Errorf("--%v and --%v are mutually exclusive", flagImage, flagImageID)
 	} else if d.ImageID == 0 && d.Image == "" {
 		d.Image = defaultImage

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ func (d *Driver) SetConfigFromFlags(opts drivers.DriverOptions) error {`
`283`	`283`	`return errors.Errorf("hetzner requires --%v to be set", flagAPIToken)`
`284`	`284`	`}`
`285`	`285`
`286`		`- if d.ImageID != 0 && d.Image != "" {`
	`286`	`+ if d.ImageID != 0 && d.Image != "" && d.Image != defaultImage /* support legacy behaviour */ {`
`287`	`287`	`return errors.Errorf("--%v and --%v are mutually exclusive", flagImage, flagImageID)`
`288`	`288`	`} else if d.ImageID == 0 && d.Image == "" {`
`289`	`289`	`d.Image = defaultImage`