diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-19 14:02:51 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-19 14:02:51 -0700 |
| commit | cf28108ea435f738242aec99f32350957ba9db99 (patch) | |
| tree | 38730e20df7a2fa4e10e794b979f84a5355da145 | |
| parent | 27af11f1e80d738ed495dfca9766c913fd67a7ca (diff) | |
| download | seaweedfs-cf28108ea435f738242aec99f32350957ba9db99.tar.xz seaweedfs-cf28108ea435f738242aec99f32350957ba9db99.zip | |
fix grpd dial option
| -rw-r--r-- | weed/iamapi/iamapi_server.go | 5 | ||||
| -rw-r--r-- | weed/s3api/auto_signature_v4_test.go | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/weed/iamapi/iamapi_server.go b/weed/iamapi/iamapi_server.go index 63d2e7a75..3a4fb914e 100644 --- a/weed/iamapi/iamapi_server.go +++ b/weed/iamapi/iamapi_server.go @@ -52,7 +52,10 @@ func NewIamApiServer(router *mux.Router, option *IamServerOption) (iamApiServer option: option, masterClient: wdclient.NewMasterClient(option.GrpcDialOption, "", "iam", "", "", "", *pb.NewServiceDiscoveryFromMap(option.Masters)), } - s3Option := s3api.S3ApiServerOption{Filer: option.Filer} + s3Option := s3api.S3ApiServerOption{ + Filer: option.Filer, + GrpcDialOption: option.GrpcDialOption, + } iamApiServer = &IamApiServer{ s3ApiConfig: s3ApiConfigure, iam: s3api.NewIdentityAccessManagement(&s3Option), diff --git a/weed/s3api/auto_signature_v4_test.go b/weed/s3api/auto_signature_v4_test.go index 8d0b677f8..41b54db63 100644 --- a/weed/s3api/auto_signature_v4_test.go +++ b/weed/s3api/auto_signature_v4_test.go @@ -8,6 +8,8 @@ import ( "encoding/hex" "errors" "fmt" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "io" "net/http" "net/url" @@ -58,7 +60,9 @@ func TestIsRequestPresignedSignatureV4(t *testing.T) { // Tests is requested authenticated function, tests replies for s3 errors. func TestIsReqAuthenticated(t *testing.T) { - option := S3ApiServerOption{} + option := S3ApiServerOption{ + GrpcDialOption: grpc.WithTransportCredentials(insecure.NewCredentials()), + } iam := NewIdentityAccessManagement(&option) iam.identities = []*Identity{ { @@ -94,7 +98,9 @@ func TestIsReqAuthenticated(t *testing.T) { } func TestCheckAdminRequestAuthType(t *testing.T) { - option := S3ApiServerOption{} + option := S3ApiServerOption{ + GrpcDialOption: grpc.WithTransportCredentials(insecure.NewCredentials()), + } iam := NewIdentityAccessManagement(&option) iam.identities = []*Identity{ { |