Merge branch 'aws-sdk-v2' of github.com:sfomuseum/go-pubsub

README.md

@@ -6,6 +6,29 @@ Go package to provide a common interface for abstract publish and subscribe oper
 
 Documentation is incomplete at this time.
 
+## Tools
+
+```
+$> make cli
+go build -mod vendor -ldflags="-s -w" -o bin/publish cmd/publish/main.go
+go build -mod vendor -ldflags="-s -w" -o bin/subscribe cmd/subscribe/main.go
+```
+
+## Examples
+
+```
+$> ./bin/publish \
+	-publisher-uri 'awssqs-creds://?region={REGION}&credentials={CREDENTIALS}&queue-url=https://sqs.{REGION}.amazonaws.com/{ACCOUNT}/{QUEUE}' \
+	'hello world'
+```
+
+```
+$> ./bin/subscribe \
+	-subscriber-uri 'awssqs-creds://?region={REGION}&credentials={CREDENTIALS}&queue-url=https://sqs.{REGION}.amazonaws.com/{ACCOUNT}/{QUEUE}'
+2024/09/04 10:59:57 INFO Listening for messages
+hello world
+```
+
 ## See also
 
 * https://gocloud.dev/howto/pubsub/

app/publish/flags.go

@@ -11,7 +11,7 @@ var mode string
 
 func DefaultFlagSet() *flag.FlagSet {
 	fs := flagset.NewFlagSet("publish")
-	fs.StringVar(&publisher_uri, "publisher-uri", "", "...")
-	fs.StringVar(&mode, "mode", "", "...")
+	fs.StringVar(&publisher_uri, "publisher-uri", "", "A valid sfomuseum/go-pubsub/publisher.Publisher URI")
+	fs.StringVar(&mode, "mode", "", "Optional flag to signal whether data should be read for an alternate source. Valid options are: readline, stdin.")
 	return fs
 }

app/subscribe/flags.go

@@ -11,7 +11,7 @@ var publisher_uri string
 
 func DefaultFlagSet() *flag.FlagSet {
 	fs := flagset.NewFlagSet("subscribe")
-	fs.StringVar(&subscriber_uri, "subscriber-uri", "", "...")
-	fs.StringVar(&publisher_uri, "publisher-uri", "stdout://?newline=true", "...")
+	fs.StringVar(&subscriber_uri, "subscriber-uri", "", "A valid sfomuseum/go-pubsub/subscriber.Subscriber URI")
+	fs.StringVar(&publisher_uri, "publisher-uri", "stdout://?newline=true", "A valid sfomuseum/go-pubsub/publisher.Publisher URI")
 	return fs
 }

go.mod

@@ -1,77 +1,55 @@
 module github.com/sfomuseum/go-pubsub
 
-/*
-
-This needs to be updated to use aws-sdk-go-v2 but AWS has removed tags that gocloud.dev
-depends on... or something?
-
-go: downloading github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17
-go: downloading github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17
-go: github.com/sfomuseum/go-pubsub/publisher imports
-	gocloud.dev/pubsub/awssnssqs imports
-	github.com/aws/aws-sdk-go-v2/service/sns: reading github.com/aws/aws-sdk-go-v2/service/sns/go.mod at revision service/sns/v1.31.3: unknown revision refs/tags/service/sns/v1.31.3
-go: github.com/sfomuseum/go-pubsub/publisher imports
-	gocloud.dev/pubsub/awssnssqs imports
-	github.com/aws/aws-sdk-go-v2/service/sns/types: reading github.com/aws/aws-sdk-go-v2/service/sns/go.mod at revision service/sns/v1.31.3: unknown revision refs/tags/service/sns/v1.31.3
-go: github.com/sfomuseum/go-pubsub/publisher imports
-	gocloud.dev/pubsub tested by
-	gocloud.dev/pubsub.test imports
-	cloud.google.com/go/pubsub/apiv1: reading cloud.google.com/go/pubsub/go.mod at revision pubsub/v1.41.0: unknown revision refs/tags/pubsub/v1.41.0
-go: github.com/sfomuseum/go-pubsub/publisher imports
-	gocloud.dev/pubsub tested by
-	gocloud.dev/pubsub.test imports
-	cloud.google.com/go/pubsub/apiv1/pubsubpb: reading cloud.google.com/go/pubsub/go.mod at revision pubsub/v1.41.0: unknown revision refs/tags/pubsub/v1.41.0
-
-*/
-
-go 1.21
+go 1.23
 
 replace github.com/hpcloud/tail v1.0.0 => github.com/sfomuseum/tail v1.0.2
 
 require (
-	github.com/aaronland/go-aws-session v0.2.1
+	github.com/aaronland/go-aws-auth v1.6.4
 	github.com/aaronland/go-roster v1.0.0
-	github.com/aws/aws-sdk-go v1.53.21
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.34.7
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/hpcloud/tail v1.0.0
 	github.com/sfomuseum/go-flags v0.10.0
-	gocloud.dev v0.37.0
+	gocloud.dev v0.39.0
 )
 
 require (
-	github.com/aaronland/go-string v1.0.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.25.3 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.27.7 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.7 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 // indirect
+	github.com/aws/aws-sdk-go v1.55.5 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.30.5 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sns v1.29.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.31.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect
-	github.com/aws/smithy-go v1.20.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.25.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/iam v1.34.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sns v1.31.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.52.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
+	github.com/aws/smithy-go v1.20.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/wire v0.6.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.13.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/api v0.169.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
-	google.golang.org/grpc v1.62.1 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
+	google.golang.org/api v0.191.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 )