Skip to content

Commit 0649319

Browse files
author
Yang Guo
committed
refactor on change output env variable name
1 parent f29b662 commit 0649319

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

platform-api/src/main/java/com/flow/platform/api/domain/envs/AgentEnvs.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,5 @@
2121
*/
2222
public enum AgentEnvs implements EnvKey {
2323

24-
FLOW_AGENT_WORKSPACE,
25-
26-
FLOW_AGENT_OUTPUT_ENV_PREFIX
24+
FLOW_AGENT_WORKSPACE
2725
}

platform-api/src/main/java/com/flow/platform/api/domain/envs/FlowEnvs.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@ public enum FlowEnvs implements EnvKey {
3636
/**
3737
* For yml error message while loading yml from git
3838
*/
39-
FLOW_YML_ERROR_MSG;
39+
FLOW_YML_ERROR_MSG,
40+
41+
42+
/**
43+
* Defined env variable output prefix
44+
*/
45+
FLOW_OUTPUT_ENV_PREFIX;
4046

4147
public enum StatusValue implements EnvValue {
4248

platform-api/src/main/java/com/flow/platform/api/service/job/CmdServiceImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.flow.platform.api.service.job;
1818

1919
import com.flow.platform.api.domain.envs.AgentEnvs;
20+
import com.flow.platform.api.domain.envs.FlowEnvs;
2021
import com.flow.platform.api.domain.job.Job;
2122
import com.flow.platform.api.domain.node.Node;
2223
import com.flow.platform.api.util.PlatformURL;
@@ -102,7 +103,7 @@ public CmdInfo runShell(Job job, Node node, String cmdId) {
102103
CmdInfo cmdInfo = new CmdInfo(zone, null, CmdType.RUN_SHELL, node.getScript());
103104
cmdInfo.setInputs(node.getEnvs());
104105
cmdInfo.setWebhook(buildCmdWebhook(job));
105-
cmdInfo.setOutputEnvFilter(job.getEnv(AgentEnvs.FLOW_AGENT_OUTPUT_ENV_PREFIX, "FLOW_OUTPUT"));
106+
cmdInfo.setOutputEnvFilter(job.getEnv(FlowEnvs.FLOW_OUTPUT_ENV_PREFIX, "FLOW_OUTPUT"));
106107
cmdInfo.setSessionId(job.getSessionId());
107108
cmdInfo.setExtra(node.getPath()); // use cmd.extra to keep node path info
108109
cmdInfo.setCustomizedId(cmdId);

0 commit comments

Comments
 (0)