mv git related vars to Git class

gy2006 · gy2006 · commit 669490a1ac9c · 2022-02-20T20:51:20.000+01:00
diff --git a/core/src/main/java/com/flowci/core/common/domain/Variables.java b/core/src/main/java/com/flowci/core/common/domain/Variables.java
@@ -42,11 +42,6 @@ public abstract static class Flow {
 
         public static final String Name = "FLOWCI_FLOW_NAME";
 
-        public static final String GitUrl = "FLOWCI_GIT_URL"; // set
-
-        public static final String GitRepo = "FLOWCI_GIT_REPO"; // set
-
-        public static final String GitCredential = "FLOWCI_GIT_CREDENTIAL"; // set
     }
 
     public abstract static class Job {
@@ -103,6 +98,12 @@ public abstract static class Agent {
 
     public abstract static class Git {
 
+        public static final String URL = "FLOWCI_GIT_URL"; // set
+
+        public static final String REPO_NAME = "FLOWCI_GIT_REPO"; // set
+
+        public static final String SECRET = "FLOWCI_GIT_CREDENTIAL"; // set
+
         public static final String EVENT_ID = "FLOWCI_GIT_EVENT_ID";
 
         /**
diff --git a/core/src/main/java/com/flowci/core/flow/domain/Flow.java b/core/src/main/java/com/flowci/core/flow/domain/Flow.java
@@ -109,11 +109,11 @@ public String pathName() {
     }
 
     public String getCredentialName() {
-        return findVar(Variables.Flow.GitCredential);
+        return findVar(Variables.Git.SECRET);
     }
 
     public String getGitUrl() {
-        return findVar(Variables.Flow.GitUrl);
+        return findVar(Variables.Git.URL);
     }
 
     /**
diff --git a/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java
@@ -198,11 +198,11 @@ public Flow confirm(String name, ConfirmOption option) {
         Vars<VarValue> localVars = flow.getLocally();
 
         if (option.hasGitUrl()) {
-            localVars.put(Variables.Flow.GitUrl, VarValue.of(option.getGitUrl(), VarType.GIT_URL, true));
+            localVars.put(Variables.Git.URL, VarValue.of(option.getGitUrl(), VarType.GIT_URL, true));
         }
 
         if (option.hasSecret()) {
-            localVars.put(Variables.Flow.GitCredential, VarValue.of(option.getSecret(), VarType.STRING, true));
+            localVars.put(Variables.Git.SECRET, VarValue.of(option.getSecret(), VarType.STRING, true));
         }
 
         flow.setStatus(Status.CONFIRMED);
diff --git a/core/src/main/java/com/flowci/core/git/service/GitServiceImpl.java b/core/src/main/java/com/flowci/core/git/service/GitServiceImpl.java
@@ -6,6 +6,7 @@
 import com.flowci.core.git.domain.GitCommitStatus;
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.event.JobFinishedEvent;
+import com.flowci.core.job.util.JobContextHelper;
 import com.flowci.util.StringHelper;
 import lombok.extern.log4j.Log4j2;
 import org.jvnet.hk2.annotations.Service;
@@ -31,9 +32,9 @@ public void onJobFinishEvent(JobFinishedEvent event) {
         }
 
         var commit = new GitCommitStatus();
-//        commit.setId();
-//        commit.setTargetUrl(job.getGitUrl());
-//        commit.setStatus(job.getStatus().name().toLowerCase());
+        commit.setUrl(JobContextHelper.getGitUrl(job));
+        commit.setTargetUrl(JobContextHelper.getJobUrl(job));
+        commit.setStatus(JobContextHelper.getStatus(job).name().toLowerCase());
 
     }
 }
diff --git a/core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java
@@ -31,6 +31,7 @@
 import com.flowci.core.job.event.JobCreatedEvent;
 import com.flowci.core.job.event.JobsDeletedEvent;
 import com.flowci.core.job.manager.YmlManager;
+import com.flowci.core.job.util.JobContextHelper;
 import com.flowci.core.user.domain.User;
 import com.flowci.domain.StringVars;
 import com.flowci.domain.Vars;
@@ -459,18 +460,16 @@ private void initJobContext(Job job, Flow flow, Vars<String> inputs) {
         context.mergeFromTypedVars(flow.getLocally());
 
         Settings settings = settingService.get();
-        context.put(Variables.App.ServerUrl, settings.getServerUrl());
-
-        context.put(Variables.Flow.Name, flow.getName());
-        context.put(Variables.Flow.GitRepo, flow.getName());
-
-        context.put(Variables.Job.Status, Job.Status.PENDING.name());
-        context.put(Variables.Job.Trigger, job.getTrigger().toString());
-        context.put(Variables.Job.BuildNumber, job.getBuildNumber().toString());
-        context.put(Variables.Job.StartAt, job.startAtInStr());
-        context.put(Variables.Job.FinishAt, job.finishAtInStr());
-        context.put(Variables.Job.DurationInSeconds, "0");
-        context.put(Variables.Job.Url, String.format("%s/#/flows/%s/jobs/%s", settings.getWebUrl(), flow.getName(), job.getBuildNumber()));
+        JobContextHelper.setServerUrl(job, settings.getServerUrl());
+
+        JobContextHelper.setFlowName(job, flow);
+        JobContextHelper.setStatus(job, Job.Status.PENDING);
+        JobContextHelper.setTrigger(job, job.getTrigger());
+        JobContextHelper.setBuildNumber(job, job.getBuildNumber());
+        JobContextHelper.setStartAt(job, job.startAtInStr());
+        JobContextHelper.setFinishAt(job, job.finishAtInStr());
+        JobContextHelper.setDurationInSecond(job, "0");
+        JobContextHelper.setJobUrl(job, String.format("%s/#/flows/%s/jobs/%s", settings.getWebUrl(), flow.getName(), job.getBuildNumber()));
 
         if (!Objects.isNull(inputs)) {
             context.merge(inputs);
diff --git a/core/src/main/java/com/flowci/core/job/util/JobContextHelper.java b/core/src/main/java/com/flowci/core/job/util/JobContextHelper.java
@@ -1,10 +1,24 @@
 package com.flowci.core.job.util;
 
 import com.flowci.core.common.domain.Variables;
+import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.job.domain.Job;
 
 public abstract class JobContextHelper {
 
+    public static void setServerUrl(Job job, String serverUrl) {
+        job.getContext().put(Variables.App.ServerUrl, serverUrl);
+    }
+
+    public static void setFlowName(Job job, Flow flow) {
+        job.getContext().put(Variables.Flow.Name, flow.getName());
+        job.getContext().put(Variables.Git.REPO_NAME, flow.getName());
+    }
+
+    public static void setTrigger(Job job, Job.Trigger trigger) {
+        job.getContext().put(Variables.Job.Trigger, trigger.name());
+    }
+
     public static void setStatus(Job job, String status) {
         job.getContext().put(Variables.Job.Status, Job.Status.valueOf(status).name());
     }
@@ -26,10 +40,34 @@ public static void setError(Job job, String err) {
     }
 
     public static String getSecretName(Job job) {
-        return job.getContext().get(Variables.Flow.GitCredential);
+        return job.getContext().get(Variables.Git.SECRET);
     }
 
     public static String getGitUrl(Job job) {
-        return job.getContext().get(Variables.Flow.GitUrl);
+        return job.getContext().get(Variables.Git.URL);
+    }
+
+    public static void setBuildNumber(Job job, Long buildNumber) {
+        job.getContext().put(Variables.Job.BuildNumber, String.valueOf(buildNumber));
+    }
+
+    public static void setStartAt(Job job, String startAtInStr) {
+        job.getContext().put(Variables.Job.StartAt, startAtInStr);
+    }
+
+    public static void setFinishAt(Job job, String finishAtInStr) {
+        job.getContext().put(Variables.Job.FinishAt, finishAtInStr);
+    }
+
+    public static void setDurationInSecond(Job job, String duration) {
+        job.getContext().put(Variables.Job.DurationInSeconds, duration);
+    }
+
+    public static void setJobUrl(Job job, String url) {
+        job.getContext().put(Variables.Job.Url, url);
+    }
+
+    public static String getJobUrl(Job job) {
+        return job.getContext().get(Variables.Job.Url);
     }
 }
diff --git a/core/src/test/java/com/flowci/core/test/flow/FlowServiceTest.java b/core/src/test/java/com/flowci/core/test/flow/FlowServiceTest.java
@@ -146,7 +146,7 @@ public void should_list_flow_by_credential_name() {
                 .setSecret(secretName));
 
         Vars<VarValue> variables = flowService.get(flow.getName()).getLocally();
-        Assert.assertEquals(secretName, variables.get(Variables.Flow.GitCredential).getData());
+        Assert.assertEquals(secretName, variables.get(Variables.Git.SECRET).getData());
 
         // when:
         List<Flow> flows = flowService.listByCredential(secretName);

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,11 @@ public String pathName() {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public String getCredentialName() {`
`112`		`- return findVar(Variables.Flow.GitCredential);`
	`112`	`+ return findVar(Variables.Git.SECRET);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`public String getGitUrl() {`
`116`		`- return findVar(Variables.Flow.GitUrl);`
	`116`	`+ return findVar(Variables.Git.URL);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -198,11 +198,11 @@ public Flow confirm(String name, ConfirmOption option) {`
`198`	`198`	`Vars<VarValue> localVars = flow.getLocally();`
`199`	`199`
`200`	`200`	`if (option.hasGitUrl()) {`
`201`		`- localVars.put(Variables.Flow.GitUrl, VarValue.of(option.getGitUrl(), VarType.GIT_URL, true));`
	`201`	`+ localVars.put(Variables.Git.URL, VarValue.of(option.getGitUrl(), VarType.GIT_URL, true));`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`if (option.hasSecret()) {`
`205`		`- localVars.put(Variables.Flow.GitCredential, VarValue.of(option.getSecret(), VarType.STRING, true));`
	`205`	`+ localVars.put(Variables.Git.SECRET, VarValue.of(option.getSecret(), VarType.STRING, true));`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`flow.setStatus(Status.CONFIRMED);`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import com.flowci.core.git.domain.GitCommitStatus;`
`7`	`7`	`import com.flowci.core.job.domain.Job;`
`8`	`8`	`import com.flowci.core.job.event.JobFinishedEvent;`
	`9`	`+import com.flowci.core.job.util.JobContextHelper;`
`9`	`10`	`import com.flowci.util.StringHelper;`
`10`	`11`	`import lombok.extern.log4j.Log4j2;`
`11`	`12`	`import org.jvnet.hk2.annotations.Service;`
`@@ -31,9 +32,9 @@ public void onJobFinishEvent(JobFinishedEvent event) {`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`var commit = new GitCommitStatus();`
`34`		`-// commit.setId();`
`35`		`-// commit.setTargetUrl(job.getGitUrl());`
`36`		`-// commit.setStatus(job.getStatus().name().toLowerCase());`
	`35`	`+ commit.setUrl(JobContextHelper.getGitUrl(job));`
	`36`	`+ commit.setTargetUrl(JobContextHelper.getJobUrl(job));`
	`37`	`+ commit.setStatus(JobContextHelper.getStatus(job).name().toLowerCase());`
`37`	`38`
`38`	`39`	`}`
`39`	`40`	`}`