Switch to official minio container for CI

Author: rowanseymour

.github/workflows/ci.yml

@@ -18,16 +18,6 @@ jobs:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
-      minio:
-        image: bitnami/minio:latest
-        env:
-          MINIO_ROOT_USER: root
-          MINIO_ROOT_PASSWORD: tembatemba
-          MINIO_DEFAULT_BUCKETS: temba-archives
-        ports:
-          - 9000:9000     
-        options: --health-cmd "mc ready local" --health-interval 10s --health-timeout 5s --health-retries 5
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -37,6 +27,19 @@ jobs:
         with:
           go-version: ${{ env.go-version }}
 
+      - name: Run MinIO docker container
+        run: |
+          docker run -d --rm \
+            -p 9000:9000 \
+            -p 9001:9001 \
+            --env MINIO_ROOT_USER=root \
+            --env MINIO_ROOT_PASSWORD=tembatemba \
+            --health-cmd "curl -f http://127.0.0.1:9000/minio/health/live" \
+            --health-interval 10s \
+            --health-timeout 5s \
+            --health-retries 5 \
+            minio/minio:latest minio server /data --console-address ":9001"
+
       - name: Run tests
         run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...
 

archives/archives_test.go

@@ -9,6 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
 	"github.com/nyaruka/gocommon/aws/cwatch"
@@ -18,7 +20,7 @@ import (
 )
 
 func setup(t *testing.T) (context.Context, *runtime.Runtime) {
-	ctx := context.Background()
+	ctx := t.Context()
 	config := runtime.NewDefaultConfig()
 	config.DB = "postgres://archiver_test:temba@localhost:5432/archiver_test?sslmode=disable&TimeZone=UTC"
 
@@ -38,14 +40,23 @@ func setup(t *testing.T) (context.Context, *runtime.Runtime) {
 	_, err = db.Exec(string(testDB))
 	require.NoError(t, err)
 
-	s3Client, err := NewS3Client(config)
+	s3Client, err := NewS3Client(config, false)
 	require.NoError(t, err)
 
+	if s3Client.Test(ctx, "temba-archives") != nil {
+		_, err = s3Client.Client.CreateBucket(ctx, &s3.CreateBucketInput{Bucket: aws.String("temba-archives")})
+		require.NoError(t, err)
+	}
+
 	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug})))
 
 	CW, err := cwatch.NewService(config.AWSAccessKeyID, config.AWSSecretAccessKey, config.AWSRegion, config.CloudwatchNamespace, config.DeploymentID)
 	require.NoError(t, err)
 
+	t.Cleanup(func() {
+		s3Client.EmptyBucket(ctx, "temba-archives")
+	})
+
 	return ctx, &runtime.Runtime{Config: config, DB: db, S3: s3Client, CW: CW}
 }
 

archives/s3.go

@@ -30,16 +30,17 @@ const maxSingleUploadBytes = 5e9 // 5GB
 const chunkSizeBytes = 1e9 // 1GB
 
 // NewS3Client creates a new s3 service from the passed in config, testing it as necessary
-func NewS3Client(cfg *runtime.Config) (*s3x.Service, error) {
+func NewS3Client(cfg *runtime.Config, test bool) (*s3x.Service, error) {
 	svc, err := s3x.NewService(cfg.AWSAccessKeyID, cfg.AWSSecretAccessKey, cfg.AWSRegion, cfg.S3Endpoint, cfg.S3Minio)
 	if err != nil {
 		return nil, err
 	}
 
-	// test out our S3 credentials
-	if err := svc.Test(context.TODO(), cfg.S3Bucket); err != nil {
-		slog.Error("s3 bucket not reachable", "error", err)
-		return nil, err
+	if test {
+		if err := svc.Test(context.TODO(), cfg.S3Bucket); err != nil {
+			slog.Error("s3 bucket not reachable", "error", err)
+			return nil, err
+		}
 	}
 
 	return svc, nil

cmd/rp-archiver/main.go

@@ -97,7 +97,7 @@ func main() {
 	}
 
 	if config.UploadToS3 {
-		rt.S3, err = archives.NewS3Client(config)
+		rt.S3, err = archives.NewS3Client(config, true)
 		if err != nil {
 			logger.Error("unable to initialize s3 client", "error", err)
 		} else {