Resolve conflicts

Author: matthewmturner

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
           key: ${{ runner.os }}-cargo-target-${{ hashFiles('Cargo.lock') }}
       - name: Setup Rust Toolchain
         uses: ./.github/actions/setup-rust
-      - name: Run tests (ex-FlightSQL)
+      - name: Run core tests
         run: |
           cargo test
   test-flightsql:
@@ -146,31 +146,6 @@ jobs:
       - name: Run Deltalake tests
         run: |
           cargo test --features=deltalake extension_cases::deltalake
-  test-hudi:
-    name: Extension / Hudi
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [amd64]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Cache Cargo
-        uses: actions/cache@v4
-        with:
-          path: /home/runner/.cargo
-          key: cargo-dft-cache-
-      - name: Cache Rust dependencies
-        uses: actions/cache@v4
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-target-${{ hashFiles('Cargo.lock') }}
-      - name: Setup Rust Toolchain
-        uses: ./.github/actions/setup-rust
-      - name: Run Hudi tests
-        run: |
-          cargo test --features=hudi extension_cases::hudi
   test-udfs-wasm:
     name: Extension / UDFs-WASM
     runs-on: ubuntu-latest
@@ -271,8 +246,8 @@ jobs:
       - name: Run UDFs WASM tests
         run: |
           cargo test --manifest-path crates/datafusion-udfs-wasm/Cargo.toml
-  test-auth-basic:
-    name: Extension / Auth-Basic
+  test-auth:
+    name: Extension / Auth
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -293,38 +268,21 @@ jobs:
           key: ${{ runner.os }}-cargo-target-${{ hashFiles('Cargo.lock') }}
       - name: Setup Rust Toolchain
         uses: ./.github/actions/setup-rust
-      - name: Start FlightSQL Server
+      # Right now basic and bearer auth can not be used at the same time.  So we serve an instance with one, then kill it, then serve an instance with another.  An alternative, perhaps simpler option, would be configuring the ports used - but this would come at the cost of a more annoying local dev experience as you have to remember to keep updating the ports.
+      - name: Start FlightSQL Server with Basic Auth
         run: |
-          cargo r --features=flightsql -- serve-flightsql --config data/configs/flightsql_basic.toml &
-      - name: Run auth tests
+          cargo r --features=flightsql -- serve-flightsql --config data/configs/flightsql_basic.toml & echo $! > server.pid
+      - name: Run Basic Auth tests
         run: |
           cargo t --features=flightsql extension_cases::auth_basic
-  test-auth-bearer:
-    name: Extension / Auth-Bearer
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [amd64]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Cache Cargo
-        uses: actions/cache@v4
-        with:
-          path: /home/runner/.cargo
-          key: cargo-dft-cache-
-      - name: Cache Rust dependencies
-        uses: actions/cache@v4
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-target-${{ hashFiles('Cargo.lock') }}
-      - name: Setup Rust Toolchain
-        uses: ./.github/actions/setup-rust
-      - name: Start FlightSQL Server
+      - name: Kill FlightSQL Server
+        run: |
+          kill $(cat server.pid)
+          rm server.pid
+      - name: Start FlightSQL Server with Bearer Auth
         run: |
           cargo r --features=flightsql -- serve-flightsql --config data/configs/flightsql_bearer.toml &
-      - name: Run auth tests
+      - name: Run Bearer Auth tests
         run: |
           cargo t --features=flightsql extension_cases::auth_bearer
   test-http-server:
@@ -349,11 +307,17 @@ jobs:
           key: ${{ runner.os }}-cargo-target-${{ hashFiles('Cargo.lock') }}
       - name: Setup Rust Toolchain
         uses: ./.github/actions/setup-rust
-      - name: Run auth tests
+      - name: Start FlightSQL Server
         run: |
-          cargo t --features=http server::http::router::test
-  test-http-server-flightsql:
-    name: Extension / HTTP Server (FlightSQL)
+          cargo r --features=flightsql -- serve-flightsql &
+      - name: Run tests
+        run: |
+          cargo t --features=http,flightsql server::http::router
+      - name: Run CLI cases
+        run: |
+          cargo t --features=http,flightsql server_cases::http
+  test-flightsql-server:
+    name: Extension / FlightSQL Server
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -370,13 +334,10 @@ jobs:
       - name: Cache Rust dependencies
         uses: actions/cache@v4
         with:
-          path: /home/runner/target
-          key: target-dft-cache-
+          path: target
+          key: ${{ runner.os }}-cargo-target-${{ hashFiles('Cargo.lock') }}
       - name: Setup Rust Toolchain
         uses: ./.github/actions/setup-rust
-      - name: Start FlightSQL Server
-        run: |
-          cargo r --features=flightsql -- serve-flight-sql &
-      - name: Run auth tests
+      - name: Run CLI cases
         run: |
-          cargo t --features=http server::http::router::flightsql_test
+          cargo t --features=http,flightsql server_cases::http