applied rename to dependents

Author: CodeShellDev

internals/proxy/middlewares/body.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	middlewareTypes "github.com/codeshelldev/secured-signal-api/internals/proxy/middlewares/types"
-	"github.com/codeshelldev/secured-signal-api/utils"
+	jsonutils "github.com/codeshelldev/secured-signal-api/utils/jsonutils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
 	request "github.com/codeshelldev/secured-signal-api/utils/request"
 )
@@ -90,7 +90,7 @@ func getMessage(aliases []middlewareTypes.MessageAlias, data map[string]any) (st
 func processAlias(alias middlewareTypes.MessageAlias, data map[string]any) (string, int, bool) {
 	aliasKey := alias.Alias
 
-	value, ok := utils.GetByPath(aliasKey, data)
+	value, ok := jsonutils.GetByPath(aliasKey, data)
 
 	aliasValue, isStr := value.(string)
 

internals/proxy/middlewares/template.go

@@ -7,11 +7,11 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/codeshelldev/secured-signal-api/utils"
+	jsonutils "github.com/codeshelldev/secured-signal-api/utils/jsonutils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
-	"github.com/codeshelldev/secured-signal-api/utils/query"
+	query "github.com/codeshelldev/secured-signal-api/utils/query"
 	request "github.com/codeshelldev/secured-signal-api/utils/request"
-	"github.com/codeshelldev/secured-signal-api/utils/templating"
+	templating "github.com/codeshelldev/secured-signal-api/utils/templating"
 )
 
 type TemplateMiddleware struct {
@@ -113,8 +113,8 @@ func TemplateBody(data map[string]any, VARIABLES any) (map[string]any, bool, err
 		return data, false, err
 	}
 
-	beforeStr := utils.ToJson(templatedData)
-	afterStr := utils.ToJson(data)
+	beforeStr := jsonutils.ToJson(templatedData)
+	afterStr := jsonutils.ToJson(data)
 
 	modified = beforeStr == afterStr
 

tests/json_test.go

@@ -3,8 +3,8 @@ package tests
 import (
 	"testing"
 
-	"github.com/codeshelldev/secured-signal-api/utils"
-	"github.com/codeshelldev/secured-signal-api/utils/templating"
+	jsonutils "github.com/codeshelldev/secured-signal-api/utils/jsonutils"
+	templating "github.com/codeshelldev/secured-signal-api/utils/templating"
 )
 
 func TestJsonTemplating(t *testing.T) {
@@ -28,7 +28,7 @@ func TestJsonTemplating(t *testing.T) {
 		"key2": "{{.int}}"
 	}`
 
-	data := utils.GetJson[map[string]any](json)
+	data := jsonutils.GetJson[map[string]any](json)
 
 	expected := map[string]any{
 		"dict": map[string]any{
@@ -48,8 +48,8 @@ func TestJsonTemplating(t *testing.T) {
 		t.Error("Error Templating JSON: ", err.Error())
 	}
 
-	expectedStr := utils.ToJson(expected)
-	gotStr := utils.ToJson(got)
+	expectedStr := jsonutils.ToJson(expected)
+	gotStr := jsonutils.ToJson(got)
 
 	if expectedStr != gotStr {
 		t.Error("\nExpected: ", expectedStr, "\nGot: ", gotStr)
@@ -71,7 +71,7 @@ func TestJsonPath(t *testing.T) {
 		"key": "val"
 	}`
 
-	data := utils.GetJson[map[string]any](json)
+	data := jsonutils.GetJson[map[string]any](json)
 
 	cases := []struct{
 		key 	 string
@@ -107,7 +107,7 @@ func TestJsonPath(t *testing.T) {
 		key := c.key
 		expected := c.expected
 
-		got, ok := utils.GetByPath(key, data)
+		got, ok := jsonutils.GetByPath(key, data)
 
 		if !ok || got.(string) != expected {
 			t.Error("Expected: ", key, " == ", expected, "; Got: ", got)

tests/request_test.go

@@ -3,9 +3,9 @@ package tests
 import (
 	"testing"
 
-	"github.com/codeshelldev/secured-signal-api/utils"
-	"github.com/codeshelldev/secured-signal-api/utils/query"
-	"github.com/codeshelldev/secured-signal-api/utils/templating"
+	jsonutils "github.com/codeshelldev/secured-signal-api/utils/jsonutils"
+	query "github.com/codeshelldev/secured-signal-api/utils/query"
+	templating "github.com/codeshelldev/secured-signal-api/utils/templating"
 )
 
 func TestQueryTemplating(t *testing.T) {
@@ -45,8 +45,8 @@ func TestTypedQuery(t *testing.T) {
 		},
 	}
 
-	expectedStr := utils.ToJson(expected)
-	gotStr := utils.ToJson(got)
+	expectedStr := jsonutils.ToJson(expected)
+	gotStr := jsonutils.ToJson(got)
 
 	if expectedStr != gotStr {
 		t.Error("\nExpected: ", expectedStr, "\nGot: ", gotStr)

tests/string_test.go

@@ -4,29 +4,29 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/codeshelldev/secured-signal-api/utils/safestrings"
+	stringutils "github.com/codeshelldev/secured-signal-api/utils/stringutils"
 )
 
 func TestStringEscaping(t *testing.T) {
 	str1 := `\#`
 
-	res1 := safestrings.IsEscaped(str1, "#")
+	res1 := stringutils.IsEscaped(str1, "#")
 
 	if !res1 {
 		t.Error("Expected: ", str1, " == true", "; Got: ", str1, " == ", res1)
 	}
 
 	str2 := "#"
 
-	res2 := safestrings.IsEscaped(str2, "#")
+	res2 := stringutils.IsEscaped(str2, "#")
 
 	if res2 {
 		t.Error("Expected: ", str2, " == false", "; Got: ", str2, " == ", res2)
 	}
 
 	str3 := `#\#`
 
-	res3 := safestrings.Contains(str3, "#")
+	res3 := stringutils.Contains(str3, "#")
 
 	if !res3 {
 		t.Error("Expected: ", str3, " == true", "; Got: ", str3, " == ", res3)
@@ -36,15 +36,15 @@ func TestStringEscaping(t *testing.T) {
 func TestStringEnclosement(t *testing.T) {
 	str1 := "[enclosed]"
 
-	res1 := safestrings.IsEnclosedBy(str1, `[`, `]`)
+	res1 := stringutils.IsEnclosedBy(str1, `[`, `]`)
 
 	if !res1 {
 		t.Error("Expected: ", str1, " == true", "; Got: ", str1, " == ", res1)
 	}
 
 	str2 := `\[enclosed]`
 
-	res2 := safestrings.IsEnclosedBy(str2, `[`, `]`)
+	res2 := stringutils.IsEnclosedBy(str2, `[`, `]`)
 
 	if res2 {
 		t.Error("Expected: ", str2, " == false", "; Got: ", str2, " == ", res2)
@@ -54,23 +54,23 @@ func TestStringEnclosement(t *testing.T) {
 func TestStringToType(t *testing.T) {
 	str1 := `[item1,item2]`
 
-	res1 := safestrings.ToType(str1)
+	res1 := stringutils.ToType(str1)
 
 	if reflect.TypeOf(res1) != reflect.TypeFor[[]string]() {
 		t.Error("Expected: ", str1, " == []string", "; Got: ", str1, " == ", reflect.TypeOf(res1))
 	}
 
 	str2 := `1`
 
-	res2 := safestrings.ToType(str2)
+	res2 := stringutils.ToType(str2)
 
 	if reflect.TypeOf(res2) != reflect.TypeFor[int]() {
 		t.Error("Expected: ", str2, " == int", "; Got: ", str2, " == ", reflect.TypeOf(res2))
 	}
 
 	str3 := `{ "key": "value" }`
 
-	res3 := safestrings.ToType(str3)
+	res3 := stringutils.ToType(str3)
 
 	if reflect.TypeOf(res3) != reflect.TypeFor[map[string]any]() {
 		t.Error("Expected: ", str3, " == map[string]any", "; Got: ", str3, " == ", reflect.TypeOf(res3))

utils/config/config.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
-	"github.com/codeshelldev/secured-signal-api/utils/safestrings"
+	stringutils "github.com/codeshelldev/secured-signal-api/utils/stringutils"
 
 	"github.com/knadh/koanf/providers/confmap"
 	"github.com/knadh/koanf/providers/env/v2"
@@ -218,5 +218,5 @@ func normalizeEnv(key string, value string) (string, any) {
 	key = strings.ReplaceAll(key, "__", ".")
 	key = strings.ReplaceAll(key, "_", "")
 
-	return key, safestrings.ToType(value)
+	return key, stringutils.ToType(value)
 }

utils/config/loader.go

@@ -8,8 +8,9 @@ import (
 	"strings"
 
 	middlewareTypes "github.com/codeshelldev/secured-signal-api/internals/proxy/middlewares/types"
-	"github.com/codeshelldev/secured-signal-api/utils"
+	jsonutils "github.com/codeshelldev/secured-signal-api/utils/jsonutils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
+
 	"github.com/knadh/koanf/parsers/yaml"
 )
 
@@ -68,8 +69,8 @@ func Load() {
 
 	log.Info("Finished Loading Configuration")
 
-	log.Dev("Loaded Config:\n" + utils.ToJson(config.All()))
-	log.Dev("Loaded Token Configs:\n" + utils.ToJson(tokensLayer.All()))
+	log.Dev("Loaded Config:\n" + jsonutils.ToJson(config.All()))
+	log.Dev("Loaded Token Configs:\n" + jsonutils.ToJson(tokensLayer.All()))
 }
 
 func InitEnv() {

utils/query/query.go

@@ -3,7 +3,7 @@ package query
 import (
 	"strings"
 
-	"github.com/codeshelldev/secured-signal-api/utils/safestrings"
+	stringutils "github.com/codeshelldev/secured-signal-api/utils/stringutils"
 )
 
 func ParseRawQuery(raw string) map[string][]string {
@@ -33,7 +33,7 @@ func ParseRawQuery(raw string) map[string][]string {
 func ParseTypedQueryValues(values []string) any {
 	raw := values[len(values)-1]
 
-	return safestrings.ToType(raw)
+	return stringutils.ToType(raw)
 }
 
 func ParseTypedQuery(query string, matchPrefix string) (map[string]any) {