Improve error paths

Author: shikokuchuo

R/launchers.R

@@ -109,8 +109,10 @@ launch_remote <- function(
   if (is.null(tls)) tls <- envir[["tls"]]
 
   if (length(remote) == 2L) {
-    submit_job <- .subset2(rstudio(), ".rs.api.launcher.submitJob")
-    new_container <- .subset2(rstudio(), ".rs.api.launcher.newContainer")
+    tools <- posit_tools()
+    is.environment(tools) || stop(._[["posit_api"]])
+    submit_job <- .subset2(tools, ".rs.api.launcher.submitJob")
+    new_container <- .subset2(tools, ".rs.api.launcher.newContainer")
     cluster <- remote[["name"]]
     container <- new_container(remote[["image"]])
     lapply(
@@ -476,12 +478,15 @@ cluster_config <- function(
 cloud_config <- function(platform = "posit") {
   switch(
     tolower(platform),
-    posit = TRUE,
+    posit = {
+      tools <- posit_tools()
+      is.environment(tools) || stop(._[["posit_api"]])
+      get_info <- .subset2(tools, ".rs.api.launcher.getInfo")
+      cluster <- get_info()[["clusters"]][[1L]]
+      list(name = cluster[["name"]], image = cluster[["defaultImage"]])
+    },
     stop(._[["platform_unsupported"]])
   )
-  get_info <- .subset2(rstudio(), ".rs.api.launcher.getInfo")
-  cluster <- get_info()[["clusters"]][[1L]]
-  list(name = cluster[["name"]], image = cluster[["defaultImage"]])
 }
 
 #' URL Constructors
@@ -568,11 +573,11 @@ find_dot <- function(args) {
   sel
 }
 
-rstudio <- function() {
-  idx <- match("tools:rstudio", search())
-  is.na(idx) && stop(._[["rstudio_api"]])
+posit_tools <- function() {
+  idx <- match("tools:rstudio", search(), nomatch = 0L)
+  idx || return()
   tools <- as.environment(idx)
   feature_available <- .subset2(tools, ".rs.api.launcher.jobsFeatureAvailable")
-  is.function(feature_available) && feature_available() || stop(._[["rstudio_api"]])
+  is.function(feature_available) && feature_available() || return()
   tools
 }

R/mirai-package.R

@@ -84,7 +84,7 @@
     not_found = "compute profile `%s` not found",
     numeric_n = "`n` must be numeric, did you mean to provide `url`?",
     platform_unsupported = "`platform` is currently not supported",
-    rstudio_api = "cannot be used outside of a Posit Workbench environment",
+    posit_api = "this launch configuration can only be used from Posit Workbench",
     sync_daemons = "mirai: initial sync with daemon(s) [%d secs elapsed]",
     sync_dispatcher = "mirai: initial sync with dispatcher [%d secs elapsed]",
     within_map = "cannot create local daemons from within mirai map"

tests/tests.R

@@ -42,7 +42,8 @@ test_true(grepl("5555", local_url(tcp = TRUE, port = 5555), fixed = TRUE))
 test_type("list", ssh_config("ssh://remotehost"))
 test_type("list", ssh_config("ssh://remotehost", tunnel = TRUE))
 test_type("list", cluster_config())
-test_class("error", tryCatch(cloud_config(), error = identity))
+test_error(cloud_config(platform = ""), "not supported")
+test_error(cloud_config(platform = "posit"), "can only be used from Posit Workbench")
 test_true(is_mirai_interrupt(r <- mirai:::mk_interrupt_error()))
 test_print(r)
 test_true(is_mirai_error(r <- `class<-`("Error in: testing\n", c("miraiError", "errorValue", "try-error"))))