mirror of
https://github.com/google/nomulus.git
synced 2025-07-24 19:48:32 +02:00
Create a nomulus "curl" command
Create a command to send arbitrary, authenticated HTTP requests to the backend and remove the existing commands that are basically just wrappers around this. Tested: In addition to the unit tests, verified both get and post requests against alpha. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=207756509
This commit is contained in:
mmuller
jianglai
parent
6810e959f9
commit
e3977024f3
9 changed files with 223 additions and 284 deletions
100
javatests/google/registry/tools/CurlCommandTest.java
Normal file
100
javatests/google/registry/tools/CurlCommandTest.java
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
// 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 static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.JUnitBackports.assertThrows;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.net.MediaType;
|
||||
import google.registry.tools.ServerSideCommand.Connection;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
|
||||
/** Unit tests for {@link RefreshDnsForAllDomainsCommand}. */
|
||||
public class CurlCommandTest extends CommandTestCase<CurlCommand> {
|
||||
@Mock private Connection connection;
|
||||
|
||||
@Before
|
||||
public void init() {
|
||||
command.setConnection(connection);
|
||||
}
|
||||
|
||||
@Captor ArgumentCaptor<ImmutableMap<String, String>> urlParamCaptor;
|
||||
|
||||
@Test
|
||||
public void testGetInvocation() throws Exception {
|
||||
runCommand("--path=/foo/bar?a=1&b=2");
|
||||
verify(connection)
|
||||
.sendGetRequest(eq("/foo/bar?a=1&b=2"), eq(ImmutableMap.<String, String>of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExplicitGetInvocation() throws Exception {
|
||||
runCommand("--path=/foo/bar?a=1&b=2", "--request=GET");
|
||||
verify(connection)
|
||||
.sendGetRequest(eq("/foo/bar?a=1&b=2"), eq(ImmutableMap.<String, String>of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPostInvocation() throws Exception {
|
||||
runCommand("--path=/foo/bar?a=1&b=2", "--data=some data");
|
||||
verify(connection)
|
||||
.send(
|
||||
eq("/foo/bar?a=1&b=2"),
|
||||
eq(ImmutableMap.<String, String>of()),
|
||||
eq(MediaType.PLAIN_TEXT_UTF_8),
|
||||
eq("some data".getBytes(UTF_8)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMultiDataPost() throws Exception {
|
||||
runCommand("--path=/foo/bar?a=1&b=2", "--data=first=100", "-d", "second=200");
|
||||
verify(connection)
|
||||
.send(
|
||||
eq("/foo/bar?a=1&b=2"),
|
||||
eq(ImmutableMap.<String, String>of()),
|
||||
eq(MediaType.PLAIN_TEXT_UTF_8),
|
||||
eq("first=100&second=200".getBytes(UTF_8)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExplicitPostInvocation() throws Exception {
|
||||
runCommand("--path=/foo/bar?a=1&b=2", "--request=POST");
|
||||
verify(connection)
|
||||
.send(
|
||||
eq("/foo/bar?a=1&b=2"),
|
||||
eq(ImmutableMap.<String, String>of()),
|
||||
eq(MediaType.PLAIN_TEXT_UTF_8),
|
||||
eq("".getBytes(UTF_8)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetWithBody() throws Exception {
|
||||
IllegalArgumentException thrown =
|
||||
assertThrows(
|
||||
IllegalArgumentException.class,
|
||||
() ->
|
||||
runCommand(
|
||||
"--path=/foo/bar?a=1&b=2", "--request=GET", "--data=inappropriate data"));
|
||||
assertThat(thrown).hasMessageThat().contains("You may not specify a body for a get method.");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
// 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 static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyMap;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.net.MediaType;
|
||||
import google.registry.tools.ServerSideCommand.Connection;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.Mock;
|
||||
|
||||
/** Unit tests for {@link DeleteEntityCommand}. */
|
||||
public class DeleteEntityCommandTest extends CommandTestCase<DeleteEntityCommand> {
|
||||
|
||||
@Mock
|
||||
private Connection connection;
|
||||
|
||||
@Before
|
||||
public void init() {
|
||||
command.setConnection(connection);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Test
|
||||
public void test_deleteTwoEntities() throws Exception {
|
||||
String firstKey = "alphaNumericKey1";
|
||||
String secondKey = "alphaNumericKey2";
|
||||
String rawKeys = String.format("%s,%s", firstKey, secondKey);
|
||||
when(connection.send(anyString(), anyMap(), any(MediaType.class), any(byte[].class)))
|
||||
.thenReturn("Deleted 1 raw entities and 1 registered entities.");
|
||||
runCommandForced(firstKey, secondKey);
|
||||
verify(connection).send(
|
||||
eq("/_dr/admin/deleteEntity"),
|
||||
eq(ImmutableMap.of("rawKeys", rawKeys)),
|
||||
eq(MediaType.PLAIN_TEXT_UTF_8),
|
||||
eq(new byte[0]));
|
||||
assertInStdout("Deleted 1 raw entities and 1 registered entities.");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
// 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 static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.net.MediaType;
|
||||
import google.registry.backup.RestoreCommitLogsAction;
|
||||
import google.registry.tools.ServerSideCommand.Connection;
|
||||
import org.joda.time.DateTime;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
|
||||
/** Unit tests for {@link CreateRegistrarCommand}. */
|
||||
public class RestoreCommitLogsCommandTest extends CommandTestCase<RestoreCommitLogsCommand> {
|
||||
@Mock private Connection connection;
|
||||
|
||||
@Before
|
||||
public void init() {
|
||||
command.setConnection(connection);
|
||||
}
|
||||
|
||||
@Captor ArgumentCaptor<ImmutableMap<String, String>> urlParamCaptor;
|
||||
|
||||
@Test
|
||||
public void testNormalForm() throws Exception {
|
||||
runCommand("--from_time=2017-05-19T20:30:00Z");
|
||||
verifySend(
|
||||
ImmutableMap.of("dryRun", false, "fromTime", DateTime.parse("2017-05-19T20:30:00.000Z")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testToTime() throws Exception {
|
||||
runCommand("--from_time=2017-05-19T20:30:00Z", "--to_time=2017-05-19T20:40:00Z");
|
||||
verifySend(
|
||||
ImmutableMap.of(
|
||||
"dryRun", false,
|
||||
"fromTime", DateTime.parse("2017-05-19T20:30:00.000Z"),
|
||||
"toTime", DateTime.parse("2017-05-19T20:40:00.000Z")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDryRun() throws Exception {
|
||||
runCommand("--dry_run", "--from_time=2017-05-19T20:30:00Z", "--to_time=2017-05-19T20:40:00Z");
|
||||
verifySend(
|
||||
ImmutableMap.of(
|
||||
"dryRun", true,
|
||||
"fromTime", DateTime.parse("2017-05-19T20:30:00.000Z"),
|
||||
"toTime", DateTime.parse("2017-05-19T20:40:00.000Z")));
|
||||
}
|
||||
|
||||
// Note that this is very similar to the one in CreateOrUpdatePremiumListCommandTestCase.java but
|
||||
// not identical.
|
||||
void verifySend(ImmutableMap<String, ?> parameters) throws Exception {
|
||||
verify(connection)
|
||||
.send(
|
||||
eq(RestoreCommitLogsAction.PATH),
|
||||
urlParamCaptor.capture(),
|
||||
eq(MediaType.PLAIN_TEXT_UTF_8),
|
||||
eq(new byte[0]));
|
||||
assertThat(urlParamCaptor.getValue()).containsExactlyEntriesIn(parameters);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue