mirror of
https://github.com/google/nomulus.git
synced 2025-05-14 08:27:14 +02:00
Add delete_host nomulus tool command
This is needed to delete an invalid host resulting from a previous bug. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=154757425
This commit is contained in:
parent
e6249196af
commit
8bb66dd365
7 changed files with 241 additions and 0 deletions
58
java/google/registry/tools/DeleteHostCommand.java
Normal file
58
java/google/registry/tools/DeleteHostCommand.java
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package google.registry.tools;
|
||||||
|
|
||||||
|
import com.beust.jcommander.Parameter;
|
||||||
|
import com.beust.jcommander.Parameters;
|
||||||
|
import com.google.template.soy.data.SoyMapData;
|
||||||
|
import google.registry.tools.soy.DeleteHostSoyInfo;
|
||||||
|
|
||||||
|
/** A command to delete a host via EPP. */
|
||||||
|
@Parameters(separators = " =", commandDescription = "Delete host")
|
||||||
|
final class DeleteHostCommand extends MutatingEppToolCommand {
|
||||||
|
|
||||||
|
@Parameter(
|
||||||
|
names = {"-c", "--client"},
|
||||||
|
description = "Client identifier of the registrar to execute the command as",
|
||||||
|
required = true)
|
||||||
|
String clientId;
|
||||||
|
|
||||||
|
@Parameter(
|
||||||
|
names = "--host",
|
||||||
|
description = "Host name to delete.",
|
||||||
|
required = true)
|
||||||
|
private String hostName;
|
||||||
|
|
||||||
|
@Parameter(
|
||||||
|
names = {"--reason"},
|
||||||
|
description = "Reason for the change.",
|
||||||
|
required = true)
|
||||||
|
private String reason;
|
||||||
|
|
||||||
|
@Parameter(
|
||||||
|
names = {"--registrar_request"},
|
||||||
|
description = "Whether the change was requested by a registrar.",
|
||||||
|
arity = 1)
|
||||||
|
private boolean requestedByRegistrar = false;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void initMutatingEppToolCommand() {
|
||||||
|
setSoyTemplate(DeleteHostSoyInfo.getInstance(), DeleteHostSoyInfo.DELETEHOST);
|
||||||
|
addSoyRecord(clientId, new SoyMapData(
|
||||||
|
"hostName", hostName,
|
||||||
|
"reason", reason,
|
||||||
|
"requestedByRegistrar", requestedByRegistrar));
|
||||||
|
}
|
||||||
|
}
|
|
@ -50,6 +50,7 @@ public final class RegistryTool {
|
||||||
.put("delete_credit", DeleteCreditCommand.class)
|
.put("delete_credit", DeleteCreditCommand.class)
|
||||||
.put("delete_domain", DeleteDomainCommand.class)
|
.put("delete_domain", DeleteDomainCommand.class)
|
||||||
.put("delete_entity", DeleteEntityCommand.class)
|
.put("delete_entity", DeleteEntityCommand.class)
|
||||||
|
.put("delete_host", DeleteHostCommand.class)
|
||||||
.put("delete_premium_list", DeletePremiumListCommand.class)
|
.put("delete_premium_list", DeletePremiumListCommand.class)
|
||||||
.put("delete_reserved_list", DeleteReservedListCommand.class)
|
.put("delete_reserved_list", DeleteReservedListCommand.class)
|
||||||
.put("delete_tld", DeleteTldCommand.class)
|
.put("delete_tld", DeleteTldCommand.class)
|
||||||
|
|
42
java/google/registry/tools/soy/DeleteHost.soy
Normal file
42
java/google/registry/tools/soy/DeleteHost.soy
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
{namespace domain.registry.tools autoescape="strict"}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete host request
|
||||||
|
*/
|
||||||
|
{template .deletehost}
|
||||||
|
{@param hostName: string}
|
||||||
|
{@param reason: string}
|
||||||
|
{@param requestedByRegistrar: any}
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
||||||
|
<command>
|
||||||
|
<delete>
|
||||||
|
<host:delete
|
||||||
|
xmlns:host="urn:ietf:params:xml:ns:host-1.0">
|
||||||
|
<host:name>{$hostName}</host:name>
|
||||||
|
</host:delete>
|
||||||
|
</delete>
|
||||||
|
<extension>
|
||||||
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
|
<metadata:reason>Deleted by registry administrator: {$reason}</metadata:reason>
|
||||||
|
<metadata:requestedByRegistrar>{$requestedByRegistrar}</metadata:requestedByRegistrar>
|
||||||
|
</metadata:metadata>
|
||||||
|
</extension>
|
||||||
|
<clTRID>RegistryTool</clTRID>
|
||||||
|
</command>
|
||||||
|
</epp>
|
||||||
|
{/template}
|
89
javatests/google/registry/tools/DeleteHostCommandTest.java
Normal file
89
javatests/google/registry/tools/DeleteHostCommandTest.java
Normal file
|
@ -0,0 +1,89 @@
|
||||||
|
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package google.registry.tools;
|
||||||
|
|
||||||
|
import com.beust.jcommander.ParameterException;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/** Unit tests for {@link DeleteHostCommand}. */
|
||||||
|
public class DeleteHostCommandTest extends EppToolCommandTestCase<DeleteHostCommand> {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSuccess() throws Exception {
|
||||||
|
runCommand("--client=NewRegistrar", "--host=ns1.example.tld", "--force", "--reason=Test");
|
||||||
|
eppVerifier().verifySent("host_delete.xml");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSuccess_multipleWordReason() throws Exception {
|
||||||
|
runCommand(
|
||||||
|
"--client=NewRegistrar", "--host=ns1.example.tld", "--force", "--reason=\"Test test\"");
|
||||||
|
eppVerifier().verifySent("host_delete_multiple_word_reason.xml");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSuccess_requestedByRegistrarFalse() throws Exception {
|
||||||
|
runCommand(
|
||||||
|
"--client=NewRegistrar",
|
||||||
|
"--host=ns1.example.tld",
|
||||||
|
"--force",
|
||||||
|
"--reason=Test",
|
||||||
|
"--registrar_request=false");
|
||||||
|
eppVerifier().verifySent("host_delete.xml");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSuccess_requestedByRegistrarTrue() throws Exception {
|
||||||
|
runCommand(
|
||||||
|
"--client=NewRegistrar",
|
||||||
|
"--host=ns1.example.tld",
|
||||||
|
"--force",
|
||||||
|
"--reason=Test",
|
||||||
|
"--registrar_request=true");
|
||||||
|
eppVerifier().verifySent("host_delete_by_registrar.xml");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFailure_noReason() throws Exception {
|
||||||
|
thrown.expect(ParameterException.class);
|
||||||
|
runCommand("--client=NewRegistrar", "--host=ns1.example.tld", "--force");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFailure_missingClientId() throws Exception {
|
||||||
|
thrown.expect(ParameterException.class);
|
||||||
|
runCommand("--host=ns1.example.tld", "--force", "--reason=Test");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFailure_missingHostName() throws Exception {
|
||||||
|
thrown.expect(ParameterException.class);
|
||||||
|
runCommand("--client=NewRegistrar", "--force", "--reason=Test");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFailure_unknownFlag() throws Exception {
|
||||||
|
thrown.expect(ParameterException.class);
|
||||||
|
runCommand(
|
||||||
|
"--client=NewRegistrar", "--host=ns1.example.tld", "--force", "--reason=Test", "--foo");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFailure_mainParameter() throws Exception {
|
||||||
|
thrown.expect(ParameterException.class);
|
||||||
|
runCommand(
|
||||||
|
"--client=NewRegistrar", "--host=ns1.example.tld", "--force", "--reason=Test", "foo");
|
||||||
|
}
|
||||||
|
}
|
17
javatests/google/registry/tools/testdata/host_delete.xml
vendored
Normal file
17
javatests/google/registry/tools/testdata/host_delete.xml
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
||||||
|
<command>
|
||||||
|
<delete>
|
||||||
|
<host:delete
|
||||||
|
xmlns:host="urn:ietf:params:xml:ns:host-1.0">
|
||||||
|
<host:name>ns1.example.tld</host:name>
|
||||||
|
</host:delete>
|
||||||
|
</delete>
|
||||||
|
<extension>
|
||||||
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
|
<metadata:reason>Deleted by registry administrator: Test</metadata:reason>
|
||||||
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
</metadata:metadata>
|
||||||
|
</extension>
|
||||||
|
<clTRID>RegistryTool</clTRID>
|
||||||
|
</command>
|
||||||
|
</epp>
|
17
javatests/google/registry/tools/testdata/host_delete_by_registrar.xml
vendored
Normal file
17
javatests/google/registry/tools/testdata/host_delete_by_registrar.xml
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
||||||
|
<command>
|
||||||
|
<delete>
|
||||||
|
<host:delete
|
||||||
|
xmlns:host="urn:ietf:params:xml:ns:host-1.0">
|
||||||
|
<host:name>ns1.example.tld</host:name>
|
||||||
|
</host:delete>
|
||||||
|
</delete>
|
||||||
|
<extension>
|
||||||
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
|
<metadata:reason>Deleted by registry administrator: Test</metadata:reason>
|
||||||
|
<metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
|
||||||
|
</metadata:metadata>
|
||||||
|
</extension>
|
||||||
|
<clTRID>RegistryTool</clTRID>
|
||||||
|
</command>
|
||||||
|
</epp>
|
17
javatests/google/registry/tools/testdata/host_delete_multiple_word_reason.xml
vendored
Normal file
17
javatests/google/registry/tools/testdata/host_delete_multiple_word_reason.xml
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
||||||
|
<command>
|
||||||
|
<delete>
|
||||||
|
<host:delete
|
||||||
|
xmlns:host="urn:ietf:params:xml:ns:host-1.0">
|
||||||
|
<host:name>ns1.example.tld</host:name>
|
||||||
|
</host:delete>
|
||||||
|
</delete>
|
||||||
|
<extension>
|
||||||
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
|
<metadata:reason>Deleted by registry administrator: Test test</metadata:reason>
|
||||||
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
</metadata:metadata>
|
||||||
|
</extension>
|
||||||
|
<clTRID>RegistryTool</clTRID>
|
||||||
|
</command>
|
||||||
|
</epp>
|
Loading…
Add table
Add a link
Reference in a new issue