From efe1fc52e01b6da21df88f8579b1d76600e4e252 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Wed, 21 Dec 2022 13:59:59 +0100
Subject: [PATCH] fix nilerr bugs

---
 services/idp/pkg/command/server.go                    | 4 ++--
 services/settings/pkg/store/filesystem/assignments.go | 2 +-
 services/settings/pkg/store/filesystem/bundles.go     | 4 ++--
 services/settings/pkg/store/filesystem/values.go      | 4 ++--
 services/thumbnails/pkg/service/grpc/v0/service.go    | 6 ++----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/services/idp/pkg/command/server.go b/services/idp/pkg/command/server.go
index a17d0c42d4..b8d299f3f0 100644
--- a/services/idp/pkg/command/server.go
+++ b/services/idp/pkg/command/server.go
@@ -139,7 +139,7 @@ func ensureEncryptionSecretExists(path string) error {
 
 	f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0600)
 	if err != nil {
-		return nil
+		return err
 	}
 	defer f.Close()
 
@@ -175,7 +175,7 @@ func ensureSigningPrivateKeyExists(paths []string) error {
 
 		f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0600)
 		if err != nil {
-			return nil
+			return err
 		}
 		defer f.Close()
 
diff --git a/services/settings/pkg/store/filesystem/assignments.go b/services/settings/pkg/store/filesystem/assignments.go
index 350a04cb1d..7e997c9d86 100644
--- a/services/settings/pkg/store/filesystem/assignments.go
+++ b/services/settings/pkg/store/filesystem/assignments.go
@@ -15,7 +15,7 @@ func (s Store) ListRoleAssignments(accountUUID string) ([]*settingsmsg.UserRoleA
 	assignmentsFolder := s.buildFolderPathForRoleAssignments(false)
 	assignmentFiles, err := os.ReadDir(assignmentsFolder)
 	if err != nil {
-		return records, nil
+		return nil, nil
 	}
 
 	for _, assignmentFile := range assignmentFiles {
diff --git a/services/settings/pkg/store/filesystem/bundles.go b/services/settings/pkg/store/filesystem/bundles.go
index 17bce7bc9f..513bff747f 100644
--- a/services/settings/pkg/store/filesystem/bundles.go
+++ b/services/settings/pkg/store/filesystem/bundles.go
@@ -23,7 +23,7 @@ func (s Store) ListBundles(bundleType settingsmsg.Bundle_Type, bundleIDs []strin
 	bundlesFolder := s.buildFolderPathForBundles(false)
 	bundleFiles, err := os.ReadDir(bundlesFolder)
 	if err != nil {
-		return []*settingsmsg.Bundle{}, nil
+		return nil, err
 	}
 
 	records := make([]*settingsmsg.Bundle, 0, len(bundleFiles))
@@ -133,7 +133,7 @@ func (s Store) AddSettingToBundle(bundleID string, setting *settingsmsg.Setting)
 func (s Store) RemoveSettingFromBundle(bundleID string, settingID string) error {
 	bundle, err := s.ReadBundle(bundleID)
 	if err != nil {
-		return nil
+		return err
 	}
 	if ok := removeSetting(bundle, settingID); ok {
 		if _, err := s.WriteBundle(bundle); err != nil {
diff --git a/services/settings/pkg/store/filesystem/values.go b/services/settings/pkg/store/filesystem/values.go
index b0a26ebff8..230a050559 100644
--- a/services/settings/pkg/store/filesystem/values.go
+++ b/services/settings/pkg/store/filesystem/values.go
@@ -18,7 +18,7 @@ func (s Store) ListValues(bundleID, accountUUID string) ([]*settingsmsg.Value, e
 	valuesFolder := s.buildFolderPathForValues(false)
 	valueFiles, err := os.ReadDir(valuesFolder)
 	if err != nil {
-		return []*settingsmsg.Value{}, nil
+		return nil, err
 	}
 
 	records := make([]*settingsmsg.Value, 0, len(valueFiles))
@@ -71,7 +71,7 @@ func (s Store) ReadValueByUniqueIdentifiers(accountUUID, settingID string) (*set
 			s.Logger.Debug().Msgf("reading contents from file: %v", filepath.Join(valuesFolder, files[i].Name()))
 			if err := s.parseRecordFromFile(&r, filepath.Join(valuesFolder, files[i].Name())); err != nil {
 				s.Logger.Debug().Msgf("match found: %v", filepath.Join(valuesFolder, files[i].Name()))
-				return &settingsmsg.Value{}, nil
+				return nil, err
 			}
 
 			// if value saved without accountUUID, then it's a global value
diff --git a/services/thumbnails/pkg/service/grpc/v0/service.go b/services/thumbnails/pkg/service/grpc/v0/service.go
index e6cc0cac59..4420258ad8 100644
--- a/services/thumbnails/pkg/service/grpc/v0/service.go
+++ b/services/thumbnails/pkg/service/grpc/v0/service.go
@@ -82,13 +82,11 @@ func (g Thumbnail) GetThumbnail(ctx context.Context, req *thumbnailssvc.GetThumb
 	}
 	generator, err := thumbnail.GeneratorForType(tType)
 	if err != nil {
-		g.logger.Debug().Str("thumbnail_type", tType).Msg("unsupported thumbnail type")
-		return nil
+		return merrors.BadRequest(g.serviceID, "unsupported thumbnail type")
 	}
 	encoder, err := thumbnail.EncoderForType(tType)
 	if err != nil {
-		g.logger.Debug().Str("thumbnail_type", tType).Msg("unsupported thumbnail type")
-		return nil
+		return merrors.BadRequest(g.serviceID, "unsupported thumbnail type")
 	}
 
 	var key string