set config data

Author: markus621

Makefile

@@ -23,8 +23,8 @@ build:
 tests:
 	devtool test
 
-.PHONY: pre-commite
-pre-commite: setup lint build tests
+.PHONY: pre-commit
+pre-commit: setup lint build tests
 
 .PHONY: ci
 ci: install setup lint build tests

application.go

@@ -33,19 +33,26 @@ type Grape interface {
 	ExitFunc(call func(code int)) Grape
 }
 
-type _grape struct {
-	appName        string
-	configFilePath string
-	pidFilePath    string
-	resolvers      []config.Resolver
-	configs        Modules
-	modules        Modules
-	packages       container.TContainer
-	logHandler     *_log
-	logger         logx.Logger
-	appContext     xc.Context
-	exitFunc       func(code int)
-}
+type (
+	_conf struct {
+		FileName string
+		Data     string
+		DataExt  string
+	}
+	_grape struct {
+		appName     string
+		config      _conf
+		pidFilePath string
+		resolvers   []config.Resolver
+		configs     Modules
+		modules     Modules
+		packages    container.TContainer
+		logHandler  *_log
+		logger      logx.Logger
+		appContext  xc.Context
+		exitFunc    func(code int)
+	}
+)
 
 // New create application
 func New(appName string) Grape {
@@ -82,7 +89,18 @@ func (a *_grape) Modules(modules ...interface{}) Grape {
 
 // ConfigFile set config file path
 func (a *_grape) ConfigFile(filename string) Grape {
-	a.configFilePath = filename
+	a.config = _conf{
+		FileName: filename,
+	}
+	return a
+}
+
+// ConfigData set config data
+func (a *_grape) ConfigData(data, ext string) Grape {
+	a.config = _conf{
+		Data:    data,
+		DataExt: ext,
+	}
 	return a
 }
 
@@ -218,12 +236,15 @@ func (a *_grape) prepareConfig(interactive bool) {
 
 	// read config file
 	resolver := config.New(a.resolvers...)
-	if len(a.configFilePath) > 0 {
-		console.FatalIfErr(resolver.OpenFile(a.configFilePath), "Open config file: %s", a.configFilePath)
+	switch true {
+	case len(a.config.Data) > 0:
+		resolver.OpenBlob(a.config.Data, a.config.DataExt)
+	case len(a.config.FileName) > 0:
+		console.FatalIfErr(resolver.OpenFile(a.config.FileName), "Open config file: %s", a.config)
 	}
-	console.FatalIfErr(resolver.Build(), "Prepare config file: %s", a.configFilePath)
+	console.FatalIfErr(resolver.Build(), "Prepare config file: %s", a.config)
 	if !interactive {
-		console.FatalIfErr(resolver.Decode(appConfig), "Decode config file: %s", a.configFilePath)
+		console.FatalIfErr(resolver.Decode(appConfig), "Decode config file: %s", a.config)
 	}
 
 	// init logger
@@ -242,7 +263,7 @@ func (a *_grape) prepareConfig(interactive bool) {
 	configs, err = reflect.TypingPtr(a.configs, func(c interface{}) error {
 		return resolver.Decode(c)
 	})
-	console.FatalIfErr(err, "Decode config file: %s", a.configFilePath)
+	console.FatalIfErr(err, "Decode config file: %s", a.config)
 	a.modules = a.modules.Add(configs...)
 
 	if !interactive && len(a.pidFilePath) > 0 {

go.mod

@@ -5,7 +5,7 @@ go 1.21
 require (
 	go.osspkg.com/algorithms v1.4.1
 	go.osspkg.com/casecheck v0.3.0
-	go.osspkg.com/config v0.1.2
+	go.osspkg.com/config v0.1.3
 	go.osspkg.com/console v0.3.3
 	go.osspkg.com/errors v0.3.1
 	go.osspkg.com/events v0.3.0

go.sum

@@ -6,8 +6,8 @@ go.osspkg.com/algorithms v1.4.1 h1:yCXiNHu+MGiUYU7wFsCg2Q0drLPnu1q13cIrPAHDlXU=
 go.osspkg.com/algorithms v1.4.1/go.mod h1:JarWCfCmgxBkk2tA/ABeHScK9WN8azu+bEc27+dF/Gw=
 go.osspkg.com/casecheck v0.3.0 h1:x15blEszElbrHrEH5H02JIIhGIg/lGZzIt1kQlD3pwM=
 go.osspkg.com/casecheck v0.3.0/go.mod h1:TRFXDMFJEOtnlp3ET2Hix3osbxwPWhvaiT/HfD3+gBA=
-go.osspkg.com/config v0.1.2 h1:CxDEVGoYUx4BfuG6xmKlYp6y2hOvbUBf+5muEu34QQo=
-go.osspkg.com/config v0.1.2/go.mod h1:+LdWszZhwqASETll0nUJLlozqR8DEdtmGxWLXHygHRg=
+go.osspkg.com/config v0.1.3 h1:LAgTTYFzoIf4VNBIpFtjG81rR0/3SG29r+1D8I/YBzs=
+go.osspkg.com/config v0.1.3/go.mod h1:MyqvXDgpHLZlO2SM/rqf1zogpUZiXvkZlc/Z+0L7alA=
 go.osspkg.com/console v0.3.3 h1:UB/pPoPsgWbyNFix8pEMQHbsXdMv/UK/dgsbRknCH2A=
 go.osspkg.com/console v0.3.3/go.mod h1:IknBCliH6mX/ogHa6wbycnGDFYixCGH3WuNc5W5tQe8=
 go.osspkg.com/errors v0.3.1 h1:F9m/EEd/Ot2jba/TV7tvVRIpWXzIpNLc7vRJKcBD86A=