Feature user service refactoring

.env

@@ -1,6 +1,4 @@
-#BUILDKIT_PROGRESS=plain
-#DOCKER_BUILDKIT=1
-DATABASE_URL=postgres://postgres:postgres@127.0.0.1:5432/stacker
+DATABASE_URL=postgres://postgres:postgres@stackerdb:5432/stacker
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 POSTGRES_DB=stacker
@@ -14,3 +12,13 @@ REDIS_URL=redis://127.0.0.1/
 VAULT_ADDRESS=http://127.0.0.1:8200
 VAULT_TOKEN=your_vault_token_here
 VAULT_AGENT_PATH_PREFIX=agent
+
+STACKER_CASBIN_RELOAD_ENABLED=true
+STACKER_CASBIN_RELOAD_INTERVAL_SECS=60
+
+STACKER_AGENT_POLL_TIMEOUT_SECS=30
+STACKER_AGENT_POLL_INTERVAL_SECS=2
+
+# Deployment Settings
+# Base directory for deployments on target servers
+DEFAULT_DEPLOY_DIR=/home/trydirect

.github/workflows/docker.yml

@@ -5,22 +5,35 @@ on:
     branches:
       - main
       - testing
+      - dev
   pull_request:
     branches:
       - main
-
-env:
-  SQLX_OFFLINE: true
+      - dev
 
 jobs:
 
   cicd-docker:
     name: Cargo and npm build
     runs-on: ubuntu-latest
+    #runs-on: self-hosted
+    env:
+      SQLX_OFFLINE: true
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
 
+      - name: Install OpenSSL build deps
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libssl-dev
+
+      - name: Verify .sqlx cache exists
+        run: |
+          ls -lh .sqlx/ || echo ".sqlx directory not found"
+          find .sqlx -type f 2>/dev/null | wc -l
+
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -30,7 +43,7 @@ jobs:
           components: rustfmt, clippy
 
       - name: Cache cargo registry
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v4
         with:
           path: ~/.cargo/registry
           key: docker-registry-${{ hashFiles('**/Cargo.lock') }}
@@ -39,7 +52,7 @@ jobs:
             docker-
 
       - name: Cache cargo index
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v4
         with:
           path: ~/.cargo/git
           key: docker-index-${{ hashFiles('**/Cargo.lock') }}
@@ -52,7 +65,7 @@ jobs:
           head -c16 /dev/urandom > src/secret.key
 
       - name: Cache cargo build
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v4
         with:
           path: target
           key: docker-build-${{ hashFiles('**/Cargo.lock') }}
@@ -65,12 +78,6 @@ jobs:
         with:
           command: check
 
-      - name: Run cargo sqlx prepare
-        uses: actions-rs/cargo@v1
-        with:
-          command: sqlx prepare
-          args: --release
-
       - name: Cargo test
         if: ${{ always() }}
         uses: actions-rs/cargo@v1
@@ -97,20 +104,22 @@ jobs:
           command: clippy
           args: -- -D warnings
 
-      - name: Run cargo build
+      - name: Build server (release)
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --release
+          args: --release --bin server
 
       - name: npm install, build, and test
+        if: ${{ hashFiles('web/package.json') != '' }}
         working-directory: ./web
         run: |
           npm install
           npm run build
       #   npm test
 
       - name: Archive production artifacts
+        if: ${{ hashFiles('web/package.json') != '' }}
         uses: actions/upload-artifact@v4
         with:
           name: dist-without-markdown
@@ -119,14 +128,15 @@ jobs:
             !web/dist/**/*.md
 
       - name: Display structure of downloaded files
+        if: ${{ hashFiles('web/package.json') != '' }}
         run: ls -R web/dist
 
       - name: Copy app files and zip
         run: |
           mkdir -p app/stacker/dist
-          cp target/release/stacker app/stacker
-          cp -a web/dist/. app/stacker
-          cp docker/prod/Dockerfile app/Dockerfile
+          cp target/release/server app/stacker/server
+          if [ -d web/dist ]; then cp -a web/dist/. app/stacker; fi
+          cp Dockerfile app/Dockerfile
           cd app
           touch .env
           tar -czvf ../app.tar.gz .

.github/workflows/rust.yml

@@ -1,4 +1,6 @@
 name: Rust
+permissions:
+  contents: read
 
 on:
   push:
@@ -8,14 +10,72 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  SQLX_OFFLINE: true
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    name: Build binaries (Linux/macOS)
+    env:
+      SQLX_OFFLINE: true
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            artifact_name: stacker-linux-x86_64
+          - os: macos-latest
+            target: x86_64-apple-darwin
+            artifact_name: stacker-macos-x86_64
+          - os: macos-latest
+            target: aarch64-apple-darwin
+            artifact_name: stacker-macos-aarch64
+    runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
-    - name: cargo build
-      run: cargo build --verbose
-    - name: cargo test 
-      run: cargo test --verbose
+      - uses: actions/checkout@v4
+      - name: Verify .sqlx cache exists
+        run: |
+          ls -lh .sqlx/ || echo ".sqlx directory not found"
+          find .sqlx -type f 2>/dev/null | wc -l
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: ${{ matrix.target }}
+          override: true
+      - name: Cache cargo registry
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-registry-
+      - name: Cache cargo index
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-index-
+      - name: Cache target directory
+        uses: actions/cache@v4
+        with:
+          path: target
+          key: ${{ runner.os }}-target-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-target-${{ matrix.target }}-
+      - name: Build server (release)
+        run: cargo build --release --target ${{ matrix.target }} --bin server --verbose
+
+      - name: Build console (release with features)
+        run: cargo build --release --target ${{ matrix.target }} --bin console --features explain --verbose
+      - name: Prepare binaries
+        run: |
+          mkdir -p artifacts
+          cp target/${{ matrix.target }}/release/server artifacts/server
+          cp target/${{ matrix.target }}/release/console artifacts/console
+          tar -czf ${{ matrix.artifact_name }}.tar.gz -C artifacts .
+      - name: Upload binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact_name }}
+          path: ${{ matrix.artifact_name }}.tar.gz
+          retention-days: 7

.gitignore

@@ -7,3 +7,5 @@ configuration.yaml.backup
 configuration.yaml.orig
 .vscode/
 .env
+docs/*.sql
+config-to-validate.yaml

.pre-commit-config.yaml

@@ -5,3 +5,20 @@ repos:
       - id: ggshield
         language_version: python3
         stages: [commit]
+  - repo: local
+    hooks:
+      - id: cargo-fmt
+        name: cargo fmt --all
+        entry: cargo fmt --all
+        language: system
+        stages: [commit]
+      - id: cargo-clippy
+        name: SQLX_OFFLINE=true cargo clippy
+        entry: bash -c 'SQLX_OFFLINE=true cargo clippy'
+        language: system
+        stages: [commit]
+      - id: cargo-test
+        name: SQLX_OFFLINE=true cargo test
+        entry: bash -c 'SQLX_OFFLINE=true cargo test'
+        language: system
+        stages: [commit]