Obj str do it (#255)

Reviewed-on: #255

.github/workflows/pr.yml

@@ -0,0 +1,116 @@
+name: pr CI
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+
+jobs:
+  test:
+    name: Test Suite
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    services:
+      postgres:
+        image: postgres:18.4-alpine
+        env:
+          POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
+          POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
+          POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }}
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.97
+      - uses: Swatinem/rust-cache@v2
+      - name: Verify Docker Environment
+        run: |
+          echo "Runner User Info:"
+          id
+          echo "Checking Docker Version:"
+          docker --version
+          echo "Checking Docker Daemon Status (info):"
+          docker info
+          echo "Checking Docker Daemon Status (ps):"
+          docker ps -a
+          echo "Docker environment check complete."
+
+      - name: Setup S3
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: us-east-1
+          ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL}}"
+        run: |
+          sudo apt update
+          echo "Installing curl and unzip"
+          sudo apt install curl unzip -y
+
+          echo "Installing awscli"
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install
+          aws --version
+
+          BUCKET="soaricarus-ci-bucket-$(echo $RANDOM | md5sum | head -c 8)"
+          echo "S3_BUCKET=$BUCKET" >> $GITHUB_ENV
+          echo "AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV
+          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
+          echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
+
+          echo "Creating bucket: $BUCKET"
+          aws --endpoint-url=$ENDPOINT_URL s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
+
+      - name: Run tests
+        env:
+          DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
+          RUST_LOG: info # Optional: configure test log level
+          SECRET_MAIN_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
+          SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
+          ROOT_DIRECTORY: "/tmp"
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
+          GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
+          GARAGE_S3_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          S3_BUCKET_NAME: ${{ env.S3_BUCKET }}
+          S3_ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL }}"
+          AWS_S3_FORCE_PATH_STYLE: "true"
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
+          chmod 600 ~/.ssh/soaricarus_models_deploy_key
+          ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/soaricarus_models_deploy_key
+
+          cargo test
+
+      - name: Cleanup
+        if: always()
+        run: |
+          echo "Cleaning up bucket $BUCK"
+          echo "Region: $AWS_DEFAULT_REGION"
+
+          aws --endpoint-url=$ENDPOINT_URL \
+              s3 rb s3://$BUCK --force \
+              --region $AWS_DEFAULT_REGION
+        env:
+          ENDPOINT_URL: ${{ secrets.S3_CI_ENDPOINT_URL }} 
+          AWS_ACCESS_KEY_ID: "${{ env.AWS_ACCESS_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ env.AWS_SECRET_ACCESS_KEY }}"
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          BUCK: ${{ env.S3_BUCKET }}
+        continue-on-error: true

.github/workflows/workflow.yml

@@ -3,8 +3,6 @@ name: soaricarus_api CI
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -35,6 +33,7 @@ jobs:
   test:
     name: Test Suite
     runs-on: ubuntu-24.04
+    timeout-minutes: 20
     services:
       postgres:
         image: postgres:18.4-alpine
@@ -65,14 +64,49 @@ jobs:
           echo "Checking Docker Daemon Status (ps):"
           docker ps -a
           echo "Docker environment check complete."
+
+      - name: Setup S3
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: us-east-1
+          ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL}}"
+        run: |
+          sudo apt update
+          echo "Installing curl and unzip"
+          sudo apt install curl unzip -y
+
+          echo "Installing awscli"
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install
+          aws --version
+
+          BUCKET="soaricarus-ci-bucket-$(echo $RANDOM | md5sum | head -c 8)"
+          echo "S3_BUCKET=$BUCKET" >> $GITHUB_ENV
+          echo "AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV
+          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
+          echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
+
+          echo "Creating bucket: $BUCKET"
+          aws --endpoint-url=$ENDPOINT_URL s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
+
       - name: Run tests
         env:
-          # Define DATABASE_URL for tests to use
           DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
           RUST_LOG: info # Optional: configure test log level
           SECRET_MAIN_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
           SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
           ROOT_DIRECTORY: "/tmp"
+          AWS_ACCESS_KEY_ID: ${{ secrets.GARAGE_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.GARAGE_SECRET }}
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          GARAGE_DEFAULT_ACCESS_KEY: ${{ secrets.GARAGE_KEY_ID }}
+          GARAGE_DEFAULT_SECRET_KEY: ${{ secrets.GARAGE_SECRET }}
+          GARAGE_S3_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          S3_BUCKET_NAME: "soaricarus-ci-bucket"
+          S3_ENDPOINT_URL: "http://localhost:3900"
+          AWS_S3_FORCE_PATH_STYLE: "true"
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
@@ -84,6 +118,23 @@ jobs:
 
           cargo test
 
+      - name: Cleanup
+        if: always()
+        run: |
+          echo "Cleaning up bucket $BUCK"
+          echo "Region: $AWS_DEFAULT_REGION"
+
+          aws --endpoint-url=$ENDPOINT_URL \
+              s3 rb s3://$BUCK --force \
+              --region $AWS_DEFAULT_REGION
+        env:
+          ENDPOINT_URL: ${{ secrets.S3_CI_ENDPOINT_URL }} 
+          AWS_ACCESS_KEY_ID: "${{ env.AWS_ACCESS_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ env.AWS_SECRET_ACCESS_KEY }}"
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          BUCK: ${{ env.S3_BUCKET }}
+        continue-on-error: true
+
   fmt:
     name: Rustfmt
     runs-on: ubuntu-24.04