[REF] fs_storage: server_environment should not be a required dependency

yankinmax · yankinmax · commit 0eb8c3801a97 · 2026-03-25T11:54:47.000+02:00
diff --git a/fs_attachment/tests/test_fs_storage.py b/fs_attachment/tests/test_fs_storage.py
@@ -299,6 +299,7 @@ def test_url_for_image_dir_optimized_and_not_obfuscated(self):
             {
                 "name": "FS Product Image Backend",
                 "code": "file",
+                "protocol": "odoofs",
                 "base_url": "https://localhost/images",
                 "optimizes_directory_path": True,
                 "use_filename_obfuscation": False,
diff --git a/fs_storage/README.rst b/fs_storage/README.rst
@@ -129,9 +129,6 @@ When you create a new backend, you must specify the following:
   depend on the protocol used and are described in the fsspec
   documentation.
 
-- Resolve env vars. This options resolves the protocol options values
-  starting with $ from environment variables
-
 - Check Connection Method. If set, Odoo will always check the connection
   before using a storage and it will remove the fs connection from the
   cache if the check fails.
@@ -166,35 +163,6 @@ follows:
 In this example, the SimpleCacheFileSystem protocol will be used as a
 wrapper around the odoofs protocol.
 
-Server Environment
-------------------
-
-To ease the management of the filesystem storages configuration accross
-the different environments, the configuration of the filesystem storages
-can be defined in environment files or directly in the main
-configuration file. For example, the configuration of a filesystem
-storage with the code fsprod can be provided in the main configuration
-file as follows:
-
-.. code:: ini
-
-   [fs_storage.fsprod]
-   protocol=s3
-   options={"endpoint_url": "https://my_s3_server/", "key": "KEY", "secret": "SECRET"}
-   directory_path=my_bucket
-
-To work, a storage.backend record must exist with the code fsprod into
-the database. In your configuration section, you can specify the value
-for the following fields:
-
-- protocol
-- options
-- directory_path
-
-When evaluating directory_path, ``{db_name}`` is replaced by the
-database name. This is usefull in multi-tenant with a setup completly
-controlled by configuration files.
-
 Migration from storage_backend
 ------------------------------
 
diff --git a/fs_storage/__manifest__.py b/fs_storage/__manifest__.py
@@ -5,13 +5,13 @@
 {
     "name": "Filesystem Storage Backend",
     "summary": "Implement the concept of Storage with amazon S3, sftp...",
-    "version": "19.0.1.1.1",
+    "version": "19.0.1.1.2",
     "category": "FS Storage",
     "website": "https://github.com/OCA/storage",
     "author": " ACSONE SA/NV, Odoo Community Association (OCA)",
     "license": "LGPL-3",
     "development_status": "Beta",
-    "depends": ["base", "base_sparse_field", "server_environment"],
+    "depends": ["base", "base_sparse_field"],
     "data": [
         "views/fs_storage_view.xml",
         "security/ir.model.access.csv",
diff --git a/fs_storage/models/fs_storage.py b/fs_storage/models/fs_storage.py
@@ -89,7 +89,6 @@ def wrapper(self, *args, **kwargs):
 
 class FSStorage(models.Model):
     _name = "fs.storage"
-    _inherit = "server.env.mixin"
     _description = "FS Storage"
 
     __slots__ = ("__fs", "__odoo_storage_path")
@@ -231,8 +230,6 @@ def __init__(self, env, ids=(), prefetch_ids=()):
         "The code must be unique",
     )
 
-    _server_env_section_name_field = "code"
-
     @api.constrains("model_xmlids")
     def _check_model_xmlid_storage_unique(self):
         """
@@ -300,18 +297,6 @@ def _get_check_connection_method_selection(self):
             ("ls", self.env._("List File")),
         ]
 
-    @property
-    def _server_env_fields(self):
-        return {
-            "protocol": {},
-            "options": {},
-            "directory_path": {},
-            "eval_options_from_env": {},
-            "model_xmlids": {},
-            "field_xmlids": {},
-            "check_connection_method": {},
-        }
-
     @api.model_create_multi
     @prevent_call_from_safe_eval("create")
     def create(self, vals_list):
diff --git a/fs_storage/readme/USAGE.md b/fs_storage/readme/USAGE.md
@@ -16,8 +16,6 @@ When you create a new backend, you must specify the following:
   fsspec python package when creating the filesystem. These options
   depend on the protocol used and are described in the fsspec
   documentation.
-- Resolve env vars. This options resolves the protocol options values
-  starting with \$ from environment variables
 - Check Connection Method. If set, Odoo will always check the connection before
   using a storage and it will remove the fs connection from the cache if the
   check fails.
@@ -51,34 +49,6 @@ follows:
 In this example, the SimpleCacheFileSystem protocol will be used as a
 wrapper around the odoofs protocol.
 
-## Server Environment
-
-To ease the management of the filesystem storages configuration accross
-the different environments, the configuration of the filesystem storages
-can be defined in environment files or directly in the main
-configuration file. For example, the configuration of a filesystem
-storage with the code fsprod can be provided in the main configuration
-file as follows:
-
-``` ini
-[fs_storage.fsprod]
-protocol=s3
-options={"endpoint_url": "https://my_s3_server/", "key": "KEY", "secret": "SECRET"}
-directory_path=my_bucket
-```
-
-To work, a storage.backend record must exist with the code fsprod into
-the database. In your configuration section, you can specify the value
-for the following fields:
-
-- protocol
-- options
-- directory_path
-
-When evaluating directory_path, `{db_name}` is replaced by the database name.
-This is usefull in multi-tenant with a setup completly controlled by
-configuration files.
-
 ## Migration from storage_backend
 
 The fs_storage addon can be used to replace the storage_backend addon.
diff --git a/fs_storage/static/description/index.html b/fs_storage/static/description/index.html
@@ -441,38 +441,37 @@ <h1>Filesystem Storage Backend</h1>
 <ul class="simple">
 <li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a><ul>
 <li><a class="reference internal" href="#configuration" id="toc-entry-2">Configuration</a></li>
-<li><a class="reference internal" href="#server-environment" id="toc-entry-3">Server Environment</a></li>
-<li><a class="reference internal" href="#migration-from-storage-backend" id="toc-entry-4">Migration from storage_backend</a></li>
+<li><a class="reference internal" href="#migration-from-storage-backend" id="toc-entry-3">Migration from storage_backend</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-5">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#changelog" id="toc-entry-6">Changelog</a><ul>
-<li><a class="reference internal" href="#section-1" id="toc-entry-7">19.0.1.1.0 (2026-03-18)</a><ul>
-<li><a class="reference internal" href="#features" id="toc-entry-8">Features</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-5">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-6">19.0.1.1.0 (2026-03-18)</a><ul>
+<li><a class="reference internal" href="#features" id="toc-entry-7">Features</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#section-2" id="toc-entry-9">18.0.2.1.0 (2025-10-20)</a><ul>
-<li><a class="reference internal" href="#features-1" id="toc-entry-10">Features</a></li>
+<li><a class="reference internal" href="#section-2" id="toc-entry-8">18.0.2.1.0 (2025-10-20)</a><ul>
+<li><a class="reference internal" href="#features-1" id="toc-entry-9">Features</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#section-3" id="toc-entry-11">18.0.2.0.1 (2025-07-23)</a><ul>
-<li><a class="reference internal" href="#features-2" id="toc-entry-12">Features</a></li>
+<li><a class="reference internal" href="#section-3" id="toc-entry-10">18.0.2.0.1 (2025-07-23)</a><ul>
+<li><a class="reference internal" href="#features-2" id="toc-entry-11">Features</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#section-4" id="toc-entry-13">18.0.1.0.1 (2024-11-10)</a><ul>
-<li><a class="reference internal" href="#features-3" id="toc-entry-14">Features</a></li>
+<li><a class="reference internal" href="#section-4" id="toc-entry-12">18.0.1.0.1 (2024-11-10)</a><ul>
+<li><a class="reference internal" href="#features-3" id="toc-entry-13">Features</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#section-5" id="toc-entry-15">16.0.1.1.0 (2023-12-22)</a></li>
-<li><a class="reference internal" href="#section-6" id="toc-entry-16">16.0.1.0.3 (2023-10-17)</a></li>
-<li><a class="reference internal" href="#section-7" id="toc-entry-17">16.0.1.0.2 (2023-10-09)</a></li>
+<li><a class="reference internal" href="#section-5" id="toc-entry-14">16.0.1.1.0 (2023-12-22)</a></li>
+<li><a class="reference internal" href="#section-6" id="toc-entry-15">16.0.1.0.3 (2023-10-17)</a></li>
+<li><a class="reference internal" href="#section-7" id="toc-entry-16">16.0.1.0.2 (2023-10-09)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-18">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-19">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-20">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-21">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-22">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-17">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-18">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-19">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-20">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-21">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -497,8 +496,6 @@ <h3><a class="toc-backref" href="#toc-entry-2">Configuration</a></h3>
 fsspec python package when creating the filesystem. These options
 depend on the protocol used and are described in the fsspec
 documentation.</li>
-<li>Resolve env vars. This options resolves the protocol options values
-starting with $ from environment variables</li>
 <li>Check Connection Method. If set, Odoo will always check the connection
 before using a storage and it will remove the fs connection from the
 cache if the check fails.<ul>
@@ -531,34 +528,8 @@ <h3><a class="toc-backref" href="#toc-entry-2">Configuration</a></h3>
 <p>In this example, the SimpleCacheFileSystem protocol will be used as a
 wrapper around the odoofs protocol.</p>
 </div>
-<div class="section" id="server-environment">
-<h3><a class="toc-backref" href="#toc-entry-3">Server Environment</a></h3>
-<p>To ease the management of the filesystem storages configuration accross
-the different environments, the configuration of the filesystem storages
-can be defined in environment files or directly in the main
-configuration file. For example, the configuration of a filesystem
-storage with the code fsprod can be provided in the main configuration
-file as follows:</p>
-<pre class="code ini literal-block">
-<span class="k">[fs_storage.fsprod]</span><span class="w">
-</span><span class="na">protocol</span><span class="o">=</span><span class="s">s3</span><span class="w">
-</span><span class="na">options={&quot;endpoint_url&quot;</span><span class="o">:</span><span class="w"> </span><span class="s">&quot;https://my_s3_server/&quot;</span><span class="na">, &quot;key&quot;</span><span class="o">:</span><span class="w"> </span><span class="s">&quot;KEY&quot;</span><span class="na">, &quot;secret&quot;</span><span class="o">:</span><span class="w"> </span><span class="s">&quot;SECRET&quot;</span><span class="na">}</span><span class="w">
-</span><span class="na">directory_path</span><span class="o">=</span><span class="s">my_bucket</span>
-</pre>
-<p>To work, a storage.backend record must exist with the code fsprod into
-the database. In your configuration section, you can specify the value
-for the following fields:</p>
-<ul class="simple">
-<li>protocol</li>
-<li>options</li>
-<li>directory_path</li>
-</ul>
-<p>When evaluating directory_path, <tt class="docutils literal">{db_name}</tt> is replaced by the
-database name. This is usefull in multi-tenant with a setup completly
-controlled by configuration files.</p>
-</div>
 <div class="section" id="migration-from-storage-backend">
-<h3><a class="toc-backref" href="#toc-entry-4">Migration from storage_backend</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-3">Migration from storage_backend</a></h3>
 <p>The fs_storage addon can be used to replace the storage_backend addon.
 (It has been designed to be a drop-in replacement for the
 storage_backend addon). To ease the migration, the fs.storage model
@@ -583,7 +554,7 @@ <h3><a class="toc-backref" href="#toc-entry-4">Migration from storage_backend</a
 </div>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h2><a class="toc-backref" href="#toc-entry-5">Known issues / Roadmap</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h2>
 <ul class="simple">
 <li>Transactions: fsspec comes with a transactional mechanism that once
 started, gathers all the files created during the transaction, and if
@@ -598,40 +569,40 @@ <h2><a class="toc-backref" href="#toc-entry-5">Known issues / Roadmap</a></h2>
 </ul>
 </div>
 <div class="section" id="changelog">
-<h2><a class="toc-backref" href="#toc-entry-6">Changelog</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Changelog</a></h2>
 <div class="section" id="section-1">
-<h3><a class="toc-backref" href="#toc-entry-7">19.0.1.1.0 (2026-03-18)</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-6">19.0.1.1.0 (2026-03-18)</a></h3>
 <div class="section" id="features">
-<h4><a class="toc-backref" href="#toc-entry-8">Features</a></h4>
+<h4><a class="toc-backref" href="#toc-entry-7">Features</a></h4>
 <ul class="simple">
 <li>Replace {db_name} by the database name in directory_path
 (<a class="reference external" href="https://github.com/OCA/storage/issues/db_name">#db_name</a>)</li>
 </ul>
 </div>
 </div>
 <div class="section" id="section-2">
-<h3><a class="toc-backref" href="#toc-entry-9">18.0.2.1.0 (2025-10-20)</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-8">18.0.2.1.0 (2025-10-20)</a></h3>
 <div class="section" id="features-1">
-<h4><a class="toc-backref" href="#toc-entry-10">Features</a></h4>
+<h4><a class="toc-backref" href="#toc-entry-9">Features</a></h4>
 <ul class="simple">
 <li>Replace {db_name} by the database name in directory_path
 (<a class="reference external" href="https://github.com/OCA/storage/issues/db_name">#db_name</a>)</li>
 </ul>
 </div>
 </div>
 <div class="section" id="section-3">
-<h3><a class="toc-backref" href="#toc-entry-11">18.0.2.0.1 (2025-07-23)</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-10">18.0.2.0.1 (2025-07-23)</a></h3>
 <div class="section" id="features-2">
-<h4><a class="toc-backref" href="#toc-entry-12">Features</a></h4>
+<h4><a class="toc-backref" href="#toc-entry-11">Features</a></h4>
 <ul class="simple">
 <li>Allow setting check_connection_method in configuration file.</li>
 </ul>
 </div>
 </div>
 <div class="section" id="section-4">
-<h3><a class="toc-backref" href="#toc-entry-13">18.0.1.0.1 (2024-11-10)</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-12">18.0.1.0.1 (2024-11-10)</a></h3>
 <div class="section" id="features-3">
-<h4><a class="toc-backref" href="#toc-entry-14">Features</a></h4>
+<h4><a class="toc-backref" href="#toc-entry-13">Features</a></h4>
 <ul class="simple">
 <li>Invalidate FS filesystem object cache when the connection fails,
 forcing a reconnection.
@@ -640,7 +611,7 @@ <h4><a class="toc-backref" href="#toc-entry-14">Features</a></h4>
 </div>
 </div>
 <div class="section" id="section-5">
-<h3><a class="toc-backref" href="#toc-entry-15">16.0.1.1.0 (2023-12-22)</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-14">16.0.1.1.0 (2023-12-22)</a></h3>
 <p><strong>Features</strong></p>
 <ul class="simple">
 <li>Add parameter on storage backend to resolve protocol options values
@@ -649,7 +620,7 @@ <h3><a class="toc-backref" href="#toc-entry-15">16.0.1.1.0 (2023-12-22)</a></h3>
 </ul>
 </div>
 <div class="section" id="section-6">
-<h3><a class="toc-backref" href="#toc-entry-16">16.0.1.0.3 (2023-10-17)</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-15">16.0.1.0.3 (2023-10-17)</a></h3>
 <p><strong>Bugfixes</strong></p>
 <ul class="simple">
 <li>Fix access to technical models to be able to upload attachments for
@@ -658,7 +629,7 @@ <h3><a class="toc-backref" href="#toc-entry-16">16.0.1.0.3 (2023-10-17)</a></h3>
 </ul>
 </div>
 <div class="section" id="section-7">
-<h3><a class="toc-backref" href="#toc-entry-17">16.0.1.0.2 (2023-10-09)</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-16">16.0.1.0.2 (2023-10-09)</a></h3>
 <p><strong>Bugfixes</strong></p>
 <ul class="simple">
 <li>Avoid config error when using the webdav protocol. The auth option is
@@ -671,23 +642,23 @@ <h3><a class="toc-backref" href="#toc-entry-17">16.0.1.0.2 (2023-10-09)</a></h3>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-18">Bug Tracker</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-17">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/storage/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/storage/issues/new?body=module:%20fs_storage%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-19">Credits</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-18">Credits</a></h2>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-20">Authors</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-19">Authors</a></h3>
 <ul class="simple">
 <li>ACSONE SA/NV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-21">Contributors</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-20">Contributors</a></h3>
 <ul class="simple">
 <li>Laurent Mignon &lt;<a class="reference external" href="mailto:laurent.mignon&#64;acsone.eu">laurent.mignon&#64;acsone.eu</a>&gt;</li>
 <li>Sébastien BEAU &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;</li>
@@ -696,7 +667,7 @@ <h3><a class="toc-backref" href="#toc-entry-21">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-22">Maintainers</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-21">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
diff --git a/fs_storage/upgrades/19.0.1.1.2/pre-update.py b/fs_storage/upgrades/19.0.1.1.2/pre-update.py

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ def test_url_for_image_dir_optimized_and_not_obfuscated(self):`
`299`	`299`	`{`
`300`	`300`	`"name": "FS Product Image Backend",`
`301`	`301`	`"code": "file",`
	`302`	`+ "protocol": "odoofs",`
`302`	`303`	`"base_url": "https://localhost/images",`
`303`	`304`	`"optimizes_directory_path": True,`
`304`	`305`	`"use_filename_obfuscation": False,`