viaprog/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-06-13 23:36:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

go fmt

Browse Source
This commit is contained in:
Chris Lu
2026-02-19 19:09:49 -08:00
parent ca48fdbb0a
commit bd3241960b
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/s3tables/table-buckets/s3tables_integration_test.go
+6 -6
View File
@@ -751,7 +751,7 @@ func writeIAMConfig(t *testing.T, dir, allowedBucket string) string {
t.Helper()
config := map[string]any{
"sts": map[string]string{
"tokenDuration": "1h",
"tokenDuration": "1h",
"maxSessionLength": "12h",
"issuer": "seaweedfs-sts",
"signingKey": testIAMSigningKey,
@@ -759,9 +759,9 @@ func writeIAMConfig(t *testing.T, dir, allowedBucket string) string {
"accounts": []map[string]string{{"id": testAccountID, "displayName": "tables-integration"}},
"identities": []map[string]any{
{
"name": "admin",
"name": "admin",
"credentials": []map[string]string{{"accessKey": testAccessKey, "secretKey": testSecretKey}},
"account": map[string]string{"id": testAccountID, "displayName": "tables-integration"},
"account": map[string]string{"id": testAccountID, "displayName": "tables-integration"},
"policyNames": []string{"S3TablesBucketPolicy"},
},
},
@@ -800,10 +800,10 @@ func writeS3APIConfig(t *testing.T, dir string) string {
config := map[string]any{
"identities": []map[string]any{
{
"name": "admin",
"name": "admin",
"credentials": []map[string]string{{"accessKey": testAccessKey, "secretKey": testSecretKey}},
"actions": []string{"Admin", "Read", "List", "Tagging", "Write"},
"account": map[string]string{"id": testAccountID, "displayName": "tables-integration"},
"actions": []string{"Admin", "Read", "List", "Tagging", "Write"},
"account": map[string]string{"id": testAccountID, "displayName": "tables-integration"},
},
},
"accounts": []map[string]string{{"id": testAccountID, "displayName": "tables-integration"}},
test/volume_server/framework/cluster_dual.go
+14 -14
View File
@@ -33,7 +33,7 @@ type DualVolumeCluster struct {
volumeGrpcPort1 int
volumePubPort1 int
masterCmd *exec.Cmd
masterCmd *exec.Cmd
volumeCmd0 *exec.Cmd
volumeCmd1 *exec.Cmd
@@ -79,21 +79,21 @@ func StartDualVolumeCluster(t testing.TB, profile matrix.Profile) *DualVolumeClu
}
c := &DualVolumeCluster{
testingTB: t,
profile: profile,
weedBinary: weedBinary,
baseDir: baseDir,
configDir: configDir,
logsDir: logsDir,
keepLogs: keepLogs,
masterPort: masterPort,
masterGrpcPort: masterGrpcPort,
volumePort0: ports[0],
testingTB: t,
profile: profile,
weedBinary: weedBinary,
baseDir: baseDir,
configDir: configDir,
logsDir: logsDir,
keepLogs: keepLogs,
masterPort: masterPort,
masterGrpcPort: masterGrpcPort,
volumePort0: ports[0],
volumeGrpcPort0: ports[1],
volumePubPort0: ports[0],
volumePort1: ports[2],
volumePubPort0: ports[0],
volumePort1: ports[2],
volumeGrpcPort1: ports[3],
volumePubPort1: ports[2],
volumePubPort1: ports[2],
}
if profile.SplitPublicPort {
c.volumePubPort0 = ports[4]
weed/s3api/auth_credentials_subscribe_test.go
+12 -12
View File
@@ -90,18 +90,18 @@ func newTestS3ApiServerWithMemoryIAM(t *testing.T, identities []*iam_pb.Identity
// Create a test IAM instance
iam := &IdentityAccessManagement{
m: sync.RWMutex{},
nameToIdentity: make(map[string]*Identity),
accessKeyIdent: make(map[string]*Identity),
identities: []*Identity{},
policies: make(map[string]*iam_pb.Policy),
accounts: make(map[string]*Account),
emailAccount: make(map[string]*Account),
hashes: make(map[string]*sync.Pool),
hashCounters: make(map[string]*int32),
isAuthEnabled: false,
stopChan: make(chan struct{}),
useStaticConfig: false,
m: sync.RWMutex{},
nameToIdentity: make(map[string]*Identity),
accessKeyIdent: make(map[string]*Identity),
identities: []*Identity{},
policies: make(map[string]*iam_pb.Policy),
accounts: make(map[string]*Account),
emailAccount: make(map[string]*Account),
hashes: make(map[string]*sync.Pool),
hashCounters: make(map[string]*int32),
isAuthEnabled: false,
stopChan: make(chan struct{}),
useStaticConfig: false,
credentialManager: cm,
}
weed/s3api/bucket_paths.go
+1 -1
View File
@@ -95,7 +95,7 @@ func (s3a *S3ApiServer) readTableLocationMappingFromDirectory(bucket string) (st
conflict := false
err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
stream, err := client.ListEntries(context.Background(), &filer_pb.ListEntriesRequest{
stream, err := client.ListEntries(context.Background(), &filer_pb.ListEntriesRequest{
Directory: mappingDir,
Limit: 4294967295, // math.MaxUint32
})
weed/s3api/s3_constants/extend_key.go
+1 -1
View File
@@ -11,7 +11,7 @@ const (
ExtETagKey = "Seaweed-X-Amz-ETag"
ExtLatestVersionIdKey = "Seaweed-X-Amz-Latest-Version-Id"
ExtLatestVersionFileNameKey = "Seaweed-X-Amz-Latest-Version-File-Name"
ExtAllowEmptyFolders = "Seaweed-X-Amz-Allow-Empty-Folders"
ExtAllowEmptyFolders = "Seaweed-X-Amz-Allow-Empty-Folders"
// Cached list metadata in .versions directory for single-scan efficiency
ExtLatestVersionSizeKey = "Seaweed-X-Amz-Latest-Version-Size"
ExtLatestVersionETagKey = "Seaweed-X-Amz-Latest-Version-ETag"