Skip to content

Add --forward-credentials flag to test commmands #36176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Dec 11, 2023
Merged

Add --forward-credentials flag to test commmands #36176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 68 additions & 65 deletions dev/breeze/src/airflow_breeze/commands/testing_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
option_debug_resources,
option_downgrade_sqlalchemy,
option_dry_run,
option_forward_credentials,
option_github_repository,
option_image_name,
option_image_tag_for_running,
Expand Down Expand Up @@ -448,6 +449,7 @@ def _verify_parallelism_parameters(
)
@option_python
@option_backend
@option_forward_credentials
@option_postgres_version
@option_mysql_version
@option_mssql_version
Expand Down Expand Up @@ -495,6 +497,7 @@ def command_for_tests(**kwargs):
)
@option_python
@option_backend
@option_forward_credentials
@option_postgres_version
@option_mysql_version
@option_mssql_version
Expand Down Expand Up @@ -542,27 +545,28 @@ def command_for_db_tests(**kwargs):
allow_extra_args=False,
),
)
@option_python
@option_image_tag_for_running
@option_use_airflow_version
@option_mount_sources
@option_test_timeout
@option_parallelism
@option_skip_cleanup
@option_collect_only
@option_debug_resources
@option_downgrade_sqlalchemy
@option_dry_run
@option_enable_coverage
@option_excluded_parallel_test_types
@option_forward_credentials
@option_github_repository
@option_image_tag_for_running
@option_include_success_outputs
@option_mount_sources
@option_parallel_test_types
@option_excluded_parallel_test_types
@option_upgrade_boto
@option_downgrade_sqlalchemy
@option_collect_only
@option_parallelism
@option_python
@option_remove_arm_packages
@option_skip_cleanup
@option_skip_docker_compose_down
@option_skip_provider_tests
@option_enable_coverage
@option_test_timeout
@option_upgrade_boto
@option_use_airflow_version
@option_verbose
@option_dry_run
@option_github_repository
def command_for_non_db_tests(**kwargs):
_run_test_command(
integration=(),
Expand All @@ -588,6 +592,7 @@ def _run_test_command(
enable_coverage: bool,
excluded_parallel_test_types: str,
extra_pytest_args: tuple,
forward_credentials: bool,
github_repository: str,
image_tag: str | None,
include_success_outputs: bool,
Expand Down Expand Up @@ -624,29 +629,30 @@ def _run_test_command(
if skip_provider_tests or "Providers" in excluded_test_list:
test_list = [test for test in test_list if not test.startswith("Providers")]
shell_params = ShellParams(
python=python,
backend=backend,
integration=integration,
postgres_version=postgres_version,
mysql_version=mysql_version,
mssql_version=mssql_version,
collect_only=collect_only,
downgrade_sqlalchemy=downgrade_sqlalchemy,
enable_coverage=enable_coverage,
forward_credentials=forward_credentials,
forward_ports=False,
github_repository=github_repository,
image_tag=image_tag,
use_airflow_version=use_airflow_version,
integration=integration,
mount_sources=mount_sources,
forward_ports=False,
test_type=test_type,
upgrade_boto=upgrade_boto,
downgrade_sqlalchemy=downgrade_sqlalchemy,
collect_only=collect_only,
mssql_version=mssql_version,
mysql_version=mysql_version,
parallel_test_types_list=test_list,
parallelism=parallelism,
postgres_version=postgres_version,
python=python,
remove_arm_packages=remove_arm_packages,
github_repository=github_repository,
run_db_tests_only=run_db_tests_only,
skip_db_tests=skip_db_tests,
use_xdist=use_xdist,
enable_coverage=enable_coverage,
parallelism=parallelism,
skip_provider_tests=skip_provider_tests,
parallel_test_types_list=test_list,
test_type=test_type,
upgrade_boto=upgrade_boto,
use_airflow_version=use_airflow_version,
use_xdist=use_xdist,
)
rebuild_or_pull_ci_image_if_needed(command_params=shell_params)
fix_ownership_using_docker()
Expand Down Expand Up @@ -698,60 +704,57 @@ def _run_test_command(
allow_extra_args=True,
),
)
@option_python
@option_backend
@option_postgres_version
@option_mysql_version
@option_mssql_version
@option_image_tag_for_running
@option_mount_sources
@option_integration
@option_db_reset
@option_dry_run
@option_enable_coverage
@option_forward_credentials
@option_github_repository
@click.option(
"--test-timeout",
help="Test timeout. Set the pytest setup, execution and teardown timeouts to this value",
default=60,
type=IntRange(min=0),
show_default=True,
)
@option_image_tag_for_running
@option_integration
@option_mount_sources
@option_mssql_version
@option_mysql_version
@option_postgres_version
@option_python
@option_skip_provider_tests
@option_db_reset
@option_test_timeout
@option_verbose
@option_dry_run
@click.argument("extra_pytest_args", nargs=-1, type=click.UNPROCESSED)
def integration_tests(
python: str,
backend: str,
postgres_version: str,
mysql_version: str,
mssql_version: str,
integration: tuple,
github_repository: str,
test_timeout: int,
skip_provider_tests: bool,
db_reset: bool,
enable_coverage: bool,
extra_pytest_args: tuple,
forward_credentials: bool,
github_repository: str,
image_tag: str | None,
integration: tuple,
mount_sources: str,
extra_pytest_args: tuple,
enable_coverage: bool,
mssql_version: str,
mysql_version: str,
postgres_version: str,
python: str,
skip_provider_tests: bool,
test_timeout: int,
):
docker_filesystem = get_filesystem_type("/var/lib/docker")
get_console().print(f"Docker filesystem: {docker_filesystem}")
shell_params = ShellParams(
python=python,
backend=backend,
integration=integration,
postgres_version=postgres_version,
mysql_version=mysql_version,
mssql_version=mssql_version,
enable_coverage=enable_coverage,
forward_credentials=forward_credentials,
forward_ports=False,
github_repository=github_repository,
image_tag=image_tag,
integration=integration,
mount_sources=mount_sources,
forward_ports=False,
test_type="Integration",
mssql_version=mssql_version,
mysql_version=mysql_version,
postgres_version=postgres_version,
python=python,
skip_provider_tests=skip_provider_tests,
github_repository=github_repository,
enable_coverage=enable_coverage,
test_type="Integration",
)
fix_ownership_using_docker()
cleanup_python_generated_files()
Expand Down
4 changes: 4 additions & 0 deletions dev/breeze/src/airflow_breeze/commands/testing_commands_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"--postgres-version",
"--mysql-version",
"--mssql-version",
"--forward-credentials",
],
},
{
Expand Down Expand Up @@ -104,6 +105,7 @@
"name": "Test environment",
"options": [
"--python",
"--forward-credentials",
],
},
{
Expand Down Expand Up @@ -154,6 +156,7 @@
"--postgres-version",
"--mysql-version",
"--mssql-version",
"--forward-credentials",
],
},
{
Expand Down Expand Up @@ -198,6 +201,7 @@
"--postgres-version",
"--mysql-version",
"--mssql-version",
"--forward-credentials",
],
},
{
Expand Down
Loading