map[string]interface{} to map[string]any

.github/workflows/test.yml

@@ -12,14 +12,8 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.18
+        go-version: ^1.20
 
     - name: Test
-      env:
-        CC_TEST_REPORTER_ID:  ${{ secrets.CC_TEST_REPORTER_ID }}
       run: |
-        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-        chmod +x ./cc-test-reporter
-        ./cc-test-reporter before-build
-        go test ./... -coverprofile=c.out
-        ./cc-test-reporter after-build --prefix github.com/argonlab-io/bucharest
+        go test ./...

Makefile

@@ -1,2 +1,2 @@
 test:
-	./test.sh
+	./scripts/test.sh

context.go

@@ -30,7 +30,7 @@ var ErrNoRedis = errors.New("*redis.Client is not present in this context")
 var ErrNoSQL = errors.New("*sql.DB is not present in this context")
 var ErrNoSQLX = errors.New("*sqlx.DB is not present in this context")
 
-func AddValuesToContext(ctx Context, values MapAny) Context {
+func AddValuesToContext(ctx Context, values map[string]any) Context {
 	for key, value := range values {
 		ctx.SetValue(key, value)
 	}

context_test.go

@@ -23,12 +23,12 @@ func TestAddValuesToContext(t *testing.T) {
 		t.Errorf("NewContext().String() = %q want %q", got, want)
 	}
 
-	key1 := 1
+	key1 := "key1"
 	value1 := "one"
-	key2 := "two"
+	key2 := "key2"
 	value2 := 2
 
-	ctx = AddValuesToContext(NewContextWithOptions(&ContextOptions{Parent: ctx}), MapAny{
+	ctx = AddValuesToContext(NewContextWithOptions(&ContextOptions{Parent: ctx}), map[string]any{
 		key1: value1,
 		key2: value2,
 	})

env.go

@@ -6,7 +6,7 @@ import (
 )
 
 type ENV interface {
-	All() Map
+	All() map[string]any
 	Bool(key string) bool
 	Int(key string) int
 	String(key string) string
@@ -15,7 +15,7 @@ type ENV interface {
 
 type env struct{ preventDefaultPointer uuid.UUID }
 
-func (e *env) All() Map {
+func (e *env) All() map[string]any {
 	return viper.AllSettings()
 }
 

gin.go

@@ -40,7 +40,7 @@ func NewGinHandlerFunc(ctx Context, handlerFunc HandlerFunc) gin.HandlerFunc {
 	}
 }
 
-func NewGinHandlerFuncWithData(ctx Context, handlerFunc HandlerFuncWithData, data Map) gin.HandlerFunc {
+func NewGinHandlerFuncWithData(ctx Context, handlerFunc HandlerFuncWithData, data map[string]any) gin.HandlerFunc {
 	return func(g *gin.Context) {
 		httpError := handlerFunc(defaultHttpContextWithGin(ctx, g), data)
 		if httpError != nil {
@@ -384,7 +384,6 @@ func (rh *ginResponseHeader) SetAccepted(formats ...string) {
 	rh.gin.SetAccepted(formats...)
 }
 
-//
 type ginResponseBody struct {
 	gin *gin.Context
 }
@@ -513,7 +512,7 @@ func (h *httpContextWithGin) Gin() *gin.Context {
 	return ctx
 }
 
-func GinLoggerWithConfig(ctx HTTPContext, data Map) HTTPError {
+func GinLoggerWithConfig(ctx HTTPContext, data map[string]any) HTTPError {
 	conf, logLevelFromGinParam := getLogConfigAndLogLevel(data)
 
 	formatter := conf.Formatter
@@ -574,7 +573,7 @@ func GinLoggerWithConfig(ctx HTTPContext, data Map) HTTPError {
 
 type LogLevelFromGinParam func(*gin.LogFormatterParams) logrus.Level
 
-func getLogConfigAndLogLevel(data Map) (*gin.LoggerConfig, LogLevelFromGinParam) {
+func getLogConfigAndLogLevel(data map[string]any) (*gin.LoggerConfig, LogLevelFromGinParam) {
 	conf, ok := data["conf"].(*gin.LoggerConfig)
 	if !ok {
 		conf = &gin.LoggerConfig{}

gin_test.go

@@ -121,10 +121,10 @@ func TestNewGinHandlerFuncWithData(t *testing.T) {
 	ctx := NewContextWithOptions(nil)
 	assert.NotNil(t, ctx)
 
-	handler := func(ctx HTTPContext, data Map) HTTPError {
+	handler := func(ctx HTTPContext, data map[string]any) HTTPError {
 		return NewBadRequestError(errors.New(data["message"].(string)))
 	}
-	ginHandlerFunc := NewGinHandlerFuncWithData(ctx, handler, Map{"message": "foobar"})
+	ginHandlerFunc := NewGinHandlerFuncWithData(ctx, handler, map[string]any{"message": "foobar"})
 	assert.NotNil(t, ginHandlerFunc)
 
 	var err error

http.go

@@ -137,5 +137,5 @@ type HTTPError interface {
 }
 
 type HandlerFunc func(HTTPContext) HTTPError
-type HandlerFuncWithData func(HTTPContext, Map) HTTPError
+type HandlerFuncWithData func(HTTPContext, map[string]any) HTTPError
 type HandlersChain []HandlerFunc