update type imports

elastic · Mar 7, 2023 · aae570b · aae570b
1 parent 6068f6a
commit aae570b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/plugins/usage_collection/server/usage_counters/index.ts b/src/plugins/usage_collection/server/usage_counters/index.ts
@@ -8,7 +8,10 @@
 
 export type { UsageCountersServiceSetup } from './usage_counters_service';
 export type { UsageCountersSavedObjectAttributes, UsageCountersSavedObject } from './saved_objects';
-export type { IUsageCounter as UsageCounter, IncrementCounterParams } from './usage_counter';
+export type { IUsageCounter as UsageCounter } from './usage_counter';
+
+import { v1 } from '../../common/types/usage_counters';
+export type IncrementCounterParams = v1.IncrementCounterParams;
 
 export { UsageCountersService } from './usage_counters_service';
 export type { SerializeCounterParams } from './saved_objects';

diff --git a/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts b/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
@@ -8,7 +8,7 @@
 
 import { serializeCounterKey, storeCounter } from './saved_objects';
 import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
-import { CounterMetric } from './usage_counter';
+import { v1 } from '../../common/types/usage_counters';
 import moment from 'moment';
 
 describe('counterKey', () => {
@@ -38,7 +38,7 @@ describe('storeCounter', () => {
   });
 
   it('stores counter in a saved object', async () => {
-    const counterMetric: CounterMetric = {
+    const counterMetric: v1.CounterMetric = {
       domainId: 'a',
       counterName: 'b',
       counterType: 'c',

diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts b/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts
@@ -5,13 +5,14 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { UsageCounter, CounterMetric } from './usage_counter';
+import { UsageCounter } from './usage_counter';
 import * as Rx from 'rxjs';
 import * as rxOp from 'rxjs/operators';
+import { v1 } from '../../common/types/usage_counters';
 
 describe('UsageCounter', () => {
   const domainId = 'test-domain-id';
-  const counter$ = new Rx.Subject<CounterMetric>();
+  const counter$ = new Rx.Subject<v1.CounterMetric>();
   const usageCounter = new UsageCounter({ domainId, counter$ });
 
   afterAll(() => {