From 8234d4c0789c6be1f0750b3cb9357eb93df40020 Mon Sep 17 00:00:00 2001
From: Pedro Brochado <pedropsb95@gmail.com>
Date: Wed, 15 Jan 2025 08:58:16 -0300
Subject: [PATCH] Add flag to use new storage settings and apply
 plugin-template

The goal of this is to test the new and legacy settings while
both are still supported.
---
 .ci/ansible/settings.py.j2           | 14 ++++++++++++--
 .github/template_gitref              |  2 +-
 .github/workflows/scripts/install.sh |  1 +
 template_config.yml                  |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2
index 9b5f5f4be4..7a73ea2f35 100644
--- a/.ci/ansible/settings.py.j2
+++ b/.ci/ansible/settings.py.j2
@@ -29,6 +29,7 @@ API_ROOT = {{ api_root | repr }}
 {% if s3_test | default(false) %}
 MEDIA_ROOT: ""
 S3_USE_SIGV4 = True
+{% if test_storages_compat_layer is defined and test_storages_compat_layer %}
 STORAGES = {
     "default": {
         "BACKEND": "storages.backends.s3boto3.S3Boto3Storage",
@@ -47,10 +48,19 @@ STORAGES = {
       "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
     },
 }
+{% else %}
+DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+AWS_ACCESS_KEY_ID = "{{ minio_access_key }}"
+AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}"
+AWS_S3_REGION_NAME = "eu-central-1"
+AWS_S3_ADDRESSING_STYLE = "path"
+AWS_S3_SIGNATURE_VERSION = "s3v4"
+AWS_STORAGE_BUCKET_NAME = "pulp3"
+AWS_S3_ENDPOINT_URL = "http://minio:9000"
+AWS_DEFAULT_ACL = "@none None"
+{% endif %}
 {% endif %}
 
-# This is using DEFAULT_FILE_STORAGE to test both usages.
-# Remove when DEFAULT_FILE_STORAGE is completely removed.
 {% if azure_test | default(false) %}
 DEFAULT_FILE_STORAGE = "storages.backends.azure_storage.AzureStorage"
 MEDIA_ROOT = ""
diff --git a/.github/template_gitref b/.github/template_gitref
index 51006453fe..bdfe03f318 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-417-gcec8e48
+2021.08.26-420-gf332a34
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index e8bebd1f73..19b35c4cf5 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -107,6 +107,7 @@ minio_access_key: "'$MINIO_ACCESS_KEY'"\
 minio_secret_key: "'$MINIO_SECRET_KEY'"\
 pulp_scenario_settings: {"DISABLED_authentication_backends": "@merge django.contrib.auth.backends.RemoteUserBackend", "DISABLED_authentication_json_header": "HTTP_X_RH_IDENTITY", "DISABLED_authentication_json_header_jq_filter": ".identity.user.username", "DISABLED_authentication_json_header_openapi_security_scheme": {"description": "External OAuth integration", "flows": {"clientCredentials": {"scopes": {"api.console": "grant_access_to_pulp"}, "tokenUrl": "https://your-identity-provider/token/issuer"}}, "type": "oauth2"}, "DISABLED_rest_framework__default_authentication_classes": "@merge pulpcore.app.authentication.JSONHeaderRemoteAuthentication", "domain_enabled": true, "hide_guarded_distributions": true, "rest_framework__default_permission_classes": ["pulpcore.plugin.access_policy.AccessPolicyFromSettings"]}\
 pulp_scenario_env: {}\
+test_storages_compat_layer: true\
 ' vars/main.yaml
   export PULP_API_ROOT="/rerouted/djnd/"
 fi
diff --git a/template_config.yml b/template_config.yml
index 38fc7ddbf9..1752e56ac4 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -102,5 +102,6 @@ test_lowerbounds: true
 test_performance: false
 test_reroute: true
 test_s3: true
+test_storages_compat_layer: true
 use_issue_template: true