TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-04 22:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: cherry pick fixes from master (#1339)

Browse Source 
* fix: return api config in ApplicationView (#1330)


(cherry picked from commit 16a47c6542)

* fix tests
This commit is contained in:
Livio Amstutz
2021-02-23 17:05:47 +01:00
committed by GitHub
parent d8e42744b4
commit 438daebdb9
13 changed files with 160 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
operator/database/kinds/backups/bucket/mock.go
View File

@@ -35,7 +35,7 @@ func SetInstantBackup(
},
StringData: map[string]string{secretKey: saJson},
Type: "Opaque",
}).Times(1).Return(nil)
}).MinTimes(1).MaxTimes(1).Return(nil)
k8sClient.EXPECT().ApplyJob(gomock.Any()).Times(1).Return(nil)
k8sClient.EXPECT().GetJob(namespace, backup.GetJobName(backupName)).Times(1).Return(nil, macherrs.NewNotFound(schema.GroupResource{"batch", "jobs"}, backup.GetJobName(backupName)))
@@ -57,7 +57,7 @@ func SetBackup(
},
StringData: map[string]string{secretKey: saJson},
Type: "Opaque",
}).Times(1).Return(nil)
}).MinTimes(1).MaxTimes(1).Return(nil)
k8sClient.EXPECT().ApplyCronJob(gomock.Any()).Times(1).Return(nil)
}
@@ -88,7 +88,7 @@ func SetRestore(
},
StringData: map[string]string{secretKey: saJson},
Type: "Opaque",
}).Times(1).Return(nil)
}).MinTimes(1).MaxTimes(1).Return(nil)
k8sClient.EXPECT().ApplyJob(gomock.Any()).Times(1).Return(nil)
k8sClient.EXPECT().GetJob(namespace, restore.GetJobName(backupName)).Times(1).Return(nil, macherrs.NewNotFound(schema.GroupResource{"batch", "jobs"}, restore.GetJobName(backupName)))