diff --git a/backend/migrations/20241127171723_apply_windmill_roles.up.sql b/backend/migrations/20241127171723_apply_windmill_roles.up.sql index 33a6476bef..dede7c1b30 100644 --- a/backend/migrations/20241127171723_apply_windmill_roles.up.sql +++ b/backend/migrations/20241127171723_apply_windmill_roles.up.sql @@ -1,4 +1,12 @@ -- for some managed dbs (e.g Azure Postgres) the role is not -- automatically applied to the user when created -GRANT windmill_user to CURRENT_USER; -GRANT windmill_admin to CURRENT_USER; \ No newline at end of file +DO +$do$ +BEGIN + GRANT windmill_user to CURRENT_USER; + GRANT windmill_admin to CURRENT_USER; +EXCEPTION WHEN OTHERS THEN + RAISE NOTICE 'error granting windmill_user and windmill_admin to current_user: %', SQLERRM; +END +$do$; + diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs index 6fec44f0fe..7c820f9fa1 100644 --- a/backend/src/monitor.rs +++ b/backend/src/monitor.rs @@ -27,14 +27,22 @@ use windmill_api::{ DEFAULT_BODY_LIMIT, IS_SECURE, OAUTH_CLIENTS, REQUEST_SIZE_LIMIT, SAML_METADATA, SCIM_TOKEN, }; #[cfg(feature = "enterprise")] -use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts, LICENSE_KEY_VALID}; +use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts}; use windmill_common::{ auth::JWT_SECRET, ee::CriticalErrorChannel, error, flow_status::FlowStatusModule, global_settings::{ - BASE_URL_SETTING, BUNFIG_INSTALL_SCOPES_SETTING, CRITICAL_ALERT_MUTE_UI_SETTING, CRITICAL_ERROR_CHANNELS_SETTING, DEFAULT_TAGS_PER_WORKSPACE_SETTING, DEFAULT_TAGS_WORKSPACES_SETTING, MONITOR_LOGS_ON_OBJECT_STORE_SETTING, EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING, EXTRA_PIP_INDEX_URL_SETTING, HUB_BASE_URL_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING, JWT_SECRET_SETTING, KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING, NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING, PIP_INDEX_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING, REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING, RETENTION_PERIOD_SECS_SETTING, SAML_METADATA_SETTING, SCIM_TOKEN_SETTING, TIMEOUT_WAIT_RESULT_SETTING + BASE_URL_SETTING, BUNFIG_INSTALL_SCOPES_SETTING, CRITICAL_ALERT_MUTE_UI_SETTING, + CRITICAL_ERROR_CHANNELS_SETTING, DEFAULT_TAGS_PER_WORKSPACE_SETTING, + DEFAULT_TAGS_WORKSPACES_SETTING, EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING, + EXTRA_PIP_INDEX_URL_SETTING, HUB_BASE_URL_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING, + JWT_SECRET_SETTING, KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING, + MONITOR_LOGS_ON_OBJECT_STORE_SETTING, NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING, + PIP_INDEX_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING, + REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING, RETENTION_PERIOD_SECS_SETTING, + SAML_METADATA_SETTING, SCIM_TOKEN_SETTING, TIMEOUT_WAIT_RESULT_SETTING, }, indexer::load_indexer_config, jobs::QueuedJob, @@ -752,10 +760,7 @@ async fn delete_log_files_from_disk_and_store( delete_futures.push(async move { let disk_path = std::path::Path::new(tmp_dir).join(&path); - if tokio::fs::metadata(&disk_path) - .await - .is_ok() - { + if tokio::fs::metadata(&disk_path).await.is_ok() { if let Err(e) = tokio::fs::remove_file(&disk_path).await { tracing::error!( "Failed to delete from disk {}: {e}",