Merge branch 'master' into develop

Author: gy2006

core/src/main/java/com/flowci/core/common/config/MongoConfig.java

@@ -17,6 +17,8 @@
 package com.flowci.core.common.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.flowci.core.agent.domain.LocalUnixAgentHost;
+import com.flowci.core.agent.domain.SshAgentHost;
 import com.flowci.core.common.mongo.EncryptConverter;
 import com.flowci.core.common.mongo.VariableMapConverter;
 import com.flowci.core.config.domain.SmtpConfig;
@@ -83,6 +85,8 @@ public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
         context.addEntity(AuthSecret.class);
         context.addEntity(RSASecret.class);
         context.addEntity(TokenSecret.class);
+        context.addEntity(LocalUnixAgentHost.class);
+        context.addEntity(SshAgentHost.class);
 
         return context;
     }

core/src/main/java/com/flowci/core/flow/controller/FlowController.java

@@ -76,7 +76,7 @@ public Flow confirm(@PathVariable String name, @RequestBody(required = false) Gi
         if (Objects.isNull(gitSettings)) {
             gitSettings = new GitSettings();
         }
-        return flowService.confirm(name, gitSettings.getGitUrl(), gitSettings.getCredential());
+        return flowService.confirm(name, gitSettings.getGitUrl(), gitSettings.getSecret());
     }
 
     @DeleteMapping("/{name}")

core/src/main/java/com/flowci/core/flow/domain/GitSettings.java

@@ -26,6 +26,5 @@ public class GitSettings {
 
     private String gitUrl;
 
-    private String credential;
-
+    private String secret;
 }

core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java

@@ -171,7 +171,7 @@ public Flow create(String name) {
     }
 
     @Override
-    public Flow confirm(String name, String gitUrl, String credential) {
+    public Flow confirm(String name, String gitUrl, String secret) {
         Flow flow = get(name);
 
         if (flow.getStatus() == Status.CONFIRMED) {
@@ -184,8 +184,8 @@ public Flow confirm(String name, String gitUrl, String credential) {
             localVars.put(Variables.Flow.GitUrl, VarValue.of(gitUrl, VarType.GIT_URL, true));
         }
 
-        if (StringHelper.hasValue(credential)) {
-            localVars.put(Variables.Flow.GitCredential, VarValue.of(credential, VarType.STRING, true));
+        if (StringHelper.hasValue(secret)) {
+            localVars.put(Variables.Flow.GitCredential, VarValue.of(secret, VarType.STRING, true));
         }
 
         flow.setStatus(Status.CONFIRMED);