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

Default to admin registrar in check_domain commands

Browse source 
The vast majority of the time this is the registrar client ID you want, so
there's no reason to require specifying it everything each time. These are
read-only commands anyway, so the potential negative effects are minimal.

See the existing lock/unlock_domain commands for existing occurrences of this
behavior.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=211857712
This commit is contained in:
mcilwain 2018-09-06 13:20:21 -07:00 • committed by jianglai
parent 72bfd43e00
commit 22e1d905b6
5 changed files with 52 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
java/google/registry/tools/CheckDomainClaimsCommand.java
View file

@ -18,9 +18,11 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.collect.Multimap;
import com.google.template.soy.data.SoyMapData;
import google.registry.config.RegistryConfig.Config;
import google.registry.tools.soy.DomainCheckClaimsSoyInfo;
import java.util.Collection;
import java.util.List;
import javax.inject.Inject;
/** A command to execute a domain check claims epp command. */
@Parameters(separators = " =", commandDescription = "Check claims on domain(s)")
@ -28,8 +30,8 @@ final class CheckDomainClaimsCommand extends NonMutatingEppToolCommand {
@Parameter(
names = {"-c", "--client"},
description = "Client identifier of the registrar to execute the command as",
required = true)
description =
"Client ID of the registrar to execute the command as, otherwise the registry registrar")
String clientId;
@Parameter(
@ -37,8 +39,17 @@ final class CheckDomainClaimsCommand extends NonMutatingEppToolCommand {
required = true)
private List<String> mainParameters;
@Inject
@Config("registryAdminClientId")
String registryAdminClientId;
@Override
void initEppToolCommand() {
// Default clientId to the registry registrar account if otherwise unspecified.
if (clientId == null) {
clientId = registryAdminClientId;
}
Multimap<String, String> domainNameMap = validateAndGroupDomainNamesByTld(mainParameters);
for (Collection<String> values : domainNameMap.asMap().values()) {
setSoyTemplate(

15
java/google/registry/tools/CheckDomainCommand.java
View file

@ -18,9 +18,11 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.collect.Multimap;
import com.google.template.soy.data.SoyMapData;
import google.registry.config.RegistryConfig.Config;
import google.registry.tools.soy.DomainCheckSoyInfo;
import java.util.Collection;
import java.util.List;
import javax.inject.Inject;
/** A command to execute a domain check EPP command (including cost of a 1 year create). */
@Parameters(separators = " =", commandDescription = "Check domain availability")
@ -28,8 +30,8 @@ final class CheckDomainCommand extends NonMutatingEppToolCommand {
@Parameter(
names = {"-c", "--client"},
description = "Client identifier of the registrar to execute the command as",
required = true)
description =
"Client ID of the registrar to execute the command as, otherwise the registry registrar")
String clientId;
@Parameter(
@ -37,8 +39,17 @@ final class CheckDomainCommand extends NonMutatingEppToolCommand {
required = true)
private List<String> mainParameters;
@Inject
@Config("registryAdminClientId")
String registryAdminClientId;
@Override
void initEppToolCommand() {
// Default clientId to the registry registrar account if otherwise unspecified.
if (clientId == null) {
clientId = registryAdminClientId;
}
Multimap<String, String> domainNameMap = validateAndGroupDomainNamesByTld(mainParameters);
for (Collection<String> values : domainNameMap.asMap().values()) {
setSoyTemplate(DomainCheckSoyInfo.getInstance(), DomainCheckSoyInfo.DOMAINCHECK);

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

@ -76,6 +76,8 @@ import javax.inject.Singleton;
WhoisModule.class,
})
interface RegistryToolComponent {
void inject(CheckDomainClaimsCommand command);
void inject(CheckDomainCommand command);
void inject(CheckSnapshotCommand command);
void inject(CountDomainsCommand command);
void inject(CreateAnchorTenantCommand command);

14
javatests/google/registry/tools/CheckDomainClaimsCommandTest.java
View file

@ -14,14 +14,23 @@
package google.registry.tools;
import static google.registry.testing.DatastoreHelper.persistNewRegistrar;
import static google.registry.testing.JUnitBackports.assertThrows;
import com.beust.jcommander.ParameterException;
import google.registry.model.registrar.Registrar.Type;
import org.junit.Before;
import org.junit.Test;
/** Unit tests for {@link CheckDomainClaimsCommand}. */
public class CheckDomainClaimsCommandTest extends EppToolCommandTestCase<CheckDomainClaimsCommand> {
@Before
public void before() {
persistNewRegistrar("adminreg", "Admin Registrar", Type.REAL, 693L);
command.registryAdminClientId = "adminreg";
}
@Test
public void testSuccess() throws Exception {
runCommand("--client=NewRegistrar", "example.tld");
@ -62,8 +71,9 @@ public class CheckDomainClaimsCommandTest extends EppToolCommandTestCase<CheckDo
}
@Test
public void testFailure_missingClientId() {
assertThrows(ParameterException.class, () -> runCommand("example.tld"));
public void testSuccess_unspecifiedClientId_defaultsToRegistryRegistrar() throws Exception {
runCommand("example.tld");
eppVerifier.expectDryRun().expectClientId("adminreg").verifySent("domain_check_claims.xml");
}
@Test

14
javatests/google/registry/tools/CheckDomainCommandTest.java
View file

@ -14,14 +14,23 @@
package google.registry.tools;
import static google.registry.testing.DatastoreHelper.persistNewRegistrar;
import static google.registry.testing.JUnitBackports.assertThrows;
import com.beust.jcommander.ParameterException;
import google.registry.model.registrar.Registrar.Type;
import org.junit.Before;
import org.junit.Test;
/** Unit tests for {@link CheckDomainCommand}. */
public class CheckDomainCommandTest extends EppToolCommandTestCase<CheckDomainCommand> {
@Before
public void before() {
persistNewRegistrar("adminreg", "Admin Registrar", Type.REAL, 693L);
command.registryAdminClientId = "adminreg";
}
@Test
public void testSuccess() throws Exception {
runCommand("--client=NewRegistrar", "example.tld");
@ -62,8 +71,9 @@ public class CheckDomainCommandTest extends EppToolCommandTestCase<CheckDomainCo
}
@Test
public void testFailure_missingClientId() {
assertThrows(ParameterException.class, () -> runCommand("example.tld"));
public void testSuccess_unspecifiedClientId_defaultsToRegistryRegistrar() throws Exception {
runCommand("example.tld");
eppVerifier.expectDryRun().expectClientId("adminreg").verifySent("domain_check_fee.xml");
}
@Test