mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2025-12-23 06:15:42 +00:00
Code Issues Releases Wiki Activity

Update CreateCdnsTld command for RST Tests (#2891)

Browse Source 
Add a flag indicating that a Sandbox TLD should use the production
servers.

No additional TLD name pattern checks. Cloud DNS has an allowlist for
names that may use production servers.

Also updated default descriptive name generation: dropping the trailing
'.', and replacing remaining dots with '_'.
This commit is contained in:
Weimin Yu
2025-11-25 14:41:44 -05:00
committed by GitHub
parent 76d4dfbb04
commit 0dc7ab99d7
2 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/google/registry/tools/CreateCdnsTld.java
View File

@@ -21,6 +21,8 @@ import com.beust.jcommander.Parameters;
import com.google.api.services.dns.Dns;
import com.google.api.services.dns.model.ManagedZone;
import com.google.api.services.dns.model.ManagedZoneDnsSecConfig;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import google.registry.config.RegistryConfig.Config;
import jakarta.inject.Inject;
import java.io.IOException;
@@ -52,6 +54,13 @@ final class CreateCdnsTld extends ConfirmingCommand {
description = "In Sandbox, skip the dns_name format check.")
boolean skipSandboxTldCheck;
@Parameter(
names = "--use_prod_name_servers_in_sandbox",
description =
"In Sandbox, create zone on the production name servers, e.g., for ICANN tests. "
+ "Ignored in other environments.")
boolean useProdNameServersInSandbox;
@Inject
@Config("projectId")
String projectId;
@@ -77,15 +86,25 @@ final class CreateCdnsTld extends ConfirmingCommand {
}
}
String nameServerSetName;
if (RegistryToolEnvironment.get().equals(RegistryToolEnvironment.PRODUCTION)) {
nameServerSetName = "cloud-dns-registry";
} else if (RegistryToolEnvironment.get().equals(RegistryToolEnvironment.SANDBOX)
&& useProdNameServersInSandbox) {
nameServerSetName = "cloud-dns-registry";
} else {
nameServerSetName = "cloud-dns-registry-test";
}
managedZone =
new ManagedZone()
.setDescription(description)
.setNameServerSet(
RegistryToolEnvironment.get() == RegistryToolEnvironment.PRODUCTION
? "cloud-dns-registry"
: "cloud-dns-registry-test")
.setNameServerSet(nameServerSetName)
.setDnsName(dnsName)
.setName((name != null) ? name : dnsName)
.setName(
(name != null)
? name
: Joiner.on('_').join(Splitter.on('.').omitEmptyStrings().split(dnsName)))
.setDnssecConfig(new ManagedZoneDnsSecConfig().setNonExistence("nsec").setState("on"));
}

37
core/src/test/java/google/registry/tools/CreateCdnsTldTest.java
View File

@@ -71,7 +71,7 @@ class CreateCdnsTldTest extends CommandTestCase<CreateCdnsTld> {
void testNameDefault() throws Exception {
runCommand("--dns_name=tld.", "--description=test run", "--force");
ManagedZone zone = requestBody.getValue();
assertThat(zone).isEqualTo(createZone("cloud-dns-registry-test", "test run", "tld.", "tld."));
assertThat(zone).isEqualTo(createZone("cloud-dns-registry-test", "test run", "tld.", "tld"));
}
@Test
@@ -109,4 +109,39 @@ class CreateCdnsTldTest extends CommandTestCase<CreateCdnsTld> {
"--description=test run",
"--force");
}
@Test
void testSandbox_defaultNameServer() throws Exception {
runCommandInEnvironment(
RegistryToolEnvironment.SANDBOX,
"--dns_name=abc.test.",
"--description=test run",
"--force");
ManagedZone zone = requestBody.getValue();
assertThat(zone.getNameServerSet()).isEqualTo("cloud-dns-registry-test");
}
@Test
void testSandbox_useProdNameServer() throws Exception {
runCommandInEnvironment(
RegistryToolEnvironment.SANDBOX,
"--use_prod_name_servers_in_sandbox",
"--dns_name=abc.test.",
"--description=test run",
"--force");
ManagedZone zone = requestBody.getValue();
assertThat(zone.getNameServerSet()).isEqualTo("cloud-dns-registry");
}
@Test
void testProdNameServerFlag_ignoredIfNotSandbox() throws Exception {
runCommandInEnvironment(
RegistryToolEnvironment.QA,
"--use_prod_name_servers_in_sandbox",
"--dns_name=abc.test.",
"--description=test run",
"--force");
ManagedZone zone = requestBody.getValue();
assertThat(zone.getNameServerSet()).isEqualTo("cloud-dns-registry-test");
}
}