Fix .gpg-id selection for subfolders

store/sub/recipients.go

@@ -120,8 +120,10 @@ func (s *Store) OurKeyID(ctx context.Context) string {
 
 // GetRecipients will load all Recipients from the .gpg-id file for the given
 // secret path
-func (s *Store) GetRecipients(ctx context.Context, file string) ([]string, error) {
-	idf := s.idFile(file)
+func (s *Store) GetRecipients(ctx context.Context, name string) ([]string, error) {
+	idf := s.idFile(name)
+
+	out.Debug(ctx, "GetRecipients(%s) - idfile: %s", name, idf)
 	// open recipient list (store/.gpg-id)
 	f, err := os.Open(idf)
 	if err != nil {

store/sub/store.go

@@ -45,8 +45,8 @@ func New(alias string, path string) *Store {
 // idFile returns the path to the recipient list for this store
 // it walks up from the given filename until it finds a directory containing
 // a gpg id file or it leaves the scope of this store.
-func (s *Store) idFile(fn string) string {
-	fn, err := filepath.Abs(filepath.Join(s.path, fn))
+func (s *Store) idFile(name string) string {
+	fn, err := filepath.Abs(filepath.Join(s.path, name))
 	if err != nil {
 		panic(err)
 	}
@@ -96,8 +96,8 @@ func (s *Store) Exists(name string) bool {
 	return fsutil.IsFile(p)
 }
 
-func (s *Store) useableKeys(ctx context.Context, file string) ([]string, error) {
-	rs, err := s.GetRecipients(ctx, file)
+func (s *Store) useableKeys(ctx context.Context, name string) ([]string, error) {
+	rs, err := s.GetRecipients(ctx, name)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get recipients")
 	}

store/sub/write.go

@@ -26,7 +26,7 @@ func (s *Store) Set(ctx context.Context, name string, sec *secret.Secret) error
 		return errors.Errorf("a folder named %s already exists", name)
 	}
 
-	recipients, err := s.useableKeys(ctx, p)
+	recipients, err := s.useableKeys(ctx, name)
 	if err != nil {
 		return errors.Wrapf(err, "failed to list useable keys for '%s'", p)
 	}