chore: adjust ci to use license file instead of license key #445
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,6 @@ jobs: | |
| env: | ||
| CONNECT_VERSION: ${{ matrix.version }} | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
|
Contributor
There was a problem hiding this comment. This line could be And then you wouldn't need to do line 58 below at all (which is extra good cause But also, stepping back and thinking about this: should this be specified at all? Where does it get used, maybe we can get rid of it entirely?
Contributor
There was a problem hiding this comment. Another option would be to add this(hardcoded in our CI yamls) as the connectapi/.github/workflows/integration-tests.yaml Lines 61 to 62 in 365b2f0
Collaborator
Author
There was a problem hiding this comment. Yeah, I'd like to keep the flexibility to specify a different license key path if running these functions locally. Passing it directly as an argument to |
||
| CONNECT_LICENSE_FILE: ${{ secrets.CONNECT_LICENSE_FILE }} | ||
| CONNECTAPI_INTEGRATED: true | ||
|
|
||
|
|
@@ -54,11 +53,11 @@ jobs: | |
| shell: Rscript {0} | ||
|
|
||
| - name: Set up license file | ||
| run: echo "$CONNECT_LICENSE_FILE" > /tmp/connect.lic | ||
|
|
||
| - name: Setup test environment | ||
| run: | | ||
| connectapi:::build_test_env(connect_license_path = "/tmp/connect.lic") | ||
| shell: Rscript {0} | ||
|
|
||
| - uses: r-lib/actions/check-r-package@v2 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,5 @@ | ||
| # nocov start | ||
|
|
||
| version_to_docker_tag <- function(version) { | ||
| # Prior to 2022.09.0, the plain version number was the tag | ||
| # After, it's "<ubuntu-codename>-<version>" | ||
|
|
@@ -49,27 +21,25 @@ version_to_docker_tag <- function(version) { | |
| } | ||
|
|
||
| compose_start <- function( | ||
| connect_license_path, | ||
| connect_version, | ||
| clean = TRUE | ||
| ) { | ||
| warn_dire("compose_start") | ||
| scoped_dire_silence() | ||
|
|
||
| stopifnot(fs::file_exists(connect_license_path)) | ||
| connect_license_path <- fs::path_abs(connect_license_path) | ||
|
|
||
| compose_file_path <- system.file( | ||
| "ci/test-connect-lic.yml", | ||
| package = "connectapi" | ||
| ) | ||
|
|
||
| env_vars <- c( | ||
| CONNECT_VERSION = version_to_docker_tag(connect_version), | ||
| PATH = Sys.getenv("PATH"), | ||
| RSC_LICENSE_FILE = connect_license_path | ||
| ) | ||
| # system2 needs a character vector of name=value | ||
| env_vars <- paste(names(env_vars), env_vars, sep = "=") | ||
|
|
@@ -105,9 +75,13 @@ compose_find_hosts <- function(prefix) { | |
|
|
||
| containers <- grep(prefix, docker_ps_output, value = TRUE) | ||
| ports <- sub(".*0\\.0\\.0\\.0:([0-9]+)->3939.*", "\\1", containers) | ||
| container_names <- sub(".*\\s+([^ ]+)$", "\\1", containers) | ||
| cat_line(glue::glue("docker: got ports {ports[1]} and {ports[2]}")) | ||
|
|
||
| list( | ||
| hosts = paste0("http://localhost:", ports), | ||
| container_names = container_names | ||
| ) | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -143,7 +117,7 @@ update_renviron_creds <- function( | |
| } | ||
|
|
||
| build_test_env <- function( | ||
| connect_license_path, | ||
| clean = TRUE, | ||
| username = "admin", | ||
| password = "admin0", | ||
|
|
@@ -153,16 +127,16 @@ build_test_env <- function( | |
| scoped_dire_silence() | ||
|
|
||
| compose_start( | ||
| connect_license_path = connect_license_path, | ||
| clean = clean, | ||
| connect_version = connect_version | ||
| ) | ||
|
|
||
| # It was ci_connect before but it's ci-connect on my machine now; | ||
| # this is a regex so it will match either | ||
| container_info <- compose_find_hosts(prefix = "ci.connect") | ||
|
|
||
| wait_for_connect_ready <- function(host, container_name, timeout = 120) { | ||
| client <- HackyConnect$new(server = host, api_key = NULL) | ||
| start_time <- Sys.time() | ||
| last_msg <- start_time | ||
|
|
@@ -175,7 +149,8 @@ build_test_env <- function( | |
| { | ||
| res <- client$GET(url = client$server_url("__ping__"), parser = NULL) | ||
| httr::status_code(res) == 200 | ||
| }, | ||
| silent = TRUE | ||
| ) | ||
| if (isTRUE(ok)) { | ||
| return(invisible(TRUE)) | ||
|
|
@@ -186,21 +161,58 @@ build_test_env <- function( | |
| } | ||
| Sys.sleep(1) | ||
| } | ||
|
|
||
| # Before failing, capture diagnostics | ||
| cat_line("Connect did not become ready in time. Capturing diagnostics...") | ||
| cat_line(glue::glue("=== Docker logs for {container_name} ===")) | ||
| try( | ||
| { | ||
| logs <- system2( | ||
| "docker", | ||
| c("logs", "--tail", "100", container_name), | ||
| stdout = TRUE, | ||
| stderr = TRUE | ||
| ) | ||
| cat(logs, sep = "\n") | ||
| }, | ||
| silent = TRUE | ||
| ) | ||
|
|
||
| cat_line(glue::glue("=== Docker inspect for {container_name} ===")) | ||
| try( | ||
| { | ||
| inspect <- system2( | ||
| "docker", | ||
| c("inspect", container_name), | ||
| stdout = TRUE, | ||
| stderr = TRUE | ||
| ) | ||
| cat(inspect, sep = "\n") | ||
| }, | ||
| silent = TRUE | ||
| ) | ||
|
|
||
| stop("Connect did not become ready in time: ", ping_url) | ||
| } | ||
|
|
||
| wait_for_connect_ready( | ||
| container_info$hosts[1], | ||
| container_name = container_info$container_names[1] | ||
| ) | ||
| wait_for_connect_ready( | ||
| container_info$hosts[2], | ||
| container_name = container_info$container_names[2] | ||
| ) | ||
|
|
||
| cat_line("connect: creating first admin...") | ||
| a1 <- create_first_admin( | ||
| container_info$hosts[1], | ||
| "admin", | ||
| "admin0", | ||
| "[email protected]" | ||
| ) | ||
| a2 <- create_first_admin( | ||
| container_info$hosts[2], | ||
| "admin", | ||
| "admin0", | ||
| "[email protected]" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.gitignorealready covers*.lic:)