mirror/mxpv-podsync
1
0
Fork 0
mirror of https://github.com/mxpv/podsync.git synced 2024-05-11 05:55:04 +00:00
Code Issues Releases Activity

Better AWS configuration handling

Browse Source
This commit is contained in:
Maksym Pavlenko
2019-05-09 10:21:16 -07:00
parent 4a33a7d11c
commit 879d35e57b
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/api/main.go
View File

@ -9,8 +9,6 @@ import (
"syscall"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/jessevdk/go-flags"
log "github.com/sirupsen/logrus"
@ -32,8 +30,6 @@ type Opts struct {
PatreonWebhooksSecret string `long:"patreon-webhook-secret" required:"true" env:"PATREON_WEBHOOKS_SECRET"`
PostgresConnectionURL string `long:"pg-url" env:"POSTGRES_CONNECTION_URL"`
CookieSecret string `long:"cookie-secret" required:"true" env:"COOKIE_SECRET"`
AWSAccessKey string `long:"aws-key" required:"true" env:"AWS_ACCESS_KEY"`
AWSAccessSecret string `long:"aws-secret" required:"true" env:"AWS_ACCESS_SECRET"`
DynamoFeedsTableName string `long:"dynamo-feeds-table" env:"DYNAMO_FEEDS_TABLE_NAME"`
DynamoPledgesTableName string `long:"dynamo-pledges-table" env:"DYNAMO_PLEDGES_TABLE_NAME"`
RedisURL string `long:"redis-url" required:"true" env:"REDIS_CONNECTION_URL"`
@ -55,12 +51,7 @@ func main() {
log.WithError(err).Fatal("failed to read configuration")
}
awsCfg := &aws.Config{
Region: aws.String("us-east-1"),
Credentials: credentials.NewStaticCredentials(opts.AWSAccessKey, opts.AWSAccessSecret, ""),
}
database, err := storage.NewDynamo(awsCfg)
database, err := storage.NewDynamo()
if err != nil {
log.WithError(err).Fatal("failed to create database")
}
@ -94,7 +85,7 @@ func main() {
log.WithError(err).Fatal("failed to create Vimeo builder")
}
generic, err := builders.NewLambda(awsCfg)
generic, err := builders.NewLambda()
if err != nil {
log.WithError(err).Fatal("failed to create Lambda builder")
}

7
docker-compose.yml
View File

@ -18,8 +18,9 @@ services:
- PATREON_WEBHOOKS_SECRET={PATREON_WEBHOOKS_SECRET}
- COOKIE_SECRET={COOKIE_SECRET}
- GIN_MODE=release
- AWS_ACCESS_KEY={AWS_ACCESS_KEY}
- AWS_ACCESS_SECRET={AWS_ACCESS_SECRET}
- AWS_ACCESS_KEY_ID={AWS_ACCESS_KEY}
- AWS_SECRET_ACCESS_KEY={AWS_ACCESS_SECRET}
- AWS_REGION=us-east-1
- DYNAMO_FEEDS_TABLE_NAME=Prod_Feeds
- DYNAMO_PLEDGES_TABLE_NAME=Prod_Pledges
redis:
@ -45,4 +46,4 @@ services:
- LE_FQDN=podsync.net,www.podsync.net
volumes:
- /data/ssl:/etc/nginx/ssl/
- /data/nginx_cache:/tmp/nginx/
- /data/nginx_cache:/tmp/nginx/