diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-08-24 23:25:36 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-08-24 23:25:36 -0700 |
| commit | c6c97bd83d379cb101a50fb141d9eae1685dbf89 (patch) | |
| tree | 2ac39456b1ffdc2f4dccfb83e3ef128e43908a54 | |
| parent | a19c728034839d893c0a73473520d9a4d558d984 (diff) | |
| download | seaweedfs-c6c97bd83d379cb101a50fb141d9eae1685dbf89.tar.xz seaweedfs-c6c97bd83d379cb101a50fb141d9eae1685dbf89.zip | |
add default env variables
| -rw-r--r-- | weed/remote_storage/s3/tencent.go | 6 | ||||
| -rw-r--r-- | weed/shell/command_remote_configure.go | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/weed/remote_storage/s3/tencent.go b/weed/remote_storage/s3/tencent.go index d790f0e98..2748d259b 100644 --- a/weed/remote_storage/s3/tencent.go +++ b/weed/remote_storage/s3/tencent.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/remote_storage" + "github.com/chrislusf/seaweedfs/weed/util" + "os" ) func init() { @@ -20,12 +22,14 @@ func (s TencentRemoteStorageMaker) Make(conf *filer_pb.RemoteConf) (remote_stora client := &s3RemoteStorageClient{ conf: conf, } + accessKey := util.Nvl(conf.TencentSecretId, os.Getenv("COS_SECRETID")) + secretKey := util.Nvl(conf.TencentSecretKey, os.Getenv("COS_SECRETKEY")) config := &aws.Config{ Endpoint: aws.String(conf.TencentEndpoint), S3ForcePathStyle: aws.Bool(true), } - config.Credentials = credentials.NewStaticCredentials(conf.TencentSecretId, conf.TencentSecretKey, "") + config.Credentials = credentials.NewStaticCredentials(accessKey, secretKey, "") sess, err := session.NewSession(config) if err != nil { diff --git a/weed/shell/command_remote_configure.go b/weed/shell/command_remote_configure.go index 33c21e218..8ea5fd39e 100644 --- a/weed/shell/command_remote_configure.go +++ b/weed/shell/command_remote_configure.go @@ -72,12 +72,12 @@ func (c *commandRemoteConfigure) Do(args []string, commandEnv *CommandEnv, write remoteConfigureCommand.StringVar(&conf.BackblazeApplicationKey, "b2.application_key", "", "backblaze applicationKey. Note that your Master Application Key will not work with the S3 Compatible API. You must create a new key that is eligible for use. For more information: https://help.backblaze.com/hc/en-us/articles/360047425453") remoteConfigureCommand.StringVar(&conf.BackblazeEndpoint, "b2.endpoint", "", "backblaze endpoint") - remoteConfigureCommand.StringVar(&conf.AliyunAccessKey, "aliyun.access_key", "", "Aliyun access key") - remoteConfigureCommand.StringVar(&conf.AliyunSecretKey, "aliyun.secret_key", "", "Aliyun secret key") + remoteConfigureCommand.StringVar(&conf.AliyunAccessKey, "aliyun.access_key", "", "Aliyun access key, default to use env ALICLOUD_ACCESS_KEY_ID") + remoteConfigureCommand.StringVar(&conf.AliyunSecretKey, "aliyun.secret_key", "", "Aliyun secret key, default to use env ALICLOUD_ACCESS_KEY_SECRET") remoteConfigureCommand.StringVar(&conf.AliyunEndpoint, "aliyun.endpoint", "", "Aliyun endpoint") - remoteConfigureCommand.StringVar(&conf.TencentSecretId, "tencent.secret_id", "", "Tencent Secret Id") - remoteConfigureCommand.StringVar(&conf.TencentSecretKey, "tencent.secret_key", "", "Tencent secret key") + remoteConfigureCommand.StringVar(&conf.TencentSecretId, "tencent.secret_id", "", "Tencent Secret Id, default to use env COS_SECRETID") + remoteConfigureCommand.StringVar(&conf.TencentSecretKey, "tencent.secret_key", "", "Tencent secret key, default to use env COS_SECRETKEY") remoteConfigureCommand.StringVar(&conf.TencentEndpoint, "tencent.endpoint", "", "Tencent endpoint") if err = remoteConfigureCommand.Parse(args); err != nil { |