Skip to content

fix: ensure instance_id overrides overlay #19

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

Merged
Rob-Johnson merged 1 commit into from
Feb 16, 2026
Merged

fix: ensure instance_id overrides overlay #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/nerve/configuration_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ def generate_nerve_config(options)
cfiles.each { |x| config["services"][File.basename(x[/(.*)\.(yaml|json)$/, 1])] = parse_config_file(x) }
end

if options[:instance_id] && !options[:instance_id].empty?
config["instance_id"] = options[:instance_id]
end

if options[:config_overlay]
overlay = parse_overlay_file(options[:config_overlay])
config = deep_merge(config, overlay) if overlay
end

if options[:instance_id] && !options[:instance_id].empty?
config["instance_id"] = options[:instance_id]
end

config
end

Expand Down
6 changes: 3 additions & 3 deletions spec/configuration_manager_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
})
end

it "instance_id flag still wins over overlay when set" do
it "instance_id flag wins over overlay when set" do
overlay_path = File.join(tmpdir, "overlay.json")
File.write(overlay_path, JSON.generate({
"instance_id" => "overlay_instance"
Expand All @@ -113,8 +113,8 @@
config_manager.parse_options!
config_manager.reload!

# Overlay is applied after instance_id flag, so overlay wins
expect(config_manager.config["instance_id"]).to eq("overlay_instance")
# Overlay is applied before instance_id flag, so flag wins
expect(config_manager.config["instance_id"]).to eq(nerve_instance_id)
end

it "loads config without error when overlay file is missing" do
Expand Down