Skip to content

Commit

Permalink
update to support Go modules
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisaaronland committed Jun 2, 2019
1 parent e393154 commit f697b4d
Show file tree
Hide file tree
Showing 1,739 changed files with 15,352 additions and 1,671,314 deletions.
40 changes: 4 additions & 36 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,42 +1,10 @@
CWD=$(shell pwd)
GOPATH := $(CWD)

prep:
if test -d pkg; then rm -rf pkg; fi

self: prep rmdeps
if test -d src; then rm -rf src; fi
mkdir -p src/github.com/go-iiif/go-iiif-aws
cp -r ecs src/github.com/go-iiif/go-iiif-aws/
cp -r vendor/* src/

rmdeps:
if test -d src; then rm -rf src; fi

build: fmt bin

deps:
@GOPATH=$(GOPATH) go get -u "github.com/go-iiif/go-iiif-uri"
@GOPATH=$(GOPATH) go get -u "github.com/aws/aws-lambda-go/lambda"
@GOPATH=$(GOPATH) go get -u "github.com/whosonfirst/go-whosonfirst-aws"
@GOPATH=$(GOPATH) go get -u "github.com/whosonfirst/go-whosonfirst-cli"
mv src/github.com/whosonfirst/go-whosonfirst-aws/vendor/github.com/aws/aws-sdk-go src/github.com/aws/

vendor-deps: rmdeps deps
if test ! -d vendor; then mkdir vendor; fi
if test -d vendor; then rm -rf vendor; fi
cp -r src vendor
find vendor -name '.git' -print -type d -exec rm -rf {} +
rm -rf src

fmt:
go fmt *.go
go fmt cmd/*.go
go fmt cmd/iiif-process-ecs/*.go
go fmt ecs/*.go

bin: self
rm -rf bin/*
@GOPATH=$(GOPATH) go build -o bin/iiif-process-ecs cmd/iiif-process-ecs.go
tools:
go build -o bin/iiif-process-ecs cmd/iiif-process-ecs/main.go

docker-process:
if test ! -f $(CONFIG); then echo "missing config file" && exit 1; fi
Expand All @@ -54,7 +22,7 @@ lambda-process:
@make self
if test -f main; then rm -f main; fi
if test -f process-task.zip; then rm -f process-task.zip; fi
@GOPATH=$(GOPATH) GOOS=linux go build -o main cmd/iiif-process-ecs.go
GOOS=linux go build -o main cmd/iiif-process-ecs.go
zip process-task.zip main
rm -f main

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Go package for using go-iiif in AWS.

## Install

You will need to have both `Go` (specifically a version of Go more recent than 1.7 so let's just assume you need [Go 1.11](https://golang.org/dl/) or higher) and the `make` programs installed on your computer. Assuming you do just type:
You will need to have both `Go` (specifically version [1.12](https://golang.org/dl/) or higher) and the `make` programs installed on your computer. Assuming you do just type:

```
make bin
make tools
```

All of this package's dependencies are bundled with the code in the `vendor` directory.
Expand Down Expand Up @@ -295,4 +295,4 @@ Required keys in a `go-whosonfirst-aws` DSN string for Lambda services are:
## See also

* https://github.com/go-iiif/go-iiif
* https://millsfield.sfomuseum.org/blog/2019/02/12/iiif-aws/
* https://millsfield.sfomuseum.org/blog/2019/02/12/iiif-aws/
File renamed without changes.
17 changes: 17 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module github.com/go-iiif/go-iiif-aws

require (
github.com/aaronland/go-string v0.1.0
github.com/aws/aws-lambda-go v1.11.1
github.com/aws/aws-sdk-go v1.19.31
github.com/go-iiif/go-iiif-uri v0.0.2
github.com/go-ini/ini v1.42.0
github.com/stretchr/testify v1.2.1
github.com/whosonfirst/go-whosonfirst-aws v0.1.0
github.com/whosonfirst/go-whosonfirst-cli v0.1.0
github.com/whosonfirst/go-whosonfirst-mimetypes v0.1.0
gopkg.in/urfave/cli.v1 v1.20.0

)

go 1.12
36 changes: 36 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
github.com/aaronland/go-string v0.1.0 h1:HU6OHmEpN2m9b5SOIwU6HoOq87Fvemj/0g6DTp8yzpk=
github.com/aaronland/go-string v0.1.0/go.mod h1:2aMIWdTqk63jZsaLLy+p9dsB1MDRqx4sHYoLtkwyYUo=
github.com/aws/aws-lambda-go v1.11.1 h1:wuOnhS5aqzPOWns71FO35PtbtBKHr4MYsPVt5qXLSfI=
github.com/aws/aws-lambda-go v1.11.1/go.mod h1:Rr2SMTLeSMKgD45uep9V/NP8tnbCcySgu04cx0k/6cw=
github.com/aws/aws-sdk-go v1.19.31 h1:6N7YBci5Nfbedd9k9ZpQlJgAfzuYQqGPSrJ52+Aja1s=
github.com/aws/aws-sdk-go v1.19.31/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-iiif/go-iiif-uri v0.0.2 h1:logqVfkfMYnmTsl2+PykJGU29y7oz0rn1Y5vsxE+iZc=
github.com/go-iiif/go-iiif-uri v0.0.2/go.mod h1:XEriqBaHmCaDOjIepc1PXvb94HVCJLdkK27HFp2sAXQ=
github.com/go-ini/ini v1.42.0 h1:TWr1wGj35+UiWHlBA8er89seFXxzwFn11spilrrj+38=
github.com/go-ini/ini v1.42.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U=
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/whosonfirst/go-whosonfirst-aws v0.1.0 h1:q+esqP3703MwJpgW90Ft9yyO1gmLZ7ymG5OLSvCmges=
github.com/whosonfirst/go-whosonfirst-aws v0.1.0/go.mod h1:gyDrfJ24VQgpKqZeFxos7AWVMaelVBY0s0jRi05wz+Y=
github.com/whosonfirst/go-whosonfirst-cli v0.1.0 h1:Wwj9z0R/ryHmPmpVm5jCbXdG4agJzKMWXDtPVReN/KA=
github.com/whosonfirst/go-whosonfirst-cli v0.1.0/go.mod h1:Edy+amD+fMq1QS1yxB3u8maA8I93q/LG7JRNh+fsdfc=
github.com/whosonfirst/go-whosonfirst-mimetypes v0.1.0 h1:eRgznGdqGnyfenjL12bFPB++J01eVo3O0NFYJXk5pzc=
github.com/whosonfirst/go-whosonfirst-mimetypes v0.1.0/go.mod h1:1huBP9SSlmkSCc+0+0ENWTr+BtCx54riH6O1Gkxp8mo=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
35 changes: 0 additions & 35 deletions vendor/github.com/aws/aws-lambda-go/.travis.yml

This file was deleted.

33 changes: 0 additions & 33 deletions vendor/github.com/aws/aws-lambda-go/Gopkg.lock

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/github.com/aws/aws-lambda-go/Gopkg.toml

This file was deleted.

87 changes: 0 additions & 87 deletions vendor/github.com/aws/aws-lambda-go/README.md

This file was deleted.

36 changes: 0 additions & 36 deletions vendor/github.com/aws/aws-lambda-go/cfn/README.md

This file was deleted.

27 changes: 0 additions & 27 deletions vendor/github.com/aws/aws-lambda-go/cfn/event.go

This file was deleted.

Loading

0 comments on commit f697b4d

Please sign in to comment.