Merge pull request #927 from JcGKitten/master

BUG: Set rest server credentials in repository URL

api/v1/backend.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"fmt"
 	"reflect"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 
@@ -275,5 +276,6 @@ func (in *RestServerSpec) EnvVars(vars map[string]*corev1.EnvVarSource) map[stri
 
 // String returns "rest:URL"
 func (in *RestServerSpec) String() string {
-	return fmt.Sprintf("rest:%s", in.URL)
+	protocol, url, _ := strings.Cut(in.URL, "://")
+	return fmt.Sprintf("rest:%s://%s:%s@%s", protocol, "$(USER)", "$(PASSWORD)", url)
 }

api/v1/backend_test.go

@@ -118,7 +118,7 @@ var tests = map[string]struct {
 			cfg.RestPasswordEnvName: {SecretKeyRef: newSecretRef("password")},
 			cfg.RestUserEnvName:     {SecretKeyRef: newSecretRef("user")},
 		},
-		expectedRepositoryString: "rest:https://server",
+		expectedRepositoryString: "rest:https://$(USER):$(PASSWORD)@server",
 	},
 }
 

operator/executor/envvarconverter.go

@@ -50,7 +50,10 @@ func (e *EnvVarConverter) setEntry(key string, value envVarEntry) {
 // are set the string will have precedence.
 func (e *EnvVarConverter) Convert() []corev1.EnvVar {
 	vars := make([]corev1.EnvVar, 0)
+	var repositoryVar corev1.EnvVar
+	var repositoryVarSet bool
 	for key, value := range e.Vars {
+
 		envVar := corev1.EnvVar{
 			Name: key,
 		}
@@ -59,7 +62,17 @@ func (e *EnvVarConverter) Convert() []corev1.EnvVar {
 		} else if value.stringEnv != nil {
 			envVar.Value = *value.stringEnv
 		}
-		vars = append(vars, envVar)
+		if key == cfg.ResticRepositoryEnvName {
+			// set repository env var at the end so the rest backend url
+			// can use previous set rest server credentials
+			repositoryVar = envVar
+			repositoryVarSet = true
+		} else {
+			vars = append(vars, envVar)
+		}
+	}
+	if repositoryVarSet {
+		vars = append(vars, repositoryVar)
 	}
 	return vars
 }