fix nilerr bugs
This commit is contained in:
@@ -139,7 +139,7 @@ func ensureEncryptionSecretExists(path string) error {
|
|||||||
|
|
||||||
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0600)
|
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0600)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return err
|
||||||
}
|
}
|
||||||
defer f.Close()
|
defer f.Close()
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ func ensureSigningPrivateKeyExists(paths []string) error {
|
|||||||
|
|
||||||
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0600)
|
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0600)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return err
|
||||||
}
|
}
|
||||||
defer f.Close()
|
defer f.Close()
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ func (s Store) ListRoleAssignments(accountUUID string) ([]*settingsmsg.UserRoleA
|
|||||||
assignmentsFolder := s.buildFolderPathForRoleAssignments(false)
|
assignmentsFolder := s.buildFolderPathForRoleAssignments(false)
|
||||||
assignmentFiles, err := os.ReadDir(assignmentsFolder)
|
assignmentFiles, err := os.ReadDir(assignmentsFolder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return records, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, assignmentFile := range assignmentFiles {
|
for _, assignmentFile := range assignmentFiles {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ func (s Store) ListBundles(bundleType settingsmsg.Bundle_Type, bundleIDs []strin
|
|||||||
bundlesFolder := s.buildFolderPathForBundles(false)
|
bundlesFolder := s.buildFolderPathForBundles(false)
|
||||||
bundleFiles, err := os.ReadDir(bundlesFolder)
|
bundleFiles, err := os.ReadDir(bundlesFolder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return []*settingsmsg.Bundle{}, nil
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
records := make([]*settingsmsg.Bundle, 0, len(bundleFiles))
|
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 {
|
func (s Store) RemoveSettingFromBundle(bundleID string, settingID string) error {
|
||||||
bundle, err := s.ReadBundle(bundleID)
|
bundle, err := s.ReadBundle(bundleID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return err
|
||||||
}
|
}
|
||||||
if ok := removeSetting(bundle, settingID); ok {
|
if ok := removeSetting(bundle, settingID); ok {
|
||||||
if _, err := s.WriteBundle(bundle); err != nil {
|
if _, err := s.WriteBundle(bundle); err != nil {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ func (s Store) ListValues(bundleID, accountUUID string) ([]*settingsmsg.Value, e
|
|||||||
valuesFolder := s.buildFolderPathForValues(false)
|
valuesFolder := s.buildFolderPathForValues(false)
|
||||||
valueFiles, err := os.ReadDir(valuesFolder)
|
valueFiles, err := os.ReadDir(valuesFolder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return []*settingsmsg.Value{}, nil
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
records := make([]*settingsmsg.Value, 0, len(valueFiles))
|
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()))
|
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 {
|
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()))
|
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
|
// if value saved without accountUUID, then it's a global value
|
||||||
|
|||||||
@@ -82,13 +82,11 @@ func (g Thumbnail) GetThumbnail(ctx context.Context, req *thumbnailssvc.GetThumb
|
|||||||
}
|
}
|
||||||
generator, err := thumbnail.GeneratorForType(tType)
|
generator, err := thumbnail.GeneratorForType(tType)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
g.logger.Debug().Str("thumbnail_type", tType).Msg("unsupported thumbnail type")
|
return merrors.BadRequest(g.serviceID, "unsupported thumbnail type")
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
encoder, err := thumbnail.EncoderForType(tType)
|
encoder, err := thumbnail.EncoderForType(tType)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
g.logger.Debug().Str("thumbnail_type", tType).Msg("unsupported thumbnail type")
|
return merrors.BadRequest(g.serviceID, "unsupported thumbnail type")
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var key string
|
var key string
|
||||||
|
|||||||
Reference in New Issue
Block a user