diff --git a/backend/migrations/20230914062021_fix_group_grant_roles.down.sql b/backend/migrations/20230914062021_fix_group_grant_roles.down.sql new file mode 100644 index 0000000000..d2f607c5b8 --- /dev/null +++ b/backend/migrations/20230914062021_fix_group_grant_roles.down.sql @@ -0,0 +1 @@ +-- Add down migration script here diff --git a/backend/migrations/20230914062021_fix_group_grant_roles.up.sql b/backend/migrations/20230914062021_fix_group_grant_roles.up.sql new file mode 100644 index 0000000000..0da0a538a3 --- /dev/null +++ b/backend/migrations/20230914062021_fix_group_grant_roles.up.sql @@ -0,0 +1 @@ +-- Add up migration script here diff --git a/backend/windmill-api/src/workers.rs b/backend/windmill-api/src/workers.rs index fe642ca781..51f540c91a 100644 --- a/backend/windmill-api/src/workers.rs +++ b/backend/windmill-api/src/workers.rs @@ -104,30 +104,23 @@ struct WorkerGroup { async fn get_worker_groups( authed: ApiAuthed, Extension(db): Extension, - Extension(user_db): Extension, ) -> error::JsonResult> { - let mut tx = user_db.begin(&authed).await?; - require_super_admin(&db, &authed.email).await?; let rows = sqlx::query_as!(WorkerGroup, "SELECT * FROM worker_group_config") - .fetch_all(&mut *tx) + .fetch_all(&db) .await?; - tx.commit().await?; Ok(Json(rows)) } +#[cfg(feature = "enterprise")] async fn update_worker_group( Path(name): Path, Extension(db): Extension, - Extension(user_db): Extension, authed: ApiAuthed, Json(config): Json, ) -> error::Result { - let tx = user_db.begin(&authed).await?; - require_super_admin(&db, &authed.email).await?; - tx.commit().await?; sqlx::query!( "INSERT INTO worker_group_config (name, config) VALUES ($1, $2) ON CONFLICT (name) DO UPDATE SET config = $2", @@ -140,6 +133,11 @@ async fn update_worker_group( Ok(format!("Updated worker group {name}")) } +#[cfg(not(feature = "enterprise"))] +async fn update_worker_group() -> String { + "Worker groups available only in enterprise version".to_string() +} + async fn delete_worker_group( Path(name): Path, Extension(db): Extension,