Merge branch 'scaleway:master' into master

Author: scaleway-bot

core/custom_transport.go

@@ -0,0 +1,63 @@
+package core
+
+import (
+	"context"
+	"crypto/tls"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/scaleway/scaleway-sdk-go/logger"
+)
+
+const defaultRetryInterval = 1 * time.Second
+
+var socketTransport = &http.Transport{}
+
+func init() {
+	socketTransport.DisableCompression = true
+	socketTransport.DialContext = func(_ context.Context, _, _ string) (net.Conn, error) {
+		return net.DialTimeout("unix", "/var/run/docker.sock", 32000000000)
+	}
+}
+
+type SocketPassthroughTransport struct{}
+
+func (r *SocketPassthroughTransport) RoundTrip(request *http.Request) (*http.Response, error) {
+	if request.URL.Host == "/var/run/docker.sock" {
+		return socketTransport.RoundTrip(request)
+	}
+
+	return http.DefaultTransport.RoundTrip(request)
+}
+
+type retryableHTTPTransport struct {
+	transport http.RoundTripper
+}
+
+func (r *retryableHTTPTransport) RoundTrip(request *http.Request) (*http.Response, error) {
+	res, err := r.transport.RoundTrip(request)
+	if err == nil && res.StatusCode == http.StatusTooManyRequests {
+		time.Sleep(defaultRetryInterval)
+
+		return r.RoundTrip(request)
+	}
+
+	return res, err
+}
+
+func (r *retryableHTTPTransport) SetInsecureTransport() {
+	transportClient, ok := http.DefaultTransport.(*http.Transport)
+	if !ok {
+		logger.Warningf(
+			"cli: cannot use insecure mode with DefaultTransport of type %T",
+			http.DefaultTransport,
+		)
+
+		return
+	}
+	if transportClient.TLSClientConfig == nil {
+		transportClient.TLSClientConfig = &tls.Config{}
+	}
+	transportClient.TLSClientConfig.InsecureSkipVerify = true
+}

core/http_retry.go

@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.13.2
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250716080040-6038c5316f66
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250725144419-de749e386a06
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7

core/socket_passthrough_transport.go

@@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250716080040-6038c5316f66 h1:cdds9CiMBdb9rLJ9xlbTkCtCXfux41nxx3j6+qtCf0Q=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250716080040-6038c5316f66/go.mod h1:fw6BmcfYRs2BEHYW0c3/rR0JgZHvdx6uMYqpeUJx3Bc=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250725144419-de749e386a06 h1:HLJAN1hyivE7jP5/0TRh4cNVWiVKJFjihBWGajSLLOk=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250725144419-de749e386a06/go.mod h1:fw6BmcfYRs2BEHYW0c3/rR0JgZHvdx6uMYqpeUJx3Bc=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=