From 70c1c0f0148ea173331f4f6d40274e3b95e3ce41 Mon Sep 17 00:00:00 2001 From: Nick White Date: Thu, 5 Sep 2019 09:40:35 +0100 Subject: Update Pipeliner interface in getpipelinebook, and update some comments --- bookpipeline/cmd/bookpipeline/main.go | 1 - bookpipeline/cmd/booktopipeline/main.go | 1 - bookpipeline/cmd/getpipelinebook/main.go | 2 +- bookpipeline/cmd/mkpipeline/main.go | 5 +++++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bookpipeline/cmd/bookpipeline/main.go b/bookpipeline/cmd/bookpipeline/main.go index 913ccc7..3698873 100644 --- a/bookpipeline/cmd/bookpipeline/main.go +++ b/bookpipeline/cmd/bookpipeline/main.go @@ -1,6 +1,5 @@ package main -// TODO: have logs go somewhere useful, like email // TODO: check if images are prebinarised and if so skip multiple binarisation import ( diff --git a/bookpipeline/cmd/booktopipeline/main.go b/bookpipeline/cmd/booktopipeline/main.go index 40ed35b..a0fcb41 100644 --- a/bookpipeline/cmd/booktopipeline/main.go +++ b/bookpipeline/cmd/booktopipeline/main.go @@ -1,6 +1,5 @@ package main // TODO: use bookpipeline package to do aws stuff -// TODO: have logs go somewhere useful, like email import ( "flag" diff --git a/bookpipeline/cmd/getpipelinebook/main.go b/bookpipeline/cmd/getpipelinebook/main.go index 9d0e35e..55401e6 100644 --- a/bookpipeline/cmd/getpipelinebook/main.go +++ b/bookpipeline/cmd/getpipelinebook/main.go @@ -24,7 +24,7 @@ type Pipeliner interface { ListObjects(bucket string, prefix string) ([]string, error) Download(bucket string, key string, fn string) error Upload(bucket string, key string, path string) error - CheckQueue(url string) (bookpipeline.Qmsg, error) + CheckQueue(url string, timeout int64) (bookpipeline.Qmsg, error) AddToQueue(url string, msg string) error DelFromQueue(url string, handle string) error WIPStorageId() string diff --git a/bookpipeline/cmd/mkpipeline/main.go b/bookpipeline/cmd/mkpipeline/main.go index b15d160..611a091 100644 --- a/bookpipeline/cmd/mkpipeline/main.go +++ b/bookpipeline/cmd/mkpipeline/main.go @@ -1,6 +1,11 @@ package main // TODO: use the bookpipeline package for aws stuff +// TODO: set up iam role and policy needed for ec2 instances to access this stuff; +// see arn:aws:iam::557852942063:policy/pipelinestorageandqueue +// and arn:aws:iam::557852942063:role/pipeliner +// TODO: set up launch template for ec2 instances +// NOTE: potentially use json templates to define things, ala aws cli import ( "log" -- cgit v1.2.1-24-ge1ad