zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 00:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix parameter problem in GenerateEscrowDepositCommand

Browse source 
It was setting the TLD and watermark date parameters as comma-separated lists. What it really needs to do is set the parameters multiple times, once for each value.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=156741051
This commit is contained in:
mountford 2017-05-22 08:42:17 -07:00 • committed by Ben McIlwain
parent 65aaeccfc6
commit fb21946366
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
java/google/registry/tools/GenerateEscrowDepositCommand.java
View file

@ -23,7 +23,6 @@ import com.beust.jcommander.Parameters;
import com.google.appengine.api.modules.ModulesService;
import com.google.appengine.api.taskqueue.Queue;
import com.google.appengine.api.taskqueue.TaskOptions;
import com.google.common.base.Joiner;
import google.registry.model.rde.RdeMode;
import google.registry.rde.RdeModule;
import google.registry.rde.RdeStagingAction;
@ -103,10 +102,14 @@ final class GenerateEscrowDepositCommand implements RemoteApiCommand {
withUrl(RdeStagingAction.PATH)
.header("Host", hostname)
.param(RdeModule.PARAM_MANUAL, String.valueOf(true))
.param(RequestParameters.PARAM_TLD, Joiner.on(',').join(tlds))
.param(RdeModule.PARAM_WATERMARK, Joiner.on(',').join(watermarks))
.param(RdeModule.PARAM_MODE, mode.toString())
.param(RdeModule.PARAM_DIRECTORY, outdir);
for (String tld : tlds) {
opts = opts.param(RequestParameters.PARAM_TLD, tld);
}
for (DateTime watermark : watermarks) {
opts = opts.param(RdeModule.PARAM_WATERMARK, watermark.toString());
}
if (revision != null) {
opts = opts.param(RdeModule.PARAM_REVISION, String.valueOf(revision));
}

6
javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
View file

@ -189,8 +189,10 @@ public class GenerateEscrowDepositCommandTest
.url("/_dr/task/rdeStaging")
.header("Host", "1.backend.test.localhost")
.param("mode", "THIN")
.param("watermark", "2017-01-01T00:00:00.000Z,2017-01-02T00:00:00.000Z")
.param("tld", "tld,anothertld")
.param("watermark", "2017-01-01T00:00:00.000Z")
.param("watermark", "2017-01-02T00:00:00.000Z")
.param("tld", "tld")
.param("tld", "anothertld")
.param("directory", "test")
.param("manual", "true")
.param("revision", "42"));