Skip to content
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.

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

Move Cassandra version check to docker.sh #4087

Merged
merged 3 commits into from
Dec 7, 2022

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Dec 7, 2022

Alternative solution, closes #4056

This keeps the create.sh script simpler and not aware of cqlsh.

Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro requested a review from a team as a code owner December 7, 2022 01:29
@codecov
Copy link

codecov bot commented Dec 7, 2022

Codecov Report

Base: 97.16% // Head: 97.17% // Increases project coverage by +0.00% 🎉

Coverage data is based on head (76dce5f) compared to base (2da8b72).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4087   +/-   ##
=======================================
  Coverage   97.16%   97.17%           
=======================================
  Files         295      295           
  Lines       17413    17413           
=======================================
+ Hits        16920    16921    +1     
+ Misses        397      396    -1     
  Partials       96       96           
Flag Coverage Δ
unittests 97.17% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
plugin/storage/integration/integration.go 76.33% <0.00%> (+0.38%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

albertteoh
albertteoh previously approved these changes Dec 7, 2022
Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines 19 to 23
if [ -z "$PASSWORD" ]; then
CQLSH_CMD="${CQLSH} ${CQLSH_SSL} ${CQLSH_HOST} ${CQLSH_PORT}"
else
CQLSH_CMD="${CQLSH} ${CQLSH_SSL} ${CQLSH_HOST} ${CQLSH_PORT} -u ${USER} -p ${PASSWORD}"
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

nit suggestion:

CQLSH_CMD="${CQLSH} ${CQLSH_SSL} ${CQLSH_HOST} ${CQLSH_PORT}"
if [ -n "$PASSWORD" ]; then
  CQLSH_CMD="${CQLSH_CMD} -u ${USER} -p ${PASSWORD}"
fi

Copy link
Member Author

Choose a reason for hiding this comment

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

+1

albertteoh and others added 2 commits December 7, 2022 21:24
Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro merged commit 3c8ffd1 into jaegertracing:main Dec 7, 2022
@yurishkuro yurishkuro deleted the fix-4056 branch December 7, 2022 16:17
shubbham1215 pushed a commit to shubbham1215/jaeger that referenced this pull request Feb 22, 2023
Alternative solution, closes jaegertracing#4056

This keeps the create.sh script simpler and not aware of cqlsh.

Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Albert <26584478+albertteoh@users.noreply.github.com>
shubbham1215 pushed a commit to shubbham1215/jaeger that referenced this pull request Mar 5, 2023
Alternative solution, closes jaegertracing#4056

This keeps the create.sh script simpler and not aware of cqlsh.

Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Albert <26584478+albertteoh@users.noreply.github.com>
Signed-off-by: shubbham1215 <sawaikershubham@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants