Skip to content

[PULP-659] Remove legacy django storages#6838

Merged
pedro-psb merged 2 commits intopulp:mainfrom
pedro-psb:issues/6807/rm-default-file-storage
Aug 11, 2025
Merged

[PULP-659] Remove legacy django storages#6838
pedro-psb merged 2 commits intopulp:mainfrom
pedro-psb:issues/6807/rm-default-file-storage

Conversation

@pedro-psb
Copy link
Member

@pedro-psb pedro-psb commented Aug 6, 2025

This PR does:

For Plugins

  • When supporting 3.85, set test_storages_compat_layer: False in template_config.yml so it only renders the newer storage settings for every storage case (s3 and azure).
  • The plugin pulpcore lowerbound must be >=3.70. If a pulpcore <3.70 is used, the CI installation can break (most likely on the lowerbound scenario), as it doest support the newer storage form.

@pedro-psb pedro-psb marked this pull request as draft August 6, 2025 17:08
@pedro-psb pedro-psb force-pushed the issues/6807/rm-default-file-storage branch 6 times, most recently from a160888 to 2c53bc4 Compare August 7, 2025 21:29
@pedro-psb pedro-psb marked this pull request as ready for review August 7, 2025 21:32
@pedro-psb pedro-psb force-pushed the issues/6807/rm-default-file-storage branch 2 times, most recently from f3a6e73 to 542b73a Compare August 7, 2025 22:00
@pedro-psb pedro-psb marked this pull request as draft August 7, 2025 22:16
@pedro-psb pedro-psb force-pushed the issues/6807/rm-default-file-storage branch 6 times, most recently from 8b3ac9b to 45275dd Compare August 11, 2025 12:01
@pedro-psb pedro-psb force-pushed the issues/6807/rm-default-file-storage branch 2 times, most recently from 499533c to 9415d79 Compare August 11, 2025 12:59
@pedro-psb pedro-psb force-pushed the issues/6807/rm-default-file-storage branch from 9415d79 to 316057e Compare August 11, 2025 14:17
@pedro-psb pedro-psb marked this pull request as ready for review August 11, 2025 14:19
Comment on lines +138 to +152
{%- if test_storages_compat_layer is not defined -%}
{%- if s3_test | default(false) -%}{{ s3_settings(legacy=True) }}{%- endif -%}
{%- if azure_test | default(false) -%}{{ azure_settings(legacy=True) }}{%- endif -%}
{%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=True) }}{%- endif -%}
{%- else -%}
{%- if test_storages_compat_layer is true -%}
{%- if s3_test | default(false) -%}{{ s3_settings(legacy=False) }}{%- endif -%}
{%- if azure_test | default(false) -%}{{ azure_settings(legacy=True) }}{%- endif -%}
{%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=True) }}{%- endif -%}
{%- elif test_storages_compat_layer is false -%}
{%- if s3_test | default(false) -%}{{ s3_settings(legacy=False) }}{%- endif -%}
{%- if azure_test | default(false) -%}{{ azure_settings(legacy=False) }}{%- endif -%}
{%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=False) }}{%- endif -%}
{%- endif -%}
{%- endif -%}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{%- if test_storages_compat_layer is not defined -%}
{%- if s3_test | default(false) -%}{{ s3_settings(legacy=True) }}{%- endif -%}
{%- if azure_test | default(false) -%}{{ azure_settings(legacy=True) }}{%- endif -%}
{%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=True) }}{%- endif -%}
{%- else -%}
{%- if test_storages_compat_layer is true -%}
{%- if s3_test | default(false) -%}{{ s3_settings(legacy=False) }}{%- endif -%}
{%- if azure_test | default(false) -%}{{ azure_settings(legacy=True) }}{%- endif -%}
{%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=True) }}{%- endif -%}
{%- elif test_storages_compat_layer is false -%}
{%- if s3_test | default(false) -%}{{ s3_settings(legacy=False) }}{%- endif -%}
{%- if azure_test | default(false) -%}{{ azure_settings(legacy=False) }}{%- endif -%}
{%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=False) }}{%- endif -%}
{%- endif -%}
{%- endif -%}
{%- if s3_test | default(false) -%}{{ s3_settings(legacy=test_storages_compat_layer is not defined) }}{%- endif -%}
{%- if azure_test | default(false) -%}{{ azure_settings(legacy=test_storages_compat_layer | default(True)) }}{%- endif -%}
{%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=test_storages_compat_layer | default(True)) }}{%- endif -%}

@pedro-psb pedro-psb merged commit 2d7cc1c into pulp:main Aug 11, 2025
13 checks passed
@pedro-psb pedro-psb linked an issue Aug 12, 2025 that may be closed by this pull request
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.

[PULP-659] Remove legacy django storages

2 participants