Fix some script + make target discrepancies post refactor#3941
Fix some script + make target discrepancies post refactor#3941
Conversation
| fi | ||
|
|
||
| pushd $PROJECT_ROOT | ||
| pushd $PROJECT_ROOT/app/connectors_service |
There was a problem hiding this comment.
Where's PROJECT_ROOT defined? I thought that was modified to point to app/connectors_service but I might be misremembering!
There was a problem hiding this comment.
It's under scripts/stack/set-env.sh - I didn't think about this subject at all, but you might still have feelings on this since this is largely your baby 😁 - do you think we should refactor where these scripts live too?
There was a problem hiding this comment.
I wouldn't be opposed to it, I'm not sure there was any explicit reason why they were left behind. If they're not used in CI or root-level Makefile then it would make sense to me to move them. Looking at them they all seem related to the service itself anw.
There was a problem hiding this comment.
Alright. Moved and adjusted stuff around that move.
This is still happening somehow - will need a fresh ✅ after the last changes. @lorenabalan have a 👀
|

Not related to any specific issue
Summary
The monorepo restructure in #3721 moved the connector service into
app/connectors_service/, but several file path references across Makefiles and stack scripts were not updated. This caused broken behavior for users running connectors from source:make runfrom the repo root silently ignored the user'sconfig.yml, falling back toservice_cli.py's default path insideapp/connectors_service/. This produced a confusingCannot connect to host localhost:9200error even with a valid cloud config at the repo root.scripts/stack/development scripts referenced stale paths forVERSION,config.yml.example, and theconnectorsCLI binary — all of which moved during the restructure.run-stack.sh --no-connectorsstill prompted for the connector configurator.Changes
Makefile wiring for
make runconfig.ymltarget (copies from example if missing) and updatedrunto passCONFIG_FILE=$(CURDIR)/config.ymlto the inner Makefile.app/connectors_service/Makefile: addedCONFIG_FILE ?= config.ymland updatedrunto pass-c $(CONFIG_FILE)explicitly. When called from root, it receives the absolute path; when called directly, it defaults to the localconfig.yml.Move
scripts/stack/intoapp/connectors_service/scripts/stack/Per review feedback, relocated the stack scripts to live alongside the service they belong to. This simplifies all internal path references because
PROJECT_ROOT(computed as two directories up from the script location) now naturally resolves toapp/connectors_service/— eliminating the need forapp/connectors_service/prefixes throughout.Script fixes
copy-config.sh: removed the intermediarycpthat created a ghostconfig.ymlatPROJECT_ROOT; now points directly atconfig.yml.example.configure-connectors.sh: fixed theconnectorsCLI path (bin/connectors→.venv/bin/connectors).run-stack.sh: moved config copy, configurator prompt, and connector startup inside theno_connectors == falseblock.Reference updates
.gitignore: updatedconnectors-configpath; added rootconfig.ymlto ignore list.README.md,docs/CLI.md, stackREADME.md: updated allscripts/stack/links and command examples to the new location.Checklists
Pre-Review Checklist
config.yml.example)v7.13.2,v7.14.0,v8.0.0)Changes Requiring Extra Attention
N/A — no security changes, no new dependencies.
Related Pull Requests
app/connectors_service/config.ymlfor the "run from source" pathRelease Note
Fixed broken file path references in Makefiles and stack scripts that were not updated during the monorepo restructure (#3721). Users running connectors from source who were experiencing
Cannot connect to host localhost:9200errors (despite having a validconfig.ymlat the repo root) will find thatmake runnow correctly picks up their configuration. Thescripts/stack/development scripts have also been relocated toapp/connectors_service/scripts/stack/and fixed to reference correct post-restructure paths. These fixes will take effect after merging to the corresponding branches and are not strictly tied to a specific release.