Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 0 additions & 24 deletions R/deploy.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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).
Expand Down
3 changes: 2 additions & 1 deletion R/ptype.R
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Comment on lines -23 to +24
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this separate from removing the swap vanity url stuff? I'm fine to bundle it in one PR, but I want to make sure I'm following.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it was a change to fix integration tests in CI on the preview version of Connect. I can also pull it out into a separate PR too if you prefer; either way I need to figure out what is going on with the integration tests for 2022-2023 versions first.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, no problem to leave it here, but maybe mention it in the PR description? Or these comments are enough record of what's up maybe?

),
usage_shiny = tibble::tibble(
"content_guid" = NA_character_,
Expand Down
1 change: 0 additions & 1 deletion man/content_delete.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/content_item.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/content_title.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/content_update.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/create_random_name.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/dashboard_url.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/delete_thumbnail.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/delete_vanity_url.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/deploy_repo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/environment.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/get_associations.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/get_bundles.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/get_image.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/get_jobs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/get_log.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/get_thumbnail.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/get_vanity_url.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/git.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/has_thumbnail.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/lock_content.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/permissions.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/search_content.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/set_image.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/set_integrations.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/set_run_as.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/set_thumbnail.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/set_vanity_url.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 0 additions & 54 deletions man/swap_vanity_url.Rd

This file was deleted.

1 change: 0 additions & 1 deletion man/swap_vanity_urls.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/terminate_jobs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/verify_content_name.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/integrated/test-lazy.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with this, this looks like it's something slightly different from the swap vanity urls thing?

})

test_that("audit_logs works", {
Expand Down
Loading