Skip to content

Commit 680788e

Browse files
committed
minor change in config
1 parent b6b0eb3 commit 680788e

File tree

3 files changed

+34
-10
lines changed

3 files changed

+34
-10
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ FROM gcr.io/distroless/static-debian11
2323

2424
WORKDIR /app-server
2525

26-
COPY --from=build-env /app-server/ /app-server
26+
COPY --from=build-env /app-server/app /app-server
2727

2828
ENTRYPOINT ["/app-server/app"]
2929
EXPOSE 3333

configs/configs.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package configs
2+
3+
import (
4+
"embed"
5+
_ "embed"
6+
"fmt"
7+
)
8+
9+
//go:embed *.yml
10+
var f embed.FS
11+
12+
func GetYamlConfig(name string) ([]byte, error) {
13+
return f.ReadFile(fmt.Sprintf("%s.yml", name))
14+
}
15+
16+
//go:embed default.yml
17+
var defaultConf []byte
18+
19+
func GetDefaultConfig() []byte {
20+
return defaultConf
21+
}

internal/appconfig/appconfig.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package appconfig
22

33
import (
4+
"bytes"
45
"os"
56

7+
"github.com/aaabhilash97/aadhaar_scrapper_apis/configs"
68
"github.com/aaabhilash97/aadhaar_scrapper_apis/pkg/logger"
79
"github.com/spf13/viper"
810
"go.uber.org/zap"
@@ -19,19 +21,20 @@ func Init() *Config {
1921
var config Config
2022
{
2123
viperConfig := viper.New()
22-
viperConfig.SetConfigType("yml")
23-
24-
viperConfig.SetConfigName("default")
25-
viperConfig.AddConfigPath("./configs")
26-
err := viperConfig.ReadInConfig()
24+
viperConfig.SetConfigType("yaml")
25+
err := viperConfig.ReadConfig(bytes.NewBuffer(configs.GetDefaultConfig()))
2726
if err != nil {
2827
log.Fatal(fn, zap.Error(err))
2928
}
30-
if context := os.Getenv("env"); context != "" {
31-
viperConfig.SetConfigName(context)
32-
err = viperConfig.MergeInConfig()
29+
if confName := os.Getenv("conf"); confName != "" {
30+
envConfig, err := configs.GetYamlConfig(confName)
31+
if err != nil {
32+
log.Fatal(fn, zap.NamedError("config not found", err))
33+
}
34+
err = viperConfig.MergeConfig(
35+
bytes.NewBuffer(envConfig))
3336
if err != nil {
34-
log.Fatal(fn, zap.String("context", context), zap.Error(err))
37+
log.Fatal(fn, zap.Error(err))
3538
}
3639
}
3740

0 commit comments

Comments
 (0)