remove clear API

elastic · Apr 20, 2020 · eb7fa18 · eb7fa18
1 parent 250081c
commit eb7fa18
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 72 deletions.
diff --git a/x-pack/plugins/licensing/server/services/feature_usage_service.mock.ts b/x-pack/plugins/licensing/server/services/feature_usage_service.mock.ts
@@ -22,7 +22,6 @@ const createStartMock = (): jest.Mocked<FeatureUsageServiceStart> => {
  const mock = {
  notifyUsage: jest.fn(),
  getLastUsages: jest.fn(),
- clear: jest.fn(),
  };
 
  return mock;

diff --git a/x-pack/plugins/licensing/server/services/feature_usage_service.test.ts b/x-pack/plugins/licensing/server/services/feature_usage_service.test.ts
@@ -102,23 +102,5 @@ describe('FeatureUsageService', () => {
  });
  });
  });
-
- describe('#clear', () => {
- it('clears the whole last usages map', () => {
- const setup = service.setup();
- setup.register('featureA');
- setup.register('featureB');
-
- const start = service.start();
- start.notifyUsage('featureA');
- start.notifyUsage('featureB');
-
- expect([...start.getLastUsages().keys()]).toEqual(['featureA', 'featureB']);
-
- start.clear();
-
- expect([...start.getLastUsages().keys()]).toEqual([]);
- });
- });
  });
 });
diff --git a/x-pack/plugins/licensing/server/services/feature_usage_service.ts b/x-pack/plugins/licensing/server/services/feature_usage_service.ts
@@ -24,10 +24,6 @@ export interface FeatureUsageServiceStart {
  * Features that were not used yet do not appear in the map.
  */
  getLastUsages(): ReadonlyMap<string, number>;
- /**
- * Clear all usage records from the service.
- */
- clear(): void;
 }
 
 export class FeatureUsageService {
@@ -55,9 +51,6 @@ export class FeatureUsageService {
  this.lastUsages.set(featureName, Math.max(usedAt, currentValue));
  },
  getLastUsages: () => new Map(this.lastUsages.entries()),
- clear: () => {
- this.lastUsages.clear();
- },
  };
  }
 }
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/clear.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/clear.ts
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts
@@ -8,7 +8,6 @@ import { IRouter, StartServicesAccessor } from 'src/core/server';
 import { FeatureUsageTestStartDependencies, FeatureUsageTestPluginStart } from '../plugin';
 
 import { registerFeatureHitRoute } from './hit';
-import { registerFeatureClearRoute } from './clear';
 
 export function registerRoutes(
  router: IRouter,
@@ -18,5 +17,4 @@ export function registerRoutes(
  >
 ) {
  registerFeatureHitRoute(router, getStartServices);
- registerFeatureClearRoute(router, getStartServices);
 }
diff --git a/x-pack/test/plugin_api_integration/test_suites/licensed_feature_usage/feature_usage.ts b/x-pack/test/plugin_api_integration/test_suites/licensed_feature_usage/feature_usage.ts
@@ -15,17 +15,9 @@ export default function({ getService }: FtrProviderContext) {
  await supertest.get(`/api/feature_usage_test/hit?featureName=${featureName}&usedAt=${usedAt}`);
  };
 
- const clearUsages = async () => {
- await supertest.get(`/api/feature_usage_test/clear`);
- };
-
  const toISO = (time: number) => new Date(time).toISOString();
 
  describe('/api/licensing/feature_usage', () => {
- beforeEach(async () => {
- await clearUsages();
- });
-
  it('returns a map of last feature usages', async () => {
  const timeA = Date.now();
  await notifyUsage('test_feature_a', timeA);
@@ -34,10 +26,9 @@ export default function({ getService }: FtrProviderContext) {
  await notifyUsage('test_feature_b', timeB);
 
  const response = await supertest.get('/api/licensing/feature_usage').expect(200);
- expect(response.body).to.eql({
- test_feature_a: toISO(timeA),
- test_feature_b: toISO(timeB),
- });
+
+ expect(response.body.test_feature_a).to.eql(toISO(timeA));
+ expect(response.body.test_feature_b).to.eql(toISO(timeB));
  });
  });
 }