From 9e4d8795a0194bfae62aa916dbf15a4974adae95 Mon Sep 17 00:00:00 2001
From: sevennt <sevennt.leslie@gmail.com>
Date: Wed, 23 Oct 2024 18:58:43 +0800
Subject: [PATCH] feat(ci): ci var minio s3ForcePathStyle

---
 .github/workflows/test.yml | 4 ++++
 aws_test.go                | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 67558bf..96f96b6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,6 +29,7 @@ jobs:
 #          AK_ID: ${{ secrets.COS_AK_ID }}
 #          AK_SECRET: ${{ secrets.COS_AK_SECRET }}
 #          BUCKET_SHARD: ${{ secrets.COS_BUCKET_SHARD }}
+#         S3_FORCE_PATH_STYLE: false
 #        run:
 #          go test -run=TestS3 -v -race $(go list ./... | grep -v /examples)
       - name: test-minio
@@ -39,6 +40,7 @@ jobs:
           AK_ID: ${{ secrets.MINIO_AK_ID }}
           AK_SECRET: ${{ secrets.MINIO_AK_SECRET }}
           BUCKET_SHARD: ${{ secrets.MINIO_BUCKET }}
+          S3_FORCE_PATH_STYLE: true
         run: env && go test -run=TestS3 -v -race $(go list ./... | grep -v /examples)
 #      - name: test-obs
 #        env:
@@ -48,6 +50,7 @@ jobs:
 #          AK_ID: ${{ secrets.OBS_AK_ID }}
 #          AK_SECRET: ${{ secrets.OBS_AK_SECRET }}
 #          BUCKET_SHARD: ${{ secrets.OBS_BUCKET }}
+#         S3_FORCE_PATH_STYLE: false
 #        run: go test -run=TestS3 -v -race $(go list ./... | grep -v /examples)
 #      - name: test-oss
 #        env:
@@ -57,4 +60,5 @@ jobs:
 #          AK_ID: ${{ secrets.OSS_AK_ID }}
 #          AK_SECRET: ${{ secrets.OSS_AK_SECRET }}
 #          BUCKET_SHARD: ${{ secrets.OSS_BUCKET }}
+#         S3_FORCE_PATH_STYLE: false
 #        run: go test -run=TestOSS -v -race $(go list ./... | grep -v /examples)
diff --git a/aws_test.go b/aws_test.go
index 3dfa89f..d439fe9 100644
--- a/aws_test.go
+++ b/aws_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/gotomicro/ego/core/econf"
+	"github.com/spf13/cast"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -36,7 +37,7 @@ accessKeyID = "%s"
 accessKeySecret = "%s"
 endpoint = "%s"
 bucket = "%s"
-s3ForcePathStyle = false 
+s3ForcePathStyle = %t
 region = "%s"
 ssl = false
 shards = [%s]
@@ -51,8 +52,9 @@ func init() {
 }
 
 func newS3Cmp(bucket string, shards string) *Component {
+	s3ForcePathStyle := cast.ToBool(os.Getenv("S3_FORCE_PATH_STYLE"))
 	newConfs := fmt.Sprintf(s3Confs, os.Getenv("AK_ID"), os.Getenv("AK_SECRET"), os.Getenv("ENDPOINT"),
-		bucket, os.Getenv("REGION"), shards)
+		bucket, s3ForcePathStyle, os.Getenv("REGION"), shards)
 	fmt.Printf("newConfs--------------->"+"%+v\n", newConfs)
 	if err := econf.LoadFromReader(strings.NewReader(newConfs), toml.Unmarshal); err != nil {
 		panic(err)