summaryrefslogtreecommitdiff
path: root/aws.go
diff options
context:
space:
mode:
authorNick White <git@njw.name>2021-08-17 13:18:04 +0100
committerNick White <git@njw.name>2021-08-17 13:18:04 +0100
commit48c68cfa7f18992b26765c7b67c52c11687ad74a (patch)
tree6194e21f03f381e1886534ca2ffd3830591bb461 /aws.go
parent2bac685f600b97676de14bb850e5b087f0d54b83 (diff)
pipeline: use regular storage for tests, rather than a separate one
Diffstat (limited to 'aws.go')
-rw-r--r--aws.go29
1 files changed, 13 insertions, 16 deletions
diff --git a/aws.go b/aws.go
index 8e9410f..0ca657f 100644
--- a/aws.go
+++ b/aws.go
@@ -44,16 +44,18 @@ type AwsConn struct {
Region string
Logger *log.Logger
- sess *session.Session
- ec2svc *ec2.EC2
- s3svc *s3.S3
- sqssvc *sqs.SQS
- downloader *s3manager.Downloader
- uploader *s3manager.Uploader
- wipequrl, prequrl, ocrpgqurl, analysequrl string
- testqurl string
- teststorageid string
- wipstorageid string
+ sess *session.Session
+ ec2svc *ec2.EC2
+ s3svc *s3.S3
+ sqssvc *sqs.SQS
+ downloader *s3manager.Downloader
+ uploader *s3manager.Uploader
+ wipequrl string
+ prequrl string
+ ocrpgqurl string
+ analysequrl string
+ testqurl string
+ wipstorageid string
}
// MinimalInit does the bare minimum to initialise aws services
@@ -140,7 +142,6 @@ func (a *AwsConn) TestInit() error {
return errors.New(fmt.Sprintf("Error getting test queue URL: %s\n", err))
}
a.testqurl = *result.QueueUrl
- a.teststorageid = storageTest
return nil
}
@@ -348,10 +349,6 @@ func (a *AwsConn) AnalyseQueueId() string {
return a.analysequrl
}
-func (a *AwsConn) TestStorageId() string {
- return a.teststorageid
-}
-
func (a *AwsConn) WIPStorageId() string {
return a.wipstorageid
}
@@ -618,7 +615,7 @@ func (a *AwsConn) Log(v ...interface{}) {
// mkpipeline sets up necessary buckets and queues for the pipeline
// TODO: also set up the necessary security group and iam stuff
func (a *AwsConn) MkPipeline() error {
- buckets := []string{storageTest, storageWip}
+ buckets := []string{storageWip}
queues := []string{queuePreProc, queueWipeOnly, queueAnalyse, queueOcrPage, queueTest}
for _, bucket := range buckets {