Skip to content

feat: support remote Armadillo URLs via local_settings.csv #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timcadman wants to merge 6 commits into
base: v6.3.6-dev
Choose a base branch
from
Open

feat: support remote Armadillo URLs via local_settings.csv #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2afaa7a
feat: support remote Armadillo URLs via local_settings.csv
timcadman Apr 19, 2026
5b13e34
try: specify full url in local settings
timcadman Apr 23, 2026
ed7f5a5
Merge branch 'datashield:feat/armadillo-remote-url' into feat/armadil…
StuartWheater Apr 24, 2026
aa82882
Reworked to contain 'server url'
StuartWheater Apr 24, 2026
36aa13a
Fixed typo
StuartWheater Apr 24, 2026
a088bd5
Merge pull request #668 from StuartWheater/feat/armadillo-remote-url
StuartWheater May 14, 2026
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
12 changes: 6 additions & 6 deletions tests/testthat/connection_to_datasets/init_discordant_datasets.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ init.discordant.dataset.simple <- function(variables)
if (ds.test_env$driver == "OpalDriver")
{
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
builder$append(server = "discordant1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "DISCORDANT.DISCORDANT_STUDY1", options=ds.test_env$options_1)
builder$append(server = "discordant2", url = ds.test_env$ip_address_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "DISCORDANT.DISCORDANT_STUDY2", options=ds.test_env$options_2)
builder$append(server = "discordant3", url = ds.test_env$ip_address_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "DISCORDANT.DISCORDANT_STUDY3", options=ds.test_env$options_3)
builder$append(server = "discordant1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "DISCORDANT.DISCORDANT_STUDY1", options=ds.test_env$options_1)
builder$append(server = "discordant2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "DISCORDANT.DISCORDANT_STUDY2", options=ds.test_env$options_2)
builder$append(server = "discordant3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "DISCORDANT.DISCORDANT_STUDY3", options=ds.test_env$options_3)
ds.test_env$login.data <- builder$build()
}
else if (ds.test_env$driver == "ArmadilloDriver")
{
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
builder$append(server = "discordant1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "datashield/discordant/DISCORDANT_STUDY1", driver = "ArmadilloDriver")
builder$append(server = "discordant2", url = ds.test_env$ip_address_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "datashield/discordant/DISCORDANT_STUDY2", driver = "ArmadilloDriver")
builder$append(server = "discordant3", url = ds.test_env$ip_address_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "datashield/discordant/DISCORDANT_STUDY3", driver = "ArmadilloDriver")
builder$append(server = "discordant1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "datashield/discordant/DISCORDANT_STUDY1", driver = "ArmadilloDriver")
builder$append(server = "discordant2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "datashield/discordant/DISCORDANT_STUDY2", driver = "ArmadilloDriver")
builder$append(server = "discordant3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "datashield/discordant/DISCORDANT_STUDY3", driver = "ArmadilloDriver")
ds.test_env$login.data <- builder$build()
}
else
Expand Down
27 changes: 16 additions & 11 deletions tests/testthat/connection_to_datasets/init_local_settings.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
#this file stores some settings for the continuous integration and local testing.
#
# The file "connection_to_datasets/local_settings.csv" (within the directory "tests/testthat") contains, if present,
# values which can be used to affect the behavious of the continuous integration.
#
# The server URL is in a CVS file, being the value of the first column, first row.
#

init.ip.address <- function()
init.server.url <- function()
{
file.name <- init.local.settings()
if (file.exists(file.name))
{
content <- read.csv(file.name, header = FALSE)
ip.address <- as.character(content[[1]][1])
content <- read.csv(file.name, header = FALSE)
server.url <- as.character(content[[1]][1])
}
else
{
# ip.address <- "127.0.0.1"
ip.address <- "localhost"
# server.url <- "http://127.0.0.1:8080/"
server.url <- "http://localhost:8080/"
}
return (ip.address)
return (server.url)
}



init.local.settings <- function()
{
path <- getwd()
path <- getwd()
sub.folder.name <- "/connection_to_datasets/"
file.name <- "local_settings.csv"
return(paste(path, sub.folder.name,file.name, sep=""))

file.name <- "local_settings.csv"

return(paste(path, sub.folder.name, file.name, sep=""))
}
12 changes: 6 additions & 6 deletions tests/testthat/connection_to_datasets/init_mediation_datasets.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ init.mediation.dataset.upb <- function(variables)
if (ds.test_env$driver == "OpalDriver")
{
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.UPBdata1", options=ds.test_env$options_1)
builder$append(server = "study2", url = ds.test_env$ip_address_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "MEDIATION.UPBdata2", options=ds.test_env$options_2)
builder$append(server = "study3", url = ds.test_env$ip_address_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "MEDIATION.UPBdata3", options=ds.test_env$options_3)
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.UPBdata1", options=ds.test_env$options_1)
builder$append(server = "study2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "MEDIATION.UPBdata2", options=ds.test_env$options_2)
builder$append(server = "study3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "MEDIATION.UPBdata3", options=ds.test_env$options_3)
ds.test_env$login.data <- builder$build()
}
else
Expand All @@ -25,7 +25,7 @@ init.mediation.dataset.student <- function(variables)
if (ds.test_env$driver == "OpalDriver")
{
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.student", options=ds.test_env$options_1)
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.student", options=ds.test_env$options_1)
ds.test_env$login.data <- builder$build()
}
else
Expand All @@ -43,7 +43,7 @@ init.mediation.dataset.framing <- function(variables)
if (ds.test_env$driver == "OpalDriver")
{
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.framing", options=ds.test_env$options_1)
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.framing", options=ds.test_env$options_1)
ds.test_env$login.data <- builder$build()
}
else
Expand All @@ -61,7 +61,7 @@ init.mediation.dataset.vv2015 <- function(variables)
if (ds.test_env$driver == "OpalDriver")
{
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.vv2015", options=ds.test_env$options_1)
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.vv2015", options=ds.test_env$options_1)
ds.test_env$login.data <- builder$build()
}
else
Expand Down
Loading