diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java index 00d78390d..3bcd5736d 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java @@ -62,12 +62,6 @@ public abstract class CreateOrUpdateReservedListCommand extends MutatingCommand arity = 1) Boolean shouldPublish; - @Parameter( - names = {"--also_cloud_sql"}, - description = - "Persist reserved list to Cloud SQL in addition to Datastore; defaults to false.") - boolean alsoCloudSql; - google.registry.schema.tld.ReservedList cloudSqlReservedList; abstract void saveToCloudSql(); @@ -78,23 +72,18 @@ public abstract class CreateOrUpdateReservedListCommand extends MutatingCommand String output = super.execute(); logger.atInfo().log(output); - String cloudSqlMessage; - if (alsoCloudSql) { + String cloudSqlMessage = + String.format( + "Saved reserved list %s with %d entries", + name, cloudSqlReservedList.getLabelsToReservations().size()); + try { + logger.atInfo().log("Saving reserved list to Cloud SQL for TLD %s", name); + saveToCloudSql(); + logger.atInfo().log(cloudSqlMessage); + } catch (Throwable e) { cloudSqlMessage = - String.format( - "Saved reserved list %s with %d entries", - name, cloudSqlReservedList.getLabelsToReservations().size()); - try { - logger.atInfo().log("Saving reserved list to Cloud SQL for TLD %s", name); - saveToCloudSql(); - logger.atInfo().log(cloudSqlMessage); - } catch (Throwable e) { - cloudSqlMessage = - "Unexpected error saving reserved list to Cloud SQL from nomulus tool command"; - logger.atSevere().withCause(e).log(cloudSqlMessage); - } - } else { - cloudSqlMessage = "Persisting reserved list to Cloud SQL is not enabled"; + "Unexpected error saving reserved list to Cloud SQL from nomulus tool command"; + logger.atSevere().withCause(e).log(cloudSqlMessage); } return cloudSqlMessage; } diff --git a/core/src/main/java/google/registry/tools/CreateReservedListCommand.java b/core/src/main/java/google/registry/tools/CreateReservedListCommand.java index e02fd7f8b..267da14f1 100644 --- a/core/src/main/java/google/registry/tools/CreateReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/CreateReservedListCommand.java @@ -67,11 +67,9 @@ final class CreateReservedListCommand extends CreateOrUpdateReservedListCommand .setLastUpdateTime(now) .build(); stageEntityChange(null, reservedList); - if (alsoCloudSql) { - cloudSqlReservedList = - google.registry.schema.tld.ReservedList.create( - name, shouldPublish, parseToReservationsByLabels(allLines)); - } + cloudSqlReservedList = + google.registry.schema.tld.ReservedList.create( + name, shouldPublish, parseToReservationsByLabels(allLines)); } @Override diff --git a/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java b/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java index bf32f5d50..02da6c747 100644 --- a/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java @@ -50,11 +50,9 @@ final class UpdateReservedListCommand extends CreateOrUpdateReservedListCommand .setLastUpdateTime(new SystemClock().nowUtc()) .setShouldPublish(shouldPublish); stageEntityChange(existing.get(), updated.build()); - if (alsoCloudSql) { - cloudSqlReservedList = - google.registry.schema.tld.ReservedList.create( - name, shouldPublish, parseToReservationsByLabels(allLines)); - } + cloudSqlReservedList = + google.registry.schema.tld.ReservedList.create( + name, shouldPublish, parseToReservationsByLabels(allLines)); } @Override diff --git a/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java index acfc883f6..fc9ff7bd6 100644 --- a/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java @@ -178,8 +178,7 @@ public class CreateReservedListCommandTest extends @Test public void testSaveToCloudSql_succeeds() throws Exception { - runCommandForced( - "--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath, "--also_cloud_sql"); + runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); verifyXnq9jyb4cInDatastore(); verifyXnq9jyb4cInCloudSql(); } @@ -193,8 +192,7 @@ public class CreateReservedListCommandTest extends "xn--q9jyb4c_common-reserved", true, ImmutableMap.of("testdomain", ReservedEntry.create(FULLY_BLOCKED, "")))); - runCommandForced( - "--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath, "--also_cloud_sql"); + runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); verifyXnq9jyb4cInDatastore(); } diff --git a/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java index f62c94c00..ff58d8fd8 100644 --- a/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java @@ -116,20 +116,18 @@ public class UpdateReservedListCommandTest extends public void testSaveToCloudSql_succeeds() throws Exception { populateInitialReservedListInDatastore(true); populateInitialReservedListInCloudSql(true); - runCommandForced( - "--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath, "--also_cloud_sql"); + runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); verifyXnq9jyb4cInDatastore(); verifyXnq9jyb4cInCloudSql(); } @Test public void testSaveToCloudSql_succeedsEvenPreviousListNotExist() throws Exception { - // Note that, during the dual-write phase, we just always save the revered list to - // Cloud SQL (if --also_cloud_sql is set) without checking if there is a list with - // same name. This is to backfill the existing list in Datastore when we update it. + // Note that, during the dual-write phase, we always save the reserved list to Cloud SQL without + // checking if there is a list with same name. This is to backfill the existing list in Cloud + // Datastore when we update it. populateInitialReservedListInDatastore(true); - runCommandForced( - "--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath, "--also_cloud_sql"); + runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); verifyXnq9jyb4cInDatastore(); assertThat(ReservedListDao.checkExists("xn--q9jyb4c_common-reserved")).isTrue(); }