feat(config,utils/flags): add s3.bucket_lookup_type flag in cli options

Author: wuhuizuo

README.md

@@ -263,6 +263,10 @@ OPTIONS:
    --s3.bucket value The S3/minio bucket to use when using S3 proxy backend.
       [$BAZEL_REMOTE_S3_BUCKET]
 
+   --s3.bucket_lookup_type value The S3/minio bucket lookup type to use when
+      using S3 proxy backend.  (default: auto, types: auto|dns|path)
+      [$BAZEL_REMOTE_S3_BUCKET_LOOKUP_TYPE]
+
    --s3.prefix value The S3/minio object prefix to use when using S3 proxy
       backend. [$BAZEL_REMOTE_S3_PREFIX]
 

config/config.go

@@ -447,6 +447,7 @@ func get(ctx *cli.Context) (*Config, error) {
 		s3 = &S3CloudStorageConfig{
 			Endpoint:                 ctx.String("s3.endpoint"),
 			Bucket:                   ctx.String("s3.bucket"),
+			BucketLookupType:         ctx.String("s3.bucket_lookup_type"),
 			Prefix:                   ctx.String("s3.prefix"),
 			AuthMethod:               ctx.String("s3.auth_method"),
 			AccessKeyID:              ctx.String("s3.access_key_id"),

config/proxy.go

@@ -8,6 +8,7 @@ import (
 	"github.com/buchgr/bazel-remote/v2/cache/gcsproxy"
 	"github.com/buchgr/bazel-remote/v2/cache/httpproxy"
 	"github.com/buchgr/bazel-remote/v2/cache/s3proxy"
+	"github.com/minio/minio-go/v7"
 )
 
 func (c *Config) setProxy() error {
@@ -49,7 +50,7 @@ func (c *Config) setProxy() error {
 		c.ProxyBackend = s3proxy.New(
 			c.S3CloudStorage.Endpoint,
 			c.S3CloudStorage.Bucket,
-			c.S3CloudStorage.BucketLookupType,
+			parseBucketLoopupType(c.S3CloudStorage.BucketLookupType),
 			c.S3CloudStorage.Prefix,
 			creds,
 			c.S3CloudStorage.DisableSSL,
@@ -79,3 +80,14 @@ func (c *Config) setProxy() error {
 
 	return nil
 }
+
+func parseBucketLoopupType(typeStr string) minio.BucketLookupType {
+	valMap := map[string]minio.BucketLookupType{
+		"auto": minio.BucketLookupAuto,
+		"dns":  minio.BucketLookupDNS,
+		"path": minio.BucketLookupPath,
+	}
+
+	// also when not found the type, return "auto" type.
+	return valMap[typeStr]
+}

config/s3.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/buchgr/bazel-remote/v2/cache/s3proxy"
 
-	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
@@ -25,8 +24,7 @@ type S3CloudStorageConfig struct {
 	KeyVersion               *int   `yaml:"key_version"`
 	AWSProfile               string `yaml:"aws_profile"`
 	AWSSharedCredentialsFile string `yaml:"aws_shared_credentials_file"`
-
-	BucketLookupType minio.BucketLookupType `yaml:"bucket_lookup_type"`
+	BucketLookupType         string `yaml:"bucket_lookup_type"`
 }
 
 func (s3c S3CloudStorageConfig) GetCredentials() (*credentials.Credentials, error) {

utils/flags/flags.go

@@ -219,6 +219,12 @@ func GetCliFlags() []cli.Flag {
 			Usage:   "The S3/minio bucket to use when using S3 proxy backend.",
 			EnvVars: []string{"BAZEL_REMOTE_S3_BUCKET"},
 		},
+		&cli.StringFlag{
+			Name:    "s3.bucket_lookup_type",
+			Value:   "auto",
+			Usage:   "The S3/minio bucket lookup type(auto|dns|path) to use when using S3 proxy backend.",
+			EnvVars: []string{"BAZEL_REMOTE_S3_BUCKET_LOOKUP_TYPE"},
+		},
 		&cli.StringFlag{
 			Name:    "s3.prefix",
 			Value:   "",