mirror of
https://github.com/getsentry/self-hosted.git
synced 2025-12-08 19:46:14 +00:00
fix: grep seaweedfs bucket name instead of using awk (#4076)
* fix: grep seaweedfs bucket name instead of using awk Closes https://github.com/getsentry/self-hosted/issues/4075 * fix: inverted logic gate * chore: file permission
This commit is contained in:
parent
d53bad58ca
commit
ebace8c662
39
_unit-test/multiple-seaweedfs-bucket-test.sh
Executable file
39
_unit-test/multiple-seaweedfs-bucket-test.sh
Executable file
@ -0,0 +1,39 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source _unit-test/_test_setup.sh
|
||||||
|
source install/dc-detect-version.sh
|
||||||
|
source install/create-docker-volumes.sh
|
||||||
|
|
||||||
|
start_service_and_wait_ready seaweedfs
|
||||||
|
|
||||||
|
$dcx seaweedfs apk add --no-cache s3cmd
|
||||||
|
s3cmd="$dc exec seaweedfs s3cmd"
|
||||||
|
|
||||||
|
# Create multiple buckets for testing
|
||||||
|
buckets=(bucket1 bucket2 bucket3)
|
||||||
|
for bucket in "${buckets[@]}"; do
|
||||||
|
$s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' mb s3://$bucket
|
||||||
|
done
|
||||||
|
|
||||||
|
# Verify that all buckets were created successfully
|
||||||
|
bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls)
|
||||||
|
for bucket in "${buckets[@]}"; do
|
||||||
|
if ! echo "$bucket_list" | grep -q "s3://$bucket"; then
|
||||||
|
echo "Error: Bucket s3://$bucket was not created successfully."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Can find "bucket2"
|
||||||
|
if ! echo "$bucket_list" | grep -q "s3://bucket2"; then
|
||||||
|
echo "Error: Bucket s3://bucket2 was not found."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Can't find "bucket5", should not exist
|
||||||
|
if echo "$bucket_list" | grep -q "s3://bucket5"; then
|
||||||
|
echo "Error: Bucket s3://bucket5 should not exist."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
report_success
|
||||||
@ -7,7 +7,7 @@ s3cmd="$dc exec seaweedfs s3cmd"
|
|||||||
|
|
||||||
bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls)
|
bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls)
|
||||||
|
|
||||||
if [[ $(echo "$bucket_list" | tail -1 | awk '{print $3}') != 's3://nodestore' ]]; then
|
if ! echo "$bucket_list" | grep -q "s3://nodestore"; then
|
||||||
apply_config_changes_nodestore=0
|
apply_config_changes_nodestore=0
|
||||||
# Only touch if no existing nodestore config is found
|
# Only touch if no existing nodestore config is found
|
||||||
if ! grep -q "SENTRY_NODESTORE" $SENTRY_CONFIG_PY; then
|
if ! grep -q "SENTRY_NODESTORE" $SENTRY_CONFIG_PY; then
|
||||||
|
|||||||
@ -19,7 +19,7 @@ if [[ "$COMPOSE_PROFILES" == "feature-complete" ]]; then
|
|||||||
|
|
||||||
bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls)
|
bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls)
|
||||||
|
|
||||||
if [[ $(echo "$bucket_list" | tail -1 | awk '{print $3}') != 's3://profiles' ]]; then
|
if ! echo "$bucket_list" | grep -q "s3://profiles"; then
|
||||||
apply_config_changes_profiles=0
|
apply_config_changes_profiles=0
|
||||||
# Only touch if no existing profiles config is found
|
# Only touch if no existing profiles config is found
|
||||||
if ! grep -q "filestore.profiles-backend" $SENTRY_CONFIG_YML; then
|
if ! grep -q "filestore.profiles-backend" $SENTRY_CONFIG_YML; then
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user