move crypto to server utils (elastic#62344)

* move crypto to server utils * fix mocks
mshustov · Apr 2, 2020 · 37730eb · 37730eb
1 parent b5403e4
commit 37730eb
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 8 deletions.
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts b/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
@@ -22,7 +22,7 @@ jest.mock('fs', () => ({ readFileSync: mockReadFileSync }));
 
 export const mockReadPkcs12Keystore = jest.fn();
 export const mockReadPkcs12Truststore = jest.fn();
-jest.mock('../../utils', () => ({
+jest.mock('../utils', () => ({
   readPkcs12Keystore: mockReadPkcs12Keystore,
   readPkcs12Truststore: mockReadPkcs12Truststore,
 }));
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.ts b/src/core/server/elasticsearch/elasticsearch_config.test.ts
@@ -227,7 +227,7 @@ describe('throws when config is invalid', () => {
   beforeAll(() => {
     const realFs = jest.requireActual('fs');
     mockReadFileSync.mockImplementation((path: string) => realFs.readFileSync(path));
-    const utils = jest.requireActual('../../utils');
+    const utils = jest.requireActual('../utils');
     mockReadPkcs12Keystore.mockImplementation((path: string, password?: string) =>
       utils.readPkcs12Keystore(path, password)
     );

diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -21,7 +21,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import { Duration } from 'moment';
 import { readFileSync } from 'fs';
 import { ConfigDeprecationProvider } from 'src/core/server';
-import { readPkcs12Keystore, readPkcs12Truststore } from '../../utils';
+import { readPkcs12Keystore, readPkcs12Truststore } from '../utils';
 import { ServiceConfigDescriptor } from '../internal_types';
 
 const hostURISchema = schema.uri({ scheme: ['http', 'https'] });

diff --git a/src/core/server/http/ssl_config.test.mocks.ts b/src/core/server/http/ssl_config.test.mocks.ts
@@ -24,7 +24,7 @@ jest.mock('fs', () => {
 
 export const mockReadPkcs12Keystore = jest.fn();
 export const mockReadPkcs12Truststore = jest.fn();
-jest.mock('../../utils', () => ({
+jest.mock('../utils', () => ({
   readPkcs12Keystore: mockReadPkcs12Keystore,
   readPkcs12Truststore: mockReadPkcs12Truststore,
 }));
diff --git a/src/core/server/http/ssl_config.test.ts b/src/core/server/http/ssl_config.test.ts
@@ -45,7 +45,7 @@ describe('#SslConfig', () => {
     beforeEach(() => {
       const realFs = jest.requireActual('fs');
       mockReadFileSync.mockImplementation((path: string) => realFs.readFileSync(path));
-      const utils = jest.requireActual('../../utils');
+      const utils = jest.requireActual('../utils');
       mockReadPkcs12Keystore.mockImplementation((path: string, password?: string) =>
         utils.readPkcs12Keystore(path, password)
       );

diff --git a/src/core/server/http/ssl_config.ts b/src/core/server/http/ssl_config.ts
@@ -20,7 +20,7 @@
 import { schema, TypeOf } from '@kbn/config-schema';
 import crypto from 'crypto';
 import { readFileSync } from 'fs';
-import { readPkcs12Keystore, readPkcs12Truststore } from '../../utils';
+import { readPkcs12Keystore, readPkcs12Truststore } from '../utils';
 
 // `crypto` type definitions doesn't currently include `crypto.constants`, see
 // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/fa5baf1733f49cf26228a4e509914572c1b74adf/types/node/v6/index.d.ts#L3412

diff --git a/src/core/utils/crypto/__fixtures__/README.md → ...erver/utils/crypto/__fixtures__/README.md b/src/core/utils/crypto/__fixtures__/README.md → ...erver/utils/crypto/__fixtures__/README.md
diff --git a/src/core/utils/crypto/__fixtures__/index.ts → ...server/utils/crypto/__fixtures__/index.ts b/src/core/utils/crypto/__fixtures__/index.ts → ...server/utils/crypto/__fixtures__/index.ts
diff --git a/src/core/utils/crypto/__fixtures__/no_ca.p12 → ...erver/utils/crypto/__fixtures__/no_ca.p12 b/src/core/utils/crypto/__fixtures__/no_ca.p12 → ...erver/utils/crypto/__fixtures__/no_ca.p12
diff --git a/...ore/utils/crypto/__fixtures__/no_cert.p12 → ...ver/utils/crypto/__fixtures__/no_cert.p12 b/...ore/utils/crypto/__fixtures__/no_cert.p12 → ...ver/utils/crypto/__fixtures__/no_cert.p12
diff --git a/...core/utils/crypto/__fixtures__/no_key.p12 → ...rver/utils/crypto/__fixtures__/no_key.p12 b/...core/utils/crypto/__fixtures__/no_key.p12 → ...rver/utils/crypto/__fixtures__/no_key.p12
diff --git a/...ore/utils/crypto/__fixtures__/two_cas.p12 → ...ver/utils/crypto/__fixtures__/two_cas.p12 b/...ore/utils/crypto/__fixtures__/two_cas.p12 → ...ver/utils/crypto/__fixtures__/two_cas.p12
diff --git a/...re/utils/crypto/__fixtures__/two_keys.p12 → ...er/utils/crypto/__fixtures__/two_keys.p12 b/...re/utils/crypto/__fixtures__/two_keys.p12 → ...er/utils/crypto/__fixtures__/two_keys.p12
diff --git a/src/core/utils/crypto/index.ts → src/core/server/utils/crypto/index.ts b/src/core/utils/crypto/index.ts → src/core/server/utils/crypto/index.ts
diff --git a/src/core/utils/crypto/pkcs12.test.ts → src/core/server/utils/crypto/pkcs12.test.ts b/src/core/utils/crypto/pkcs12.test.ts → src/core/server/utils/crypto/pkcs12.test.ts
@@ -29,7 +29,7 @@ import {
 import { NO_CA_PATH, NO_CERT_PATH, NO_KEY_PATH, TWO_CAS_PATH, TWO_KEYS_PATH } from './__fixtures__';
 import { readFileSync } from 'fs';
 
-import { readPkcs12Keystore, Pkcs12ReadResult, readPkcs12Truststore } from '.';
+import { readPkcs12Keystore, Pkcs12ReadResult, readPkcs12Truststore } from './index';
 
 const reformatPem = (pem: string) => {
   // ensure consistency in line endings when comparing two PEM files

diff --git a/src/core/utils/crypto/pkcs12.ts → src/core/server/utils/crypto/pkcs12.ts b/src/core/utils/crypto/pkcs12.ts → src/core/server/utils/crypto/pkcs12.ts
diff --git a/src/core/server/utils/index.ts b/src/core/server/utils/index.ts
@@ -17,5 +17,6 @@
  * under the License.
  */
 
+export * from './crypto';
 export * from './from_root';
 export * from './package_json';
diff --git a/src/core/utils/index.ts b/src/core/utils/index.ts
@@ -19,7 +19,6 @@
 
 export * from './assert_never';
 export * from './context';
-export * from './crypto';
 export * from './deep_freeze';
 export * from './get';
 export * from './map_to_object';