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

Require that DNS writer be set on Registry entities

Browse source 
We ran into a bunch of prober deployment issues this past week when
attempting to spin up a new cluster because the newly created prober
TLDs had null values for the dnsWriter field. Given that VoidDnsWriter
exists, we can require that dnsWriter always be set, and have people
use that if DNS publishing is not required.

Also cleans up a bunch of related inconsistent exception messages and
tests not verifying said exception messages properly.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=154325830
This commit is contained in:
mcilwain 2017-04-26 11:58:09 -07:00 • committed by Ben McIlwain
parent d7da112c19
commit d30f9411d8
11 changed files with 332 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

8
java/google/registry/tools/CreateOrUpdateTldCommand.java
View file

@ -260,7 +260,7 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
assertAllowedEnvironment();
initTldCommand();
String duplicates = Joiner.on(", ").join(findDuplicates(mainParameters));
checkArgument(duplicates.isEmpty(), "Duplicate arguments found: \"%s\"", duplicates);
checkArgument(duplicates.isEmpty(), "Duplicate arguments found: '%s'", duplicates);
Set<String> tlds = ImmutableSet.copyOf(mainParameters);
checkArgument(roidSuffix == null || tlds.size() == 1,
"Can't update roid suffixes on multiple TLDs simultaneously");
@ -268,7 +268,7 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
checkArgument(tld.equals(canonicalizeDomainName(tld)));
checkArgument(
!CharMatcher.javaDigit().matches(tld.charAt(0)),
"TLDs cannot begin with a number.");
"TLDs cannot begin with a number");
Registry oldRegistry = getOldRegistry(tld);
// TODO(b/26901539): Add a flag to set the pricing engine once we have more than one option.
Registry.Builder builder =
@ -388,14 +388,12 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
}
}
if (dnsWriter != null) {
if (dnsWriter.isPresent()) {
if (dnsWriter != null && dnsWriter.isPresent()) {
checkArgument(
dnsWriterNames.contains(dnsWriter.get()),
"The DNS writer '%s' doesn't exist",
dnsWriter.get());
builder.setDnsWriter(dnsWriter.get());
}
}
if (lrpPeriod != null) {

2
java/google/registry/tools/CreateTldCommand.java
View file

@ -86,7 +86,7 @@ class CreateTldCommand extends CreateOrUpdateTldCommand {
@Override
Registry getOldRegistry(String tld) {
checkState(!getTlds().contains(tld), "TLD already exists");
checkState(!getTlds().contains(tld), "TLD '%s' already exists", tld);
return null;
}

24
java/google/registry/tools/SetupOteCommand.java
View file

@ -32,7 +32,9 @@ import google.registry.util.StringGenerator;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
import org.joda.time.Duration;
/** Composite command to set up OT&E TLDs and accounts. */
@ -52,6 +54,10 @@ final class SetupOteCommand extends ConfirmingCommand implements RemoteApiComman
private static final String DEFAULT_PREMIUM_LIST = "default_sandbox_list";
@Inject
@Named("dnsWriterNames")
Set<String> dnsWriterNames;
@Parameter(
names = {"-r", "--registrar"},
description = "must 1) consist of only lowercase letters, numbers, or hyphens, "
@ -75,6 +81,12 @@ final class SetupOteCommand extends ConfirmingCommand implements RemoteApiComman
validateWith = PathParameter.InputFile.class)
private Path certFile;
@Parameter(
names = {"--dns_writer"},
description = "DNS writer to use on all TLDs",
required = true)
private String dnsWriter;
@Parameter(
names = {"--premium_list"},
description = "premium list to apply to all TLDs")
@ -97,15 +109,17 @@ final class SetupOteCommand extends ConfirmingCommand implements RemoteApiComman
Duration redemptionGracePeriod,
Duration pendingDeleteLength) throws Exception {
CreateTldCommand command = new CreateTldCommand();
command.addGracePeriod = addGracePeriod;
command.dnsWriter = Optional.of(dnsWriter);
command.dnsWriterNames = dnsWriterNames;
command.force = force;
command.initialTldState = initialTldState;
command.mainParameters = ImmutableList.of(tldName);
command.roidSuffix = String.format(
"%S%X", tldName.replaceAll("[^a-z0-9]", "").substring(0, 7), roidSuffixCounter++);
command.addGracePeriod = addGracePeriod;
command.redemptionGracePeriod = redemptionGracePeriod;
command.pendingDeleteLength = pendingDeleteLength;
command.premiumListName = Optional.of(premiumList);
command.force = force;
command.roidSuffix = String.format(
"%S%X", tldName.replaceAll("[^a-z0-9]", "").substring(0, 7), roidSuffixCounter++);
command.redemptionGracePeriod = redemptionGracePeriod;
command.run();
}

8
java/google/registry/tools/params/TransitionListParameter.java
View file

@ -30,7 +30,9 @@ public abstract class TransitionListParameter<V> extends KeyValueMapParameter<Da
private static final DateTimeParameter DATE_TIME_CONVERTER = new DateTimeParameter();
public TransitionListParameter() {
super("Not formatted correctly or has transition times out of order.");
// This is not sentence-capitalized like most exception messages because it is appended to the
// end of the toString() of the transition map in rendering a full exception message.
super("not formatted correctly or has transition times out of order");
}
@Override
@ -40,10 +42,10 @@ public abstract class TransitionListParameter<V> extends KeyValueMapParameter<Da
@Override
protected final ImmutableSortedMap<DateTime, V> processMap(ImmutableMap<DateTime, V> map) {
checkArgument(Ordering.natural().isOrdered(map.keySet()), "Transition times out of order.");
checkArgument(Ordering.natural().isOrdered(map.keySet()), "Transition times out of order");
return ImmutableSortedMap.copyOf(map);
}
/** Converter-validator for TLD state transitions. */
public static class TldStateTransitions extends TransitionListParameter<TldState> {
@Override