Skip to content

[Draft] CLI options should override Env vars and allow custom orchestration file #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[Draft] CLI options should override Env vars and allow custom orchestration file #693

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b263e43
Cleanup-cli
blink1073 Sep 23, 2025
a8434b8
update name
blink1073 Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .evergreen/orchestration/drivers_orchestration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,21 @@ def get_options():
"--tls-cert-key-file",
help="A .pem to be used as the tlsCertificateKeyFile option in mongo-orchestration",
)
other_group.add_argument(
"--custom-mo-config",
help="The path to a custom mongo orchestration config file",
)

# Get the options, and then allow environment variable overrides.
# Get the options, and then allow environment variables to override defaults.
opts = parser.parse_args(sys.argv[2:])
for key in vars(opts).keys():
env_var = key.upper()
if env_var == "VERSION":
env_var = "MONGODB_VERSION"
if env_var in os.environ:
if env_var == "AUTH":
if parser.get_default(key) != getattr(opts, key):
LOGGER.info("Overriding env var '%s' with cli option", env_var)
elif env_var == "AUTH":
opts.auth = os.environ.get("AUTH") == "auth"
elif env_var == "SSL":
ssl_opt = os.environ.get("SSL", "")
Expand Down Expand Up @@ -538,7 +544,6 @@ def clean_start(opts):
for fname in [
"out.log",
"server.log",
"orchestration.config",
"config.json",
"server.pid",
]:
Expand All @@ -559,10 +564,13 @@ def start(opts):

# Set up the mongo orchestration config.
os.makedirs(mo_home / "lib", exist_ok=True)
mo_config = mo_home / "orchestration.config"
mdb_binaries = Path(opts.mongodb_binaries)
config = dict(releases=dict(default=normalize_path(mdb_binaries)))
mo_config.write_text(json.dumps(config, indent=2))
if opts.custom_mo_config:
mo_config = Path(opts.custom_mo_config)
else:
mo_config = mo_home / "orchestration.config"
mdb_binaries = Path(opts.mongodb_binaries)
config = dict(releases=dict(default=normalize_path(mdb_binaries)))
mo_config.write_text(json.dumps(config, indent=2))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be useful here to detect whether this overwrites an existing (nonidentical) configuration and warn if so. That way if someone forgets the --custom-mo-config parameter, the log will guide the way to success.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the problem though, we create it every time we run, so when running locally it would error out.

mo_config_str = normalize_path(mo_config)
sys_executable = normalize_path(sys.executable)
command = f"{sys_executable} -m mongo_orchestration.server"
Expand Down
Loading