fix: add DelayLeaseAssignmentBy management in e2e tests

Author: Swop

e2e/config_test.go

@@ -20,12 +20,13 @@ var _ = Describe("Config", Ordered, func() {
 				cfg, _ = configHelper.LoadDefaultConfig()
 				Expect(cfg).To(Equal(&latest.ServerConfig{Repositories: []*latest.GithubRepositoryConfig{
 					{
-						Owner:                config.DefaultConfigRepoOwner,
-						Name:                 config.DefaultConfigRepoName,
-						BaseRef:              config.DefaultConfigRepoBaseRef,
-						StabilizeDuration:    config.DefaultConfigRepoStabilizeDurationSeconds,
-						ExpectedRequestCount: config.DefaultConfigRepoExpectedRequestCount,
-						TTL:                  config.DefaultConfigRepoTTLSeconds,
+						Owner:                  config.DefaultConfigRepoOwner,
+						Name:                   config.DefaultConfigRepoName,
+						BaseRef:                config.DefaultConfigRepoBaseRef,
+						StabilizeDuration:      config.DefaultConfigRepoStabilizeDurationSeconds,
+						ExpectedRequestCount:   config.DefaultConfigRepoExpectedRequestCount,
+						TTL:                    config.DefaultConfigRepoTTLSeconds,
+						DelayLeaseAssignmentBy: config.DefaultConfigRepoDelayAssignmentCount,
 					},
 				}}))
 
@@ -36,12 +37,13 @@ var _ = Describe("Config", Ordered, func() {
 				)
 				Expect(cfg).To(Equal(&latest.ServerConfig{Repositories: []*latest.GithubRepositoryConfig{
 					{
-						Owner:                config.DefaultConfigRepoOwner,
-						Name:                 "another-repo",
-						BaseRef:              "develop",
-						StabilizeDuration:    3,
-						ExpectedRequestCount: config.DefaultConfigRepoExpectedRequestCount,
-						TTL:                  config.DefaultConfigRepoTTLSeconds,
+						Owner:                  config.DefaultConfigRepoOwner,
+						Name:                   "another-repo",
+						BaseRef:                "develop",
+						StabilizeDuration:      3,
+						ExpectedRequestCount:   config.DefaultConfigRepoExpectedRequestCount,
+						TTL:                    config.DefaultConfigRepoTTLSeconds,
+						DelayLeaseAssignmentBy: config.DefaultConfigRepoDelayAssignmentCount,
 					},
 				}}))
 			})

e2e/helpers/config/config.go

@@ -16,6 +16,7 @@ const (
 	DefaultConfigRepoStabilizeDurationSeconds = 30
 	DefaultConfigRepoExpectedRequestCount     = 4
 	DefaultConfigRepoTTLSeconds               = 200
+	DefaultConfigRepoDelayAssignmentCount     = 0
 )
 
 // baseConfigContent default YAML configuration used in GenerateDefaultConfig method
@@ -27,6 +28,7 @@ repositories:
     stabilize_duration_seconds: ${E2E_CONFIG_REPO_STABILIZE_DURATION_SECONDS}
     expected_request_count: ${E2E_CONFIG_REPO_EXPECTED_REQUEST_COUNT}
     ttl_seconds: ${E2E_CONFIG_REPO_TTL_SECONDS}
+    delay_lease_assignment_by: ${E2E_CONFIG_REPO_DELAY_ASSIGNMENT_COUNT}
 `
 
 type HelperOption func() map[string]string
@@ -85,6 +87,15 @@ func WithTTLSeconds(duration int) HelperOption {
 	}
 }
 
+// WithDelayAssignmentCount override the DelayAssignmentCount value used in base configuration YAML (i.e. don't use the default one)
+func WithDelayAssignmentCount(count int) HelperOption {
+	return func() map[string]string {
+		return map[string]string{
+			"E2E_CONFIG_REPO_DELAY_ASSIGNMENT_COUNT": strconv.Itoa(count),
+		}
+	}
+}
+
 type Helper struct {
 	baseDir      string
 	setupEnvVars map[string]struct{}
@@ -156,6 +167,7 @@ func (h *Helper) LoadDefaultConfig(options ...HelperOption) (*latest.ServerConfi
 			"E2E_CONFIG_REPO_STABILIZE_DURATION_SECONDS": strconv.Itoa(DefaultConfigRepoStabilizeDurationSeconds),
 			"E2E_CONFIG_REPO_EXPECTED_REQUEST_COUNT":     strconv.Itoa(DefaultConfigRepoExpectedRequestCount),
 			"E2E_CONFIG_REPO_TTL_SECONDS":                strconv.Itoa(DefaultConfigRepoTTLSeconds),
+			"E2E_CONFIG_REPO_DELAY_ASSIGNMENT_COUNT":     strconv.Itoa(DefaultConfigRepoDelayAssignmentCount),
 		}
 	}