From e485c380e04e130488ea82bcd7667ec4db5037be Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 30 Nov 2021 11:31:12 -0500
Subject: [PATCH] Change the name of the CSV file argument to avoid upstream
 naming collisions

---
 .../textsecuregcm/workers/MigrateProfilesCommand.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/MigrateProfilesCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/MigrateProfilesCommand.java
index c76f63b8e..7a644bdc6 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/MigrateProfilesCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/MigrateProfilesCommand.java
@@ -60,8 +60,8 @@ public class MigrateProfilesCommand extends EnvironmentCommand<WhisperServerConf
         .setDefault(64)
         .help("The maximum number of concurrent DynamoDB requests");
 
-    subparser.addArgument("-f", "--file")
-        .dest("file")
+    subparser.addArgument("--csv-file")
+        .dest("csvFile")
         .type(String.class)
         .required(false)
         .help("A CSV containing UUID/version pairs to migrate; if not specified, all profiles are migrated");
@@ -88,7 +88,7 @@ public class MigrateProfilesCommand extends EnvironmentCommand<WhisperServerConf
     ProfilesDynamoDb profilesDynamoDb = new ProfilesDynamoDb(dynamoDbClient, dynamoDbAsyncClient,
         configuration.getDynamoDbTables().getProfiles().getTableName());
 
-    final String csvFile = namespace.getString("file");
+    final String csvFile = namespace.getString("csvFile");
 
     if (StringUtils.isNotBlank(csvFile)) {
       migrateFromCsvFile(profiles, profilesDynamoDb, csvFile);