Fix git url pattern. Make it configurable (#3426)

Author: dakodakov

projects/control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml

@@ -81,6 +81,8 @@ spec:
               value: "{{ .Values.deploymentGitUsername }}"
             - name: GIT_PASSWORD
               value: "{{ .Values.deploymentGitPassword }}"
+            - name: GIT_URL_PATTERN
+              value: "{{ .Values.deploymentGitUrlPattern }}"
             - name: AWS_REGION
               value: "{{ .Values.deploymentEcrAwsRegion }}"
             - name: AWS_ACCESS_KEY_ID

projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml

@@ -187,6 +187,7 @@ deploymentGitRemote: "origin"
 # Credentials with read-only access to the Git repository.
 deploymentGitUsername: ""
 deploymentGitPassword: ""
+deploymentGitUrlPattern: "/tree/%s/%s"
 # Credentials with read and write access to the Git repository.
 uploadGitReadWriteUsername: ""
 uploadGitReadWritePassword: ""

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/graphql/strategy/datajob/JobFieldStrategyBySourceUrl.java

@@ -24,14 +24,17 @@ public class JobFieldStrategyBySourceUrl extends FieldStrategy<V2DataJob> {
   private final String gitDataJobsUrl;
 
   private final String getGitDataJobsBranch;
+  private final String gitUrlPattern;
 
   public JobFieldStrategyBySourceUrl(
       @Value("${datajobs.git.url}") String gitDataJobsUrl,
       @Value("${datajobs.git.branch}") String getGitDataJobsBranch,
+      @Value("${datajobs.git.url.pattern:/tree/%s/%s}") String gitUrlPattern,
       @Value("${datajobs.git.ssl.enabled}") boolean gitDataJobsSslEnabled) {
 
     this.gitDataJobsUrl = GitWrapper.constructCorrectGitUrl(gitDataJobsUrl, gitDataJobsSslEnabled);
     this.getGitDataJobsBranch = getGitDataJobsBranch;
+    this.gitUrlPattern = gitUrlPattern;
   }
 
   @Override
@@ -64,8 +67,8 @@ public void alterFieldData(V2DataJob dataJob) {
         StringUtils.stripFilenameExtension(gitDataJobsUrl)
             .concat(
                 String.format(
-                    "/-/tree/%s/%s",
-                    getGitDataJobsBranch,
+                    this.gitUrlPattern,
+                    this.getGitDataJobsBranch,
                     dataJob.getJobName())); // TODO in TAUR-1400, when deployments are implemented,
     // replace master
     config.setSourceUrl(sourceUrl);

projects/control-service/projects/pipelines_control_service/src/main/resources/application.properties

@@ -127,6 +127,7 @@ datajobs.git.url=${GIT_URL}
 datajobs.git.username=${GIT_USERNAME}
 datajobs.git.password=${GIT_PASSWORD}
 datajobs.git.branch=${GIT_BRANCH:master}
+datajobs.git.url.pattern=${GIT_URL_PATTERN:/tree/%s/%s}
 datajobs.git.remote=${GIT_REMOTE:origin}
 datajobs.git.ssl.enabled=${GIT_SSL_ENABLED:true}
 # The registry type, if left blank, defaults to ecr. The alternative registry type is generic

projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/graphql/GraphQLDataFetchersTest.java

@@ -547,7 +547,7 @@ private Set<FieldStrategy<V2DataJob>> collectSupportedFieldStrategies() {
     strategies.add(new JobFieldStrategyByName());
     strategies.add(new JobFieldStrategyByNextRun());
     strategies.add(new JobFieldStrategyByScheduleCron());
-    strategies.add(new JobFieldStrategyBySourceUrl("gitlab.com/demo-data-jobs.git", "main", true));
+    strategies.add(new JobFieldStrategyBySourceUrl("gitlab.com/demo-data-jobs.git", "main", "/tree/%s/%s",true));
     strategies.add(new JobFieldStrategyByTeam());
     strategies.add(new JobFieldStrategyByLastExecutionStatus());
     strategies.add(new JobFieldStrategyByLastExecutionTime());

projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/graphql/strategy/datajob/JobFieldStrategyBySourceUrlTest.java

@@ -22,7 +22,7 @@ class JobFieldStrategyBySourceUrlTest {
   private static final String GIT_REPO_URL_FORMATTED = "https://gitlab.com/taurus/jobs";
   private static final String GIT_REPO_BRANCH = "main";
   private final JobFieldStrategyBySourceUrl strategyBySourceUrl =
-      new JobFieldStrategyBySourceUrl(GIT_REPO_URL_RAW, GIT_REPO_BRANCH, true);
+      new JobFieldStrategyBySourceUrl(GIT_REPO_URL_RAW, GIT_REPO_BRANCH, "/tree/%s/%s", true);
 
   @Test
   void testJobSourceUrlStrategy_whenGettingStrategyName_shouldBeSpecific() {
@@ -38,7 +38,7 @@ void testJobSourceUrlStrategy_whenAlteringFieldData_shouldModifyState() {
 
     assertThat(dataJob.getConfig().getSourceUrl())
         .isEqualTo(
-            String.format("%s/-/tree/%s/%s", GIT_REPO_URL_FORMATTED, GIT_REPO_BRANCH, jobName));
+            String.format("%s/tree/%s/%s", GIT_REPO_URL_FORMATTED, GIT_REPO_BRANCH, jobName));
   }
 
   @Test