Always attempt to save the claims list to Cloud SQL (#472)

* Always attempt to save the claims list to Cloud SQL
This commit is contained in:
Ben McIlwain 2020-02-06 12:21:34 -05:00 committed by GitHub
parent a5d08ae057
commit 44ac2d14cf

View file

@ -37,11 +37,6 @@ final class UploadClaimsListCommand extends ConfirmingCommand implements Command
@Parameter(description = "Claims list filename") @Parameter(description = "Claims list filename")
private List<String> mainParameters = new ArrayList<>(); private List<String> mainParameters = new ArrayList<>();
@Parameter(
names = {"--also_cloud_sql"},
description = "Persist claims list to Cloud SQL in addition to Datastore; defaults to false.")
boolean alsoCloudSql;
private String claimsListFilename; private String claimsListFilename;
private ClaimsList claimsList; private ClaimsList claimsList;
@ -64,9 +59,7 @@ final class UploadClaimsListCommand extends ConfirmingCommand implements Command
@Override @Override
public String execute() { public String execute() {
ClaimsListShard.create(claimsList.getTmdbGenerationTime(), claimsList.getLabelsToKeys()).save(); ClaimsListShard.create(claimsList.getTmdbGenerationTime(), claimsList.getLabelsToKeys()).save();
if (alsoCloudSql) { ClaimsListDao.trySave(claimsList);
ClaimsListDao.trySave(claimsList);
}
return String.format("Successfully uploaded claims list %s", claimsListFilename); return String.format("Successfully uploaded claims list %s", claimsListFilename);
} }
} }