diff --git a/NAMESPACE b/NAMESPACE index 05cedfd6..ae5c1e14 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -161,7 +161,6 @@ export(set_schedule_weekday) export(set_schedule_year) export(set_thumbnail) export(set_vanity_url) -export(swap_vanity_url) export(swap_vanity_urls) export(tbl_connect) export(terminate_jobs) diff --git a/NEWS.md b/NEWS.md index 64538994..262a0ea2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,6 +7,8 @@ - Removed `get_job()`, which was deprecated in 0.6.0. Instead, use `get_jobs()` to get a data frame of jobs, use `get_job_list()` to get a list of job objects, and use `get_log()` to get the log for a job (#491). +- Removed `swap_vanity_url()`, which was deprecated in 0.6.0. Use + `swap_vanity_urls()` instead (#493). # connectapi 0.9.0 diff --git a/R/deploy.R b/R/deploy.R index 854803d2..184578cc 100644 --- a/R/deploy.R +++ b/R/deploy.R @@ -621,29 +621,6 @@ swap_vanity_urls <- function(content_a, content_b) { ) } -#' Swap Vanity URLs -#' -#' Swap the vanity URLs of two pieces of content. -#' This function is deprecated; please use \code{\link{swap_vanity_urls}}. -#' -#' @param from A Content object -#' @param to A Content object -#' -#' @returns A list of the new vanity URLs for `from` and `to` -#' -#' @family content functions -#' @export -swap_vanity_url <- function(from, to) { - lifecycle::deprecate_warn("0.6.0", "swap_vanity_url()", "swap_vanity_urls()") - res <- swap_vanity_urls(from, to) - return( - list( - from = res[["content_a"]], - to = res[["content_b"]] - ) - ) -} - #' Poll Task #' #' Polls a task, waiting for information about a deployment. If the task has @@ -695,7 +672,6 @@ poll_task <- function(task, wait = 1, callback = message) { task } - #' Build a Dashboard URL from a Content Item #' #' Returns the URL for the content dashboard (opened to the selected pane). diff --git a/R/ptype.R b/R/ptype.R index 269c88d5..5b5e1a0e 100644 --- a/R/ptype.R +++ b/R/ptype.R @@ -20,7 +20,8 @@ connectapi_ptypes <- list( groups = tibble::tibble( "guid" = NA_character_, "name" = NA_character_, - "owner_guid" = NA_character_ + "owner_guid" = NA_character_, + "gid" = NA_character_ ), usage_shiny = tibble::tibble( "content_guid" = NA_character_, diff --git a/man/content_delete.Rd b/man/content_delete.Rd index 265aebe0..85bcf193 100644 --- a/man/content_delete.Rd +++ b/man/content_delete.Rd @@ -46,7 +46,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/content_item.Rd b/man/content_item.Rd index 93881b02..085b5ac4 100644 --- a/man/content_item.Rd +++ b/man/content_item.Rd @@ -52,7 +52,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/content_title.Rd b/man/content_title.Rd index d6171f69..18bd4166 100644 --- a/man/content_title.Rd +++ b/man/content_title.Rd @@ -48,7 +48,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/content_update.Rd b/man/content_update.Rd index d1b47642..f878c857 100644 --- a/man/content_update.Rd +++ b/man/content_update.Rd @@ -68,7 +68,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/create_random_name.Rd b/man/create_random_name.Rd index fdd9923a..63b280ca 100644 --- a/man/create_random_name.Rd +++ b/man/create_random_name.Rd @@ -45,7 +45,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/dashboard_url.Rd b/man/dashboard_url.Rd index 56cb8466..cded3d2d 100644 --- a/man/dashboard_url.Rd +++ b/man/dashboard_url.Rd @@ -45,7 +45,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/delete_thumbnail.Rd b/man/delete_thumbnail.Rd index 02650c86..a375ebc5 100644 --- a/man/delete_thumbnail.Rd +++ b/man/delete_thumbnail.Rd @@ -56,7 +56,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/delete_vanity_url.Rd b/man/delete_vanity_url.Rd index 7d4d857e..6a2d37f4 100644 --- a/man/delete_vanity_url.Rd +++ b/man/delete_vanity_url.Rd @@ -40,7 +40,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/deploy_repo.Rd b/man/deploy_repo.Rd index 3dc3fc79..e2df5679 100644 --- a/man/deploy_repo.Rd +++ b/man/deploy_repo.Rd @@ -83,7 +83,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/environment.Rd b/man/environment.Rd index 89c77fe6..75e3ab31 100644 --- a/man/environment.Rd +++ b/man/environment.Rd @@ -65,7 +65,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/get_associations.Rd b/man/get_associations.Rd index 32537ab4..604ecbb8 100644 --- a/man/get_associations.Rd +++ b/man/get_associations.Rd @@ -82,7 +82,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/get_bundles.Rd b/man/get_bundles.Rd index 88e88895..57925c69 100644 --- a/man/get_bundles.Rd +++ b/man/get_bundles.Rd @@ -45,7 +45,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} @@ -77,7 +76,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/get_image.Rd b/man/get_image.Rd index 6a4b3a0e..98e1b7d2 100644 --- a/man/get_image.Rd +++ b/man/get_image.Rd @@ -55,7 +55,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/get_jobs.Rd b/man/get_jobs.Rd index 7f98b8f9..e2d8e7a2 100644 --- a/man/get_jobs.Rd +++ b/man/get_jobs.Rd @@ -123,7 +123,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/get_log.Rd b/man/get_log.Rd index e7bb0acb..85d06a27 100644 --- a/man/get_log.Rd +++ b/man/get_log.Rd @@ -70,7 +70,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/get_thumbnail.Rd b/man/get_thumbnail.Rd index cc563d9e..6f13d983 100644 --- a/man/get_thumbnail.Rd +++ b/man/get_thumbnail.Rd @@ -61,7 +61,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/get_vanity_url.Rd b/man/get_vanity_url.Rd index 95c9848f..2f6f91ba 100644 --- a/man/get_vanity_url.Rd +++ b/man/get_vanity_url.Rd @@ -43,7 +43,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/git.Rd b/man/git.Rd index b4d96130..bc02d975 100644 --- a/man/git.Rd +++ b/man/git.Rd @@ -68,7 +68,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/has_thumbnail.Rd b/man/has_thumbnail.Rd index 956139b7..67611280 100644 --- a/man/has_thumbnail.Rd +++ b/man/has_thumbnail.Rd @@ -57,7 +57,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/lock_content.Rd b/man/lock_content.Rd index 5d909af9..b8141cf7 100644 --- a/man/lock_content.Rd +++ b/man/lock_content.Rd @@ -70,7 +70,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/permissions.Rd b/man/permissions.Rd index 8e480f64..af916903 100644 --- a/man/permissions.Rd +++ b/man/permissions.Rd @@ -90,7 +90,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/search_content.Rd b/man/search_content.Rd index a12fd289..2f23772e 100644 --- a/man/search_content.Rd +++ b/man/search_content.Rd @@ -85,7 +85,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/set_image.Rd b/man/set_image.Rd index 6697ec29..6366cb5e 100644 --- a/man/set_image.Rd +++ b/man/set_image.Rd @@ -61,7 +61,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/set_integrations.Rd b/man/set_integrations.Rd index db225068..50972120 100644 --- a/man/set_integrations.Rd +++ b/man/set_integrations.Rd @@ -82,7 +82,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/set_run_as.Rd b/man/set_run_as.Rd index 5c30b19c..6c807c53 100644 --- a/man/set_run_as.Rd +++ b/man/set_run_as.Rd @@ -63,7 +63,6 @@ Other content functions: \code{\link{set_integrations}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/set_thumbnail.Rd b/man/set_thumbnail.Rd index c5ff2c91..afd48007 100644 --- a/man/set_thumbnail.Rd +++ b/man/set_thumbnail.Rd @@ -60,7 +60,6 @@ Other content functions: \code{\link{set_integrations}()}, \code{\link{set_run_as}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/set_vanity_url.Rd b/man/set_vanity_url.Rd index 2a4f3733..4a827eb8 100644 --- a/man/set_vanity_url.Rd +++ b/man/set_vanity_url.Rd @@ -56,7 +56,6 @@ Other content functions: \code{\link{set_integrations}()}, \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} diff --git a/man/swap_vanity_url.Rd b/man/swap_vanity_url.Rd deleted file mode 100644 index 6dd5ab34..00000000 --- a/man/swap_vanity_url.Rd +++ /dev/null @@ -1,54 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/deploy.R -\name{swap_vanity_url} -\alias{swap_vanity_url} -\title{Swap Vanity URLs} -\usage{ -swap_vanity_url(from, to) -} -\arguments{ -\item{from}{A Content object} - -\item{to}{A Content object} -} -\value{ -A list of the new vanity URLs for \code{from} and \code{to} -} -\description{ -Swap the vanity URLs of two pieces of content. -This function is deprecated; please use \code{\link{swap_vanity_urls}}. -} -\seealso{ -Other content functions: -\code{\link{content_delete}()}, -\code{\link{content_item}()}, -\code{\link{content_title}()}, -\code{\link{content_update}()}, -\code{\link{create_random_name}()}, -\code{\link{dashboard_url}()}, -\code{\link{delete_thumbnail}()}, -\code{\link{delete_vanity_url}()}, -\code{\link{deploy_repo}()}, -\code{\link{get_associations}()}, -\code{\link{get_bundles}()}, -\code{\link{get_environment}()}, -\code{\link{get_image}()}, -\code{\link{get_jobs}()}, -\code{\link{get_log}()}, -\code{\link{get_thumbnail}()}, -\code{\link{get_vanity_url}()}, -\code{\link{git}}, -\code{\link{has_thumbnail}()}, -\code{\link{lock_content}()}, -\code{\link{permissions}}, -\code{\link{search_content}()}, -\code{\link{set_image_path}()}, -\code{\link{set_integrations}()}, -\code{\link{set_run_as}()}, -\code{\link{set_thumbnail}()}, -\code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_urls}()}, -\code{\link{terminate_jobs}()}, -\code{\link{verify_content_name}()} -} -\concept{content functions} diff --git a/man/swap_vanity_urls.Rd b/man/swap_vanity_urls.Rd index 16e48965..76f3358f 100644 --- a/man/swap_vanity_urls.Rd +++ b/man/swap_vanity_urls.Rd @@ -46,7 +46,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{terminate_jobs}()}, \code{\link{verify_content_name}()} } diff --git a/man/terminate_jobs.Rd b/man/terminate_jobs.Rd index e23af41b..69f948ba 100644 --- a/man/terminate_jobs.Rd +++ b/man/terminate_jobs.Rd @@ -73,7 +73,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{verify_content_name}()} } diff --git a/man/verify_content_name.Rd b/man/verify_content_name.Rd index bd8b6d26..54d62fcf 100644 --- a/man/verify_content_name.Rd +++ b/man/verify_content_name.Rd @@ -49,7 +49,6 @@ Other content functions: \code{\link{set_run_as}()}, \code{\link{set_thumbnail}()}, \code{\link{set_vanity_url}()}, -\code{\link{swap_vanity_url}()}, \code{\link{swap_vanity_urls}()}, \code{\link{terminate_jobs}()} } diff --git a/tests/integrated/test-lazy.R b/tests/integrated/test-lazy.R index 8e299df6..13febff0 100644 --- a/tests/integrated/test-lazy.R +++ b/tests/integrated/test-lazy.R @@ -107,7 +107,7 @@ test_that("groups works", { expect_type(colnames(groups_list), "character") expect_gt(length(colnames(groups_list)), 1) - expect_ptype_equal(groups_list_local, connectapi_ptypes$groups) + expect_ptype_equal(groups_list_local, connectapi_ptypes$groups, exact = FALSE) }) test_that("audit_logs works", {