diff --git a/.releaserc.yaml b/.releaserc.yaml index 8aeb820..c3ddbdc 100644 --- a/.releaserc.yaml +++ b/.releaserc.yaml @@ -1,6 +1,6 @@ --- # Only allow releases on the main branch (for 3k) -# releases for 2k are published manaually. +# releases for 2k are published manually. branches: - name: main diff --git a/service/internal/api/api.go b/service/internal/api/api.go index c0a2411..53c58fa 100644 --- a/service/internal/api/api.go +++ b/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(), "", " ") - 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" diff --git a/service/internal/entities/storage.go b/service/internal/entities/storage.go index 1ae9780..e1fac78 100644 --- a/service/internal/entities/storage.go +++ b/service/internal/entities/storage.go @@ -20,21 +20,21 @@ type EntitiesByClass map[string]entityInstancesByKey var ( rwmutex = sync.RWMutex{} - Entities EntitiesByClass + entities EntitiesByClass ) func init() { rwmutex.Lock() - Entities = make(EntitiesByClass, 0) + entities = make(EntitiesByClass, 0) rwmutex.Unlock() } func GetEntities() EntitiesByClass { 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)) for key, entity := range entityInstances { @@ -52,7 +52,7 @@ func GetEntityInstances(entityName string) entityInstancesByKey { rwmutex.RLock() defer rwmutex.RUnlock() - if entities, ok := Entities[entityName]; ok { + if entities, ok := entities[entityName]; ok { copiedInstances := make(entityInstancesByKey, len(entities)) for key, entity := range entities { @@ -67,11 +67,11 @@ func GetEntityInstances(entityName string) entityInstancesByKey { func AddEntity(entityName string, entityKey string, data any) { 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, UniqueKey: entityKey, Title: findEntityTitle(data), @@ -108,5 +108,5 @@ func ClearEntitiesOfType(entityType string) { rwmutex.Lock() defer rwmutex.Unlock() - delete(Entities, entityType) + delete(entities, entityType) }