libvirt: Fix machine driver command name

cfergeau · anjannath · commit aa46dadc9b54 · 2024-07-16T12:36:32.000+05:30
It now includes a '-$arch' suffix, such as `crc-driver-libvirt-amd64`.
This fixes the downloading of the machine driver binary and avoids some
warnings about URL name/file name mismatches.
This needs a libmachine update so that it's able to start machine driver
binaries with an arch suffix.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/containers/image/v5 v5.31.1
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/crc-org/admin-helper v0.5.4
-	github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b
+	github.com/crc-org/machine v0.0.0-20240715101719-0c1bc9eb95f8
 	github.com/crc-org/vfkit v0.5.1
 	github.com/cucumber/godog v0.14.1
 	github.com/cucumber/messages-go/v10 v10.0.3
diff --git a/go.sum b/go.sum
@@ -59,8 +59,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/crc-org/admin-helper v0.5.4 h1:Wq6wp6514MipPHHYdoL2VUyhUL9qh26wR1I3qPaVxf4=
 github.com/crc-org/admin-helper v0.5.4/go.mod h1:sFkqIILzKrt62CH1bJn5PSBFSdhaCyMdz6BG37N3TBE=
-github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b h1:VPbW5D21B1WToPvEA/EGwhi4e3lXevmRff9M1lUTc5g=
-github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b/go.mod h1:9bEsvgLE3LIPfvGATt9Mo73gG1CKKS6A/++VqOONKqc=
+github.com/crc-org/machine v0.0.0-20240715101719-0c1bc9eb95f8 h1:KVdN/5PTWRwth2suZEQCY54MXSXp1SAUd54CiE952oI=
+github.com/crc-org/machine v0.0.0-20240715101719-0c1bc9eb95f8/go.mod h1:trWeQimjfE3dJ8qWOxI4ePtYm13aecK42bf01s6h/Nc=
 github.com/crc-org/vfkit v0.5.1 h1:r1zNf1g1bLbgu5BgIQodirvYaIGWJQ91eS/PIgNO6lo=
 github.com/crc-org/vfkit v0.5.1/go.mod h1:Hqi20zQcqXMk6JqvByvOidHYv+KzPx3G+cjkdGSWv60=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
diff --git a/pkg/crc/machine/libvirt/constants.go b/pkg/crc/machine/libvirt/constants.go
@@ -21,12 +21,12 @@ const (
 )
 
 const (
-	machineDriverCommand = "crc-driver-libvirt"
 	MachineDriverVersion = "0.13.8"
 )
 
 var (
-	MachineDriverDownloadURL = fmt.Sprintf("https://github.com/crc-org/machine-driver-libvirt/releases/download/%s/%s-%s", MachineDriverVersion, machineDriverCommand, runtime.GOARCH)
+	machineDriverCommand     = fmt.Sprintf("crc-driver-libvirt-%s", runtime.GOARCH)
+	MachineDriverDownloadURL = fmt.Sprintf("https://github.com/crc-org/machine-driver-libvirt/releases/download/%s/%s", MachineDriverVersion, machineDriverCommand)
 )
 
 func MachineDriverPath() string {
diff --git a/vendor/github.com/crc-org/machine/libmachine/drivers/plugin/localbinary/plugin.go b/vendor/github.com/crc-org/machine/libmachine/drivers/plugin/localbinary/plugin.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -202,7 +202,7 @@ github.com/coreos/go-systemd/v22/daemon
 github.com/crc-org/admin-helper/pkg/client
 github.com/crc-org/admin-helper/pkg/hosts
 github.com/crc-org/admin-helper/pkg/types
-# github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b
+# github.com/crc-org/machine v0.0.0-20240715101719-0c1bc9eb95f8
 ## explicit; go 1.17
 github.com/crc-org/machine/drivers/libvirt
 github.com/crc-org/machine/libmachine/drivers

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ const (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
`24`		`- machineDriverCommand = "crc-driver-libvirt"`
`25`	`24`	`MachineDriverVersion = "0.13.8"`
`26`	`25`	`)`
`27`	`26`
`28`	`27`	`var (`
`29`		`- MachineDriverDownloadURL = fmt.Sprintf("https://github.com/crc-org/machine-driver-libvirt/releases/download/%s/%s-%s", MachineDriverVersion, machineDriverCommand, runtime.GOARCH)`
	`28`	`+ machineDriverCommand = fmt.Sprintf("crc-driver-libvirt-%s", runtime.GOARCH)`
	`29`	`+ MachineDriverDownloadURL = fmt.Sprintf("https://github.com/crc-org/machine-driver-libvirt/releases/download/%s/%s", MachineDriverVersion, machineDriverCommand)`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`func MachineDriverPath() string {`