diff --git a/src/registrar/management/commands/master_domain_migrations.py b/src/registrar/management/commands/master_domain_migrations.py index ea0e827fa..22f8a004b 100644 --- a/src/registrar/management/commands/master_domain_migrations.py +++ b/src/registrar/management/commands/master_domain_migrations.py @@ -95,6 +95,19 @@ class Command(BaseCommand): ) # The following file arguments have default values for running in the sandbox + + # TODO: make this a mandatory argument (if/when we strip out defaults, it will be mandatory) + # TODO: use the migration directory arg or force user to type FULL filepath? + parser.add_argument( + "--migrationJson", + default="/app/management/commands/utility/dataFile.json", # TODO: Get rid of this once done? Or leave it as defaults?? + help=( + "A JSON file that holds the location and filenames" + "of all the data files used for migrations" + ), + ) + + # TODO: deprecate this once JSON module is done? (or keep as an override) parser.add_argument( "--migrationDirectory", default="migrationdata", @@ -103,6 +116,8 @@ class Command(BaseCommand): "load_transition_domain migration script" ), ) + + # TODO: deprecate this once JSON module is done? (or keep as an override) parser.add_argument( "--migrationFilenames", default="escrow_domain_contacts.daily.gov.GOV.txt," diff --git a/src/registrar/management/commands/utility/terminal_helper.py b/src/registrar/management/commands/utility/terminal_helper.py index 5ec9408cd..4f937e699 100644 --- a/src/registrar/management/commands/utility/terminal_helper.py +++ b/src/registrar/management/commands/utility/terminal_helper.py @@ -81,7 +81,7 @@ class TerminalHelper: The "answer" return value is True for "yes" or False for "no". """ - valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False, "e": "exit", "s": "skip"} + valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False, "e": "exit"} if default is None: prompt = " [y/n] " elif default == "yes": @@ -148,12 +148,13 @@ class TerminalHelper: """Create to reduce code complexity. Prompts the user to inspect the given string and asks if they wish to proceed. - Returns true if the user responds (y), - Returns false if the user responds (n)""" + If the user responds (y), returns TRUE + If the user responds (n), either returns FALSE + or exits the system if system_exit_on_terminate = TRUE""" action_description_for_selecting_no = "skip, E = exit" if system_exit_on_terminate: - action_description_for_selecting_no = "exit, S = skip" + action_description_for_selecting_no = "exit" # Allow the user to inspect the command string # and ask if they wish to proceed @@ -176,8 +177,6 @@ class TerminalHelper: if system_exit_on_terminate: sys.exit() return False - if proceed_execution == "skip": - return False return True @staticmethod