From ede8b4eabcc972a8eb076ef7c64ff34aeedf8fdf Mon Sep 17 00:00:00 2001
From: Artem Shelkovnikov <artem.shelkovnikov@elastic.co>
Date: Fri, 10 Jan 2025 12:51:25 +0100
Subject: [PATCH 1/3] Add new native fields for SPO connector - certificate
 authenticate (#205337)

## Summary

This PR reflects the changes done in
https://github.com/elastic/connectors/pull/3064: update of Sharepoint
Online native connector configurable fields.

### Checklist

Check the PR satisfies following conditions.

Reviewers should verify this PR satisfies this list as well.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This was checked for breaking HTTP API changes, and any breaking
changes have been approved by the breaking-change committee. The
`release_note:breaking` label should be applied in these situations.
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] The PR description includes the appropriate Release Notes section,
and the correct `release_note:*` label is applied per the
[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)

(cherry picked from commit f612e71452b9f38e84ebe9ee275804624dd6e43e)

# Conflicts:
#	packages/kbn-search-connectors/types/native_connectors.ts
---
 .../types/native_connectors.ts                | 205 +++++++++++++-----
 1 file changed, 147 insertions(+), 58 deletions(-)

diff --git a/packages/kbn-search-connectors/types/native_connectors.ts b/packages/kbn-search-connectors/types/native_connectors.ts
index f9719cb84b801..95ba28fd90e1e 100644
--- a/packages/kbn-search-connectors/types/native_connectors.ts
+++ b/packages/kbn-search-connectors/types/native_connectors.ts
@@ -4376,6 +4376,45 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: '',
       },
+      auth_method: {
+        default_value: null,
+        depends_on: [],
+        display: DROPDOWN,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethodLabel',
+          {
+            defaultMessage: 'Authentication Method',
+          }
+        ),
+        options: [
+          {
+            label: translate(
+              'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethod.clientSecretLabel',
+              {
+                defaultMessage: 'Client Secret',
+              }
+            ),
+            value: 'secret',
+          },
+          {
+            label: translate(
+              'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethod.certificateLabel',
+              {
+                defaultMessage: 'Certificate',
+              }
+            ),
+            value: 'certificate',
+          },
+        ],
+        order: 4,
+        required: true,
+        sensitive: false,
+        tooltip: null,
+        type: STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: 'certificate',
+      },
       secret_value: {
         default_value: null,
         depends_on: [],
@@ -4387,7 +4426,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 4,
+        order: 5,
         required: true,
         sensitive: true,
         tooltip: '',
@@ -4396,6 +4435,56 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: '',
       },
+      certificate: {
+        default_value: null,
+        depends_on: [
+          {
+            field: 'auth_method',
+            value: 'certificate',
+          },
+        ],
+        display: TEXTAREA,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.certificateLabel',
+          {
+            defaultMessage: 'Content of certificate file',
+          }
+        ),
+        options: [],
+        order: 6,
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      private_key: {
+        default_value: null,
+        depends_on: [
+          {
+            field: 'auth_method',
+            value: 'certificate',
+          },
+        ],
+        display: TEXTAREA,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.privateKeyLabel',
+          {
+            defaultMessage: 'Content of private key file',
+          }
+        ),
+        options: [],
+        order: 7,
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
       site_collections: {
         default_value: null,
         depends_on: [],
@@ -4407,7 +4496,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 5,
+        order: 8,
         required: true,
         sensitive: false,
         tooltip: i18n.translate(
@@ -4423,13 +4512,63 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: '*',
       },
+      enumerate_all_sites: {
+        default_value: true,
+        depends_on: [],
+        display: TOGGLE,
+        label: i18n.translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesLabel',
+          { defaultMessage: 'Enumerate all sites?' }
+        ),
+        options: [],
+        order: 9,
+        required: false,
+        sensitive: false,
+        tooltip: i18n.translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesTooltip',
+          {
+            defaultMessage:
+              'If enabled, sites will be fetched in bulk, then filtered down to the configured list of sites. This is efficient when syncing many sites. If disabled, each configured site will be fetched with an individual request. This is efficient when syncing fewer sites.',
+          }
+        ),
+        type: BOOLEAN,
+        ui_restrictions: [],
+        validations: [],
+        value: true,
+      },
+      fetch_subsites: {
+        default_value: false,
+        depends_on: [{ field: 'enumerate_all_sites', value: false }],
+        display: TOGGLE,
+        label: i18n.translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesLabel',
+          {
+            defaultMessage: 'Fetch sub-sites of configured sites?',
+          }
+        ),
+        options: [],
+        order: 10,
+        required: false,
+        sensitive: false,
+        tooltip: i18n.translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesTooltip',
+          {
+            defaultMessage:
+              'Whether subsites of the configured site(s) should be automatically fetched.',
+          }
+        ),
+        type: BOOLEAN,
+        ui_restrictions: [],
+        validations: [],
+        value: true,
+      },
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
         display: DisplayType.TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
-        order: 6,
+        order: 11,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
@@ -4449,7 +4588,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 7,
+        order: 12,
         required: true,
         sensitive: false,
         tooltip: i18n.translate(
@@ -4480,7 +4619,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 8,
+        order: 13,
         required: true,
         sensitive: false,
         tooltip: i18n.translate(
@@ -4511,7 +4650,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 9,
+        order: 14,
         required: true,
         sensitive: false,
         tooltip: i18n.translate(
@@ -4542,7 +4681,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 10,
+        order: 15,
         required: true,
         sensitive: false,
         tooltip: i18n.translate(
@@ -4573,7 +4712,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 11,
+        order: 16,
         required: true,
         sensitive: false,
         tooltip: i18n.translate(
@@ -4588,56 +4727,6 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: true,
       },
-      enumerate_all_sites: {
-        default_value: true,
-        depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesLabel',
-          { defaultMessage: 'Enumerate all sites?' }
-        ),
-        options: [],
-        order: 6,
-        required: false,
-        sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesTooltip',
-          {
-            defaultMessage:
-              'If enabled, sites will be fetched in bulk, then filtered down to the configured list of sites. This is efficient when syncing many sites. If disabled, each configured site will be fetched with an individual request. This is efficient when syncing fewer sites.',
-          }
-        ),
-        type: FieldType.BOOLEAN,
-        ui_restrictions: [],
-        validations: [],
-        value: true,
-      },
-      fetch_subsites: {
-        default_value: false,
-        depends_on: [{ field: 'enumerate_all_sites', value: false }],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesLabel',
-          {
-            defaultMessage: 'Fetch sub-sites of configured sites?',
-          }
-        ),
-        options: [],
-        order: 7,
-        required: false,
-        sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesTooltip',
-          {
-            defaultMessage:
-              'Whether subsites of the configured site(s) should be automatically fetched.',
-          }
-        ),
-        type: FieldType.BOOLEAN,
-        ui_restrictions: [],
-        validations: [],
-        value: true,
-      },
     },
     features: {
       [FeatureName.SYNC_RULES]: {

From fcfa0440e0405e4a7bd0fe2a525e13cabdbfd0e0 Mon Sep 17 00:00:00 2001
From: Artem Shelkovnikov <lavatroublebubble@gmail.com>
Date: Fri, 10 Jan 2025 14:22:27 +0100
Subject: [PATCH 2/3] Fix variable usage for enums

---
 .../types/native_connectors.ts                | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/kbn-search-connectors/types/native_connectors.ts b/packages/kbn-search-connectors/types/native_connectors.ts
index 95ba28fd90e1e..d50baf49a5d2c 100644
--- a/packages/kbn-search-connectors/types/native_connectors.ts
+++ b/packages/kbn-search-connectors/types/native_connectors.ts
@@ -4379,7 +4379,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       auth_method: {
         default_value: null,
         depends_on: [],
-        display: DROPDOWN,
+        display: DisplayType.DROPDOWN,
         label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethodLabel',
           {
@@ -4410,7 +4410,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: STRING,
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: 'certificate',
@@ -4443,7 +4443,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'certificate',
           },
         ],
-        display: TEXTAREA,
+        display: DisplayType.TEXTAREA,
         label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.certificateLabel',
           {
@@ -4455,7 +4455,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: STRING,
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4468,7 +4468,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'certificate',
           },
         ],
-        display: TEXTAREA,
+        display: DisplayType.TEXTAREA,
         label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.privateKeyLabel',
           {
@@ -4480,7 +4480,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: STRING,
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4515,7 +4515,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       enumerate_all_sites: {
         default_value: true,
         depends_on: [],
-        display: TOGGLE,
+        display: DisplayType.TOGGLE,
         label: i18n.translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesLabel',
           { defaultMessage: 'Enumerate all sites?' }
@@ -4531,7 +4531,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
               'If enabled, sites will be fetched in bulk, then filtered down to the configured list of sites. This is efficient when syncing many sites. If disabled, each configured site will be fetched with an individual request. This is efficient when syncing fewer sites.',
           }
         ),
-        type: BOOLEAN,
+        type: FieldType.BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
@@ -4539,7 +4539,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_subsites: {
         default_value: false,
         depends_on: [{ field: 'enumerate_all_sites', value: false }],
-        display: TOGGLE,
+        display: DisplayType.TOGGLE,
         label: i18n.translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesLabel',
           {
@@ -4557,7 +4557,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
               'Whether subsites of the configured site(s) should be automatically fetched.',
           }
         ),
-        type: BOOLEAN,
+        type: FieldType.BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,

From 0b53993460bab94ab4d0a7b75f7a539c082254c1 Mon Sep 17 00:00:00 2001
From: Artem Shelkovnikov <lavatroublebubble@gmail.com>
Date: Fri, 10 Jan 2025 15:50:27 +0100
Subject: [PATCH 3/3] Now fix translate

---
 .../kbn-search-connectors/types/native_connectors.ts   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/kbn-search-connectors/types/native_connectors.ts b/packages/kbn-search-connectors/types/native_connectors.ts
index d50baf49a5d2c..0959ca53dd2c7 100644
--- a/packages/kbn-search-connectors/types/native_connectors.ts
+++ b/packages/kbn-search-connectors/types/native_connectors.ts
@@ -4380,7 +4380,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         default_value: null,
         depends_on: [],
         display: DisplayType.DROPDOWN,
-        label: translate(
+        label: i18n.translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethodLabel',
           {
             defaultMessage: 'Authentication Method',
@@ -4388,7 +4388,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         ),
         options: [
           {
-            label: translate(
+            label: i18n.translate(
               'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethod.clientSecretLabel',
               {
                 defaultMessage: 'Client Secret',
@@ -4397,7 +4397,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'secret',
           },
           {
-            label: translate(
+            label: i18n.translate(
               'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethod.certificateLabel',
               {
                 defaultMessage: 'Certificate',
@@ -4444,7 +4444,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           },
         ],
         display: DisplayType.TEXTAREA,
-        label: translate(
+        label: i18n.translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.certificateLabel',
           {
             defaultMessage: 'Content of certificate file',
@@ -4469,7 +4469,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           },
         ],
         display: DisplayType.TEXTAREA,
-        label: translate(
+        label: i18n.translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.privateKeyLabel',
           {
             defaultMessage: 'Content of private key file',