feat: Release floating entitlements on license:clear command (no-changelog) (#9603)

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
This commit is contained in:
Cornelius Suermann 2024-06-07 13:13:31 +02:00 committed by GitHub
parent 3b10c0f6aa
commit 44ecab73d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 0 deletions

View file

@ -2,6 +2,7 @@ import { Container } from 'typedi';
import { SETTINGS_LICENSE_CERT_KEY } from '@/constants';
import { BaseCommand } from '../BaseCommand';
import { SettingsRepository } from '@db/repositories/settings.repository';
import { License } from '@/License';
export class ClearLicenseCommand extends BaseCommand {
static description = 'Clear license';
@ -10,6 +11,12 @@ export class ClearLicenseCommand extends BaseCommand {
async run() {
this.logger.info('Clearing license from database.');
// Invoke shutdown() to force any floating entitlements to be released
const license = Container.get(License);
await license.init();
await license.shutdown();
await Container.get(SettingsRepository).delete({
key: SETTINGS_LICENSE_CERT_KEY,
});

View file

@ -0,0 +1,28 @@
import { InternalHooks } from '@/InternalHooks';
import { License } from '@/License';
import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
import { ClearLicenseCommand } from '@/commands/license/clear';
import { Config } from '@oclif/core';
import { mockInstance } from '../../shared/mocking';
const oclifConfig = new Config({ root: __dirname });
beforeAll(async () => {
mockInstance(InternalHooks);
mockInstance(LoadNodesAndCredentials);
await oclifConfig.load();
});
test('license:clear invokes shutdown() to release any floating entitlements', async () => {
const cmd = new ClearLicenseCommand([], oclifConfig);
await cmd.init();
const license = mockInstance(License);
await cmd.run();
expect(license.init).toHaveBeenCalledTimes(1);
expect(license.shutdown).toHaveBeenCalledTimes(1);
jest.restoreAllMocks();
});