up

Author: csaybar

R/utils-credentials.R

@@ -4,6 +4,11 @@ ee_create_credentials_drive <- function(user=NULL, ee_utils, quiet) {
   # check googledrive R package installation
   ee_check_packages("ee_Initialize", "googledrive")
 
+  # Check sanity of earth-engine and return ee_utils.py module
+  init <- ee_check_init()
+  ee_utils <- init$ee_utils
+
+
   # setting drive folder
   if (is.null(user)) {
     ee_path <- ee_utils_py_to_r(ee_utils$ee_path())
@@ -83,6 +88,10 @@ ee_create_credentials_gcs_ <- function(user, ee_utils) {
   # check packages
   ee_check_packages("ee_Initialize", "googleCloudStorageR")
 
+  # Check sanity of earth-engine and return ee_utils.py module
+  init <- ee_check_init()
+  ee_utils <- init$ee_utils
+
   # setting gcs folder
   if (is.null(user)) {
     ee_path <- suppressWarnings(ee_utils_py_to_r(ee_utils$ee_path()))
@@ -99,8 +108,10 @@ ee_create_credentials_gcs_ <- function(user, ee_utils) {
   if (!any(gcs_condition)) {
     gcs_text <- paste(
       sprintf("Unable to find a service account key (SAK) file in: %s",  crayon::bold(ee_path_user)),
-      "Please, download and validate it using rgee::ee_utils_sak_validate.",
-      "Then, use rgee::ee_utils_sak_copy to set the Service Account Key.",
+      "To solve this problem:",
+      "  1) download it from your Google cloud console",
+      "  2) validate it using rgee::ee_utils_sak_validate [OPTIONAL].",
+      "  3) Use rgee::ee_utils_sak_copy to set the SaK in rgee.",
       "A tutorial to obtain the SAK file is available at:",
       "> https://r-spatial.github.io/rgee/articles/rgee05.html",
       crayon::bold("As long as you haven't saved a SKA file, the following functions will not work:"),

man/rgee-package.Rd

@@ -13,7 +13,7 @@ skip_if_no_credentials <- function() {
   ee_path <- ee_get_earthengine_path()
   credentials <- list.files(
     path = ee_path,
-    pattern = "@gmail.com|credentials|GCS_AUTH_FILE.json"
+    pattern = "@gmail.com|credentials|.*.json"
   )
   if (length(credentials) != 3) {
     skip("All google credentials were not found")
@@ -23,7 +23,7 @@ skip_if_no_credentials <- function() {
 # Necessary Python packages were loaded?
 skip_if_no_pypkg <- function() {
   have_ee <- reticulate::py_module_available("ee")
-  have_numpy <- reticulate::py_module_available("numpy2")
+  have_numpy <- reticulate::py_module_available("numpy")
   if (isFALSE(have_ee)) {
     skip("ee not available for testing")
   }
@@ -43,7 +43,7 @@ drive_folder_f <- function(){
 # intermediate files. ALERT!!: After test finished all the files
 # inside the bucket will be deleted.
 gcs_bucket_f <- function(){
-  "rgee_dev"
+  "rgeedev2"
 }
 
 # Define your own GCS bucket with uniform access to save
@@ -56,7 +56,7 @@ gcs_bucket_uniform_f <- function(){
 # Initialize credentials
 # If you do not count with GCS credentials the test will be skipped
 have_ee <- reticulate::py_module_available("ee")
-have_numpy <- reticulate::py_module_available("numpy2")
+have_numpy <- reticulate::py_module_available("numpy")
 if (have_ee & have_numpy) {
 ee_Initialize(drive = TRUE, gcs = TRUE)
 }