From bf26525d8701405ab06dd74f23ef35d9e7144dad Mon Sep 17 00:00:00 2001 From: Zhiwei Liang Date: Wed, 4 Mar 2026 13:15:03 -0500 Subject: [PATCH 1/4] Upgrade docker machine to v0.16.2-gitlab.43 --- go.mod | 6 ++---- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 54b80b5..2d6d4b9 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,10 @@ module github.com/linode/docker-machine-driver-linode -go 1.24.0 - -toolchain go1.24.1 +go 1.24.11 // This replacement is necessary to support Docker versions > v20.x.x // which provide critical security fixes. -replace github.com/docker/machine => gitlab.com/gitlab-org/ci-cd/docker-machine v0.16.2-gitlab.27 +replace github.com/docker/machine => gitlab.com/gitlab-org/ci-cd/docker-machine v0.16.2-gitlab.43 require ( github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index 4cfc808..b3cd882 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -gitlab.com/gitlab-org/ci-cd/docker-machine v0.16.2-gitlab.27 h1:6XE5SIyDteS5BFR3EhlEt7UUBhkcf77loHYWaVS4BHM= -gitlab.com/gitlab-org/ci-cd/docker-machine v0.16.2-gitlab.27/go.mod h1:WX9wJGY7+MC7527nUL2hvFOLNlowPeNjeiLtX5B6MnQ= +gitlab.com/gitlab-org/ci-cd/docker-machine v0.16.2-gitlab.43 h1:3AOpTvIZHfvNnCEaPvmMTiX65gY3yYtpabcAZJUgsTE= +gitlab.com/gitlab-org/ci-cd/docker-machine v0.16.2-gitlab.43/go.mod h1:WDpNHYkfs5yjw3iwSBFrFrsGZRGf2hPjkLVCbCvJvj8= golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU= golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0= golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= From 27fd30c2d7941fa289165d93e2d5c32930339d5f Mon Sep 17 00:00:00 2001 From: Zhiwei Liang Date: Wed, 4 Mar 2026 13:15:15 -0500 Subject: [PATCH 2/4] Turn off linode client debug --- pkg/drivers/linode/linode.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/drivers/linode/linode.go b/pkg/drivers/linode/linode.go index 297ef98..e75d1df 100644 --- a/pkg/drivers/linode/linode.go +++ b/pkg/drivers/linode/linode.go @@ -102,7 +102,6 @@ func (d *Driver) getClient() *linodego.Client { } client.SetUserAgent(ua) - client.SetDebug(true) d.client = &client } return d.client From b07b1369b39073a29d7a47c7403ba173735094bc Mon Sep 17 00:00:00 2001 From: Zhiwei Liang Date: Wed, 4 Mar 2026 13:15:43 -0500 Subject: [PATCH 3/4] Fix lint --- pkg/drivers/linode/linode.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/linode/linode.go b/pkg/drivers/linode/linode.go index e75d1df..ee0df1b 100644 --- a/pkg/drivers/linode/linode.go +++ b/pkg/drivers/linode/linode.go @@ -111,7 +111,7 @@ func createRandomRootPassword() (string, error) { rawRootPass := make([]byte, 50) _, err := rand.Read(rawRootPass) if err != nil { - return "", fmt.Errorf("Failed to generate random password") + return "", errors.New("Failed to generate random password") } rootPass := base64.StdEncoding.EncodeToString(rawRootPass) return rootPass, nil From c3a0d1bc7d412bc0655d545ce36460f04e1edcaf Mon Sep 17 00:00:00 2001 From: Zhiwei Liang Date: Wed, 4 Mar 2026 14:56:34 -0500 Subject: [PATCH 4/4] Add SetClient function to allow customized linodego client --- pkg/drivers/linode/linode.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/drivers/linode/linode.go b/pkg/drivers/linode/linode.go index ee0df1b..096c6df 100644 --- a/pkg/drivers/linode/linode.go +++ b/pkg/drivers/linode/linode.go @@ -107,6 +107,11 @@ func (d *Driver) getClient() *linodego.Client { return d.client } +// SetClient sets the Linode API client for the driver +func (d *Driver) SetClient(client *linodego.Client) { + d.client = client +} + func createRandomRootPassword() (string, error) { rawRootPass := make([]byte, 50) _, err := rand.Read(rawRootPass)