fix(api,cdn): set timeout for swift client (#6614)

ovh · Sep 5, 2023 · 77e252e · 77e252e
1 parent 2c8cc0f
commit 77e252e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/engine/api/objectstore/swift.go b/engine/api/objectstore/swift.go
@@ -26,12 +26,14 @@ func newSwiftStore(ctx context.Context, integration sdk.ProjectIntegration, conf
 	log.Info(ctx, "ObjectStore> Initialize Swift driver on url: %s", conf.Address)
 	s := &SwiftStore{
 		Connection: swift.Connection{
-			AuthUrl:  conf.Address,
-			Region:   conf.Region,
-			Tenant:   conf.Tenant,
-			Domain:   conf.Domain,
-			UserName: conf.Username,
-			ApiKey:   conf.Password,
+			AuthUrl:        conf.Address,
+			Region:         conf.Region,
+			Tenant:         conf.Tenant,
+			Domain:         conf.Domain,
+			UserName:       conf.Username,
+			ApiKey:         conf.Password,
+			ConnectTimeout: time.Minute * 1,
+			Timeout:        time.Minute * 10,
 		},
 		containerPrefix:    conf.ContainerPrefix,
 		disableTempURL:     conf.DisableTempURL,

diff --git a/engine/cdn/storage/swift/swift.go b/engine/cdn/storage/swift/swift.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/url"
 	"strings"
+	"time"
 
 	"github.com/go-gorp/gorp"
 	"github.com/ncw/swift"
@@ -46,12 +47,14 @@ func (s *Swift) Init(_ context.Context, cfg interface{}) error {
 	s.config = *config
 	s.ConvergentEncryption = encryption.New(config.Encryption)
 	s.client = swift.Connection{
-		AuthUrl:  config.Address,
-		Region:   config.Region,
-		Tenant:   config.Tenant,
-		Domain:   config.Domain,
-		UserName: config.Username,
-		ApiKey:   config.Password,
+		AuthUrl:        config.Address,
+		Region:         config.Region,
+		Tenant:         config.Tenant,
+		Domain:         config.Domain,
+		UserName:       config.Username,
+		ApiKey:         config.Password,
+		ConnectTimeout: time.Minute * 1,
+		Timeout:        time.Minute * 10,
 	}
 	return sdk.WithStack(s.client.Authenticate())
 }