From 2ef205d6d53fa50f76c7a8f772aeb696caa9ce5f Mon Sep 17 00:00:00 2001
From: Mark Hoy <mark.hoy@elastic.co>
Date: Wed, 10 Jan 2024 13:35:35 -0500
Subject: [PATCH] use connectors cli configuration; revert changes

---
 connectors/connectors_cli.py          |  3 +--
 scripts/stack/README.md               |  4 ++++
 scripts/stack/configure-connectors.sh | 16 ++++++++++++++--
 scripts/stack/copy-config.sh          |  1 +
 scripts/stack/run-stack.sh            |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/connectors/connectors_cli.py b/connectors/connectors_cli.py
index ab717c1a6..5e90d33bd 100644
--- a/connectors/connectors_cli.py
+++ b/connectors/connectors_cli.py
@@ -24,7 +24,6 @@
 from connectors.cli.index import Index
 from connectors.cli.job import Job
 from connectors.config import _default_config
-from connectors.config import load_config as configuration_loader
 from connectors.es.settings import Settings
 
 __all__ = ["main"]
@@ -32,7 +31,7 @@
 
 def load_config(ctx, config):
     if config:
-        return configuration_loader(config.name)
+        return yaml.safe_load(config)
     elif os.path.isfile(CONFIG_FILE_PATH):
         with open(CONFIG_FILE_PATH, "r") as f:
             return yaml.safe_load(f.read())
diff --git a/scripts/stack/README.md b/scripts/stack/README.md
index f03fe4e1b..3d38fce0d 100644
--- a/scripts/stack/README.md
+++ b/scripts/stack/README.md
@@ -52,6 +52,10 @@ ELASTICSEARCH_VERSION=8.11.2 KIBANA_VERSION=8.11.2 CONNECTORS_VERSION=8.11.2.0 .
 
 Once the stack is running, you can monitor the logs from the Connectors instance by running:
 ```bash
+./scripts/stack/view-connectors-logs.sh
+```
+or:
+```bash
 docker-compose -f ./scripts/stack/docker/docker-compose.yml logs -f elastic-connectors
 ```
 
diff --git a/scripts/stack/configure-connectors.sh b/scripts/stack/configure-connectors.sh
index ebb99c8a8..5e267d6d9 100755
--- a/scripts/stack/configure-connectors.sh
+++ b/scripts/stack/configure-connectors.sh
@@ -22,6 +22,18 @@ pushd $PROJECT_ROOT
     if [[ "${CONFIG_FILE:-}" == "" ]]; then
         CONFIG_FILE="${PROJECT_ROOT}/scripts/stack/connectors-config/config.yml"
     fi
+    CLI_CONFIG="${PROJECT_ROOT}/scripts/stack/connectors-config/cli_config.yml"
+
+    # ensure our Connectors CLI config exists and has the correct information
+    if [ ! -f "$CLI_CONFIG" ]; then
+        cliConfigText='
+elasticsearch:
+    host: http://localhost:9200
+    password: '"${ELASTIC_PASSWORD}"'
+    username: elastic
+'
+        echo "${cliConfigText}" > "$CLI_CONFIG"
+    fi
 
     CONNECTORS_EXE="${PROJECT_ROOT}/bin/connectors"
     if [ ! -f "$CONNECTORS_EXE" ]; then
@@ -39,7 +51,7 @@ pushd $PROJECT_ROOT
     while [ $keep_configuring == true ]; do
         echo
         echo "Currently configured connectors:"
-        $CONNECTORS_EXE --config "$CONFIG_FILE" connector list
+        $CONNECTORS_EXE --config "$CLI_CONFIG" connector list
         echo
         while true; do
             read -p "Do you want to set up a new connector? (y/N) " yn
@@ -51,7 +63,7 @@ pushd $PROJECT_ROOT
         done
 
         if [ $keep_configuring == true ]; then
-            $CONNECTORS_EXE --config "${CONFIG_FILE}" connector create --connector-service-config "$CONFIG_FILE" --update-config
+            $CONNECTORS_EXE --config "${CLI_CONFIG}" connector create --connector-service-config "$CONFIG_FILE" --update-config
         fi
     done
 popd
diff --git a/scripts/stack/copy-config.sh b/scripts/stack/copy-config.sh
index e589ee3e6..77bbe5f83 100755
--- a/scripts/stack/copy-config.sh
+++ b/scripts/stack/copy-config.sh
@@ -26,6 +26,7 @@ cp "$CONFIG_PATH" "$script_config"
 echo "copied config from $CONFIG_PATH to $config_dir"
 
 if [[ "$is_example_config" == true ]]; then
+    export CONFIG_FILE="$script_config"
     sed_cmd="sed -i"
     if [[ "$MACHINE_OS" == "MacOS" || "$MACHINE_OS" == "FreeBSD" ]]; then
         sed_cmd="sed -i -e"
diff --git a/scripts/stack/run-stack.sh b/scripts/stack/run-stack.sh
index 6e7705e21..2b2e1d80e 100755
--- a/scripts/stack/run-stack.sh
+++ b/scripts/stack/run-stack.sh
@@ -51,7 +51,7 @@ if [[ "${bypass_config:-}" == false ]]; then
   done
   if [ $run_configurator == "yes" ]; then
     source ./copy-config.sh
-    source ./configure-connectors.sh $SECURE_STATE_DIR
+    source ./configure-connectors.sh
   fi
 fi