chore: openidconnect is a feature flag

windmill-labs · Mar 17, 2024 · 7b2047b · 7b2047b
1 parent abaeafa
commit 7b2047b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -73,7 +73,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=embedding,parquet
+            features=embedding,parquet,openidconnect
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev
             ${{ steps.meta-public.outputs.tags }}
@@ -135,7 +135,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect
             nsjail=true
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:dev

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -48,6 +48,7 @@ embedding = ["windmill-api/embedding"]
 parquet = ["windmill-api/parquet", "windmill-common/parquet", "windmill-worker/parquet"]
 prometheus = ["windmill-common/prometheus", "windmill-api/prometheus", "windmill-worker/prometheus", "windmill-queue/prometheus"]
 flow_testing = ["windmill-worker/flow_testing"]
+openidconnect = ["windmill-api/openidconnect"]
 
 [dependencies]
 anyhow.workspace = true

diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-ddf6266d267f7811b67109ae3f8aae82c4adc642
+95790456721e43dd0be281f78bbae2e510288d20
diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml
@@ -10,13 +10,14 @@ path = "src/lib.rs"
 
 [features]
 default = []
-enterprise = ["windmill-queue/enterprise", "windmill-audit/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise"]
+enterprise = ["windmill-queue/enterprise", "windmill-audit/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise", "dep:openidconnect"]
 stripe = ["dep:async-stripe"]
 enterprise_saml = ["dep:samael"]
 benchmark = []
 embedding = ["dep:tinyvector", "dep:hf-hub", "dep:tokenizers", "dep:candle-core", "dep:candle-transformers", "dep:candle-nn"]
 parquet = ["dep:polars", "dep:polars-io", "dep:object_store", "windmill-common/parquet"]
 prometheus = ["windmill-common/prometheus", "windmill-queue/prometheus", "dep:prometheus"]
+openidconnect = ["dep:openidconnect"]
 
 [dependencies]
 windmill-queue.workspace = true
@@ -85,7 +86,7 @@ candle-nn = { workspace = true, optional = true}
 polars = { workspace = true, optional = true}
 polars-io = { workspace = true, optional = true}
 object_store = { workspace = true, optional = true}
-openidconnect = { workspace = true}
+openidconnect = { workspace = true, optional = true}
 pin-project.workspace = true
 crc.workspace = true
 
diff --git a/backend/windmill-worker/Cargo.toml b/backend/windmill-worker/Cargo.toml
@@ -11,7 +11,7 @@ path = "src/lib.rs"
 [features]
 default = []
 prometheus = ["dep:prometheus", "windmill-common/prometheus"]
-enterprise = ["windmill-queue/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise", "dep:gcp_auth", "dep:jsonwebtoken", "dep:openidconnect", "dep:pem", "dep:sha2", "dep:tiberius", "dep:tokio-util"]
+enterprise = ["windmill-queue/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise", "dep:gcp_auth", "dep:jsonwebtoken", "dep:pem", "dep:sha2", "dep:tiberius", "dep:tokio-util", "dep:openidconnect"]
 benchmark = ["windmill-queue/benchmark"]
 flamegraph = []
 parquet = ["windmill-common/parquet"]