public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug: Expect a plugin signature per version (#74595)

Browse Source
This commit is contained in:
Andres Martinez Gotor
2023-09-12 09:31:38 +02:00
committed by GitHub
parent 36728dd671
commit 29238c19fd
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/plugins/admin/helpers.test.ts
+21 -6
View File
@@ -113,14 +113,29 @@ describe('Plugins/Helpers', () => {
test('adds the correct signature enum', () => { test('adds the correct signature enum', () => {
const pluginWithoutSignature = { ...remotePlugin, signatureType: '', versionSignatureType: '' } as RemotePlugin; const pluginWithoutSignature = { ...remotePlugin, signatureType: '', versionSignatureType: '' } as RemotePlugin;
// With only "signatureType" -> valid // With only "signatureType" -> invalid
const pluginWithSignature1 = { ...remotePlugin, signatureType: PluginSignatureType.commercial } as RemotePlugin; const pluginWithSignature1 = {
// With only "versionSignatureType" -> valid ...remotePlugin,
const pluginWithSignature2 = { ...remotePlugin, versionSignatureType: PluginSignatureType.core } as RemotePlugin; signatureType: PluginSignatureType.commercial,
versionSignatureType: '',
} as RemotePlugin;
// With only "versionSignatureType" -> invalid
const pluginWithSignature2 = {
...remotePlugin,
signatureType: '',
versionSignatureType: PluginSignatureType.core,
} as RemotePlugin;
// With signatureType and versionSignatureType -> valid
const pluginWithSignature3 = {
...remotePlugin,
signatureType: PluginSignatureType.commercial,
versionSignatureType: PluginSignatureType.commercial,
} as RemotePlugin;
expect(mapRemoteToCatalog(pluginWithoutSignature).signature).toBe(PluginSignatureStatus.missing); expect(mapRemoteToCatalog(pluginWithoutSignature).signature).toBe(PluginSignatureStatus.missing);
expect(mapRemoteToCatalog(pluginWithSignature1).signature).toBe(PluginSignatureStatus.valid); expect(mapRemoteToCatalog(pluginWithSignature1).signature).toBe(PluginSignatureStatus.missing);
expect(mapRemoteToCatalog(pluginWithSignature2).signature).toBe(PluginSignatureStatus.valid); expect(mapRemoteToCatalog(pluginWithSignature2).signature).toBe(PluginSignatureStatus.missing);
expect(mapRemoteToCatalog(pluginWithSignature3).signature).toBe(PluginSignatureStatus.valid);
}); });
test('adds an "isEnterprise" field', () => { test('adds an "isEnterprise" field', () => {
public/app/features/plugins/admin/helpers.ts
+1 -1
View File
@@ -250,7 +250,7 @@ function getPluginSignature(options: {
return local.signature; return local.signature;
} }
if (remote?.signatureType || remote?.versionSignatureType) { if (remote?.signatureType && remote?.versionSignatureType) {
return PluginSignatureStatus.valid; return PluginSignatureStatus.valid;
} }