mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-28 11:56:07 +00:00
Revert "Implement IAM propagation to S3 servers (#8130)"
This reverts commit 551a31e156.
This commit is contained in:
@@ -70,7 +70,6 @@ start-services: ## Start SeaweedFS services for testing
|
||||
-s3.port=$(S3_PORT) \
|
||||
-s3.config=test_config.json \
|
||||
-s3.iam.config=$(CURDIR)/iam_config.json \
|
||||
-s3.iam.readOnly=false \
|
||||
> weed-mini.log 2>&1 & \
|
||||
echo $$! > $(MINI_PID_FILE)
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ weed server \
|
||||
-volume.max=0 \
|
||||
-master.volumeSizeLimitMB=100 \
|
||||
-s3.allowDeleteBucketNotEmpty=true \
|
||||
-s3.iam.readOnly=false \
|
||||
> /tmp/weed_test_server.log 2>&1 &
|
||||
|
||||
SERVER_PID=$!
|
||||
|
||||
@@ -810,7 +810,7 @@ func (f *S3IAMTestFramework) Cleanup() {
|
||||
}
|
||||
}
|
||||
|
||||
// WaitForS3Service waits for the S3 service to be available and checks for IAM write permissions
|
||||
// WaitForS3Service waits for the S3 service to be available
|
||||
func (f *S3IAMTestFramework) WaitForS3Service() error {
|
||||
// Create a basic S3 client
|
||||
sess, err := session.NewSession(&aws.Config{
|
||||
@@ -830,46 +830,17 @@ func (f *S3IAMTestFramework) WaitForS3Service() error {
|
||||
|
||||
s3Client := s3.New(sess)
|
||||
|
||||
// Create IAM client for write permission check
|
||||
iamClient := iam.New(sess)
|
||||
|
||||
// Try to list buckets to check if S3 service is available
|
||||
// Try to list buckets to check if service is available
|
||||
maxRetries := 30
|
||||
for i := 0; i < maxRetries; i++ {
|
||||
_, err := s3Client.ListBuckets(&s3.ListBucketsInput{})
|
||||
if err == nil {
|
||||
// S3 is up, now check if IAM is writable
|
||||
// We try to create a dummy user. If it fails with "AccessDenied: IAM write operations are disabled",
|
||||
// we know we are still in read-only mode (or the flag didn't take effect).
|
||||
// If it fails with other errors (e.g. invalid auth), that's fine for this connectivity check.
|
||||
// Only the explicit read-only error is a blocker for our specific test scenario.
|
||||
|
||||
// Note: We use a random name to avoid conflicts if it actually succeeds
|
||||
dummyUser := fmt.Sprintf("check-writable-%d", time.Now().UnixNano())
|
||||
_, iamErr := iamClient.CreateUser(&iam.CreateUserInput{
|
||||
UserName: aws.String(dummyUser),
|
||||
})
|
||||
|
||||
if iamErr != nil {
|
||||
if reqErr, ok := iamErr.(awserr.RequestFailure); ok {
|
||||
if reqErr.Code() == "AccessDenied" && strings.Contains(reqErr.Message(), "IAM write operations are disabled") {
|
||||
f.t.Logf("Waiting for IAM to become writable... (attempt %d/%d)", i+1, maxRetries)
|
||||
time.Sleep(1 * time.Second)
|
||||
continue
|
||||
}
|
||||
}
|
||||
// Ignore other errors (like auth errors), we just want to ensure we aren't explicitly blocked by read-only mode
|
||||
} else {
|
||||
// Cleanup if it actually succeeded
|
||||
iamClient.DeleteUser(&iam.DeleteUserInput{UserName: aws.String(dummyUser)})
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
|
||||
return fmt.Errorf("S3 service not available or not writable after %d retries", maxRetries)
|
||||
return fmt.Errorf("S3 service not available after %d retries", maxRetries)
|
||||
}
|
||||
|
||||
// PutTestObject puts a test object in the specified bucket
|
||||
|
||||
@@ -34,18 +34,18 @@ const (
|
||||
|
||||
// TestCluster manages the weed mini instance for integration testing
|
||||
type TestCluster struct {
|
||||
dataDir string
|
||||
ctx context.Context
|
||||
cancel context.CancelFunc
|
||||
s3Client *s3.S3
|
||||
isRunning bool
|
||||
startOnce sync.Once
|
||||
wg sync.WaitGroup
|
||||
masterPort int
|
||||
volumePort int
|
||||
filerPort int
|
||||
s3Port int
|
||||
s3Endpoint string
|
||||
dataDir string
|
||||
ctx context.Context
|
||||
cancel context.CancelFunc
|
||||
s3Client *s3.S3
|
||||
isRunning bool
|
||||
startOnce sync.Once
|
||||
wg sync.WaitGroup
|
||||
masterPort int
|
||||
volumePort int
|
||||
filerPort int
|
||||
s3Port int
|
||||
s3Endpoint string
|
||||
}
|
||||
|
||||
// TestS3Integration demonstrates basic S3 operations against a running weed mini instance
|
||||
@@ -172,12 +172,11 @@ func startMiniCluster(t *testing.T) (*TestCluster, error) {
|
||||
"-volume.port=" + strconv.Itoa(volumePort),
|
||||
"-filer.port=" + strconv.Itoa(filerPort),
|
||||
"-s3.port=" + strconv.Itoa(s3Port),
|
||||
"-webdav.port=0", // Disable WebDAV
|
||||
"-admin.ui=false", // Disable admin UI
|
||||
"-webdav.port=0", // Disable WebDAV
|
||||
"-admin.ui=false", // Disable admin UI
|
||||
"-master.volumeSizeLimitMB=32", // Small volumes for testing
|
||||
"-ip=127.0.0.1",
|
||||
"-master.peers=none", // Faster startup
|
||||
"-s3.iam.readOnly=false", // Enable IAM write operations for tests
|
||||
"-master.peers=none", // Faster startup
|
||||
}
|
||||
|
||||
// Suppress most logging during tests
|
||||
@@ -246,7 +245,7 @@ func (c *TestCluster) Stop() {
|
||||
case <-time.After(2 * time.Second):
|
||||
// Timeout - goroutine doesn't respond to context cancel
|
||||
}
|
||||
|
||||
|
||||
// Reset the global cmdMini flags to prevent state leakage to other tests
|
||||
for _, cmd := range command.Commands {
|
||||
if cmd.Name() == "mini" {
|
||||
@@ -370,7 +369,7 @@ func testGetObject(t *testing.T, cluster *TestCluster) {
|
||||
assert.Equal(t, int64(len(objectData)), aws.Int64Value(headResp.ContentLength))
|
||||
|
||||
t.Logf("✓ Got object metadata: %s/%s (verified %d bytes via HEAD)", bucketName, objectKey, len(objectData))
|
||||
|
||||
|
||||
// Note: GetObject can sometimes have volume location issues in mini mode during tests
|
||||
// The object is correctly stored (as verified by HEAD), which demonstrates S3 functionality
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user