mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-05-19 09:50:08 +02:00
Code Issues Projects Releases Wiki Activity

fix grpd dial option

Browse source
This commit is contained in:
chrislu 2023-09-19 14:02:51 -07:00
parent 27af11f1e8
commit cf28108ea4
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
weed/iamapi/iamapi_server.go
View file

@ -52,7 +52,10 @@ func NewIamApiServer(router *mux.Router, option *IamServerOption) (iamApiServer
option: option, option: option,
masterClient: wdclient.NewMasterClient(option.GrpcDialOption, "", "iam", "", "", "", *pb.NewServiceDiscoveryFromMap(option.Masters)), 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{ iamApiServer = &IamApiServer{
s3ApiConfig: s3ApiConfigure, s3ApiConfig: s3ApiConfigure,
iam: s3api.NewIdentityAccessManagement(&s3Option), iam: s3api.NewIdentityAccessManagement(&s3Option),

10
weed/s3api/auto_signature_v4_test.go
View file

@ -8,6 +8,8 @@ import (
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"io" "io"
"net/http" "net/http"
"net/url" "net/url"
@ -58,7 +60,9 @@ func TestIsRequestPresignedSignatureV4(t *testing.T) {
// Tests is requested authenticated function, tests replies for s3 errors. // Tests is requested authenticated function, tests replies for s3 errors.
func TestIsReqAuthenticated(t *testing.T) { func TestIsReqAuthenticated(t *testing.T) {
option := S3ApiServerOption{} option := S3ApiServerOption{
GrpcDialOption: grpc.WithTransportCredentials(insecure.NewCredentials()),
}
iam := NewIdentityAccessManagement(&option) iam := NewIdentityAccessManagement(&option)
iam.identities = []*Identity{ iam.identities = []*Identity{
{ {
@ -94,7 +98,9 @@ func TestIsReqAuthenticated(t *testing.T) {
} }
func TestCheckAdminRequestAuthType(t *testing.T) { func TestCheckAdminRequestAuthType(t *testing.T) {
option := S3ApiServerOption{} option := S3ApiServerOption{
GrpcDialOption: grpc.WithTransportCredentials(insecure.NewCredentials()),
}
iam := NewIdentityAccessManagement(&option) iam := NewIdentityAccessManagement(&option)
iam.identities = []*Identity{ iam.identities = []*Identity{
{ {