From 279ab0f24ad838f680d526358c92fb7ef81712dd Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 11 Oct 2023 16:00:58 -0700
Subject: [PATCH] Remove integrations card from datasources (#1110) (#1118)

* Remove integrations card



* Fix test



* Also include copy changes



---------


(cherry picked from commit 48b1bad100d86612f82004d3cae48267e879c7b8)

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../data_connection.test.tsx.snap             | 45 -------------------
 .../components/manage/data_connection.tsx     |  8 ----
 .../new/configure_s3_datasource.tsx           | 20 ++++-----
 .../new/new_datasource_card_view.tsx          |  2 +-
 4 files changed, 11 insertions(+), 64 deletions(-)

diff --git a/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
index bb7b39ed6..da46504aa 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
@@ -656,51 +656,6 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                     </div>
                   </div>
                 </div>
-                <div
-                  class="euiFlexItem"
-                >
-                  <div
-                    class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--isClickable euiCard euiCard--centerAligned euiCard--isClickable euiCard--hasIcon"
-                  >
-                    <div
-                      class="euiCard__top"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="euiIcon euiIcon--xxLarge euiIcon-isLoading euiCard__icon"
-                        focusable="false"
-                        height="16"
-                        role="img"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </div>
-                    <div
-                      class="euiCard__content"
-                    >
-                      <span
-                        class="euiTitle euiTitle--small euiCard__title"
-                        id="random_html_idTitle"
-                      >
-                        <button
-                          aria-describedby=" random_html_idDescription"
-                          class="euiCard__titleButton"
-                        >
-                          Integrate data
-                        </button>
-                      </span>
-                      <div
-                        class="euiText euiText--small euiCard__description"
-                        id="random_html_idDescription"
-                      >
-                        <p>
-                          Explore data faster through integrations
-                        </p>
-                      </div>
-                    </div>
-                  </div>
-                </div>
               </div>
             </div>
           </div>
diff --git a/public/components/datasources/components/manage/data_connection.tsx b/public/components/datasources/components/manage/data_connection.tsx
index 4c9da43a3..12b40df10 100644
--- a/public/components/datasources/components/manage/data_connection.tsx
+++ b/public/components/datasources/components/manage/data_connection.tsx
@@ -98,14 +98,6 @@ export const DataConnection = (props: any) => {
             }
           />
         </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiCard
-            icon={<EuiIcon size="xxl" type="integrationGeneral" />}
-            title={'Integrate data'}
-            description="Explore data faster through integrations"
-            onClick={() => application!.navigateToApp(observabilityIntegrationsID)}
-          />
-        </EuiFlexItem>
       </EuiFlexGroup>
     );
   };
diff --git a/public/components/datasources/components/new/configure_s3_datasource.tsx b/public/components/datasources/components/new/configure_s3_datasource.tsx
index 344252d4a..1b65c7b2b 100644
--- a/public/components/datasources/components/new/configure_s3_datasource.tsx
+++ b/public/components/datasources/components/new/configure_s3_datasource.tsx
@@ -88,7 +88,7 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
         </EuiTitle>
         <EuiSpacer size="s" />
         <EuiText size="s" color="subdued">
-          {`Connect to Amazon S3 via AWS Glue with Amazon EMR as an execution engine. `}
+          {`Connect to Amazon S3 via AWS Glue Data Catalog with Amazon EMR as an execution engine. `}
           <EuiLink external={true} href={OPENSEARCH_S3_DOCUMENTATION_URL} target="blank">
             Learn more
           </EuiLink>
@@ -96,7 +96,7 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
         <EuiSpacer size="s" />
         <EuiCallOut title="Setup Amazon EMR as execution engine first" iconType="iInCircle">
           <EuiText size="s" color="subdued">
-            {`Connect to Amazon S3 via AWS Glue with Amazon EMR as an execution engine. `}
+            {`Connect to Amazon S3 via AWS Glue Data Catalog with Amazon EMR as an execution engine. `}
             <EuiLink external={true} href={OPENSEARCH_S3_DOCUMENTATION_URL} target="blank">
               Learn more
             </EuiLink>
@@ -129,7 +129,7 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
         <EuiSpacer />
 
         <EuiText>
-          <h3>AWS Glue authentication details</h3>
+          <h3>AWS Glue Data Catalog authentication details</h3>
         </EuiText>
         <EuiSpacer />
 
@@ -138,14 +138,14 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
             <EuiText size="xs">
               <p>
                 This parameter provides the authentication type information required for execution
-                engine to connect to AWS Glue.
+                engine to connect to AWS Glue Data Catalog.
               </p>
             </EuiText>
             <EuiFieldText data-test-subj="authentication-method" value="IAM role" disabled />
           </>
         </EuiFormRow>
 
-        <EuiFormRow label="AWS Glue authentication ARN">
+        <EuiFormRow label="AWS Glue Data Catalog authentication ARN">
           <>
             <EuiText size="xs">
               <p>This should be the IAM role ARN</p>
@@ -167,16 +167,16 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
         <EuiSpacer />
 
         <EuiText>
-          <h3>AWS Glue index store details</h3>
+          <h3>AWS Glue Data Catalog index store details</h3>
         </EuiText>
         <EuiSpacer />
 
-        <EuiFormRow label="AWS Glue index store URI">
+        <EuiFormRow label="AWS Glue Data Catalog index store URI">
           <>
             <EuiText size="xs">
               <p>
-                This parameter provides the OpenSearch cluster host information for AWS Glue. This
-                OpenSearch instance is used for writing index data back.
+                This parameter provides the OpenSearch cluster host information for AWS Glue Data
+                Catalog. This OpenSearch instance is used for writing index data back.
               </p>
             </EuiText>
             <EuiFieldText
@@ -193,7 +193,7 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
           </>
         </EuiFormRow>
 
-        <EuiFormRow label="AWS Glue index store authentication">
+        <EuiFormRow label="AWS Glue Data Catalog index store authentication">
           <>
             <EuiText size="xs">
               <p>Authentication settings to access the index store.</p>
diff --git a/public/components/datasources/components/new/new_datasource_card_view.tsx b/public/components/datasources/components/new/new_datasource_card_view.tsx
index bfc83ea85..bbd695bfb 100644
--- a/public/components/datasources/components/new/new_datasource_card_view.tsx
+++ b/public/components/datasources/components/new/new_datasource_card_view.tsx
@@ -23,7 +23,7 @@ export function NewDatasourceCardView() {
     {
       name: 'S3GLUE',
       displayName: 'S3',
-      description: 'Connect to Amazon S3 via AWS Glue',
+      description: 'Connect to Amazon S3 via AWS Glue Data Catalog',
       displayIcon: <EuiIcon type={s3Svg} size="xl" />,
       onClick: () => (window.location.hash = `#/configure/S3GLUE`),
     },