Merge branch 'apache:main' into main

.asf.yaml

@@ -118,16 +118,27 @@ github:
         required_approving_review_count: 1
       required_linear_history: true
       required_conversation_resolution: true
+    providers-fab/v1-5:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+      required_linear_history: true
+      required_conversation_resolution: true
   collaborators:
     # Max 10 collaborators allowed
     # https://github.com/apache/infrastructure-asfyaml/blob/main/README.md#assigning-the-github-triage-role-to-external-collaborators
     - aritra24
-    - dirrao
-    - mhenc
+    - omkar-foss
+    - rawwar
     - nathadfield
     - sunank200
     - vatsrahul1001
     - cmarteepants
+    - bugraoz93
+    - briana-okyere
 
 notifications:
   jobs: [email protected]
+  commits: [email protected]
+  issues: [email protected]
+  pullrequests: [email protected]
+  discussions: [email protected]

.cherry_picker.toml

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+team = "apache"
+repo = "airflow"
+"check_sha"= "a85d94e6cdcd09efe93c3acee0b4ce5c9508bc23"
+fix_commit_msg = false
+default_branch = "main"
+require_version_in_branch_name=false
+draft_pr = true

.devcontainer/mysql/devcontainer.json

@@ -22,5 +22,10 @@
         "rogalmic.bash-debug"
     ],
     "service": "airflow",
-    "forwardPorts": [8080,5555,5432,6379]
+    "forwardPorts": [8080,5555,5432,6379],
+    "workspaceFolder": "/opt/airflow",
+    // for users who use non-standard git config patterns
+    // https://github.com/microsoft/vscode-remote-release/issues/2084#issuecomment-989756268
+    "initializeCommand": "cd \"${localWorkspaceFolder}\" && git config --local user.email \"$(git config user.email)\" && git config --local user.name \"$(git config user.name)\"",
+    "overrideCommand": true
 }

.devcontainer/postgres/devcontainer.json

@@ -22,5 +22,10 @@
         "rogalmic.bash-debug"
     ],
     "service": "airflow",
-    "forwardPorts": [8080,5555,5432,6379]
+    "forwardPorts": [8080,5555,5432,6379],
+    "workspaceFolder": "/opt/airflow",
+    // for users who use non-standard git config patterns
+    // https://github.com/microsoft/vscode-remote-release/issues/2084#issuecomment-989756268
+    "initializeCommand": "cd \"${localWorkspaceFolder}\" && git config --local user.email \"$(git config user.email)\" && git config --local user.name \"$(git config user.name)\"",
+    "overrideCommand": true
 }

.dockerignore

@@ -34,12 +34,15 @@
 !chart
 !docs
 !licenses
+!providers/
+!task_sdk/
 
 # Add those folders to the context so that they are available in the CI container
 !scripts
 
 # Add tests and kubernetes_tests to context.
 !tests
+!tests_common
 !kubernetes_tests
 !helm_tests
 !docker_tests
@@ -122,6 +125,9 @@ docs/_build/
 docs/_api/
 docs/_doctrees/
 
+# Exclude new providers docs generated files
+providers/**/docs/_api/
+
 # files generated by memray
 *.py.*.html
 *.py.*.bin

.github/CODEOWNERS

@@ -1,41 +1,42 @@
 # Core
-/airflow/executors/ @kaxil @XD-DENG @ashb @o-nikolas @pierrejeambrun @hussein-awala
-/airflow/jobs/ @kaxil @ashb @XD-DENG
-/airflow/models/ @kaxil @XD-DENG @ashb
+/airflow/executors/ @XD-DENG @ashb @o-nikolas @pierrejeambrun @hussein-awala
+/airflow/jobs/ @ashb @XD-DENG
+/airflow/models/ @XD-DENG @ashb
 
 # DAG Serialization
-/airflow/serialization/ @kaxil @ashb @bolkedebruin
+/airflow/serialization/ @ashb @bolkedebruin
 
 # DAG Parsing
 /airflow/dag_processing @jedcunningham @ephraimbuddy
 
 # Kubernetes
 /airflow/kubernetes/ @dstandish @jedcunningham
-/airflow/providers/cncf/kubernetes/executors/ @dstandish @jedcunningham
+/providers/src/airflow/providers/cncf/kubernetes/executors/ @dstandish @jedcunningham
 
 # Helm Chart
 /chart/ @dstandish @jedcunningham @hussein-awala
 
 # Docs (without Providers)
-/docs/*.py @kaxil @potiuk
+/docs/*.py @potiuk
 /docs/apache-airflow @potiuk
 /docs/docker-stack @potiuk
 /docs/helm-chart @dstandish @jedcunningham
 
 # API
 /airflow/api/ @ephraimbuddy @pierrejeambrun
 /airflow/api_connexion/ @ephraimbuddy @pierrejeambrun
+/airflow/api_fastapi/ @ephraimbuddy @pierrejeambrun
 
 # WWW
-/airflow/www/ @ryanahamilton @ashb @bbovenzi @pierrejeambrun
+/airflow/www/ @ryanahamilton @ashb @bbovenzi @pierrejeambrun @jscheffl
 
 # UI
-/airflow/ui/ @bbovenzi @pierrejeambrun
+/airflow/ui/ @bbovenzi @pierrejeambrun @ryanahamilton @jscheffl
 
 # Security/Permissions
-/airflow/api_connexion/security.py @jhtimmins
-/airflow/security/permissions.py @jhtimmins
-/airflow/www/security.py @jhtimmins
+/airflow/api_connexion/security.py @vincbeck
+/airflow/security/permissions.py @vincbeck
+/airflow/www/security.py @vincbeck
 
 # Calendar/Timetables
 /airflow/timetables/ @uranusjr
@@ -57,33 +58,35 @@
 /docs/apache-airflow/concepts/deferring.rst @dstandish @hussein-awala
 
 # Secrets Backends
-/airflow/secrets  @dstandish @kaxil @potiuk @ashb
+/airflow/secrets  @dstandish @potiuk @ashb
 
 # Providers
-/airflow/providers/amazon/ @eladkal @o-nikolas
-/airflow/providers/celery/ @hussein-awala
-/airflow/providers/cncf/kubernetes @jedcunningham @hussein-awala
-/airflow/providers/common/sql/ @eladkal
-/airflow/providers/dbt/cloud/ @josh-fell
-/airflow/providers/hashicorp/ @hussein-awala
-/airflow/providers/openlineage/ @mobuchowski
-/airflow/providers/slack/ @eladkal
-/airflow/providers/smtp/ @hussein-awala
-/airflow/providers/snowflake/ @potiuk @mik-laj
-/airflow/providers/tabular/ @Fokko
+/providers/src/airflow/providers/amazon/ @eladkal @o-nikolas
+/providers/src/airflow/providers/celery/ @hussein-awala
+/providers/src/airflow/providers/cncf/kubernetes @jedcunningham @hussein-awala
+/providers/src/airflow/providers/common/sql/ @eladkal
+/providers/src/airflow/providers/dbt/cloud/ @josh-fell
+/providers/src/airflow/providers/edge @jscheffl
+/providers/src/airflow/providers/hashicorp/ @hussein-awala
+/providers/src/airflow/providers/openlineage/ @mobuchowski
+/providers/src/airflow/providers/slack/ @eladkal
+/providers/src/airflow/providers/smtp/ @hussein-awala
+/providers/src/airflow/providers/snowflake/ @potiuk @mik-laj
+/providers/src/airflow/providers/apache/iceberg/ @Fokko
+/providers/tests/apache/iceberg/ @Fokko
 /docs/apache-airflow-providers-amazon/ @eladkal @o-nikolas
 /docs/apache-airflow-providers-cncf-kubernetes @jedcunningham
 /docs/apache-airflow-providers-common-sql/ @eladkal
 /docs/apache-airflow-providers-openlineage/ @mobuchowski
 /docs/apache-airflow-providers-slack/ @eladkal
-/tests/providers/amazon/ @eladkal @o-nikolas
-/tests/providers/common/sql/ @eladkal
-/tests/providers/openlineage/ @mobuchowski
-/tests/providers/slack/ @eladkal
+/providers/tests/amazon/ @eladkal @o-nikolas
+/providers/tests/common/sql/ @eladkal
+/providers/tests/openlineage/ @mobuchowski
+/providers/tests/slack/ @eladkal
 /tests/system/providers/amazon/ @eladkal @o-nikolas
 
 # Dev tools
-/.github/workflows/ @potiuk @ashb @kaxil
+/.github/workflows/ @potiuk @ashb
 /dev/ @potiuk @ashb @jedcunningham
 /docker_tests/ @potiuk @ashb
 /provider_packages/ @potiuk @ashb
@@ -93,7 +96,7 @@ Dockerfile.ci @potiuk @ashb
 
 # Releasing Guides & Project Guidelines
 /dev/PROJECT_GUIDELINES.md  @kaxil
-/dev/PROVIDER_PACKAGE_DETAILS.md  @kaxil
+/dev/PROVIDER_PACKAGE_DETAILS.md  @eladkal
 /dev/README.md  @kaxil
 /dev/README_RELEASE_*.md  @kaxil @pierrejeambrun
 /dev/README_RELEASE_PROVIDER_PACKAGES.md  @eladkal
@@ -106,6 +109,10 @@ ISSUE_TRIAGE_PROCESS.rst @eladkal
 
 # AIP-58 - Object Storage
 /airflow/io/ @bolkedebruin
-/airflow/providers/**/fs/ @bolkedebruin
-/airflow/providers/common/io/ @bolkedebruin
+/providers/src/airflow/providers/**/fs/ @bolkedebruin
+/providers/src/airflow/providers/common/io/ @bolkedebruin
 /docs/apache-airflow/core-concepts/objectstorage.rst @bolkedebruin
+
+# Migrations
+/airflow/migrations/ @ephraimbuddy
+/providers/src/airflow/providers/fab/migrations/ @ephraimbuddy

.github/ISSUE_TEMPLATE/airflow_bug_report.yml

@@ -25,8 +25,7 @@ body:
         the latest release or main to see if the issue is fixed before reporting it.
       multiple: false
       options:
-        - "2.10.0"
-        - "2.9.3"
+        - "2.10.4"
         - "main (development)"
         - "Other Airflow 2 version (please specify below)"
     validations:

.github/ISSUE_TEMPLATE/airflow_providers_bug_report.yml

@@ -58,6 +58,7 @@ body:
         - dingding
         - discord
         - docker
+        - edge
         - elasticsearch
         - exasol
         - fab
@@ -105,6 +106,7 @@ body:
         - snowflake
         - sqlite
         - ssh
+        - standard
         - tableau
         - telegram
         - teradata

.github/SECURITY.md

@@ -99,10 +99,11 @@ do not apply to Airflow, or have a different severity than some generic scoring
 
 The Airflow Security Team will get back to you after assessing the report. You will usually get
 confirmation that the issue is being worked (or that we quickly assessed it as invalid) within several
-business days. Note that this is an Open-Source projects and members of the security team are volunteers
-so please make sure to be patient. If you do not get a response within a week or so, please send a
-kind reminder to the security team. We will usually let you know the CVE number that will be assigned
-to the issue and the severity of the issue as well as release the issue is scheduled to be fixed
+business days. Note that this is an Open-Source projects and members of the security team are volunteers,
+so please make sure to be patient. If you do not get a response within a week, please send a kind reminder
+to the security team about a lack of response; however, reminders should only be for the initial response
+and not for updates on the assessment or remediation. We will usually let you know the CVE number that will
+be assigned to the issue and the severity of the issue as well as release the issue is scheduled to be fixed
 after we assess the issue (which might take longer or shorter time depending on the issue complexity and
 potential impact, severity, whether we want to address a whole class issues in a single fix and a number
 of other factors). You should subscribe  and monitor the `[email protected]` mailing

.github/actions/breeze/action.yml

@@ -21,10 +21,10 @@ description: 'Sets up Python and Breeze'
 inputs:
   python-version:
     description: 'Python version to use'
-    # Version of Python used for reproducibility of the packages built
-    # Python 3.8 tarfile produces different tarballs than Python 3.9+ tarfile that's why we are forcing
-    # Python 3.9 for all release preparation commands to make sure that the tarballs are reproducible
     default: "3.9"
+  use-uv:
+    description: 'Whether to use uv tool'
+    required: true
 outputs:
   host-python-version:
     description: Python version used in host
@@ -36,13 +36,11 @@ runs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
-        cache: 'pip'
-        cache-dependency-path: ./dev/breeze/pyproject.toml
+    # NOTE! Installing Breeze without using cache is FASTER than when using cache - uv is so fast and has
+    # so low overhead, that just running upload cache/restore cache is slower than installing it from scratch
     - name: "Install Breeze"
       shell: bash
       run: ./scripts/ci/install_breeze.sh
-      env:
-        PYTHON_VERSION: ${{ inputs.python-version }}
     - name: "Free space"
       shell: bash
       run: breeze ci free-space