fix gitiops_auth_password when using jenkins as pipeline provider

Author: xinredhat

integration-tests/config/testplan.json

@@ -3,55 +3,29 @@
       {
         "name": "backend-tests",
         "templates": ["go"],
-        "tssc": [{
-          "git": "github",
-          "ci": "tekton",
-          "registry": "quay",
-          "tpa": "remote",
-          "acs": "remote"
-        },
-        {
-          "git": "gitlab",
-          "ci": "tekton",
-          "registry": "nexus",
-          "tpa": "remote",
-          "acs": "remote"
-        },
-        {
-          "git": "gitlab",
-          "ci": "gitlabci",
-          "registry": "quay",
-          "tpa": "remote",
-          "acs": "remote"
-        },
-        {
-          "git": "github",
-          "ci": "githubactions",
-          "registry": "artifactory",
-          "tpa": "remote",
-          "acs": "remote"
-        },
+        "tssc": [
         {
           "git": "github",
-          "ci": "azure",
+          "ci": "jenkins",
           "registry": "quay",
           "tpa": "remote",
           "acs": "remote"
         },
         {
-          "git": "github",
+          "git": "gitlab",
           "ci": "jenkins",
           "registry": "quay",
           "tpa": "remote",
           "acs": "remote"
         },
         {
-          "git": "gitlab",
+          "git": "bitbucket",
           "ci": "jenkins",
           "registry": "quay",
           "tpa": "remote",
           "acs": "remote"
-        }],
+        }
+      ],
         "tests": ["full_workflow.test.ts"]
       }
     ]

src/rhtap/core/integration/git/baseGitProvider.ts

@@ -165,4 +165,11 @@ export abstract class BaseGitProvider implements Git {
   ): Promise<string>;
 
   public abstract getToken(): string;
+
+  public getUsername(): string {
+    if (!this.secret?.username) {
+      throw new Error('Username not found in the secret. Please ensure the username is provided.');
+    }
+    return this.secret.username;
+  }
 }

src/rhtap/core/integration/git/gitInterface.ts

@@ -115,4 +115,6 @@ export interface Git extends IntegrationSecret {
   ): Promise<string>;
 
   getToken(): string;
+
+  getUsername(): string;
 }

src/rhtap/modification/jenkinsfile.ts

@@ -109,6 +109,19 @@ export class EnableTPAVariablesModification implements JenkinsfileModification {
     };
   }
 }
+
+export class EnableGitoAuthUsernameModification implements JenkinsfileModification {
+  getModification(): ContentModifications {
+    return {
+      Jenkinsfile: [
+        {
+          oldContent: "/* GITOPS_AUTH_USERNAME = credentials('GITOPS_AUTH_USERNAME') */",
+          newContent: "GITOPS_AUTH_USERNAME = credentials('GITOPS_AUTH_USERNAME')",
+        },
+      ],
+    };
+  }
+}
 /**
  * Enum of available Jenkinsfile modification types
  */
@@ -119,6 +132,7 @@ export enum JenkinsfileModificationType {
   DISABLE_QUAY_CREDENTIALS = 'DISABLE_QUAY_CREDENTIALS',
   ENABLE_COSIGN_PUBLIC_KEY = 'ENABLE_COSIGN_PUBLIC_KEY',
   ENABLE_TPA_VARIABLES = 'ENABLE_TPA_VARIABLES',
+  GITOPS_AUTH_USERNAME = 'GITOPS_AUTH_USERNAME',
 }
 
 /**
@@ -144,6 +158,8 @@ export class JenkinsfileModificationFactory {
         return new EnableCosignPublicKeyModification();
       case JenkinsfileModificationType.ENABLE_TPA_VARIABLES:
         return new EnableTPAVariablesModification();
+      case JenkinsfileModificationType.GITOPS_AUTH_USERNAME:
+        return new EnableGitoAuthUsernameModification();
       default:
         throw new Error(`Unknown Jenkinsfile modification type: ${type}`);
     }
@@ -218,6 +234,14 @@ export class JenkinsfileModifier {
     return this;
   }
 
+  enableGitoAuthUsername(): JenkinsfileModifier {
+    const modification = JenkinsfileModificationFactory.create(
+      JenkinsfileModificationType.GITOPS_AUTH_USERNAME
+    ).getModification();
+    this.container.merge(modification);
+    return this;
+  }
+
   getModifications(): ContentModifications {
     return this.container.getModifications();
   }

src/rhtap/postcreation/strategies/commands/addJenkinsSecretsCommand.ts

@@ -63,11 +63,12 @@ export class AddJenkinsSecretsCommand extends BaseCommand {
   }
 
   private async addGitAuthSecrets(): Promise<void> {
+    const username = this.git.getUsername();
     const password = this.getGitOpsAuthPassword();
     await this.jenkinsCI.addCredential(
       this.folderName,
       Credential.GITOPS_AUTH_PASSWORD,
-      `fakeUsername:${password}`,
+      `${username}:${password}`,
       CredentialType.USERNAME_PASSWORD
     );
   }
@@ -133,6 +134,7 @@ export class AddJenkinsSecretsCommand extends BaseCommand {
         throw new Error('Unsupported Git type');
     }
   }
+
   //add ROX_CENTRAL_ENDPOINT
   private async addRoxCentralEndpointSecrets(): Promise<void> {
     await this.jenkinsCI.addCredential(

src/rhtap/postcreation/strategies/commands/jenkinsfileAndEnvModificationsOnGitopsRepoCommand.ts

@@ -33,10 +33,8 @@ export class JenkinsfileAndEnvModificationsOnGitopsRepoCommand extends BaseComma
 
     modificationsContainer.merge(
       JenkinsfileModifier.create()
-        .updateKubernetesAgentConfig()
         .enableRegistryPassword()
         .disableQuayCredentials()
-        .enableTPAVariables()
         .getModifications()
     );
 

src/rhtap/postcreation/strategies/commands/jenkinsfileAndEnvModificationsOnSourceRepoCommand.ts

@@ -39,7 +39,6 @@ export class JenkinsfileAndEnvModificationsOnSourceRepoCommand extends BaseComma
 
     modificationsContainer.merge(
       JenkinsfileModifier.create()
-        .updateKubernetesAgentConfig()
         .enableRegistryPassword()
         .disableQuayCredentials()
         .getModifications()