Skip to content

Fix config format outputted by preinstall script #1149

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
dhurley merged 3 commits into from
Jul 2, 2025
Merged

Fix config format outputted by preinstall script #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcf42c4
Fix config format outputted by preinstall script
dhurley Jun 30, 2025
216c980
Fix config format outputted by preinstall script
dhurley Jun 30, 2025
ab32927
Fix config format outputted by preinstall script
dhurley Jun 30, 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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ require (
go.opentelemetry.io/collector/processor v1.30.0
go.opentelemetry.io/collector/processor/batchprocessor v0.124.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.0
go.opentelemetry.io/collector/processor/processortest v0.124.0
go.opentelemetry.io/collector/receiver v1.30.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.0
go.opentelemetry.io/collector/receiver/receivertest v0.124.0
Expand All @@ -74,6 +75,7 @@ require (
go.opentelemetry.io/collector/scraper/scrapertest v0.124.0
go.opentelemetry.io/otel v1.35.0
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/mod v0.23.0
golang.org/x/sync v0.13.0
Expand Down Expand Up @@ -260,7 +262,6 @@ require (
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processortest v0.124.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.124.0 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.124.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.124.0 // indirect
Expand Down Expand Up @@ -289,7 +290,6 @@ require (
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.12.0 // indirect
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
golang.org/x/tools v0.30.0 // indirect
Expand Down
9 changes: 7 additions & 2 deletions scripts/packages/preinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,13 @@ command:
skip_verify: false
"

echo "$v3_config_contents" > "$v3_config_file" \
|| err_exit "Failed to write v3 config"
if [ -n "$( echo -e )" ]; then
Copy link
Contributor

@sean-breen sean-breen Jun 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Pretty sure this will only fail when echo itself isn't found

sh-3.2$ echo -e
-e
sh-3.2$ echo $?
0

echo "$v3_config_contents" > "$v3_config_file" \
|| err_exit "Failed to write v3 config"
Copy link
Contributor

@sean-breen sean-breen Jun 30, 2025

Choose a reason for hiding this comment

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

I think this err_exit condition will never be executed since the echo won't fail even with empty string etc.

Copy link
Contributor

@sean-breen sean-breen Jun 30, 2025

Choose a reason for hiding this comment

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

sh-3.2$ echo "" > i_dont_exist
sh-3.2$ echo $?
0

else
echo -e "$v3_config_contents" > "$v3_config_file" \
|| err_exit "Failed to write v3 config"
fi
else
echo "Existing NGINX Agent version is not v2, skipping config migration"
fi
Expand Down