diff --git a/airflow-core/src/airflow/cli/cli_config.py b/airflow-core/src/airflow/cli/cli_config.py index 0a89a7b1668d7..01eb9e262a107 100644 --- a/airflow-core/src/airflow/cli/cli_config.py +++ b/airflow-core/src/airflow/cli/cli_config.py @@ -598,7 +598,7 @@ def string_lower_type(val): # database ARG_MIGRATION_TIMEOUT = Arg( ("-t", "--migration-wait-timeout"), - help="timeout to wait for db to migrate ", + help="timeout to wait for db to migrate", type=int, default=60, ) @@ -1461,8 +1461,8 @@ class GroupCommand(NamedTuple): DB_COMMANDS = ( ActionCommand( name="check-migrations", - help="Check if migration have finished", - description="Check if migration have finished (or continually check until timeout)", + help="Check if migrations have finished", + description="Check if migrations have finished (or continually check until timeout)", func=lazy_load_command("airflow.cli.commands.db_command.check_migrations"), args=(ARG_MIGRATION_TIMEOUT, ARG_VERBOSE), ), diff --git a/airflow-core/src/airflow/cli/commands/db_command.py b/airflow-core/src/airflow/cli/commands/db_command.py index 638dc1c74d6c6..f5c1a061a1a9f 100644 --- a/airflow-core/src/airflow/cli/commands/db_command.py +++ b/airflow-core/src/airflow/cli/commands/db_command.py @@ -137,7 +137,7 @@ def run_db_migrate_command(args, command, revision_heads_map: dict[str, str]): show_sql_only=args.show_sql_only, ) if not args.show_sql_only: - print("Database migrating done!") + print("Database migration done!") def run_db_downgrade_command(args, command, revision_heads_map: dict[str, str]): diff --git a/airflow-core/tests/unit/cli/commands/test_db_command.py b/airflow-core/tests/unit/cli/commands/test_db_command.py index 013f1bbb1c8d0..01edaa4c522b2 100644 --- a/airflow-core/tests/unit/cli/commands/test_db_command.py +++ b/airflow-core/tests/unit/cli/commands/test_db_command.py @@ -65,7 +65,7 @@ def fake_command(**kwargs): db_command.run_db_migrate_command(Args(), fake_command, heads) out = capsys.readouterr().out assert "Performing upgrade" in out - assert "Database migrating done!" in out + assert "Database migration done!" in out assert called == {"to_revision": None, "from_revision": None, "show_sql_only": False} def test_run_db_migrate_command_offline_generation(self, capsys): diff --git a/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py index 38d2617f78f37..09a05fdfa49de 100644 --- a/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py +++ b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py @@ -46,5 +46,5 @@ def migratedb(args): def downgrade(args): """Downgrades the metadata database.""" session = settings.Session() - dwongrade_command = FABDBManager(session).downgrade - run_db_downgrade_command(args, dwongrade_command, revision_heads_map=_REVISION_HEADS_MAP) + downgrade_command = FABDBManager(session).downgrade + run_db_downgrade_command(args, downgrade_command, revision_heads_map=_REVISION_HEADS_MAP) diff --git a/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py index e7f778f9c00f1..4ae060e144ffd 100644 --- a/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py +++ b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py @@ -73,7 +73,7 @@ def users_create(args): raise SystemExit(f"{args.role} is not a valid role. Valid roles are: {valid_roles}") password = _create_password(args) if appbuilder.sm.find_user(args.username): - print(f"{args.username} already exist in the db") + print(f"{args.username} already exists in the db") return user = appbuilder.sm.add_user( args.username, args.firstname, args.lastname, args.email, role, password @@ -101,7 +101,7 @@ def _find_user(args): @cli_utils.action_cli @providers_configuration_loaded def user_reset_password(args): - """Reset user password user from DB.""" + """Reset user password from DB.""" user = _find_user(args) password = _create_password(args) with get_application_builder() as appbuilder: @@ -143,7 +143,7 @@ def users_delete(args): @cli_utils.action_cli @providers_configuration_loaded def users_manage_role(args, remove=False): - """Delete or appends user roles.""" + """Delete or append user roles.""" with get_application_builder() as appbuilder: user = _find_user(args) role = appbuilder.sm.find_role(args.role) diff --git a/providers/fab/src/airflow/providers/fab/cli/definition.py b/providers/fab/src/airflow/providers/fab/cli/definition.py index 2ac4fa8e0d665..72cb109177f50 100644 --- a/providers/fab/src/airflow/providers/fab/cli/definition.py +++ b/providers/fab/src/airflow/providers/fab/cli/definition.py @@ -147,7 +147,7 @@ ), epilog=( "examples:\n" - 'To create an user with "Admin" role and username equals to "admin", run:\n' + 'To create a user with "Admin" role and username equals to "admin", run:\n' "\n" " $ airflow users create \\\n" " --username admin \\\n" @@ -172,7 +172,7 @@ ), epilog=( "examples:\n" - 'To reset an user with username equals to "admin", run:\n' + 'To reset a user with username equals to "admin", run:\n' "\n" " $ airflow users reset-password \\\n" " --username admin"