Przeglądaj źródła

fix: Various coderabbit suggestions on tpl ext

jamesread 5 miesięcy temu
rodzic
commit
561cd9c431

+ 1 - 1
.releaserc.yaml

@@ -1,6 +1,6 @@
 ---
 ---
 # Only allow releases on the main branch (for 3k)
 # Only allow releases on the main branch (for 3k)
-# releases for 2k are published manaually.
+# releases for 2k are published manually.
 branches:
 branches:
   - name: main
   - name: main
 
 

+ 1 - 1
service/internal/api/api.go

@@ -711,7 +711,7 @@ func (api *oliveTinAPI) DumpVars(ctx ctx.Context, req *connect.Request[apiv1.Dum
 	}
 	}
 
 
 	jsonstring, _ := json.MarshalIndent(tpl.GetNewGeneralTemplateContext(), "", "  ")
 	jsonstring, _ := json.MarshalIndent(tpl.GetNewGeneralTemplateContext(), "", "  ")
-	fmt.Printf("%s", &jsonstring)
+	fmt.Printf("%s", jsonstring)
 
 
 	res.Alert = "Dumping variables has been enabled in the configuration. Please set InsecureAllowDumpVars = false again after you don't need it anymore"
 	res.Alert = "Dumping variables has been enabled in the configuration. Please set InsecureAllowDumpVars = false again after you don't need it anymore"
 
 

+ 9 - 9
service/internal/entities/storage.go

@@ -20,21 +20,21 @@ type EntitiesByClass map[string]entityInstancesByKey
 
 
 var (
 var (
 	rwmutex  = sync.RWMutex{}
 	rwmutex  = sync.RWMutex{}
-	Entities EntitiesByClass
+	entities EntitiesByClass
 )
 )
 
 
 func init() {
 func init() {
 	rwmutex.Lock()
 	rwmutex.Lock()
-	Entities = make(EntitiesByClass, 0)
+	entities = make(EntitiesByClass, 0)
 	rwmutex.Unlock()
 	rwmutex.Unlock()
 }
 }
 
 
 func GetEntities() EntitiesByClass {
 func GetEntities() EntitiesByClass {
 	rwmutex.RLock()
 	rwmutex.RLock()
 
 
-	copiedEntities := make(EntitiesByClass, len(Entities))
+	copiedEntities := make(EntitiesByClass, len(entities))
 
 
-	for entityName, entityInstances := range Entities {
+	for entityName, entityInstances := range entities {
 		copiedInstances := make(entityInstancesByKey, len(entityInstances))
 		copiedInstances := make(entityInstancesByKey, len(entityInstances))
 
 
 		for key, entity := range entityInstances {
 		for key, entity := range entityInstances {
@@ -52,7 +52,7 @@ func GetEntityInstances(entityName string) entityInstancesByKey {
 	rwmutex.RLock()
 	rwmutex.RLock()
 	defer rwmutex.RUnlock()
 	defer rwmutex.RUnlock()
 
 
-	if entities, ok := Entities[entityName]; ok {
+	if entities, ok := entities[entityName]; ok {
 		copiedInstances := make(entityInstancesByKey, len(entities))
 		copiedInstances := make(entityInstancesByKey, len(entities))
 
 
 		for key, entity := range entities {
 		for key, entity := range entities {
@@ -67,11 +67,11 @@ func GetEntityInstances(entityName string) entityInstancesByKey {
 func AddEntity(entityName string, entityKey string, data any) {
 func AddEntity(entityName string, entityKey string, data any) {
 	rwmutex.Lock()
 	rwmutex.Lock()
 
 
-	if _, ok := Entities[entityName]; !ok {
-		Entities[entityName] = make(entityInstancesByKey, 0)
+	if _, ok := entities[entityName]; !ok {
+		entities[entityName] = make(entityInstancesByKey, 0)
 	}
 	}
 
 
-	Entities[entityName][entityKey] = &Entity{
+	entities[entityName][entityKey] = &Entity{
 		Data:      data,
 		Data:      data,
 		UniqueKey: entityKey,
 		UniqueKey: entityKey,
 		Title:     findEntityTitle(data),
 		Title:     findEntityTitle(data),
@@ -108,5 +108,5 @@ func ClearEntitiesOfType(entityType string) {
 	rwmutex.Lock()
 	rwmutex.Lock()
 	defer rwmutex.Unlock()
 	defer rwmutex.Unlock()
 
 
-	delete(Entities, entityType)
+	delete(entities, entityType)
 }
 }