Integration tests (#5)

.github/workflows/build.yml

@@ -9,49 +9,126 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  test:
-    name: Test
+  cargo-deny:
     runs-on: ubuntu-latest
     container:
       image: antonengelhardt/rust-docker-tools
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Rust version
+        run: rustc --version && cargo --version
 
       - name: Cargo Deny
         uses: EmbarkStudios/cargo-deny-action@v1
 
+  clippy:
+    runs-on: ubuntu-latest
+    container:
+      image: antonengelhardt/rust-docker-tools
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
       - name: Rust version
         run: rustc --version && cargo --version
 
       - name: Clippy
-        run: cargo clippy --release --all-targets --target=wasm32-wasi
+        run: |
+          rustc --version && cargo --version
+          cargo clippy
+
+  fmt:
+    runs-on: ubuntu-latest
+    container:
+      image: antonengelhardt/rust-docker-tools
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Rust version
+        run: rustc --version && cargo --version
 
       - name: Fmt
         run: cargo fmt -- --check
 
+  test:
+    runs-on: ubuntu-latest
+    container:
+      image: antonengelhardt/rust-docker-tools
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Rust version
+        run: rustc --version && cargo --version
+
       - name: Test
         run: cargo test --workspace
 
-      - name: Build
-        run: cargo build --release --target wasm32-wasi
-
   build:
     name: Build Plugin and publish artifact
-    needs: test
+    needs: [cargo-deny, clippy, fmt, test]
     runs-on: ubuntu-latest
     container:
-      image: antonengelhardt/rust-docker-tools
+      image: ghcr.io/antonengelhardt/rust-docker-tools
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
       - name: Build
         run: |
           cargo build --target wasm32-wasi --release
@@ -64,7 +141,7 @@ jobs:
 
   docker-image:
     name: Build and push Docker image
-    needs: test
+    needs: [build, test]
     runs-on: ubuntu-latest
 
     steps:
@@ -87,7 +164,7 @@ jobs:
   ghcr-image:
     name: Build and push GHCR image
     runs-on: ubuntu-latest
-    needs: test
+    needs: [build, test, docker-image]
     permissions:
       contents: read
       packages: write

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     name: Build and upload artifacts
     runs-on: ubuntu-latest
     container:
-      image: antonengelhardt/rust-docker-tools
+      image: ghcr.io/antonengelhardt/rust-docker-tools
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.github/workflows/test.yml

@@ -4,35 +4,197 @@ on:
   pull_request:
 
 jobs:
-  test:
-    name: Test
+  cargo-deny:
     runs-on: ubuntu-latest
     container:
       image: antonengelhardt/rust-docker-tools
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Rust version
+        run: rustc --version && cargo --version
 
       - name: Cargo Deny
         uses: EmbarkStudios/cargo-deny-action@v1
 
+  clippy:
+    runs-on: ubuntu-latest
+    container:
+      image: antonengelhardt/rust-docker-tools
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up cargo cache
+        uses: actions/cache@v4
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
       - name: Rust version
         run: rustc --version && cargo --version
 
       - name: Clippy
-        run: cargo clippy --release --all-targets --target=wasm32-wasi
+        run: |
+          rustc --version && cargo --version
+          cargo clippy
+
+  fmt:
+    runs-on: ubuntu-latest
+    container:
+      image: antonengelhardt/rust-docker-tools
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up cargo cache
+        uses: actions/cache@v4
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Rust version
+        run: rustc --version && cargo --version
 
       - name: Fmt
         run: cargo fmt -- --check
 
+  test:
+    runs-on: ubuntu-latest
+    container:
+      image: antonengelhardt/rust-docker-tools
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up cargo cache
+        uses: actions/cache@v4
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Rust version
+        run: rustc --version && cargo --version
+
       - name: Test
         run: cargo test --workspace
 
-      - name: Build
-        run: cargo build --release --target wasm32-wasi
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/antonengelhardt/rust-docker-tools
+    # needs: [test]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up cargo cache
+        uses: actions/cache@v4
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Build WASM OIDC Plugin
+        run: |
+          cargo build --target wasm32-wasi --release
+
+      - name: Upload plugin as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: plugin
+          path: target/wasm32-wasi/release/wasm_oidc_plugin.wasm
+
+  integration-tests:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/antonengelhardt/rust-docker-tools
+      ports:
+        - 10000
+    needs: [build]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download plugin from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: plugin
+          path: target/wasm32-wasi/release/wasm_oidc_plugin.wasm
+
+      - name: Install apks
+        run: |
+          apk update
+          apk add chromium chromium-chromedriver python3 py3-pip curl docker
+
+      - name: Install Python dependencies
+        run: pip install -r integration-tests/requirements.txt --break-system-packages
+
+      - name: Create .env for Integration tests
+        run: |
+          echo "CI=true" >> integration-tests/.env
+          echo "WASM_OIDC_PLUGIN_TEST_EMAIL=${{ secrets.WASM_OIDC_PLUGIN_TEST_EMAIL }}" >> integration-tests/.env
+          echo "WASM_OIDC_PLUGIN_TEST_PASSWORD=${{ secrets.WASM_OIDC_PLUGIN_TEST_PASSWORD }}" >> integration-tests/.env
+          sed -i 's/client_secret: \"redacted\"/client_secret: \"${{ secrets.WASM_OIDC_PLUGIN_TEST_CLIENT_SECRET }}\"/g' integration-tests/envoy.yaml
+          sed -i 's/aes_key: \"redacted\"/aes_key: \"${{ secrets.WASM_OIDC_PLUGIN_TEST_AES_KEY }}\"/g' integration-tests/envoy.yaml
+
+      - name: Start Containers & Run Integration tests
+        run: |
+          cd integration-tests
+
+          echo "Creating Envoy container"
+          docker container create --name envoy -p 10000:10000 docker.io/envoyproxy/envoy:v1.29-latest envoy -c /etc/envoy/envoy.yaml --concurrency 1 --component-log-level wasm:debug
+
+          echo "Copying files to Envoy container because Alpine doesn't like mounting files to files"
+          docker cp ../target/wasm32-wasi/release/wasm_oidc_plugin.wasm envoy:/etc/envoy/proxy-wasm-plugins
+          docker cp envoy.yaml envoy:/etc/envoy/envoy.yaml
+
+          echo "Starting Envoy container"
+          docker start envoy
+
+          sleep 5
+          docker ps
+          docker logs envoy
+
+          # Get the gateway of the envoy container
+          export GATEWAY=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' envoy)
+
+          echo "Running Integration Tests"
+          export WASM_OIDC_PLUGIN_TEST_EMAIL=${{ secrets.WASM_OIDC_PLUGIN_TEST_EMAIL }}
+          export WASM_OIDC_PLUGIN_TEST_PASSWORD=${{ secrets.WASM_OIDC_PLUGIN_TEST_PASSWORD }}
+          pytest test.py
+
+      - name: Finally show the envoy logs in case something failed
+        run: |
+          docker logs envoy
+        if: always()

Makefile

@@ -4,3 +4,8 @@ simulate:
 	docker-compose up
 clean:
 	docker-compose rm --force
+integration-test:
+	cargo build --target wasm32-wasi --release
+	docker-compose -f integration-tests/docker-compose.yaml up -d
+	pytest integration-tests/test.py
+	docker-compose -f integration-tests/docker-compose.yaml down

demo/configmap.yml

@@ -7,6 +7,11 @@ metadata:
   namespace: wasm-oidc-plugin
 data:
   envoy.yaml: |
+    admin:
+      address:
+        socket_address:
+          address: 0.0.0.0
+          port_value: 9901
     static_resources:
       listeners:
         address: