From 1796c40c82b621dba68b33bb1a43db8185e3a858 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Sun, 22 Dec 2024 18:27:39 +0100 Subject: [PATCH] Sort "opts" element in click option dictionary before hashing (#45156) Some impleemntation details of click 8.1.8 caused instability in configuration directories that are produced by click config - the instability is in sequence of generated "opts" list - the sequence of options in it is random. While it can be likely fixed in later versions, better is to protect from it and sort the opts list before hashing the dict. --- dev/breeze/doc/images/output_build-docs.txt | 2 +- .../doc/images/output_ci-image_build.txt | 2 +- .../doc/images/output_ci-image_pull.txt | 2 +- .../doc/images/output_ci-image_verify.txt | 2 +- .../doc/images/output_ci_fix-ownership.txt | 2 +- .../doc/images/output_ci_free-space.txt | 2 +- .../doc/images/output_ci_resource-check.txt | 2 +- .../doc/images/output_ci_selective-check.txt | 2 +- dev/breeze/doc/images/output_cleanup.txt | 2 +- .../doc/images/output_compile-ui-assets.txt | 2 +- .../doc/images/output_compile-www-assets.txt | 2 +- dev/breeze/doc/images/output_down.txt | 2 +- dev/breeze/doc/images/output_exec.txt | 2 +- .../images/output_generate-migration-file.txt | 2 +- .../doc/images/output_k8s_build-k8s-image.txt | 2 +- .../images/output_k8s_configure-cluster.txt | 2 +- .../doc/images/output_k8s_create-cluster.txt | 2 +- .../doc/images/output_k8s_delete-cluster.txt | 2 +- .../doc/images/output_k8s_deploy-airflow.txt | 2 +- dev/breeze/doc/images/output_k8s_k9s.txt | 2 +- dev/breeze/doc/images/output_k8s_logs.txt | 2 +- .../images/output_k8s_run-complete-tests.txt | 2 +- .../doc/images/output_k8s_setup-env.txt | 2 +- dev/breeze/doc/images/output_k8s_shell.txt | 2 +- dev/breeze/doc/images/output_k8s_status.txt | 2 +- dev/breeze/doc/images/output_k8s_tests.txt | 2 +- .../images/output_k8s_upload-k8s-image.txt | 2 +- .../doc/images/output_prod-image_build.txt | 2 +- .../doc/images/output_prod-image_pull.txt | 2 +- .../doc/images/output_prod-image_verify.txt | 2 +- ...release-management_add-back-references.txt | 2 +- ...anagement_clean-old-provider-artifacts.txt | 2 +- ...release-management_create-minor-branch.txt | 2 +- ...elease-management_generate-constraints.txt | 2 +- ...management_generate-issue-content-core.txt | 2 +- ...ment_generate-issue-content-helm-chart.txt | 2 +- ...e-management_install-provider-packages.svg | 90 ++++---- ...e-management_install-provider-packages.txt | 2 +- ...ase-management_prepare-airflow-package.txt | 2 +- ...-management_prepare-helm-chart-package.txt | 2 +- ...-management_prepare-helm-chart-tarball.txt | 2 +- ...agement_prepare-provider-documentation.txt | 2 +- ...e-management_prepare-provider-packages.txt | 2 +- ...lease-management_prepare-python-client.txt | 2 +- ...se-management_prepare-task-sdk-package.txt | 2 +- ...output_release-management_publish-docs.txt | 2 +- ...release-management_release-prod-images.txt | 2 +- ...ut_release-management_start-rc-process.txt | 2 +- ...utput_release-management_start-release.txt | 2 +- ...utput_release-management_tag-providers.txt | 2 +- ..._release-management_update-constraints.txt | 2 +- ...se-management_verify-provider-packages.svg | 88 ++++---- ...se-management_verify-provider-packages.txt | 2 +- .../output_sbom_build-all-airflow-images.txt | 2 +- ...put_sbom_export-dependency-information.txt | 2 +- ...t_sbom_generate-providers-requirements.txt | 2 +- .../output_sbom_update-sbom-information.txt | 2 +- dev/breeze/doc/images/output_setup.txt | 2 +- .../doc/images/output_setup_autocomplete.txt | 2 +- ...utput_setup_check-all-params-in-groups.txt | 2 +- dev/breeze/doc/images/output_setup_config.txt | 2 +- ...output_setup_regenerate-command-images.txt | 2 +- .../doc/images/output_setup_self-upgrade.txt | 2 +- .../output_setup_synchronize-local-mounts.txt | 2 +- .../doc/images/output_setup_version.txt | 2 +- dev/breeze/doc/images/output_shell.svg | 142 ++++++------- dev/breeze/doc/images/output_shell.txt | 2 +- .../doc/images/output_start-airflow.svg | 80 ++++---- .../doc/images/output_start-airflow.txt | 2 +- .../doc/images/output_static-checks.txt | 2 +- .../output_testing_core-integration-tests.txt | 2 +- .../doc/images/output_testing_core-tests.svg | 194 +++++++++--------- .../doc/images/output_testing_core-tests.txt | 2 +- .../output_testing_docker-compose-tests.txt | 2 +- .../doc/images/output_testing_helm-tests.txt | 2 +- ...ut_testing_providers-integration-tests.txt | 2 +- .../images/output_testing_providers-tests.txt | 2 +- ...output_testing_python-api-client-tests.txt | 2 +- .../images/output_testing_system-tests.txt | 2 +- .../images/output_testing_task-sdk-tests.txt | 2 +- .../airflow_breeze/commands/setup_commands.py | 30 ++- 81 files changed, 410 insertions(+), 364 deletions(-) diff --git a/dev/breeze/doc/images/output_build-docs.txt b/dev/breeze/doc/images/output_build-docs.txt index 644e9bf767696..2fab67274b0f2 100644 --- a/dev/breeze/doc/images/output_build-docs.txt +++ b/dev/breeze/doc/images/output_build-docs.txt @@ -1 +1 @@ -b349182dab04b6ff58acd122a403a5a4 +16278718c7278a46f343ae5a64a9ae21 diff --git a/dev/breeze/doc/images/output_ci-image_build.txt b/dev/breeze/doc/images/output_ci-image_build.txt index a53f9ce997325..1e8db97e1c14d 100644 --- a/dev/breeze/doc/images/output_ci-image_build.txt +++ b/dev/breeze/doc/images/output_ci-image_build.txt @@ -1 +1 @@ -b03ca6dcb44ef05f9c27f72318ff9500 +60e01048b3af164825f8ec4070543e89 diff --git a/dev/breeze/doc/images/output_ci-image_pull.txt b/dev/breeze/doc/images/output_ci-image_pull.txt index aac2c46f1ad44..1e72758575b7a 100644 --- a/dev/breeze/doc/images/output_ci-image_pull.txt +++ b/dev/breeze/doc/images/output_ci-image_pull.txt @@ -1 +1 @@ -eadf5c7b6661cf557c2ab5b38e462481 +a2b4311906864d2e22049bf37c1b6b64 diff --git a/dev/breeze/doc/images/output_ci-image_verify.txt b/dev/breeze/doc/images/output_ci-image_verify.txt index 3d2f72ffa6857..329f90d21149b 100644 --- a/dev/breeze/doc/images/output_ci-image_verify.txt +++ b/dev/breeze/doc/images/output_ci-image_verify.txt @@ -1 +1 @@ -324f4d4949eef209e991d890ddf2ff4f +d4747f6b4f6d78a8eeced35475ed91f0 diff --git a/dev/breeze/doc/images/output_ci_fix-ownership.txt b/dev/breeze/doc/images/output_ci_fix-ownership.txt index df6f8b9361a20..ddf23d2424f8f 100644 --- a/dev/breeze/doc/images/output_ci_fix-ownership.txt +++ b/dev/breeze/doc/images/output_ci_fix-ownership.txt @@ -1 +1 @@ -3e5a73533cc96045e72cb258783cfc96 +9decf6bb3eecbe566006f39f22cb331a diff --git a/dev/breeze/doc/images/output_ci_free-space.txt b/dev/breeze/doc/images/output_ci_free-space.txt index 4f460e5d24525..28dab1aeb49be 100644 --- a/dev/breeze/doc/images/output_ci_free-space.txt +++ b/dev/breeze/doc/images/output_ci_free-space.txt @@ -1 +1 @@ -49af17b032039c05c41a7a8283f365cc +21f9955c2f47b4524f1df73af8594d54 diff --git a/dev/breeze/doc/images/output_ci_resource-check.txt b/dev/breeze/doc/images/output_ci_resource-check.txt index 194cda808be74..ddad0edbd2074 100644 --- a/dev/breeze/doc/images/output_ci_resource-check.txt +++ b/dev/breeze/doc/images/output_ci_resource-check.txt @@ -1 +1 @@ -bfcca92f18a403ca630955074eb5e9ad +858a3c3a7f47ab6b47364a9fff1c19ac diff --git a/dev/breeze/doc/images/output_ci_selective-check.txt b/dev/breeze/doc/images/output_ci_selective-check.txt index 22984f7955810..ebeb5277929f6 100644 --- a/dev/breeze/doc/images/output_ci_selective-check.txt +++ b/dev/breeze/doc/images/output_ci_selective-check.txt @@ -1 +1 @@ -6657ed5d42affb7264b5efcc86f17a2a +78d4ac07ec90efce5bd901f461d940bc diff --git a/dev/breeze/doc/images/output_cleanup.txt b/dev/breeze/doc/images/output_cleanup.txt index b4b8f084ef797..bf619de66a7e0 100644 --- a/dev/breeze/doc/images/output_cleanup.txt +++ b/dev/breeze/doc/images/output_cleanup.txt @@ -1 +1 @@ -231de69d5f47ba29c883164e4575e310 +45d1ac665d85bff99d1ea396be00f892 diff --git a/dev/breeze/doc/images/output_compile-ui-assets.txt b/dev/breeze/doc/images/output_compile-ui-assets.txt index 71551f00ef5d0..5ed3485174545 100644 --- a/dev/breeze/doc/images/output_compile-ui-assets.txt +++ b/dev/breeze/doc/images/output_compile-ui-assets.txt @@ -1 +1 @@ -a3230118e8ad9cd73c9b67acaf77c994 +92830a5b5f1afbbd42017e2e4b7b2dbb diff --git a/dev/breeze/doc/images/output_compile-www-assets.txt b/dev/breeze/doc/images/output_compile-www-assets.txt index 09a068ea8d4bd..b94d633f3abc1 100644 --- a/dev/breeze/doc/images/output_compile-www-assets.txt +++ b/dev/breeze/doc/images/output_compile-www-assets.txt @@ -1 +1 @@ -2c65b08cbff1b5be5b5c55fcd18580a9 +5b57c7464757837e78ed9ad7e2b39d6b diff --git a/dev/breeze/doc/images/output_down.txt b/dev/breeze/doc/images/output_down.txt index 6311b956ecf11..a0b06e332c802 100644 --- a/dev/breeze/doc/images/output_down.txt +++ b/dev/breeze/doc/images/output_down.txt @@ -1 +1 @@ -65834d56aa23a727a3b5a5c6f8197400 +17e350cf4ddd966bc9aa142d5452317c diff --git a/dev/breeze/doc/images/output_exec.txt b/dev/breeze/doc/images/output_exec.txt index 85e16aefc6e98..52dddc0e1a613 100644 --- a/dev/breeze/doc/images/output_exec.txt +++ b/dev/breeze/doc/images/output_exec.txt @@ -1 +1 @@ -42bbd3c1659128b0341ae118c3482da2 +300c15ecdfffbb85926ab31fc775521a diff --git a/dev/breeze/doc/images/output_generate-migration-file.txt b/dev/breeze/doc/images/output_generate-migration-file.txt index 640a1dec40895..1a80bedb173c1 100644 --- a/dev/breeze/doc/images/output_generate-migration-file.txt +++ b/dev/breeze/doc/images/output_generate-migration-file.txt @@ -1 +1 @@ -747d68bcaed5decfa6da146eb9c74e64 +fe2f7beb040bd87d2ba9ec143c067711 diff --git a/dev/breeze/doc/images/output_k8s_build-k8s-image.txt b/dev/breeze/doc/images/output_k8s_build-k8s-image.txt index dd6b1b79cdf6c..e27fa3aee05ce 100644 --- a/dev/breeze/doc/images/output_k8s_build-k8s-image.txt +++ b/dev/breeze/doc/images/output_k8s_build-k8s-image.txt @@ -1 +1 @@ -7e4553f3179fe40e5c05bfc556cb2355 +23407b52a0d231586a557bfb3a62cf56 diff --git a/dev/breeze/doc/images/output_k8s_configure-cluster.txt b/dev/breeze/doc/images/output_k8s_configure-cluster.txt index 7ed7f0e99146a..cb79733a6ce34 100644 --- a/dev/breeze/doc/images/output_k8s_configure-cluster.txt +++ b/dev/breeze/doc/images/output_k8s_configure-cluster.txt @@ -1 +1 @@ -6e0e5ed30fcde18abe30f7dab1c4f0b6 +c6b00a3e29661e7da1b4f31ec8059f9c diff --git a/dev/breeze/doc/images/output_k8s_create-cluster.txt b/dev/breeze/doc/images/output_k8s_create-cluster.txt index e9e52f4a391e9..de5d1c4aad6c0 100644 --- a/dev/breeze/doc/images/output_k8s_create-cluster.txt +++ b/dev/breeze/doc/images/output_k8s_create-cluster.txt @@ -1 +1 @@ -254a3805eeb108125d078abecf9226fb +db5457f7b24c460af060fd0570cf6540 diff --git a/dev/breeze/doc/images/output_k8s_delete-cluster.txt b/dev/breeze/doc/images/output_k8s_delete-cluster.txt index 3c0998b1f3cde..a33c81b61c24a 100644 --- a/dev/breeze/doc/images/output_k8s_delete-cluster.txt +++ b/dev/breeze/doc/images/output_k8s_delete-cluster.txt @@ -1 +1 @@ -11cd0c89e39c35786fb33d00fbb927fc +4858df418c00c6f7610a8b6c5712dc21 diff --git a/dev/breeze/doc/images/output_k8s_deploy-airflow.txt b/dev/breeze/doc/images/output_k8s_deploy-airflow.txt index 7daf0c1c26015..216e0a7fd27e1 100644 --- a/dev/breeze/doc/images/output_k8s_deploy-airflow.txt +++ b/dev/breeze/doc/images/output_k8s_deploy-airflow.txt @@ -1 +1 @@ -5b0897a8784fd3ef29cf789e10507936 +e76733e85aa4515c885e1545d23a808b diff --git a/dev/breeze/doc/images/output_k8s_k9s.txt b/dev/breeze/doc/images/output_k8s_k9s.txt index 41cb876d4b85f..2ec4e3f0f0248 100644 --- a/dev/breeze/doc/images/output_k8s_k9s.txt +++ b/dev/breeze/doc/images/output_k8s_k9s.txt @@ -1 +1 @@ -4330a248804808ca67646fd429521ea4 +987bac06ce9be77bb97a2e3edeed41ec diff --git a/dev/breeze/doc/images/output_k8s_logs.txt b/dev/breeze/doc/images/output_k8s_logs.txt index cb10a8737e7f5..263873f6e24c9 100644 --- a/dev/breeze/doc/images/output_k8s_logs.txt +++ b/dev/breeze/doc/images/output_k8s_logs.txt @@ -1 +1 @@ -109337ad03745a9ee525cc5c88b44965 +681859603186949ed61bbc30fbcc11ff diff --git a/dev/breeze/doc/images/output_k8s_run-complete-tests.txt b/dev/breeze/doc/images/output_k8s_run-complete-tests.txt index c55a90dcdd2b8..82f8f4ad877fc 100644 --- a/dev/breeze/doc/images/output_k8s_run-complete-tests.txt +++ b/dev/breeze/doc/images/output_k8s_run-complete-tests.txt @@ -1 +1 @@ -e90124f34ca3e3048003f30dcb4726a6 +8a9d77567085d89265fc52eb77932731 diff --git a/dev/breeze/doc/images/output_k8s_setup-env.txt b/dev/breeze/doc/images/output_k8s_setup-env.txt index 1285e24d1e215..16d82b4ee317a 100644 --- a/dev/breeze/doc/images/output_k8s_setup-env.txt +++ b/dev/breeze/doc/images/output_k8s_setup-env.txt @@ -1 +1 @@ -a34e94744ca4e0592371fe55478c3d54 +519e87a2048c3f841196e43a09f183f6 diff --git a/dev/breeze/doc/images/output_k8s_shell.txt b/dev/breeze/doc/images/output_k8s_shell.txt index 1ba5126599f5b..c897d0bf4da7c 100644 --- a/dev/breeze/doc/images/output_k8s_shell.txt +++ b/dev/breeze/doc/images/output_k8s_shell.txt @@ -1 +1 @@ -e4d387e242567191bd381fffbe949b57 +e85c5d5b7be263ab98e2fac81ce70d86 diff --git a/dev/breeze/doc/images/output_k8s_status.txt b/dev/breeze/doc/images/output_k8s_status.txt index 1c221abaefef3..671e7ea5a9269 100644 --- a/dev/breeze/doc/images/output_k8s_status.txt +++ b/dev/breeze/doc/images/output_k8s_status.txt @@ -1 +1 @@ -8d422180eade6405e3bb880496242aaa +a48ee98548f41870849af461a5679f91 diff --git a/dev/breeze/doc/images/output_k8s_tests.txt b/dev/breeze/doc/images/output_k8s_tests.txt index d7966d71948bc..a8d9975a1e3f0 100644 --- a/dev/breeze/doc/images/output_k8s_tests.txt +++ b/dev/breeze/doc/images/output_k8s_tests.txt @@ -1 +1 @@ -ed1e0a02b7f38a9cdd8810b70fd350d3 +17965ece7bd99cae183a3610ff03e7be diff --git a/dev/breeze/doc/images/output_k8s_upload-k8s-image.txt b/dev/breeze/doc/images/output_k8s_upload-k8s-image.txt index 7e93734dfe0c3..c9f2df0b397fd 100644 --- a/dev/breeze/doc/images/output_k8s_upload-k8s-image.txt +++ b/dev/breeze/doc/images/output_k8s_upload-k8s-image.txt @@ -1 +1 @@ -774439a1c9e22923f9ace56902c41dcd +069265058f363e5e2f5ab7ff53ded033 diff --git a/dev/breeze/doc/images/output_prod-image_build.txt b/dev/breeze/doc/images/output_prod-image_build.txt index 8610d58e7ac25..406c08e61e267 100644 --- a/dev/breeze/doc/images/output_prod-image_build.txt +++ b/dev/breeze/doc/images/output_prod-image_build.txt @@ -1 +1 @@ -3576058438d009eb3dc8be53ea16be8a +46a046cb3b7ba63753bbc61410d4d8d3 diff --git a/dev/breeze/doc/images/output_prod-image_pull.txt b/dev/breeze/doc/images/output_prod-image_pull.txt index ae34f765e6aed..3fd11c7ba2cf1 100644 --- a/dev/breeze/doc/images/output_prod-image_pull.txt +++ b/dev/breeze/doc/images/output_prod-image_pull.txt @@ -1 +1 @@ -54188d6d9544b2bd4cc9b77f55a34565 +55b7b67b36baabc8067c3453549bde75 diff --git a/dev/breeze/doc/images/output_prod-image_verify.txt b/dev/breeze/doc/images/output_prod-image_verify.txt index aaf8ba31ae5d2..c3c52cc0eda34 100644 --- a/dev/breeze/doc/images/output_prod-image_verify.txt +++ b/dev/breeze/doc/images/output_prod-image_verify.txt @@ -1 +1 @@ -1c833a3c2dcde9f9edf165a958fccb47 +476434f4359f3e4e12b76ff55f4ba2f5 diff --git a/dev/breeze/doc/images/output_release-management_add-back-references.txt b/dev/breeze/doc/images/output_release-management_add-back-references.txt index a3982ff0fa67a..6016cbc47a4b6 100644 --- a/dev/breeze/doc/images/output_release-management_add-back-references.txt +++ b/dev/breeze/doc/images/output_release-management_add-back-references.txt @@ -1 +1 @@ -33a9bed85312c80e1464318d1aaa5632 +03f7d04a09488fcd7c28c13d0653ff7e diff --git a/dev/breeze/doc/images/output_release-management_clean-old-provider-artifacts.txt b/dev/breeze/doc/images/output_release-management_clean-old-provider-artifacts.txt index 6bb6f32c3fb2e..644ef44e5799a 100644 --- a/dev/breeze/doc/images/output_release-management_clean-old-provider-artifacts.txt +++ b/dev/breeze/doc/images/output_release-management_clean-old-provider-artifacts.txt @@ -1 +1 @@ -16862ea6a616ef66a192424838062813 +085dfd3570b78ad1be8dd95f480be582 diff --git a/dev/breeze/doc/images/output_release-management_create-minor-branch.txt b/dev/breeze/doc/images/output_release-management_create-minor-branch.txt index 80fe1e8310c6a..ba10a8aae0500 100644 --- a/dev/breeze/doc/images/output_release-management_create-minor-branch.txt +++ b/dev/breeze/doc/images/output_release-management_create-minor-branch.txt @@ -1 +1 @@ -a3834afc4aa5d1e98002c9e9e7a9931d +5b63e90b9597e5a47cc4fbfa32ab9fbe diff --git a/dev/breeze/doc/images/output_release-management_generate-constraints.txt b/dev/breeze/doc/images/output_release-management_generate-constraints.txt index 5af8f1b6f8589..ac283e82ce299 100644 --- a/dev/breeze/doc/images/output_release-management_generate-constraints.txt +++ b/dev/breeze/doc/images/output_release-management_generate-constraints.txt @@ -1 +1 @@ -ac54d7c8e352e6012280df2649354c3b +74e78d80f0339f8069039fa95479ec2a diff --git a/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt b/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt index bf380665aa306..b35e23d09d408 100644 --- a/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt +++ b/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt @@ -1 +1 @@ -15723131610a3be9a3093f346e72ed06 +00382e6b2a84a1edbf77eb5ed0a9df72 diff --git a/dev/breeze/doc/images/output_release-management_generate-issue-content-helm-chart.txt b/dev/breeze/doc/images/output_release-management_generate-issue-content-helm-chart.txt index 20d87ba8dfc30..68f8a48a8b621 100644 --- a/dev/breeze/doc/images/output_release-management_generate-issue-content-helm-chart.txt +++ b/dev/breeze/doc/images/output_release-management_generate-issue-content-helm-chart.txt @@ -1 +1 @@ -3e0e080fa8422853ed7df3967725b35f +798f6631dad1b650e8a48fa5d51d73e6 diff --git a/dev/breeze/doc/images/output_release-management_install-provider-packages.svg b/dev/breeze/doc/images/output_release-management_install-provider-packages.svg index 65765722c1dcd..594dc76523b6d 100644 --- a/dev/breeze/doc/images/output_release-management_install-provider-packages.svg +++ b/dev/breeze/doc/images/output_release-management_install-provider-packages.svg @@ -1,4 +1,4 @@ - +