Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(quaint): enable integrated-auth-gssapi tiberius feature #4980

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
1 change: 1 addition & 0 deletions .github/workflows/codspeed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: ./.github/workflows/include/kerberos-setup

- name: Install cargo-codspeed
run: cargo install --locked cargo-codspeed
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
with:
components: clippy
targets: wasm32-unknown-unknown
- uses: ./.github/workflows/include/kerberos-setup
# Check the whole workspace with clippy for the native compilation
# target, and query-engine-wasm and dependencies for wasm32-unknown-unknown.
# Note that `--all-targets` is unrelated to `--target` as in target platform,
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/include/kerberos-setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Kerberos deps
description: Install the libkrb5-dev package on Ubuntu. This is required by tiberius when integrated-auth-gssapi is enabled.

runs:
using: "composite"
steps:
- name: Install libkrb5-dev
if: runner.os == 'Linux'
shell: bash
run: sudo apt-get update && sudo apt-get install -y libkrb5-dev
2 changes: 2 additions & 0 deletions .github/workflows/publish-query-engine-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:

- uses: ./.github/workflows/include/rust-wasm-setup

- uses: ./.github/workflows/include/kerberos-setup

- name: Build @prisma/query-engine-wasm
run: make build-qe-wasm
env:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: ./.github/workflows/include/kerberos-setup

- name: compile ${{ matrix.crate }}
shell: bash
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-driver-adapters-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
fi

- uses: ./.github/workflows/include/rust-wasm-setup
- uses: ./.github/workflows/include/kerberos-setup
- uses: taiki-e/install-action@nextest

- name: Setup
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-quaint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
target
key: ${{ runner.os }}-cargo-${{ matrix.features }}

- uses: ./.github/workflows/include/kerberos-setup

- name: Start Databases
run: docker compose -f docker-compose.yml up -d
working-directory: ./quaint
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-query-engine-black-box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: ./.github/workflows/include/kerberos-setup

- name: Login to Docker Hub
uses: docker/login-action@v3
continue-on-error: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-query-engine-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: taiki-e/install-action@nextest
- uses: ./.github/workflows/include/kerberos-setup

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-schema-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: taiki-e/install-action@nextest
- uses: ./.github/workflows/include/kerberos-setup

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down Expand Up @@ -112,6 +113,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: taiki-e/install-action@nextest
- uses: ./.github/workflows/include/kerberos-setup

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: ./.github/workflows/include/kerberos-setup

- run: |
cargo test --workspace --all-features \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/wasm-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:

- uses: ./.github/workflows/include/rust-wasm-setup

- uses: ./.github/workflows/include/kerberos-setup

- name: "Setup Node.js"
uses: actions/setup-node@v4

Expand Down
46 changes: 46 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions quaint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ version = "0.31"
features = ["chrono", "column_decltype"]
optional = true

[target.'cfg(target_os = "linux")'.dependencies.tiberius]
version = "0.11.8"
optional = true
features = ["integrated-auth-gssapi"]

[target.'cfg(not(any(target_os = "macos", target_os = "ios")))'.dependencies.tiberius]
version = "0.11.8"
optional = true
Expand Down