bump: soaricarus_api

.github/workflows/workflow.yml

@@ -65,30 +65,25 @@ jobs:
           docker ps -a
           echo "Docker environment check complete."
 
-      - name: Setup LocalStack S3
+      - name: Setup S3
-        run: |
-          # Install AWS CLI
-          sudo apt update
-          sudo apt search awscli
-          pip install awscli
-          
-          # Wait for LocalStack
-          until curl -s http://localhost:4566/_localstack/health | grep -q '"s3":"available"'; do
-            sleep 3
-          done
-          
-          # CHOOSE A BUCKET NAME - this is whatever you want
-          BUCKET_NAME="soaricarus-ci-bucket"  # <-- CHANGE THIS TO WHAT YOUR APP EXPECTS
-          
-          # Create the bucket
-          aws --endpoint-url=http://localhost:4566 s3 mb s3://$BUCKET_NAME --region ${{ secrets.GARAGE_REGION }}
-          
-          # Set it as an environment variable for the test step
-          echo "BUCKET_NAME=$BUCKET_NAME" >> $GITHUB_ENV
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.GARAGE_KEY_ID }}
+          GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.GARAGE_SECRET }}
+          GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
-          AWS_DEFAULT_REGION: ${{ secrets.GARAGE_REGION }}
+          GARAGE_DEFAULT_BUCKET: "soaricarus-ci-bucket"
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: us-east-1
+        run: |
+          sudo apt update
+          sudo apt install curl unzip -y
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install
+          aws --version
+          # curl -v ${{ secrets.S3_CI_ENDPOINT_URL }}
+
+          # Create bucket
+          aws --endpoint-url=${{ secrets.S3_CI_ENDPOINT_URL }} s3 mb s3://soaricarus-ci-bucket --region us-east-1
 
       - name: Run tests
         env:
@@ -100,12 +95,13 @@ jobs:
           ROOT_DIRECTORY: "/tmp"
           AWS_ACCESS_KEY_ID: ${{ secrets.GARAGE_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.GARAGE_SECRET }}
-          AWS_DEFAULT_REGION: ${{ secrets.GARAGE_REGION }}
+          AWS_DEFAULT_REGION: us-east-1
           GARAGE_DEFAULT_ACCESS_KEY: ${{ secrets.GARAGE_KEY_ID }}
           GARAGE_DEFAULT_SECRET_KEY: ${{ secrets.GARAGE_SECRET }}
-          GARAGE_S3_REGION: ${{ secrets.GARAGE_REGION }}
+          GARAGE_S3_REGION: us-east-1
           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
@@ -117,6 +113,18 @@ jobs:
 
           cargo test
 
+      - name: Cleanup
+        if: always()
+        run: |
+          aws --endpoint-url=${{ secrets.S3_CI_ENDPOINT_URL }} \
+              s3 rb s3://soaricarus-ci-bucket --force \
+              --region us-east-1
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: us-east-1
+        continue-on-error: true
+
   fmt:
     name: Rustfmt
     runs-on: ubuntu-24.04

Cargo.lock

@@ -3022,7 +3022,7 @@ dependencies = [
 
 [[package]]
 name = "soaricarus_api"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "axum",
  "axum-extra",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soaricarus_api"
-version = "0.5.2"
+version = "0.5.3"
 edition = "2024"
 rust-version = "1.95"
 license = "MIT"

README.md

@@ -19,6 +19,21 @@ Copy the `.env.docker.sample` file to `.env`. Ensure that the `ROOT_DIRECTORY` v
 and exists on the docker image's filesystem. The credentials for the database doesn't need to be
 changed for development, but if deploying it, it should be modified.
 
+### S3 Setup
+Using the copied `.env.docker.sample`, ensure that the following has been properly populated.
+```
+S3_ENDPOINT_URL - URL of the S3 bucket
+S3_BUCKET_NAME - Name of the S3 bucket
+GARAGE_S3_REGION - Region of the S3 bucket
+GARAGE_RPC_SECRET - A 32-bit hex string
+GARAGE_DEFAULT_ACCESS_KEY - Access key starting with GK followed with a 16-bit hex string
+GARAGE_DEFAULT_SECRET_KEY - Secret key with a 32-bit hex string
+```
+
+The other S3-related environment variables can be left as is for the sake of getting
+started.
+
+
 Build containers
 ```
 docker compose build --ssh default