Skip to content

Commit 8ff1c2c

Browse files
Feat: Add OSS-specific parameters for HW and ALI private deployment (#539)
* Update internal/types/app/config.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * Update internal/server/server.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
1 parent 72e9a7b commit 8ff1c2c

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ ALIYUN_OSS_ACCESS_KEY_ID=
3131
ALIYUN_OSS_ACCESS_KEY_SECRET=
3232
ALIYUN_OSS_AUTH_VERSION=v4
3333
ALIYUN_OSS_PATH=
34+
ALIYUN_OSS_CLOUDBOX_ID=
3435

3536
# azure blob storage credentials
3637
AZURE_BLOB_STORAGE_CONTAINER_NAME=
@@ -49,7 +50,7 @@ GCS_CREDENTIALS=
4950
HUAWEI_OBS_ACCESS_KEY=
5051
HUAWEI_OBS_SECRET_KEY=
5152
HUAWEI_OBS_SERVER=
52-
53+
HUAWEI_OBS_PATH_STYLE=false
5354

5455
# services storage
5556
# https://github.com/langgenius/dify-cloud-kit/blob/main/oss/factory/factory.go

internal/server/server.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,14 @@ func initOSS(config *app.Config) oss.OSS {
5656
AuthVersion: config.AliyunOSSAuthVersion,
5757
Path: config.AliyunOSSPath,
5858
Bucket: config.PluginStorageOSSBucket,
59+
CloudBoxId: config.AliyunOSSCloudBoxId,
5960
},
6061
HuaweiOBS: &oss.HuaweiOBS{
6162
AccessKey: config.HuaweiOBSAccessKey,
6263
SecretKey: config.HuaweiOBSSecretKey,
6364
Server: config.HuaweiOBSServer,
6465
Bucket: config.PluginStorageOSSBucket,
66+
PathStyle: config.HuaweiOBSPathStyle,
6567
},
6668
VolcengineTOS: &oss.VolcengineTOS{
6769
Region: config.VolcengineTOSRegion,

internal/types/app/config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ type Config struct {
5858
AliyunOSSAccessKeySecret string `envconfig:"ALIYUN_OSS_ACCESS_KEY_SECRET"`
5959
AliyunOSSAuthVersion string `envconfig:"ALIYUN_OSS_AUTH_VERSION" default:"v4"`
6060
AliyunOSSPath string `envconfig:"ALIYUN_OSS_PATH"`
61+
AliyunOSSCloudBoxId string `envconfig:"ALIYUN_OSS_CLOUDBOX_ID" default:""`
6162

6263
// google gcs
6364
GoogleCloudStorageCredentialsB64 string `envconfig:"GCS_CREDENTIALS"`
@@ -66,6 +67,7 @@ type Config struct {
6667
HuaweiOBSAccessKey string `envconfig:"HUAWEI_OBS_ACCESS_KEY"`
6768
HuaweiOBSSecretKey string `envconfig:"HUAWEI_OBS_SECRET_KEY"`
6869
HuaweiOBSServer string `envconfig:"HUAWEI_OBS_SERVER"`
70+
HuaweiOBSPathStyle bool `envconfig:"HUAWEI_OBS_PATH_STYLE" default:"false"`
6971

7072
// volcengine tos
7173
VolcengineTOSEndpoint string `envconfig:"VOLCENGINE_TOS_ENDPOINT"`

0 commit comments

Comments
 (0)