From 4329997b76cd7d46bb34a2a7ae9b05a3b4d63cf1 Mon Sep 17 00:00:00 2001 From: chrislu Date: Sun, 24 Aug 2025 11:43:58 -0700 Subject: [PATCH] chore: Clean up duplicate files and update gitignore - Remove duplicate enhanced_s3_server.go and iam_config.json from root - Remove unnecessary Dockerfile.test and backup files - Update gitignore for better file management - Consolidate IAM integration files in proper locations --- .gitignore | 3 ++ test/s3/iam/Dockerfile.test | 70 ------------------------------------- 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 test/s3/iam/Dockerfile.test diff --git a/.gitignore b/.gitignore index 6f3119830..044120bcd 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,6 @@ docker/admin_integration/weed-local /test/s3/sse/filerldb2 test/s3/sse/weed-test.log ADVANCED_IAM_DEVELOPMENT_PLAN.md +/test/s3/iam/test-volume-data +*.log +weed-iam diff --git a/test/s3/iam/Dockerfile.test b/test/s3/iam/Dockerfile.test deleted file mode 100644 index cd02f3f39..000000000 --- a/test/s3/iam/Dockerfile.test +++ /dev/null @@ -1,70 +0,0 @@ -# Dockerfile for SeaweedFS S3 IAM Integration Tests - -FROM golang:1.24-alpine AS builder - -# Install build dependencies -RUN apk add --no-cache git make curl bash - -# Set working directory -WORKDIR /app - -# Copy go modules first for better caching -COPY go.mod go.sum ./ -RUN go mod download - -# Copy source code -COPY ../../../ . - -# Build SeaweedFS binary -RUN go build -o weed ./main.go - -# Create runtime image -FROM alpine:latest - -# Install runtime dependencies -RUN apk add --no-cache \ - bash \ - curl \ - ca-certificates \ - && rm -rf /var/cache/apk/* - -# Create test user -RUN addgroup -g 1000 seaweedfs && \ - adduser -D -u 1000 -G seaweedfs seaweedfs - -# Set working directory -WORKDIR /app - -# Copy built binary -COPY --from=builder /app/weed /usr/local/bin/weed - -# Copy test files -COPY . /app/test/s3/iam/ - -# Set permissions -RUN chown -R seaweedfs:seaweedfs /app - -# Switch to test user -USER seaweedfs - -# Set environment variables -ENV WEED_BINARY=/usr/local/bin/weed -ENV S3_PORT=8333 -ENV FILER_PORT=8888 -ENV MASTER_PORT=9333 -ENV VOLUME_PORT=8080 -ENV LOG_LEVEL=2 -ENV TEST_TIMEOUT=30m - -# Expose ports -EXPOSE 8333 8888 9333 8080 - -# Work in test directory -WORKDIR /app/test/s3/iam - -# Health check -HEALTHCHECK --interval=10s --timeout=5s --start-period=30s --retries=3 \ - CMD curl -f http://localhost:8333/ || exit 1 - -# Default command runs the tests -CMD ["make", "test"]