Store credentials and config in .env

strideynet · Jul 18, 2023 · c8b0bf6 · c8b0bf6
1 parent 5fc62d4
commit c8b0bf6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,6 @@
+ENV=dev
+
+# Your handle on bsky.app and an app password generated
+# at: https://bsky.app/settings/app-passwords
+BLUESKY_USERNAME=
+BLUESKY_PASSWORD=
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,5 @@ go.work
 
 .idea/
 infra/secrets/
-.DS_Store
+.DS_Store
+.env
diff --git a/cmd/bffctl/main.go b/cmd/bffctl/main.go
@@ -2,11 +2,14 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"os"
+
+	"github.com/joho/godotenv"
 	"github.com/strideynet/bsky-furry-feed/bluesky"
 	"github.com/urfave/cli/v2"
 	"go.uber.org/zap"
-	"os"
 )
 
 type environment struct {
@@ -37,6 +40,10 @@ func getBlueskyClient(ctx context.Context) (*bluesky.Client, error) {
 func main() {
 	log, _ := zap.NewDevelopment()
 
+	if err := godotenv.Load(); err != nil && !errors.Is(err, os.ErrNotExist) {
+		log.Info("could not load .env file", zap.Error(err))
+	}
+
 	var env = &environment{}
 	app := &cli.App{
 		Name:  "bffctl",

diff --git a/cmd/bffsrv/main.go b/cmd/bffsrv/main.go
@@ -2,7 +2,13 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"os"
+	"os/signal"
+	"time"
+
+	"github.com/joho/godotenv"
 	"github.com/strideynet/bsky-furry-feed/api"
 	"github.com/strideynet/bsky-furry-feed/bluesky"
 	"github.com/strideynet/bsky-furry-feed/feed"
@@ -18,9 +24,6 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/sys/unix"
-	"os"
-	"os/signal"
-	"time"
 )
 
 // TODO: Better, more granular, env configuration.
@@ -48,8 +51,12 @@ func getMode() (mode, error) {
 
 func main() {
 	log, _ := zap.NewProduction()
-	err := runE(log)
-	if err != nil {
+
+	if err := godotenv.Load(); err != nil && !errors.Is(err, os.ErrNotExist) {
+		log.Fatal("could not load existing .env file", zap.Error(err))
+	}
+
+	if err := runE(log); err != nil {
 		log.Fatal("exited with error", zap.Error(err))
 	}
 }

diff --git a/go.mod b/go.mod
@@ -87,6 +87,7 @@ require (
 	github.com/jbenet/goprocess v0.1.4 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/joho/godotenv v1.5.1
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

diff --git a/go.sum b/go.sum
@@ -298,6 +298,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=