refactor(wit): Remove app-init-no-cleanup-error

Author: tomasol

workflow/deployer-workflow/impl-flyio/src/lib.rs

@@ -23,9 +23,7 @@ use generated::{
         },
         workflow::{
             types::{AppCleanupFailed, AppInitModifyError},
-            workflow::{
-                self as workflow_import, AppInitError, AppInitNoCleanupError, ObeliskConfig,
-            },
+            workflow::{self as workflow_import, AppInitError, ObeliskConfig},
         },
     },
 };
@@ -174,7 +172,7 @@ fn app_modify_without_cleanup(
     Ok(get_secret_keys(config))
 }
 
-fn cleanup(app_name: &str, modify_error: Option<AppInitModifyError>) -> AppInitError {
+fn cleanup(app_name: &str, modify_error: AppInitModifyError) -> AppInitError {
     // Delete the app with force.
     match activity_fly_http::apps::delete(app_name, true) {
         Ok(()) => AppInitError::CleanupOk,
@@ -203,9 +201,8 @@ impl Guest for Component {
     fn app_modify_no_cleanup_on_error(
         app_name: String,
         config: ObeliskConfig,
-    ) -> Result<Vec<String>, AppInitNoCleanupError> {
+    ) -> Result<Vec<String>, AppInitModifyError> {
         app_modify_without_cleanup(&app_name, config)
-            .map_err(AppInitNoCleanupError::AppInitModifyError)
     }
 
     fn app_init(
@@ -217,10 +214,7 @@ impl Guest for Component {
         app_create(&org_slug, &app_name)?;
         // Launch a child workflow by using import
         let required_secrets = workflow_import::app_modify_no_cleanup_on_error(&app_name, &config)
-            .map_err(|err| match err {
-                AppInitNoCleanupError::AppInitModifyError(err) => cleanup(&app_name, Some(err)),
-                AppInitNoCleanupError::ExecutionFailed => cleanup(&app_name, None),
-            })?;
+            .map_err(|err| cleanup(&app_name, err))?;
         // Sleep until all requested secrets are stored in the app.
         let required_secrets: HashSet<_> = required_secrets.into_iter().collect();
         while !required_secrets.is_empty() {

workflow/deployer-workflow/wit/obelisk-flyio_workflow@1.0.0-beta/types.wit

@@ -46,21 +46,17 @@ interface types {
         volume-write-error(string),
         /// Error running `obelisk server verify -i`
         verify-error(string),
+        /// Trap (panic) during execution
+        execution-failed,
     }
 
     record app-cleanup-failed {
-        /// The associated value contains the reason of failure, if available.
-        /// If the payload is missing a trap in child workflow occurred.
-        modify-error: option<app-init-modify-error>,
+        /// Reason of the original failure.
+        modify-error: app-init-modify-error,
         /// Reason why cleanup failed.
         cleanup-error: string,
     }
 
-    variant app-init-no-cleanup-error {
-        app-init-modify-error(app-init-modify-error),
-        execution-failed,
-    }
-
     variant app-init-error {
         app-name-conflict,
         app-create-error(string),

workflow/deployer-workflow/wit/obelisk-flyio_workflow@1.0.0-beta/workflow.wit

@@ -1,7 +1,7 @@
 package obelisk-flyio:workflow@1.0.0-beta;
 
 interface workflow {
-    use types.{obelisk-config, app-init-no-cleanup-error, app-init-error};
+    use types.{obelisk-config, app-init-modify-error, app-init-error};
 
     /// Allocate an IP address.
     /// Create a volume.
@@ -13,8 +13,7 @@ interface workflow {
     app-modify-no-cleanup-on-error: func(
         app-name: string,
         config: obelisk-config,
-        ) -> result<list<string>, app-init-no-cleanup-error>;
-
+        ) -> result<list<string>, app-init-modify-error>;
 
     /// Chcek whether the app_name exists. If it does, return app-name-conflict.
     /// Create a fly app.