Skip to content

Commit

Permalink
Use external ssmenv package
Browse files Browse the repository at this point in the history
Signed-off-by: Taiki Ono <[email protected]>
  • Loading branch information
taiki45 committed Sep 12, 2024
1 parent 073888a commit 03d3bdc
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 135 deletions.
4 changes: 2 additions & 2 deletions cmd/lambda/lambda.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/Finatext/belldog/internal/lambdaurl"
"github.com/Finatext/belldog/internal/service"
"github.com/Finatext/belldog/internal/slack"
"github.com/Finatext/belldog/internal/ssmenv"
"github.com/Finatext/belldog/internal/storage"
"github.com/Finatext/ssmenv-go"
)

func main() {
Expand All @@ -45,7 +45,7 @@ func doMain() error {
ssmClient := ssm.NewFromConfig(awsConfig)
replacedEnv, err := ssmenv.ReplacedEnv(ctx, ssmClient, os.Environ())
if err != nil {
return err
return errors.Wrap(err, "failed to replace env")
}
config, err := env.ParseAsWithOptions[appconfig.Config](env.Options{
Environment: replacedEnv,
Expand Down
4 changes: 2 additions & 2 deletions cmd/oneshot/oneshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/Finatext/belldog/internal/appconfig"
"github.com/Finatext/belldog/internal/handler"
"github.com/Finatext/belldog/internal/slack"
"github.com/Finatext/belldog/internal/ssmenv"
"github.com/Finatext/belldog/internal/storage"
"github.com/Finatext/ssmenv-go"
)

func main() {
Expand All @@ -39,7 +39,7 @@ func doMain() error {
ssmClient := ssm.NewFromConfig(awsConfig)
replacedEnv, err := ssmenv.ReplacedEnv(ctx, ssmClient, os.Environ())
if err != nil {
return err
return errors.Wrap(err, "failed to replace env")
}
config, err := env.ParseAsWithOptions[appconfig.Config](env.Options{
Environment: replacedEnv,
Expand Down
4 changes: 2 additions & 2 deletions cmd/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/Finatext/belldog/internal/handler"
"github.com/Finatext/belldog/internal/service"
"github.com/Finatext/belldog/internal/slack"
"github.com/Finatext/belldog/internal/ssmenv"
"github.com/Finatext/belldog/internal/storage"
"github.com/Finatext/ssmenv-go"
)

func main() {
Expand All @@ -39,7 +39,7 @@ func doMain() error {
ssmClient := ssm.NewFromConfig(awsConfig)
replacedEnv, err := ssmenv.ReplacedEnv(ctx, ssmClient, os.Environ())
if err != nil {
return err
return errors.Wrap(err, "failed to replace env")
}
config, err := env.ParseAsWithOptions[appconfig.Config](env.Options{
Environment: replacedEnv,
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module github.com/Finatext/belldog

go 1.23
go 1.23.0

require (
github.com/Finatext/ssmenv-go v0.1.0
github.com/aws/aws-lambda-go v1.47.0
github.com/aws/aws-sdk-go-v2 v1.30.5
github.com/aws/aws-sdk-go-v2/config v1.27.33
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
github.com/Finatext/ssmenv-go v0.1.0 h1:dgSsrx1l26HuiiI5xzOVEIdUE+/GJtcHhbFdJzb+khQ=
github.com/Finatext/ssmenv-go v0.1.0/go.mod h1:bPMbAiACozllI+O+TX25KUI2WnYgd581y9Dp4WrGFDA=
github.com/aws/aws-lambda-go v1.47.0 h1:0H8s0vumYx/YKs4sE7YM0ktwL2eWse+kfopsRI1sXVI=
github.com/aws/aws-lambda-go v1.47.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A=
github.com/aws/aws-sdk-go-v2 v1.30.5 h1:mWSRTwQAb0aLE17dSzztCVJWI9+cRMgqebndjwDyK0g=
Expand Down
83 changes: 0 additions & 83 deletions internal/ssmenv/ssmenv.go

This file was deleted.

45 changes: 0 additions & 45 deletions internal/ssmenv/ssmenv_test.go

This file was deleted.

0 comments on commit 03d3bdc

Please sign in to comment.