Merge branch 'main' into split-types-from-code-on-kbn-es

elastic · Dec 7, 2021 · 6366d58 · 6366d58
2 parents 62a9092 + d0f7d7c
commit 6366d58
Show file tree

Hide file tree

Showing 343 changed files with 44,092 additions and 3,727 deletions.
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -290,7 +290,14 @@ readonly links: {
         }>;
         readonly watcher: Record<string, string>;
         readonly ccs: Record<string, string>;
-        readonly plugins: Record<string, string>;
+        readonly plugins: {
+            azureRepo: string;
+            gcsRepo: string;
+            hdfsRepo: string;
+            s3Repo: string;
+            snapshotRestoreRepos: string;
+            mapperSize: string;
+        };
         readonly snapshotRestore: Record<string, string>;
         readonly ingest: Record<string, string>;
         readonly fleet: Readonly<{

diff --git a/packages/kbn-es/src/artifact.test.js b/packages/kbn-es/src/artifact.test.js
@@ -90,10 +90,10 @@ const artifactTest = (requestedLicense, expectedLicense, fetchTimesCalled = 1) =
         `${PERMANENT_SNAPSHOT_BASE_URL}/${MOCK_VERSION}/manifest.json`
       );
     }
-    expect(artifact.getUrl()).toEqual(MOCK_URL + `/${expectedLicense}`);
-    expect(artifact.getChecksumUrl()).toEqual(MOCK_URL + `/${expectedLicense}.sha512`);
-    expect(artifact.getChecksumType()).toEqual('sha512');
-    expect(artifact.getFilename()).toEqual(MOCK_FILENAME + `-${ARCHITECTURE}.${expectedLicense}`);
+    expect(artifact.spec.url).toEqual(MOCK_URL + `/${expectedLicense}`);
+    expect(artifact.spec.checksumUrl).toEqual(MOCK_URL + `/${expectedLicense}.sha512`);
+    expect(artifact.spec.checksumType).toEqual('sha512');
+    expect(artifact.spec.filename).toEqual(MOCK_FILENAME + `-${ARCHITECTURE}.${expectedLicense}`);
   };
 };
 
@@ -158,7 +158,7 @@ describe('Artifact', () => {
 
       it('should return artifact metadata for the correct architecture', async () => {
         const artifact = await Artifact.getSnapshot('oss', MOCK_VERSION, log);
-        expect(artifact.getFilename()).toEqual(MOCK_FILENAME + `-${ARCHITECTURE}.oss`);
+        expect(artifact.spec.filename).toEqual(MOCK_FILENAME + `-${ARCHITECTURE}.oss`);
       });
     });
 
@@ -182,7 +182,7 @@ describe('Artifact', () => {
 
     describe('with latest unverified snapshot', () => {
       beforeEach(() => {
-        process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED = 1;
+        process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED = '1';
         mockFetch(MOCKS.valid);
       });