fix(backup): storing storage name for key

Author: fiftin

db/Store.go

@@ -299,6 +299,7 @@ type EnvironmentManager interface {
 
 type GetAccessKeyOptions struct {
 	Owner         AccessKeyOwner
+	IgnoreOwner   bool
 	EnvironmentID *int
 	StorageID     *int
 }

db/sql/access_key.go

@@ -24,13 +24,15 @@ func (d *SqlDb) GetAccessKeys(projectID int, options db.GetAccessKeyOptions, par
 		return
 	}
 
-	q = q.Where("pe.owner=?", options.Owner)
-
-	switch options.Owner {
-	case db.AccessKeyVariable, db.AccessKeyEnvironment:
-		q = q.Where(squirrel.Eq{"pe.environment_id": *options.EnvironmentID})
-	case db.AccessKeyVault:
-		q = q.Where(squirrel.Eq{"pe.storage_id": options.StorageID})
+	if !options.IgnoreOwner {
+		q = q.Where("pe.owner=?", options.Owner)
+
+		switch options.Owner {
+		case db.AccessKeyVariable, db.AccessKeyEnvironment:
+			q = q.Where(squirrel.Eq{"pe.environment_id": *options.EnvironmentID})
+		case db.AccessKeyVault:
+			q = q.Where(squirrel.Eq{"pe.storage_id": options.StorageID})
+		}
 	}
 
 	query, args, err := q.ToSql()

services/project/backup.go

@@ -144,7 +144,7 @@ func (b *BackupDB) load(projectID int, store db.Store) (err error) {
 		return
 	}
 
-	b.keys, err = store.GetAccessKeys(projectID, db.GetAccessKeyOptions{}, db.RetrieveQueryParams{})
+	b.keys, err = store.GetAccessKeys(projectID, db.GetAccessKeyOptions{IgnoreOwner: true}, db.RetrieveQueryParams{})
 	if err != nil {
 		return
 	}

services/project/backup_test.go

@@ -117,6 +117,7 @@ func TestBackup_BackupSecretStorage(t *testing.T) {
 		Type:      db.AccessKeyNone,
 		StorageID: &storage.ID,
 		Name:      "Test Key",
+		Owner:     "vault",
 	})
 	assert.NoError(t, err)
 
@@ -138,7 +139,7 @@ func TestBackup_BackupSecretStorage(t *testing.T) {
   "keys": [
     {
       "name": "Test Key",
-      "owner": "",
+      "owner": "vault",
       "storage": "Test",
       "type": "none"
     }
@@ -186,7 +187,7 @@ func TestBackup_BackupSecretStorage(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Len(t, restoredStorages, 1)
 
-	restoredKeys, err := store.GetAccessKeys(restoredProj.ID, db.GetAccessKeyOptions{}, db.RetrieveQueryParams{})
+	restoredKeys, err := store.GetAccessKeys(restoredProj.ID, db.GetAccessKeyOptions{IgnoreOwner: true}, db.RetrieveQueryParams{})
 	assert.NoError(t, err)
 	assert.Len(t, restoredKeys, 1)