Remove prefix arg from connect() and just use usual env vars everywhere

Author: nealrichardson

.github/workflows/integration-tests.yaml

@@ -53,11 +53,5 @@ jobs:
         with:
           version: ${{ matrix.version }}
           license: ${{ secrets.CONNECT_LICENSE_FILE }}
-          # TODO: rewrite tests to use CONNECT_* env vars directly
           command: |
-            Rscript -e '
-              Sys.setenv(
-                TEST_1_SERVER=Sys.getenv("CONNECT_SERVER"),
-                TEST_1_API_KEY=Sys.getenv("CONNECT_API_KEY")
-              )
-              source("tests/test-integrated.R")'
+            Rscript -e 'source("tests/test-integrated.R")'

.github/workflows/pkgdown.yaml

@@ -40,12 +40,7 @@ jobs:
           license: ${{ secrets.CONNECT_LICENSE_FILE }}
           # TODO: rewrite tests to use CONNECT_* env vars directly
           command: |
-            Rscript -e '
-              Sys.setenv(
-                TEST_1_SERVER=Sys.getenv("CONNECT_SERVER"),
-                TEST_1_API_KEY=Sys.getenv("CONNECT_API_KEY")
-              )
-              pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)'
+            Rscript -e 'pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)'
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'

.github/workflows/test-coverage.yaml

@@ -38,16 +38,11 @@ jobs:
           # TODO: rewrite tests to use CONNECT_* env vars directly
           command: |
             Rscript -e '
-              Sys.setenv(
-                TEST_1_SERVER=Sys.getenv("CONNECT_SERVER"),
-                TEST_1_API_KEY=Sys.getenv("CONNECT_API_KEY")
-              )
-              token <- "${{ secrets.CODECOV_TOKEN }}"
               covr::codecov(
                 quiet = FALSE,
                 clean = FALSE,
                 install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package"),
-                token = if (token != "") token
+                token = "${{ secrets.CODECOV_TOKEN }}"
               )'
 
 

R/connect.R

@@ -963,7 +963,6 @@ Connect <- R6::R6Class(
 #'   `Connect` object using the `api_key`. By providing a different
 #'   key here you can test a visitor client with differently-scoped
 #'   permissions.
-#' @param prefix The prefix used to determine environment variables
 #' @param audience Optional. The GUID of a Connect API integration associated with this piece of content.
 #' @param ... Additional arguments. Not used at present
 #' @param .check_is_fatal Whether to fail if "check" requests fail. Useful in
@@ -991,16 +990,14 @@ Connect <- R6::R6Class(
 #' @examplesIf identical(Sys.getenv("IN_PKGDOWN"), "true")
 #'
 #' # default is to read CONNECT_SERVER and CONNECT_API_KEY environment variables
-#' # this example will read TEST_1_SERVER and TEST_1_API_KEY
-#' connect(prefix = "TEST_1")
+#' connect()
 #'
 #' @export
 connect <- function(
-  server = Sys.getenv(paste0(prefix, "_SERVER"), NA_character_),
-  api_key = Sys.getenv(paste0(prefix, "_API_KEY"), NA_character_),
+  server = Sys.getenv("CONNECT_SERVER"),
+  api_key = Sys.getenv("CONNECT_API_KEY"),
   token,
   token_local_testing_key = api_key,
-  prefix = "CONNECT",
   audience = NULL,
   ...,
   .check_is_fatal = TRUE

R/deploy.R

@@ -402,7 +402,7 @@ download_bundle <- function(
 #' }
 #' @examplesIf identical(Sys.getenv("IN_PKGDOWN"), "true")
 #'
-#' client <- connect(prefix = "TEST_1")
+#' client <- connect()
 #' bnd <- bundle_path(system.file("tests/testthat/examples/static.tar.gz", package = "connectapi"))
 #' deploy(client, bnd)
 #'
@@ -413,8 +413,7 @@ deploy <- function(
   title = name,
   guid = NULL,
   ...,
-  .pre_deploy = {
-  }
+  .pre_deploy = {}
 ) {
   validate_R6_class(bundle, "Bundle")
   validate_R6_class(connect, "Connect")