fix

Author: kooksee

clients/grpcc/grpcc_builder/middleware.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/pubgo/lava/clients/grpcc/grpcc_config"
 	"github.com/pubgo/lava/middleware"
+	"github.com/pubgo/lava/pkg/grpcutil"
 	"github.com/pubgo/lava/pkg/utils"
 )
 
@@ -62,9 +63,9 @@ func unaryInterceptor(middlewares []middleware.Middleware) grpc.UnaryClientInter
 
 		// get content type
 		ct := utils.FirstFnNotEmpty(func() string {
-			return middleware.HeaderGet(md, "content-type")
+			return grpcutil.HeaderGet(md, "content-type")
 		}, func() string {
-			return middleware.HeaderGet(md, "x-content-type")
+			return grpcutil.HeaderGet(md, "x-content-type")
 		}, func() string {
 			return grpcc_config.DefaultContentType
 		})
@@ -135,9 +136,9 @@ func streamInterceptor(middlewares []middleware.Middleware) grpc.StreamClientInt
 
 		// get content type
 		ct := utils.FirstFnNotEmpty(func() string {
-			return middleware.HeaderGet(md, "content-type")
+			return grpcutil.HeaderGet(md, "content-type")
 		}, func() string {
-			return middleware.HeaderGet(md, "x-content-type")
+			return grpcutil.HeaderGet(md, "x-content-type")
 		}, func() string {
 			return grpcc_config.DefaultContentType
 		})

config/builder.go

@@ -1,9 +1,10 @@
 package config
 
 import (
-	"github.com/pubgo/lava/inject"
 	"github.com/spf13/viper"
 	"go.uber.org/fx"
+
+	"github.com/pubgo/lava/inject"
 )
 
 var conf Config

config/builder_test.go

@@ -17,6 +17,9 @@ func TestName(t *testing.T) {
 	assert.So(c, should.NotBeNil)
 
 	_ = os.Setenv(runtime.Project+"_123", "app.name=hello")
+	for _, ff := range os.Environ() {
+		println(ff)
+	}
 	c = newCfg()
 	assert.So(c.GetString("app.name"), should.Equal, "hello")
 	assert.So(c.GetString("app.home"), should.Equal, c.GetString("app.project"))

config/util.go

@@ -6,20 +6,21 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/iancoleman/strcase"
 	"github.com/pubgo/xerror"
 	"github.com/spf13/viper"
 
 	"github.com/pubgo/lava/consts"
 )
 
-const _resIdKey = "name"
+const resKey = "name"
 
 func getResId(m map[string]interface{}) string {
 	if m == nil {
 		return consts.KeyDefault
 	}
 
-	var val, ok = m[_resIdKey]
+	var val, ok = m[resKey]
 	if !ok || val == nil {
 		return consts.KeyDefault
 	}
@@ -50,8 +51,8 @@ func strMap(strList []string, fn func(str string) string) []string {
 }
 
 func loadEnv(envPrefix string, v *viper.Viper) {
-	var r = strings.NewReplacer("-", "_", ".", "_", "__", "_", "/", "_")
-	envPrefix = strings.ReplaceAll(r.Replace(envPrefix)+"_", "__", "_")
+	var r = strings.NewReplacer("-", "_", ".", "_", "/", "_")
+	envPrefix = strings.ReplaceAll(r.Replace(strcase.ToSnake(envPrefix))+"_", "__", "_")
 
 	for _, env := range os.Environ() {
 		if !strings.HasPrefix(env, envPrefix) {

example/Makefile

@@ -1,6 +1,5 @@
 WORKDIR=`pwd`
 Domain=lava
-Project=test-grpc
 VersionBase=github.com/pubgo/lava
 Tag=$(shell git describe --abbrev=0 --tags)
 Version=$(shell git tag --sort=committerdate | tail -n 1)
@@ -14,7 +13,6 @@ LDFLAGS=-ldflags " \
 -X '${VersionBase}/version.Version=${Version}' \
 -X '${VersionBase}/version.Tag=${Tag}' \
 -X '${VersionBase}/version.Domain=${Domain}' \
--X '${VersionBase}/version.Project=${Project}' \
 -X '${VersionBase}/version.Data=hello' \
 "
 

logging/log_middleware/middleware.go

@@ -21,7 +21,7 @@ import (
 	"github.com/pubgo/lava/version"
 )
 
-const Name = "log-record"
+const Name = "accesslog"
 
 var log = logging.Component(Name)
 

pkg/env/env.go

@@ -1,6 +1,7 @@
 package env
 
 import (
+	"fmt"
 	"os"
 	"strconv"
 	"strings"
@@ -18,6 +19,15 @@ func Get(names ...string) string {
 	return val
 }
 
+func MustGet(names ...string) string {
+	var val string
+	GetWith(&val, names...)
+	if val == "" {
+		panic(fmt.Sprintf("env value is null in %v, all:%v", names, os.Environ()))
+	}
+	return val
+}
+
 func GetWith(val *string, names ...string) {
 	for _, name := range names {
 		env, ok := Lookup(name)
@@ -71,7 +81,7 @@ func GetFloatVal(val *float64, names ...string) {
 }
 
 func Lookup(key string) (string, bool) {
-	return os.LookupEnv(key)
+	return os.LookupEnv(strings.ToUpper(key))
 }
 
 func UnSetenv(key string) error {

middleware/header.go renamed to pkg/grpcutil/header.go

@@ -1,4 +1,4 @@
-package middleware
+package grpcutil
 
 import (
 	"google.golang.org/grpc/metadata"

runtime/flags.go

@@ -3,15 +3,15 @@ package runtime
 import (
 	"io/ioutil"
 	"os"
+	"strconv"
 	"strings"
 	"syscall"
 
 	"github.com/denisbrodbeck/machineid"
 	"github.com/google/uuid"
-	dir "github.com/mitchellh/go-homedir"
 	"github.com/pubgo/xerror"
-	"k8s.io/client-go/util/homedir"
 
+	"github.com/pubgo/lava/pkg/env"
 	"github.com/pubgo/lava/pkg/utils"
 	"github.com/pubgo/lava/version"
 )
@@ -22,7 +22,7 @@ var (
 	Block   = true
 	Trace   = false
 	Addr    = ":8080"
-	Project = version.Project
+	Project = ""
 	Level   = "debug"
 	Mode    = RunModeLocal
 
@@ -60,15 +60,16 @@ var (
 			return ""
 		},
 	)
-
-	// Homedir the home directory for the current user
-	Homedir = utils.FirstFnNotEmpty(
-		homedir.HomeDir,
-		func() string {
-			var h, err = dir.Dir()
-			xerror.Exit(err)
-			return h
-		},
-		func() string { return "." },
-	)
 )
+
+func init() {
+	Project = env.MustGet("lava_project", "app_name", "project_name", "service_name")
+	mode := env.Get("lava_mode", "app_mode")
+	if mode != "" {
+		var i, err = strconv.Atoi(mode)
+		xerror.Panic(err)
+
+		Mode = RunMode(i)
+		xerror.Assert(Mode.String() == "", "unknown mode, mode=%s", mode)
+	}
+}