From 8cb3ed5cc2d51ddb391dfc80cdc96d2b71556d3a Mon Sep 17 00:00:00 2001
From: "Byron.wang" <byron@dify.ai>
Date: Fri, 13 Jun 2025 15:05:55 +0800
Subject: [PATCH] feat: add S3_USE_AWS env var to explicitly distinguish AWS S3
 usage in plugin-daemon (#20923)

---
 docker/.env.example                   | 1 +
 docker/docker-compose-template.yaml   | 1 +
 docker/docker-compose.middleware.yaml | 1 +
 docker/docker-compose.yaml            | 2 ++
 docker/middleware.env.example         | 1 +
 5 files changed, 6 insertions(+)

diff --git a/docker/.env.example b/docker/.env.example
index 4cf5e202d..d4d59936e 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -1067,6 +1067,7 @@ PLUGIN_MEDIA_CACHE_PATH=assets
 # Plugin oss bucket
 PLUGIN_STORAGE_OSS_BUCKET=
 # Plugin oss s3 credentials
+PLUGIN_S3_USE_AWS=
 PLUGIN_S3_USE_AWS_MANAGED_IAM=false
 PLUGIN_S3_ENDPOINT=
 PLUGIN_S3_USE_PATH_STYLE=false
diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index a409a729c..648b82c91 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -168,6 +168,7 @@ services:
       PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
       PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
       S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
+      S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
       S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
       S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
       AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml
index dceee484c..4081bfd81 100644
--- a/docker/docker-compose.middleware.yaml
+++ b/docker/docker-compose.middleware.yaml
@@ -104,6 +104,7 @@ services:
       PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
       PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
       PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
+      S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
       S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
       S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
       S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index d92733411..ec910f625 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -467,6 +467,7 @@ x-shared-env: &shared-api-worker-env
   PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
   PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
   PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
+  PLUGIN_S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
   PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
   PLUGIN_S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
   PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
@@ -674,6 +675,7 @@ services:
       PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
       PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
       S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
+      S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
       S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
       S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
       AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
diff --git a/docker/middleware.env.example b/docker/middleware.env.example
index 66037f281..338b057ae 100644
--- a/docker/middleware.env.example
+++ b/docker/middleware.env.example
@@ -133,6 +133,7 @@ PLUGIN_MEDIA_CACHE_PATH=assets
 PLUGIN_STORAGE_OSS_BUCKET=
 # Plugin oss s3 credentials
 PLUGIN_S3_USE_AWS_MANAGED_IAM=false
+PLUGIN_S3_USE_AWS=
 PLUGIN_S3_ENDPOINT=
 PLUGIN_S3_USE_PATH_STYLE=false
 PLUGIN_AWS_ACCESS_KEY=