chore: Provide ability to configure backup job retry limit in DevWorkspaceOperatorConfig

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

Author: tolusha

pkg/library/env/workspaceenv.go

@@ -228,29 +228,3 @@ func getSourceForComponent(component dw.Component) string {
 	}
 	return fmt.Sprintf("component %s", component.Name)
 }
-
-// MergeEnvVars merges two slices of environment variables, with variables in
-// 'toAdd' taking precedence over those in 'existing' when names conflict.
-// The order of variables in the result is non-deterministic due to map usage.
-// Returns a new slice without modifying the input slices.
-func MergeEnvVars(existing, toAdd []corev1.EnvVar) []corev1.EnvVar {
-	envMap := make(map[string]corev1.EnvVar, len(existing)+len(toAdd))
-
-	// Add existing env vars first
-	for _, env := range existing {
-		envMap[env.Name] = env
-	}
-
-	// Add new env vars (overrides existing with same name)
-	for _, env := range toAdd {
-		envMap[env.Name] = env
-	}
-
-	// Convert map back to slice
-	result := make([]corev1.EnvVar, 0, len(envMap))
-	for _, env := range envMap {
-		result = append(result, env)
-	}
-
-	return result
-}

pkg/library/env/workspaceenv_test.go

@@ -86,105 +86,3 @@ func loadAllTestsOrPanic(t *testing.T, fromDir string) []TestCase {
 	}
 	return tests
 }
-
-func TestMergeEnvVars(t *testing.T) {
-	tests := []struct {
-		name     string
-		existing []corev1.EnvVar
-		toAdd    []corev1.EnvVar
-		expected map[string]string // Using map for easier assertion since order is non-deterministic
-	}{
-		{
-			name: "no duplicates - variables are combined",
-			existing: []corev1.EnvVar{
-				{Name: "VAR1", Value: "value1"},
-				{Name: "VAR2", Value: "value2"},
-			},
-			toAdd: []corev1.EnvVar{
-				{Name: "VAR3", Value: "value3"},
-			},
-			expected: map[string]string{
-				"VAR1": "value1",
-				"VAR2": "value2",
-				"VAR3": "value3",
-			},
-		},
-		{
-			name: "toAdd overrides existing - new value wins",
-			existing: []corev1.EnvVar{
-				{Name: "VAR1", Value: "old"},
-				{Name: "VAR2", Value: "keep"},
-			},
-			toAdd: []corev1.EnvVar{
-				{Name: "VAR1", Value: "new"},
-			},
-			expected: map[string]string{
-				"VAR1": "new",
-				"VAR2": "keep",
-			},
-		},
-		{
-			name: "empty existing - only toAdd returned",
-			existing: []corev1.EnvVar{},
-			toAdd: []corev1.EnvVar{
-				{Name: "VAR1", Value: "value1"},
-			},
-			expected: map[string]string{
-				"VAR1": "value1",
-			},
-		},
-		{
-			name: "empty toAdd - only existing returned",
-			existing: []corev1.EnvVar{
-				{Name: "VAR1", Value: "value1"},
-			},
-			toAdd: []corev1.EnvVar{},
-			expected: map[string]string{
-				"VAR1": "value1",
-			},
-		},
-		{
-			name:     "both empty - empty result",
-			existing: []corev1.EnvVar{},
-			toAdd:    []corev1.EnvVar{},
-			expected: map[string]string{},
-		},
-		{
-			name: "multiple duplicates - all overridden",
-			existing: []corev1.EnvVar{
-				{Name: "VAR1", Value: "old1"},
-				{Name: "VAR2", Value: "old2"},
-				{Name: "VAR3", Value: "keep"},
-			},
-			toAdd: []corev1.EnvVar{
-				{Name: "VAR1", Value: "new1"},
-				{Name: "VAR2", Value: "new2"},
-			},
-			expected: map[string]string{
-				"VAR1": "new1",
-				"VAR2": "new2",
-				"VAR3": "keep",
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := MergeEnvVars(tt.existing, tt.toAdd)
-
-			// Convert result to map for comparison (order doesn't matter)
-			resultMap := make(map[string]string)
-			for _, env := range result {
-				resultMap[env.Name] = env.Value
-			}
-
-			// Verify length matches
-			assert.Equal(t, len(tt.expected), len(resultMap), "Result should have correct number of env vars")
-
-			// Verify each expected env var
-			for name, value := range tt.expected {
-				assert.Equal(t, value, resultMap[name], "Env var %s should have correct value", name)
-			}
-		})
-	}
-}