fix filter overrides with nil

cloudentity · Jul 17, 2024 · 6503ca3 · 6503ca3
1 parent 773f457
commit 6503ca3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/internal/cac/storage/multi.go b/internal/cac/storage/multi.go
@@ -3,6 +3,7 @@ package storage
 import (
 	"context"
 	"fmt"
+
 	"github.com/cloudentity/acp-client-go/clients/hub/models"
 	"github.com/cloudentity/cac/internal/cac/api"
 	"github.com/imdario/mergo"

diff --git a/internal/cac/storage/tenant_storage.go b/internal/cac/storage/tenant_storage.go
@@ -115,10 +115,6 @@ func (t *TenantStorage) Read(ctx context.Context, opts ...api.SourceOpt) (models
         return nil, err
     }
 
-    if err = readFilesToMap(tenant, "themes", filepath.Join(path, "themes")); err != nil {
-        return nil, err
-    }
-
     if themeDirs, err = listDirsInPath(filepath.Join(path, "themes")); err != nil {
         return nil, err
     }
@@ -144,7 +140,7 @@ func (t *TenantStorage) Read(ctx context.Context, opts ...api.SourceOpt) (models
             templatesConfig map[string]any
         )
 
-        if templatesConfig, err = readFiles(filepath.Join(path, "themes", normalize(theme.Name), "templates")); err != nil {
+        if templatesConfig, err = readFiles(filepath.Join(path, "themes", dir, "templates")); err != nil {
             return nil, err
         }
 

diff --git a/internal/cac/storage/tenant_storage_test.go b/internal/cac/storage/tenant_storage_test.go
@@ -195,7 +195,7 @@ updated_at: 0001-01-01T00:00:00.000Z
             st, err := storage.InitMultiStorage(&storage.MultiStorageConfiguration{
                 DirPath: []string{t.TempDir(), t.TempDir()},
             }, storage.InitTenantStorage)
-
+q
             require.NoError(t, err)
 
             patchData, err := utils.FromModelToPatch(tc.data)

diff --git a/internal/cac/utils/model.go b/internal/cac/utils/model.go
@@ -85,7 +85,9 @@ func FilterPatch(patch models.Rfc7396PatchOperation, filters []string) (models.R
 			filter = mapped
 		}
 
-		newPatch[filter] = patch[filter]
+		if _, ok := patch[filter]; ok {
+			newPatch[filter] = patch[filter]
+		}
 	}
 
 	return newPatch, nil