Skip to content

Commit

Permalink
Made EconData and auth URL's settable through env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
byrongibby committed Jan 7, 2025
1 parent c1f314e commit 2f5307e
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 1 deletion.
7 changes: 7 additions & 0 deletions R/get_metadata.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
get_metadata <- function(x) {
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}


# Fetch data structure definition (metadata) ----
Expand Down
7 changes: 7 additions & 0 deletions R/read_database.R
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ read_database <- function(id, include_series = FALSE, tidy = FALSE, ...) {
version <- "latest"
}
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}


# Fetch data set(s) ----
Expand Down
7 changes: 7 additions & 0 deletions R/read_dataset.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ read_dataset <- function(id, tidy = FALSE, ...) {
version <- "latest"
}
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}


# Fetch data set(s) ----
Expand Down
7 changes: 7 additions & 0 deletions R/read_registry.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ read_registry <- function(structure, tidy = FALSE, ...) {
version <- "latest"
}
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}
params$env <- env


Expand Down
7 changes: 7 additions & 0 deletions R/read_release.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ read_release <- function(id, tidy = FALSE, ...) {
query_params$description <- params$description
}
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}


# Fetch release ----
Expand Down
8 changes: 8 additions & 0 deletions R/write_database.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ write_database <- function(x, method = "update", ...) {
stopifnot(length(method) == 1)
stopifnot(method %in% c("create", "update"))
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}



# Push data message ----
Expand Down
8 changes: 7 additions & 1 deletion R/write_dataset.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@ write_dataset <- function(x, method = "stage", ...) {

# Parameters ----

env <- fromJSON(system.file("settings.json", package = "econdatar"))
params <- list(...)
stopifnot(length(method) == 1)
stopifnot(method %in% c("stage", "validate"))
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}


# Push data message ----
Expand Down
7 changes: 7 additions & 0 deletions R/write_registry.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ write_registry <- function(structure, x, method = "update", ...) {
stopifnot(length(method) == 1)
stopifnot(method %in% c("delete", "create", "update"))
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}
params$env <- env


Expand Down
7 changes: 7 additions & 0 deletions R/write_release.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ write_release <- function(id, version, description, method = "release", ...) {
stopifnot(length(method) == 1)
stopifnot(method %in% c("release", "reset", "rollback"))
env <- fromJSON(system.file("settings.json", package = "econdatar"))
if (nchar(Sys.getenv("ECONDATA_URL")) != 0) {
env$repository$url <- Sys.getenv("ECONDATA_URL")
env$registry$url <- Sys.getenv("ECONDATA_URL")
}
if (nchar(Sys.getenv("ECONDATA_AUTH_URL")) != 0) {
env$auth$url <- Sys.getenv("ECONDATA_AUTH_URL")
}


# Commit data set release ----
Expand Down

0 comments on commit 2f5307e

Please sign in to comment.