Add Azure config methods and tests

Author: boris-ilijic

pbm/storage/azure/azure.go

@@ -25,6 +25,7 @@ const (
 	defaultUploadBuff = 10 << 20 // 10Mb
 
 	defaultMaxRetries    = 3
+	defaultMinRetryDelay = 800 * time.Millisecond
 	defaultMaxRetryDelay = 60 * time.Second
 
 	maxBlocks = 50_000

pbm/storage/azure/config.go

@@ -25,6 +25,8 @@ type Credentials struct {
 	Key string `bson:"key" json:"key,omitempty" yaml:"key,omitempty"`
 }
 
+// Retryer is configuration for retry behavior described:
+// https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore@v1.19.1/policy#RetryOptions
 type Retryer struct {
 	NumMaxRetries int32         `bson:"numMaxRetries" json:"numMaxRetries" yaml:"numMaxRetries"`
 	MinRetryDelay time.Duration `bson:"minRetryDelay" json:"minRetryDelay" yaml:"minRetryDelay"`
@@ -38,6 +40,10 @@ func (cfg *Config) Clone() *Config {
 
 	rv := *cfg
 	rv.EndpointURLMap = maps.Clone(cfg.EndpointURLMap)
+	if cfg.Retryer != nil {
+		v := *cfg.Retryer
+		rv.Retryer = &v
+	}
 	if cfg.MaxObjSizeGB != nil {
 		v := *cfg.MaxObjSizeGB
 		rv.MaxObjSizeGB = &v
@@ -46,33 +52,7 @@ func (cfg *Config) Clone() *Config {
 }
 
 func (cfg *Config) Equal(other *Config) bool {
-	if cfg == nil || other == nil {
-		return cfg == other
-	}
-
-	if cfg.Account != other.Account {
-		return false
-	}
-	if cfg.Container != other.Container {
-		return false
-	}
-	if cfg.EndpointURL != other.EndpointURL {
-		return false
-	}
-	if !maps.Equal(cfg.EndpointURLMap, other.EndpointURLMap) {
-		return false
-	}
-	if cfg.Prefix != other.Prefix {
-		return false
-	}
-	if cfg.Credentials.Key != other.Credentials.Key {
-		return false
-	}
-	if !reflect.DeepEqual(cfg.MaxObjSizeGB, other.MaxObjSizeGB) {
-		return false
-	}
-
-	return true
+	return reflect.DeepEqual(cfg, other)
 }
 
 // IsSameStorage identifies the same instance of the Azure storage.
@@ -101,12 +81,16 @@ func (cfg *Config) Cast() error {
 	if cfg.Retryer == nil {
 		cfg.Retryer = &Retryer{
 			NumMaxRetries: defaultMaxRetries,
+			MinRetryDelay: defaultMinRetryDelay,
 			MaxRetryDelay: defaultMaxRetryDelay,
 		}
 	} else {
 		if cfg.Retryer.NumMaxRetries == 0 {
 			cfg.Retryer.NumMaxRetries = defaultMaxRetries
 		}
+		if cfg.Retryer.MinRetryDelay == 0 {
+			cfg.Retryer.MinRetryDelay = defaultMinRetryDelay
+		}
 		if cfg.Retryer.MaxRetryDelay == 0 {
 			cfg.Retryer.MaxRetryDelay = defaultMaxRetryDelay
 		}

pbm/storage/azure/config_test.go

@@ -0,0 +1,91 @@
+package azure
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestClone(t *testing.T) {
+	f := 1.1
+	c1 := &Config{
+		Account:        "acc",
+		Container:      "cnt",
+		EndpointURL:    "ep.com",
+		EndpointURLMap: map[string]string{"n1": "ep1", "n2": "ep2"},
+		Prefix:         "p1",
+		Credentials: Credentials{
+			Key: "k1",
+		},
+		MaxObjSizeGB: &f,
+		Retryer: &Retryer{
+			NumMaxRetries: 5,
+			MinRetryDelay: 10 * time.Second,
+			MaxRetryDelay: 20 * time.Second,
+		},
+	}
+
+	c2 := c1.Clone()
+
+	if &c1.EndpointURLMap == &c2.EndpointURLMap ||
+		c1.MaxObjSizeGB == c2.MaxObjSizeGB ||
+		c1.Retryer == c2.Retryer {
+		t.Fatal("Deep copy of pointer fields is missing")
+	}
+	if !reflect.DeepEqual(c1, c2) {
+		t.Fatalf("Clone is not performed, diff=%s", cmp.Diff(*c1, *c2))
+	}
+}
+
+func TestEqual(t *testing.T) {
+	f := 1.1
+	c1 := &Config{
+		Account:        "acc",
+		Container:      "cnt",
+		EndpointURL:    "ep.com",
+		EndpointURLMap: map[string]string{"n1": "ep1", "n2": "ep2"},
+		Prefix:         "p1",
+		Credentials: Credentials{
+			Key: "k1",
+		},
+		MaxObjSizeGB: &f,
+		Retryer: &Retryer{
+			NumMaxRetries: 5,
+			MinRetryDelay: 10 * time.Second,
+			MaxRetryDelay: 20 * time.Second,
+		},
+	}
+
+	c2 := c1.Clone()
+
+	if !c1.Equal(c2) {
+		t.Fatalf("cfg should be equal, diff=%s", cmp.Diff(*c1, *c2))
+	}
+}
+
+func TestCast(t *testing.T) {
+	var c *Config
+	err := c.Cast()
+	if err == nil {
+		t.Fatal("sigsegv should have happened instead")
+	}
+
+	c = &Config{}
+	err = c.Cast()
+	if err != nil {
+		t.Fatalf("got error during Cast: %v", err)
+	}
+	want := &Config{
+		Retryer: &Retryer{
+			NumMaxRetries: defaultMaxRetries,
+			MinRetryDelay: defaultMinRetryDelay,
+			MaxRetryDelay: defaultMaxRetryDelay,
+		},
+	}
+
+	if !c.Equal(want) {
+		t.Fatalf("wrong config after Cast, diff=%s", cmp.Diff(*c, *want))
+	}
+}