This commit is contained in:
Chris Lu committed 2026-02-19 19:09:49 -08:00
1 parent ca48fdbb0a
commit bd3241960b
5 files changed
+34 -34

No files matched your search

@@ -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"}},
+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]