Re-apply fix for VPC type (#809)

* Fix VPC type Signed-off-by: Simeon Widdis <[email protected]> * Add a test case Signed-off-by: Simeon Widdis <[email protected]> * Re-apply link fix and update test Signed-off-by: Simeon Widdis <[email protected]> * Revert "Re-apply link fix and update test" This reverts commit f2ec20d. Signed-off-by: Simeon Widdis <[email protected]> --------- Signed-off-by: Simeon Widdis <[email protected]> (cherry picked from commit 0e9e8cd) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Aug 3, 2023 · 5d3235c · 5d3235c
1 parent b719ebc
commit 5d3235c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
@@ -4,7 +4,7 @@
   "displayName": "AWS VPC Flow",
   "description": "AWS VPC Flow log collector",
   "license": "Apache-2.0",
-  "type": "logs",
+  "type": "logs_vpc",
   "author": "Haidong Wang",
   "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info",
   "statics": {

diff --git a/server/adaptors/integrations/__test__/local_repository.test.ts b/server/adaptors/integrations/__test__/local_repository.test.ts
@@ -7,16 +7,26 @@ import { Repository } from '../repository/repository';
 import { Integration } from '../repository/integration';
 import path from 'path';
 
-describe("The local repository", () => {
-    it("Should pass shallow validation for all local integrations.", async () => {
-        let repository: Repository = new Repository(path.join(__dirname, '../__data__/repository'));
-        let integrations: Integration[] = await repository.getIntegrationList();
-        await Promise.all(integrations.map(i => expect(i.check()).resolves.toBeTruthy()));
-    });
+describe('The local repository', () => {
+  it('Should pass shallow validation for all local integrations.', async () => {
+    const repository: Repository = new Repository(path.join(__dirname, '../__data__/repository'));
+    const integrations: Integration[] = await repository.getIntegrationList();
+    await Promise.all(integrations.map((i) => expect(i.check()).resolves.toBeTruthy()));
+  });
 
-    it("Should pass deep validation for all local integrations.", async () => {
-        let repository: Repository = new Repository(path.join(__dirname, '../__data__/repository'));
-        let integrations: Integration[] = await repository.getIntegrationList();
-        await Promise.all(integrations.map(i => expect(i.deepCheck()).resolves.toBeTruthy()));
-    });
+  it('Should pass deep validation for all local integrations.', async () => {
+    const repository: Repository = new Repository(path.join(__dirname, '../__data__/repository'));
+    const integrations: Integration[] = await repository.getIntegrationList();
+    await Promise.all(integrations.map((i) => expect(i.deepCheck()).resolves.toBeTruthy()));
+  });
+
+  it('Should not have a type that is not imported in the config', async () => {
+    const repository: Repository = new Repository(path.join(__dirname, '../__data__/repository'));
+    const integrations: Integration[] = await repository.getIntegrationList();
+    for (const integration of integrations) {
+      const config = await integration.getConfig();
+      const components = config!.components.map((x) => x.name);
+      expect(components).toContain(config!.type);
+    }
+  });
 });