From f0eebd9bd7ea403ffa1dd9f42098e50e5e3260bc Mon Sep 17 00:00:00 2001 From: Stephen Beckstrand Date: Thu, 24 Oct 2024 09:40:59 -0600 Subject: [PATCH] chore: Update references to windmill-ee-full image (#4578) * chore: Update windmill-ee-full image references The messaging in a few backend executors references the need to use the full enterprise image rather than `windmill-ee`. These messages reference the `windmill-full-ee` image but its the image is actually named `windmill-ee-full` under the available Packages. * chore: Update refs to rust to ansible in ansible executor --- backend/windmill-worker/src/ansible_executor.rs | 4 ++-- backend/windmill-worker/src/php_executor.rs | 2 +- backend/windmill-worker/src/rust_executor.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/windmill-worker/src/ansible_executor.rs b/backend/windmill-worker/src/ansible_executor.rs index 9c2474d95f..ef18ddba13 100644 --- a/backend/windmill-worker/src/ansible_executor.rs +++ b/backend/windmill-worker/src/ansible_executor.rs @@ -185,7 +185,7 @@ async fn install_galaxy_collections( #[cfg(not(feature = "enterprise"))] fn check_ansible_exists() -> Result<(), error::Error> { if !Path::new(ANSIBLE_PLAYBOOK_PATH.as_str()).exists() { - let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full` for your instance in order to run rust jobs.", ANSIBLE_PLAYBOOK_PATH.as_str()); + let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full` for your instance in order to run Ansible jobs.", ANSIBLE_PLAYBOOK_PATH.as_str()); return Err(error::Error::NotFound(msg)); } Ok(()) @@ -194,7 +194,7 @@ fn check_ansible_exists() -> Result<(), error::Error> { #[cfg(feature = "enterprise")] fn check_ansible_exists() -> Result<(), error::Error> { if !Path::new(ANSIBLE_PLAYBOOK_PATH.as_str()).exists() { - let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run rust jobs.", ANSIBLE_PLAYBOOK_PATH.as_str()); + let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run Ansible jobs.", ANSIBLE_PLAYBOOK_PATH.as_str()); return Err(error::Error::NotFound(msg)); } Ok(()) diff --git a/backend/windmill-worker/src/php_executor.rs b/backend/windmill-worker/src/php_executor.rs index b16e25f8ae..194e621fe1 100644 --- a/backend/windmill-worker/src/php_executor.rs +++ b/backend/windmill-worker/src/php_executor.rs @@ -143,7 +143,7 @@ fn check_php_exists() -> error::Result<()> { #[cfg(feature = "enterprise")] fn check_php_exists() -> error::Result<()> { if !Path::new(PHP_PATH.as_str()).exists() { - let msg = format!("Couldn't find php at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run php jobs.", PHP_PATH.as_str()); + let msg = format!("Couldn't find php at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run php jobs.", PHP_PATH.as_str()); return Err(error::Error::NotFound(msg)); } Ok(()) diff --git a/backend/windmill-worker/src/rust_executor.rs b/backend/windmill-worker/src/rust_executor.rs index 6a0090ab55..530be394ff 100644 --- a/backend/windmill-worker/src/rust_executor.rs +++ b/backend/windmill-worker/src/rust_executor.rs @@ -281,7 +281,7 @@ fn check_cargo_exists() -> Result<(), Error> { #[cfg(feature = "enterprise")] fn check_cargo_exists() -> Result<(), Error> { if !Path::new(CARGO_PATH.as_str()).exists() { - let msg = format!("Couldn't find cargo at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run rust jobs.", CARGO_PATH.as_str()); + let msg = format!("Couldn't find cargo at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run rust jobs.", CARGO_PATH.as_str()); return Err(Error::NotFound(msg)); } Ok(())