package main
import (
+ "errors"
"flag"
"fmt"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
func main() {
flag.Parse()
if minutesBetweenRuns == 0 {
- err := singlerun()
+ err := singlerun(makeArvadosClient())
if err != nil {
- log.Fatalf("Got an error: %v", err)
+ log.Fatalf("singlerun: %v", err)
}
} else {
waitTime := time.Minute * time.Duration(minutesBetweenRuns)
for {
log.Println("Beginning Run")
- err := singlerun()
+ err := singlerun(makeArvadosClient())
if err != nil {
- log.Printf("Got an error: %v", err)
+ log.Printf("singlerun: %v", err)
}
log.Printf("Sleeping for %d minutes", minutesBetweenRuns)
time.Sleep(waitTime)
}
}
-func singlerun() error {
+func makeArvadosClient() arvadosclient.ArvadosClient {
arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
- log.Fatalf("Error setting up arvados client %s", err.Error())
+ log.Fatalf("Error setting up arvados client: %s", err)
}
+ return arv
+}
- if is_admin, err := util.UserIsAdmin(arv); err != nil {
- log.Fatalf("Error querying current arvados user %s", err.Error())
- } else if !is_admin {
- log.Fatalf("Current user is not an admin. Datamanager can only be run by admins.")
+func singlerun(arv arvadosclient.ArvadosClient) error {
+ var err error
+ if isAdmin, err := util.UserIsAdmin(arv); err != nil {
+ return errors.New("Error verifying admin token: " + err.Error())
+ } else if !isAdmin {
+ return errors.New("Current user is not an admin. Datamanager requires a privileged token.")
}
var arvLogger *logger.Logger
arvLogger.AddWriteHook(loggerutil.LogMemoryAlloc)
}
- // Verify that datamanager token belongs to an admin user
- dataManagerToken := keep.GetDataManagerToken(arvLogger)
- origArvToken := arv.ApiToken
- arv.ApiToken = dataManagerToken
- if is_admin, err := util.UserIsAdmin(arv); err != nil {
- log.Fatalf("Error querying arvados user for data manager token %s", err.Error())
- } else if !is_admin {
- log.Fatalf("Datamanager token does not belong to an admin user.")
- }
- arv.ApiToken = origArvToken
-
var (
dataFetcher summary.DataFetcher
readCollections collection.ReadCollections
if trashErr != nil {
return err
} else {
- keep.SendTrashLists(dataManagerToken, kc, trashLists)
+ keep.SendTrashLists(kc, trashLists)
}
return nil