mirror of
https://github.com/google/nomulus.git
synced 2025-07-01 08:43:34 +02:00
Default to REAL TLDs in nomulus list_domains command
This is what you want most of the time when you're running the command to see recent domains, as this will list all the real billable domains and exclude the prober ones. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=217603275
This commit is contained in:
parent
b81525cea4
commit
9e4222a5cb
2 changed files with 25 additions and 2 deletions
|
@ -15,11 +15,14 @@
|
||||||
package google.registry.tools;
|
package google.registry.tools;
|
||||||
|
|
||||||
import static com.google.common.base.Preconditions.checkArgument;
|
import static com.google.common.base.Preconditions.checkArgument;
|
||||||
|
import static google.registry.model.registry.Registries.getTldsOfType;
|
||||||
|
import static google.registry.util.CollectionUtils.isNullOrEmpty;
|
||||||
|
|
||||||
import com.beust.jcommander.Parameter;
|
import com.beust.jcommander.Parameter;
|
||||||
import com.beust.jcommander.Parameters;
|
import com.beust.jcommander.Parameters;
|
||||||
import com.google.common.base.Joiner;
|
import com.google.common.base.Joiner;
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
|
import google.registry.model.registry.Registry.TldType;
|
||||||
import google.registry.tools.server.ListDomainsAction;
|
import google.registry.tools.server.ListDomainsAction;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -29,8 +32,7 @@ final class ListDomainsCommand extends ListObjectsCommand {
|
||||||
|
|
||||||
@Parameter(
|
@Parameter(
|
||||||
names = {"-t", "--tld", "--tlds"},
|
names = {"-t", "--tld", "--tlds"},
|
||||||
description = "Comma-delimited list of top-level domain(s) to list second-level domains of.",
|
description = "Comma-delimited list of TLDs to list domains on; defaults to all REAL TLDs.")
|
||||||
required = true)
|
|
||||||
private List<String> tlds;
|
private List<String> tlds;
|
||||||
|
|
||||||
@Parameter(
|
@Parameter(
|
||||||
|
@ -47,6 +49,10 @@ final class ListDomainsCommand extends ListObjectsCommand {
|
||||||
/** Returns a map of parameters to be sent to the server (in addition to the usual ones). */
|
/** Returns a map of parameters to be sent to the server (in addition to the usual ones). */
|
||||||
@Override
|
@Override
|
||||||
ImmutableMap<String, Object> getParameterMap() {
|
ImmutableMap<String, Object> getParameterMap() {
|
||||||
|
// Default to all REAL TLDs if not specified.
|
||||||
|
if (isNullOrEmpty(tlds)) {
|
||||||
|
tlds = getTldsOfType(TldType.REAL).asList();
|
||||||
|
}
|
||||||
String tldsParam = Joiner.on(',').join(tlds);
|
String tldsParam = Joiner.on(',').join(tlds);
|
||||||
checkArgument(tldsParam.length() < 1024, "Total length of TLDs is too long for URL parameter");
|
checkArgument(tldsParam.length() < 1024, "Total length of TLDs is too long for URL parameter");
|
||||||
return ImmutableMap.of("tlds", tldsParam, "limit", maxDomains);
|
return ImmutableMap.of("tlds", tldsParam, "limit", maxDomains);
|
||||||
|
|
|
@ -15,6 +15,9 @@
|
||||||
package google.registry.tools;
|
package google.registry.tools;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
import static google.registry.testing.DatastoreHelper.createTlds;
|
||||||
|
import static google.registry.testing.DatastoreHelper.newRegistry;
|
||||||
|
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||||
import static google.registry.testing.JUnitBackports.assertThrows;
|
import static google.registry.testing.JUnitBackports.assertThrows;
|
||||||
import static org.mockito.Matchers.eq;
|
import static org.mockito.Matchers.eq;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
|
@ -22,6 +25,7 @@ import static org.mockito.Mockito.verify;
|
||||||
import com.google.common.base.Strings;
|
import com.google.common.base.Strings;
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
import com.google.common.net.MediaType;
|
import com.google.common.net.MediaType;
|
||||||
|
import google.registry.model.registry.Registry.TldType;
|
||||||
import google.registry.tools.server.ListDomainsAction;
|
import google.registry.tools.server.ListDomainsAction;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
@ -62,4 +66,17 @@ public class ListDomainsCommandTest extends ListObjectsCommandTestCase<ListDomai
|
||||||
eq(MediaType.PLAIN_TEXT_UTF_8),
|
eq(MediaType.PLAIN_TEXT_UTF_8),
|
||||||
eq(new byte[0]));
|
eq(new byte[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void test_defaultsToAllRealTlds() throws Exception {
|
||||||
|
createTlds("tldone", "tldtwo");
|
||||||
|
persistResource(newRegistry("fake", "FAKE").asBuilder().setTldType(TldType.TEST).build());
|
||||||
|
runCommand();
|
||||||
|
verify(connection)
|
||||||
|
.send(
|
||||||
|
eq(getTaskPath()),
|
||||||
|
eq(ImmutableMap.of("tlds", "tldone,tldtwo", "limit", Integer.MAX_VALUE)),
|
||||||
|
eq(MediaType.PLAIN_TEXT_UTF_8),
|
||||||
|
eq(new byte[0]));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue