Skip to content

Fix GitDagBundle submodule clone not using SSH settings from connection#64879

Open
shunsuke-sugita wants to merge 1 commit intoapache:mainfrom
shunsuke-sugita:provider-git-fix-fetch-submodul
Open

Fix GitDagBundle submodule clone not using SSH settings from connection#64879
shunsuke-sugita wants to merge 1 commit intoapache:mainfrom
shunsuke-sugita:provider-git-fix-fetch-submodul

Conversation

@shunsuke-sugita
Copy link
Copy Markdown

What

GitDagBundle now wraps git submodule sync / submodule update with GIT_SSH_COMMAND from the Git connection (via GitPython custom_environment), using the worktree Repo (self.repo.git), not the bare mirror.

Why

configure_hook_env() populates hook.env, and bare clone passes it with clone_from(..., env=...). Submodule commands are separate Git subprocesses and did not receive GIT_SSH_COMMAND, so SSH URLs in .gitmodules could fail (host key / identity) even when the main repo clone worked.

Example failure (before this fix)

Submodule update could fail with errors such as:

2026-04-08T03:39:43.516370889Z Cloning into '{submodul_path}'...
2026-04-08T03:39:43.516372014Z Host key verification failed.
2026-04-08T03:39:43.516373389Z fatal: Could not read from remote repository.
2026-04-08T03:39:43.516374555Z
2026-04-08T03:39:43.516375430Z Please make sure you have the correct access rights
2026-04-08T03:39:43.516376389Z and the repository exists.
2026-04-08T03:39:43.516377430Z fatal: clone of '{submodule}' into submodule path 
'/tmp/airflow/dag_bundles/{submodule_path}s' failed
2026-04-08T03:39:43.516378680Z Failed to clone '{submodule}' a second time, aborting'
2026-04-08T03:39:43.518691472Z RuntimeError: Error pulling submodule from repository

Notes

  • Aligns with the existing pattern in _fetch_bare_repo for origin.fetch on the bare repo.
  • Unit tests still assert that submodule sync/update are invoked when submodules=True; no behavior change to other bundle modes.

Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst, in airflow-core/newsfragments. You can add this file in a follow-up commit after the PR is created so you know the PR number.

@boring-cyborg
Copy link
Copy Markdown

boring-cyborg bot commented Apr 8, 2026

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contributors' Guide (https://github.com/apache/airflow/blob/main/contributing-docs/README.rst)
Here are some useful points:

  • Pay attention to the quality of your code (ruff, mypy and type annotations). Our prek-hooks will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it's a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
  • Always keep your Pull Requests rebased, otherwise your build might fail due to changes not related to your commits.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant