Use new fields in original integration creation request

Signed-off-by: Simeon Widdis <[email protected]>
opensearch-project · Apr 16, 2024 · 27890d0 · 27890d0
1 parent c1e8fdd
commit 27890d0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/docs/integrations/setup.md b/docs/integrations/setup.md
@@ -27,6 +27,8 @@ the author in hindsight.
 If working on S3-based integrations, it's worth noting that queries have some values
 [substituted](https://github.com/opensearch-project/dashboards-observability/blob/4e1e0e585/public/components/integrations/components/setup_integration.tsx#L438) when installing. They are:
 
+- `{table_name}` is the fully qualified name of the Flint table, typically `datasource.database.object_name`.
+  This is also substituted in any linked Saved Queries when using S3-based integrations.
 - `{s3_bucket_location}` to locate data.
 - `{s3_checkpoint_location}` to store intermediate results, which is required by Spark.
 - `{object_name}` used for giving tables a unique name per-integration to avoid collisions.

diff --git a/public/components/integrations/components/create_integration_helpers.ts b/public/components/integrations/components/create_integration_helpers.ts
@@ -286,7 +286,8 @@ export async function addIntegrationRequest(
   name?: string,
   indexPattern?: string,
   workflows?: string[],
-  skipRedirect?: boolean
+  skipRedirect?: boolean,
+  dataSourceInfo?: { dataSource: string; tableName: string }
 ): Promise<boolean> {
   const http = coreRefs.http!;
   if (addSample) {
@@ -300,9 +301,25 @@ export async function addIntegrationRequest(
     indexPattern = `ss4o_${integration.type}-${integrationTemplateId}-sample-sample`;
   }
 
+  const createReqBody: {
+    name?: string;
+    indexPattern?: string;
+    workflows?: string[];
+    dataSource?: string;
+    tableName?: string;
+  } = {
+    name,
+    indexPattern,
+    workflows,
+  };
+  if (dataSourceInfo) {
+    createReqBody.dataSource = dataSourceInfo.dataSource;
+    createReqBody.tableName = dataSourceInfo.dataSource;
+  }
+
   let response: boolean = await http
     .post(`${INTEGRATIONS_BASE}/store/${templateName}`, {
-      body: JSON.stringify({ name, indexPattern, workflows }),
+      body: JSON.stringify(createReqBody),
     })
     .then((res) => {
       setToast(`${name} integration successfully added!`, 'success');

diff --git a/public/components/integrations/components/setup_integration.tsx b/public/components/integrations/components/setup_integration.tsx
@@ -435,11 +435,12 @@ export function SetupIntegrationFormInputs({
   );
 }
 
+const makeTableName = (config: IntegrationSetupInputs): string => {
+  return `${config.connectionDataSource}.default.${config.connectionTableName}`;
+};
+
 const prepareQuery = (query: string, config: IntegrationSetupInputs): string => {
-  let queryStr = query.replaceAll(
-    '{table_name}',
-    `${config.connectionDataSource}.default.${config.connectionTableName}`
-  );
+  let queryStr = query.replaceAll('{table_name}', makeTableName(config));
   queryStr = queryStr.replaceAll('{s3_bucket_location}', config.connectionLocation);
   queryStr = queryStr.replaceAll('{s3_checkpoint_location}', config.checkpointLocation);
   queryStr = queryStr.replaceAll('{object_name}', config.connectionTableName);
@@ -516,7 +517,8 @@ const addIntegration = async ({
       config.displayName,
       `flint_${config.connectionDataSource}_default_${config.connectionTableName}__*`,
       config.enabledWorkflows,
-      setIsInstalling ? true : false
+      setIsInstalling ? true : false,
+      { dataSource: config.connectionDataSource, tableName: makeTableName(config) }
     );
     if (setIsInstalling) {
       setIsInstalling(false, res);