ssh updates

NAMESPACE

@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(as.cluster,gce_instance)
 S3method(as.container,character)
 S3method(as.container,container)
 S3method(as.container,list)
@@ -16,7 +17,6 @@ S3method(print,gce_instanceList)
 S3method(print,gce_region_operation)
 S3method(print,gce_zone_operation)
 S3method(print,machineTypeList)
-export(as.cluster.gce_instance)
 export(as.container)
 export(container_logs)
 export(container_rm)

R/metadata.R

@@ -123,10 +123,12 @@ Metadata <- function(items) {
 #' }
 #'  
 gce_set_metadata <- function(metadata, 
-                             instance = NULL, 
+                             instance, 
                              project = gce_get_global_project(), 
                              zone = gce_get_global_zone()) {
 
+  instance <- if(is.gce_instance(instance)) instance$name else instance
+
   if(instance == "project-wide"){
     pw_obj <- gce_get_metadata_project(project)
     meta_now <- pw_obj$commonInstanceMetadata$items

R/service-accounts.R

@@ -2,7 +2,7 @@
 #' @noRd
 gce_make_serviceaccounts <- function(){
 
-  if(Sys.getenv(source) == ""){
+  if(Sys.getenv("GCE_AUTH_FILE") == ""){
     stop("No email found in the authentication file at Sys.getenv('GCE_AUTH_FILE')", call.=FALSE)
   }
 

R/ssh_admin.R

@@ -251,8 +251,10 @@ gce_ssh_setup <- function(instance,
 #' 
 #' @export
 gce_check_ssh <- function(instance){
+  stopifnot(is.gce_instance(instance))
+  pz <- gce_extract_projectzone(instance)
 
-  instance <- gce_get_instance(instance)
+  instance <- gce_get_instance(instance, project = pz$project, zone = pz$zone)
 
   ssh_keys <- gce_get_metadata(instance, "ssh-keys")$value
 

R/template.R

@@ -146,7 +146,7 @@ gce_vm_template <- function(template = c("rstudio","shiny","opencpu",
   }
 
   template <- match.arg(template)
-  
+
   assert_that(is.flag(wait),
               is.string(image_family))