feat: ssh credentials

Author: robertgraeff

internal/flux_deployer/deployer_test.go

@@ -24,7 +24,7 @@ func TestDeployFluxController(t *testing.T) {
 	namespace := "flux-system-test"
 
 	d := flux_deployer.NewFluxDeployer("", "", "",
-		"", ocmcli.NoOcmConfig, "", namespace, "", platformCluster, logging.GetLogger())
+		"", "", ocmcli.NoOcmConfig, "", namespace, "", platformCluster, logging.GetLogger())
 
 	// Create a deployment
 	err := d.DeployFluxControllers(t.Context(), rootComponentVersion1, downloadDir)

internal/flux_deployer/git_credentials.go

@@ -26,13 +26,7 @@ const (
 // The file should contain a YAML of a map[string]string, whose keys are described
 // in https://fluxcd.io/flux/components/source/gitrepositories/#secret-reference, e.g. username and password.
 func CreateGitCredentialsSecret(ctx context.Context, gitCredentials string, secretName, secretNamespace string, platformClient client.Client) error {
-	gitCredentialsData := map[string]string{
-		username:   "",
-		password:   "",
-		token:      "",
-		identity:   "",
-		knownHosts: "",
-	}
+	gitCredentialsData := map[string][]byte{}
 
 	if gitCredentials != "" {
 		filepath := gitCredentials
@@ -46,19 +40,19 @@ func CreateGitCredentialsSecret(ctx context.Context, gitCredentials string, secr
 		}
 
 		if config.Authentication.BasicAuth != nil {
-			gitCredentialsData[username] = config.Authentication.BasicAuth.Username
-			gitCredentialsData[password] = config.Authentication.BasicAuth.Password
+			gitCredentialsData[username] = []byte(config.Authentication.BasicAuth.Username)
+			gitCredentialsData[password] = []byte(config.Authentication.BasicAuth.Password)
 		}
 		if config.Authentication.BearerToken != nil {
-			gitCredentialsData[token] = config.Authentication.BearerToken.Token
+			gitCredentialsData[token] = []byte(config.Authentication.BearerToken.Token)
 		}
 		if config.Authentication.SSHPrivateKey != nil {
 			privateKey, err := base64.StdEncoding.DecodeString(config.Authentication.SSHPrivateKey.PrivateKey)
 			if err != nil {
 				return fmt.Errorf("error base64 decoding SSH private key: %w", err)
 			}
 
-			gitCredentialsData[identity] = string(privateKey)
+			gitCredentialsData[identity] = privateKey
 
 			if config.Authentication.SSHPrivateKey.KnownHosts != "" {
 				knownHostsPath := config.Authentication.SSHPrivateKey.KnownHosts
@@ -69,12 +63,12 @@ func CreateGitCredentialsSecret(ctx context.Context, gitCredentials string, secr
 				if err != nil {
 					return fmt.Errorf("error reading known hosts file %s: %w", knownHostsPath, err)
 				}
-				gitCredentialsData[knownHosts] = string(knownHostsContent)
+				gitCredentialsData[knownHosts] = knownHostsContent
 			}
 		}
 	}
 
-	secretMutator := resources.NewSecretMutatorWithStringData(secretName, secretNamespace, gitCredentialsData, corev1.SecretTypeOpaque)
+	secretMutator := resources.NewSecretMutator(secretName, secretNamespace, gitCredentialsData, corev1.SecretTypeOpaque)
 	if err := resources.CreateOrUpdateResource(ctx, platformClient, secretMutator); err != nil {
 		return fmt.Errorf("error creating or updating git credentials secret: %w", err)
 	}