From 993199aca31f8956cfb8a5ad8c4b8a1746cc87f3 Mon Sep 17 00:00:00 2001 From: Urko Date: Mon, 10 Jul 2023 14:45:52 +0200 Subject: [PATCH] feat: load env variables from config --- cmd/main.go | 10 +++++++--- go.mod | 3 +++ go.sum | 10 ++++++++++ kit/config/config.go | 31 +++++++++++++++++++++++++++++++ kit/path.go | 9 +++++++++ 5 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 kit/config/config.go create mode 100644 kit/path.go diff --git a/cmd/main.go b/cmd/main.go index 75851bd..b50b063 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -6,6 +6,7 @@ import ( "os" "gitea.urkob.com/urko/backblaze-backup/internal/services" + "gitea.urkob.com/urko/backblaze-backup/kit/config" "github.com/spf13/cobra" ) @@ -27,10 +28,13 @@ var rootCmd = &cobra.Command{ log.Fatalln("bucket %w", err) } - id := os.Getenv("BB_ID") - key := os.Getenv("BB_KEY") + envFile := "" + if os.Getenv("BACKBLAZE_ENV") == "dev" { + envFile = ".env" + } + cfg := config.NewConfig(envFile) - bbService := services.NewBackBlaze(id, key).WithBucket(bucketName).WithDir(dir).WithFile(filePath) + bbService := services.NewBackBlaze(cfg.BbId, cfg.BbKey).WithBucket(bucketName).WithDir(dir).WithFile(filePath) if err := bbService.Sync(); err != nil { log.Fatalln("bbService.Sync()", err) } diff --git a/go.mod b/go.mod index 83e76c6..3b4e195 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,9 @@ module gitea.urkob.com/urko/backblaze-backup go 1.20 require ( + gitea.urkob.com/urko/go-root-dir v0.0.0-20230311113851-2f6d4355888a + github.com/joho/godotenv v1.5.1 + github.com/kelseyhightower/envconfig v1.4.0 github.com/kurin/blazer v0.5.3 github.com/spf13/cobra v1.7.0 golang.org/x/sync v0.3.0 diff --git a/go.sum b/go.sum index 0caf7bd..050f792 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,24 @@ +gitea.urkob.com/urko/go-root-dir v0.0.0-20230311113851-2f6d4355888a h1:s73cd3bRR6v0LGiBei841iIolbBJN2tbkUwN54X9vVg= +gitea.urkob.com/urko/go-root-dir v0.0.0-20230311113851-2f6d4355888a/go.mod h1:mU9nRHl70tBhJFbgKotpoXMV+s0wx+1uJ988p4oEpSo= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= +github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kurin/blazer v0.5.3 h1:SAgYv0TKU0kN/ETfO5ExjNAPyMt2FocO2s/UlCHfjAk= github.com/kurin/blazer v0.5.3/go.mod h1:4FCXMUWo9DllR2Do4TtBd377ezyAJ51vB5uTBjt0pGU= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/kit/config/config.go b/kit/config/config.go new file mode 100644 index 0000000..85250b7 --- /dev/null +++ b/kit/config/config.go @@ -0,0 +1,31 @@ +package config + +import ( + "log" + + "gitea.urkob.com/urko/backblaze-backup/kit" + "github.com/joho/godotenv" + "github.com/kelseyhightower/envconfig" +) + +type Config struct { + BbId string `required:"true" split_words:"true"` + BbKey string `required:"false" split_words:"true"` +} + +func NewConfig(envFile string) *Config { + if envFile != "" { + err := godotenv.Load(kit.RootDir() + "/" + envFile) + if err != nil { + log.Fatalln("godotenv.Load:", err) + } + } + + cfg := &Config{} + err := envconfig.Process("", cfg) + if err != nil { + log.Fatalf("envconfig.Process: %s\n", err) + } + + return cfg +} diff --git a/kit/path.go b/kit/path.go new file mode 100644 index 0000000..b35f115 --- /dev/null +++ b/kit/path.go @@ -0,0 +1,9 @@ +package kit + +import ( + root_dir "gitea.urkob.com/urko/go-root-dir" +) + +func RootDir() string { + return root_dir.RootDir("backblaze-backup") +}