Setup S3 connection with integrations (opensearch-project#1057)

derek-ho · Oct 4, 2023 · 4008c02 · 4008c02
1 parent 7f2f568
commit 4008c02
Show file tree

Hide file tree

Showing 8 changed files with 273 additions and 101 deletions.
diff --git a/...omponents/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/...omponents/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -2,26 +2,7 @@
 
 exports[`Integration Setup Page Renders integration setup page as expected 1`] = `
 <SetupIntegrationPage
-  integration={
-    Object {
-      "assets": Object {
-        "savedObjects": Object {
-          "name": "sample",
-          "version": "1.0.1",
-        },
-      },
-      "components": Array [
-        Object {
-          "name": "logs",
-          "version": "1.0.0",
-        },
-      ],
-      "license": "Apache-2.0",
-      "name": "sample",
-      "type": "logs",
-      "version": "2.0.0",
-    }
-  }
+  integration="sample"
 >
   <EuiPage>
     <div
@@ -55,22 +36,9 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                       }
                       integration={
                         Object {
-                          "assets": Object {
-                            "savedObjects": Object {
-                              "name": "sample",
-                              "version": "1.0.1",
-                            },
-                          },
-                          "components": Array [
-                            Object {
-                              "name": "logs",
-                              "version": "1.0.0",
-                            },
-                          ],
-                          "license": "Apache-2.0",
+                          "assets": Object {},
                           "name": "sample",
-                          "type": "logs",
-                          "version": "2.0.0",
+                          "type": "",
                         }
                       }
                       updateConfig={[Function]}
@@ -232,10 +200,12 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   options={
                                     Array [
                                       Object {
+                                        "disabled": true,
                                         "text": "S3 Connection",
                                         "value": "s3",
                                       },
                                       Object {
+                                        "disabled": true,
                                         "text": "OpenSearch Index",
                                         "value": "index",
                                       },
@@ -273,12 +243,14 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                             value="index"
                                           >
                                             <option
+                                              disabled={true}
                                               key="0"
                                               value="s3"
                                             >
                                               S3 Connection
                                             </option>
                                             <option
+                                              disabled={true}
                                               key="1"
                                               value="index"
                                             >
@@ -724,24 +696,15 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
             }
             integration={
               Object {
-                "assets": Object {
-                  "savedObjects": Object {
-                    "name": "sample",
-                    "version": "1.0.1",
-                  },
-                },
-                "components": Array [
-                  Object {
-                    "name": "logs",
-                    "version": "1.0.0",
-                  },
-                ],
-                "license": "Apache-2.0",
+                "assets": Object {},
                 "name": "sample",
-                "type": "logs",
-                "version": "2.0.0",
+                "type": "",
               }
             }
+            loading={false}
+            loadingProgress={0}
+            setLoading={[Function]}
+            setProgress={[Function]}
           >
             <EuiBottomBar>
               <EuiPortal>
@@ -1243,10 +1206,12 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
               options={
                 Array [
                   Object {
+                    "disabled": true,
                     "text": "S3 Connection",
                     "value": "s3",
                   },
                   Object {
+                    "disabled": false,
                     "text": "OpenSearch Index",
                     "value": "index",
                   },
@@ -1284,12 +1249,14 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
                         value="index"
                       >
                         <option
+                          disabled={true}
                           key="0"
                           value="s3"
                         >
                           S3 Connection
                         </option>
                         <option
+                          disabled={false}
                           key="1"
                           value="index"
                         >

diff --git a/public/components/integrations/components/__tests__/setup_integration.test.tsx b/public/components/integrations/components/__tests__/setup_integration.test.tsx
@@ -17,7 +17,7 @@ describe('Integration Setup Page', () => {
   configure({ adapter: new Adapter() });
 
   it('Renders integration setup page as expected', async () => {
-    const wrapper = mount(<SetupIntegrationPage integration={TEST_INTEGRATION_CONFIG} />);
+    const wrapper = mount(<SetupIntegrationPage integration={TEST_INTEGRATION_CONFIG.name} />);
 
     await waitFor(() => {
       expect(wrapper).toMatchSnapshot();

diff --git a/public/components/integrations/components/create_integration_helpers.ts b/public/components/integrations/components/create_integration_helpers.ts
@@ -12,6 +12,17 @@ type ValidationResult = { ok: true } | { ok: false; errors: string[] };
 export interface IntegrationTemplate {
   name: string;
   type: string;
+  assets: {
+    savedObjects?: {
+      name: string;
+      version: string;
+    };
+    queries?: Array<{
+      name: string;
+      version: string;
+      language: string;
+    }>;
+  };
 }
 
 export const doTypeValidation = (