-
Notifications
You must be signed in to change notification settings - Fork 239
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/go_modules/tools/workflow/cleaner…
…/github.com/aws/aws-sdk-go-1.44.321
- Loading branch information
Showing
7 changed files
with
159 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#!/bin/bash -x | ||
|
||
set -e | ||
|
||
# This script is supposed to run during the CI to validate that the control | ||
# script is working as expected | ||
# Important: this script requires root permission. | ||
|
||
COLLECTOR_DEB=$1 | ||
COLLECTOR_CONFIG=$2 | ||
|
||
ADOT_CTL=/opt/aws/aws-otel-collector/bin/aws-otel-collector-ctl | ||
ENV_FILE="/opt/aws/aws-otel-collector/etc/.env" | ||
CONFIG_FILE="/opt/aws/aws-otel-collector/etc/config.yaml" | ||
|
||
setup() { | ||
dpkg -i "$COLLECTOR_DEB" | ||
} | ||
|
||
test_collector_ctl_does_not_overwrite_env() { | ||
$ADOT_CTL -a start | ||
if [ ! -e $CONFIG_FILE ]; then | ||
echo "Config file does not exist" | ||
exit 1 | ||
fi | ||
|
||
echo "EXTRA_ENV=\"some value\"" | tee -a $ENV_FILE > /dev/null | ||
|
||
# We don't need the collector to succeed, just that the control script is execised | ||
$ADOT_CTL -a start -c "http://example.com" | ||
|
||
if ! grep -q EXTRA_ENV "$ENV_FILE"; then | ||
echo "Env file was overwritten" | ||
exit 1 | ||
fi | ||
|
||
$ADOT_CTL -a start -c "$COLLECTOR_CONFIG" | ||
if ! grep -q EXTRA_ENV "$ENV_FILE"; then | ||
ehco "Env file was overwritten" | ||
exit 1 | ||
fi | ||
echo "${FUNCNAME[0]} ... OK" | ||
} | ||
|
||
test_collector_ctl_with_sed_special_chars() { | ||
# ampersand is a special character in sed | ||
cfg="https://example.com?test=1&test=2" | ||
$ADOT_CTL -a start -c "$cfg" | ||
|
||
expected_string="^config=\"--config '${cfg}'\"$" | ||
|
||
if ! grep -q "${expected_string}" "$ENV_FILE"; then | ||
echo "Configuration is incorrect" | ||
exit 1 | ||
fi | ||
|
||
cfg="./config.yaml" | ||
$ADOT_CTL -a start -c "$cfg" | ||
|
||
expected_string="^config=\"--config /opt/aws/aws-otel-collector/etc/config.yaml\"$" | ||
if ! grep -q "${expected_string}" "$ENV_FILE"; then | ||
echo "Configuration is incorrect" | ||
exit 1 | ||
fi | ||
|
||
echo "${FUNCNAME[0]} ... OK" | ||
} | ||
|
||
|
||
setup | ||
|
||
## Tests | ||
test_collector_ctl_does_not_overwrite_env | ||
test_collector_ctl_with_sed_special_chars |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -379,6 +379,27 @@ jobs: | |
run: | | ||
gpg --fingerprint --with-colons [email protected] grep "^fpr" | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p' | xargs gpg --batch --yes --delete-secret-keys | ||
gpg --list-secret-keys | ||
test-control-stript: | ||
runs-on: ubuntu-latest | ||
needs: [packaging-deb] | ||
steps: | ||
- name: Checkout | ||
if: ${{ needs.changes.outputs.changed == 'true' }} | ||
uses: actions/checkout@v3 | ||
|
||
- name: Restore cached Debs | ||
if: ${{ needs.changes.outputs.changed == 'true' }} | ||
uses: actions/cache@v3 | ||
with: | ||
key: "cached_debs_${{ github.run_id }}" | ||
path: ${{ env.PACKAGING_ROOT }} | ||
|
||
- name: Execute tests | ||
if: ${{ needs.changes.outputs.changed == 'true' }} | ||
run: | | ||
sudo ./.github/scripts/test-collector-ctl.sh $PACKAGING_ROOT/debian/amd64/aws-otel-collector.deb ./config.yaml | ||
packaging-ssm: | ||
runs-on: ubuntu-latest | ||
needs: [packaging-rpm, packaging-deb, packaging-msi] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters