From e1b86cf0090c212f0aaaa28f9f2f14e49dc15c91 Mon Sep 17 00:00:00 2001 From: "Bruce.wu" Date: Wed, 11 Sep 2024 09:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81nacos=20configset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/req/NacosApplyChangeSetReq.java | 32 ++++--------------- .../model/req/NacosGetChangeSetReq.java | 2 ++ .../model/resp/NacosGetChangeSetResp.java | 2 ++ .../nacos/NacosChangeSetApplyStep.java | 23 +++++++------ .../nacos/NacosChangeSetGetStep.java | 22 ++++++++++--- 5 files changed, 42 insertions(+), 39 deletions(-) diff --git a/src/main/java/io/jenkins/plugins/configops/model/req/NacosApplyChangeSetReq.java b/src/main/java/io/jenkins/plugins/configops/model/req/NacosApplyChangeSetReq.java index b56d43f..4486743 100644 --- a/src/main/java/io/jenkins/plugins/configops/model/req/NacosApplyChangeSetReq.java +++ b/src/main/java/io/jenkins/plugins/configops/model/req/NacosApplyChangeSetReq.java @@ -3,41 +3,23 @@ import io.jenkins.plugins.configops.model.dto.NacosConfigDTO; import java.io.Serializable; import java.util.List; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; /** * @author Bruce.Wu * @date 2024-08-30 */ +@Setter +@Getter +@ToString public class NacosApplyChangeSetReq implements Serializable { private static final long serialVersionUID = -801656933583501739L; private String nacosId; - private String changeSetId; + private List changeSetIds; private List changes; - - public String getNacosId() { - return nacosId; - } - - public void setNacosId(String nacosId) { - this.nacosId = nacosId; - } - - public String getChangeSetId() { - return changeSetId; - } - - public void setChangeSetId(String changeSetId) { - this.changeSetId = changeSetId; - } - - public List getChanges() { - return changes; - } - - public void setChanges(List changes) { - this.changes = changes; - } } diff --git a/src/main/java/io/jenkins/plugins/configops/model/req/NacosGetChangeSetReq.java b/src/main/java/io/jenkins/plugins/configops/model/req/NacosGetChangeSetReq.java index 831d0f1..986b04c 100644 --- a/src/main/java/io/jenkins/plugins/configops/model/req/NacosGetChangeSetReq.java +++ b/src/main/java/io/jenkins/plugins/configops/model/req/NacosGetChangeSetReq.java @@ -16,4 +16,6 @@ public class NacosGetChangeSetReq implements Serializable { private String nacosId; private String changeLogFile; + + private Integer count; } diff --git a/src/main/java/io/jenkins/plugins/configops/model/resp/NacosGetChangeSetResp.java b/src/main/java/io/jenkins/plugins/configops/model/resp/NacosGetChangeSetResp.java index 0cc5934..389e564 100644 --- a/src/main/java/io/jenkins/plugins/configops/model/resp/NacosGetChangeSetResp.java +++ b/src/main/java/io/jenkins/plugins/configops/model/resp/NacosGetChangeSetResp.java @@ -19,5 +19,7 @@ public class NacosGetChangeSetResp implements Serializable { private String comment; + private List ids; + private List changes; } diff --git a/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetApplyStep.java b/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetApplyStep.java index c892635..60edfb3 100644 --- a/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetApplyStep.java +++ b/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetApplyStep.java @@ -49,16 +49,19 @@ public class NacosChangeSetApplyStep extends Step implements Serializable { private final String toolUrl; - private final String changeSetId; + private final List changeSetIds; private final List items; @DataBoundConstructor public NacosChangeSetApplyStep( - @NonNull String nacosId, String toolUrl, String changeSetId, @NonNull List items) { + @NonNull String nacosId, + String toolUrl, + @NonNull List changeSetIds, + @NonNull List items) { this.nacosId = nacosId; this.toolUrl = StringUtils.defaultIfBlank(toolUrl, Constants.DEFAULT_TOOL_URL); - this.changeSetId = changeSetId; + this.changeSetIds = changeSetIds; this.items = items; } @@ -118,11 +121,11 @@ protected Map run() throws Exception { .collect(Collectors.toList()); VirtualChannel channel = Utils.getChannel(launcher); logger.log( - "Applying change log config. toolUrl:%s, nacosId:%s, changeSetId:%s", - step.getToolUrl(), step.getNacosId(), step.getChangeSetId()); + "Applying change log config. toolUrl:%s, nacosId:%s, changeSetIds:%s", + step.getToolUrl(), step.getNacosId(), step.getChangeSetIds()); channel.call( - new RemoteExecutionCallable(step.getToolUrl(), step.getNacosId(), step.getChangeSetId(), changes)); + new RemoteExecutionCallable(step.getToolUrl(), step.getNacosId(), step.getChangeSetIds(), changes)); return Collections.emptyMap(); } @@ -133,14 +136,14 @@ public static class RemoteExecutionCallable implements Callable changeSetIds; private final List changes; public RemoteExecutionCallable( - String toolUrl, String nacosId, String changeSetId, List changes) { + String toolUrl, String nacosId, List changeSetIds, List changes) { this.toolUrl = toolUrl; this.nacosId = nacosId; - this.changeSetId = changeSetId; + this.changeSetIds = changeSetIds; this.changes = changes; } @@ -149,7 +152,7 @@ public String call() throws Exception { ConfigOpsClient client = new ConfigOpsClient(toolUrl); NacosApplyChangeSetReq req = new NacosApplyChangeSetReq(); req.setNacosId(nacosId); - req.setChangeSetId(changeSetId); + req.setChangeSetIds(changeSetIds); req.setChanges(changes); return client.applyChangeSet(req); } diff --git a/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetGetStep.java b/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetGetStep.java index 541e76c..9be7a24 100644 --- a/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetGetStep.java +++ b/src/main/java/io/jenkins/plugins/configops/nacos/NacosChangeSetGetStep.java @@ -31,6 +31,7 @@ import org.jenkinsci.plugins.workflow.steps.StepExecution; import org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution; import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.DataBoundSetter; @Setter @Getter @@ -44,6 +45,8 @@ public class NacosChangeSetGetStep extends Step implements Serializable { private final String changeLogFile; + private Integer count; + @DataBoundConstructor public NacosChangeSetGetStep(String nacosId, String toolUrl, String changeLogFile) { this.nacosId = nacosId; @@ -51,6 +54,11 @@ public NacosChangeSetGetStep(String nacosId, String toolUrl, String changeLogFil this.changeLogFile = changeLogFile; } + @DataBoundSetter + public void setCount(Integer count) { + this.count = count; + } + @Override public StepExecution start(StepContext context) throws Exception { return new StepExecutionImpl(context, this); @@ -79,7 +87,8 @@ protected NacosGetChangeSetResp run() throws Exception { if (!changeLog.exists()) { throw new IllegalArgumentException("Change log file not found"); } - NacosGetChangeSetResp resp = changeLog.act(new RemoteCallable(step.getToolUrl(), step.getNacosId())); + NacosGetChangeSetResp resp = + changeLog.act(new RemoteCallable(step.getToolUrl(), step.getNacosId(), step.getCount())); logger.log("Get ChangeSet from file: %s", step.getChangeLogFile()); if (CollectionUtils.isNotEmpty(resp.getChanges())) { for (NacosConfigDTO nc : resp.getChanges()) { @@ -99,16 +108,21 @@ private static class RemoteCallable extends MasterToSlaveFileCallable