-
Notifications
You must be signed in to change notification settings - Fork 3
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
fix: fixes a regex problem on groundswell manifest #9
Conversation
Lift and shift for seqeralabs/docs_old#115 Signed-off-by: Justine Geffen <[email protected]>
Signed-off-by: Justine Geffen <[email protected]>
✅ Deploy Preview for seqera-docs ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
@gwright99, please review this when you have a chance. Thank you! |
I'm a bit foggy on this issue (looking at original ticket now - I remember the issue, I just don't remember exactly how to test) -- any suggestions on how your folks tested it? |
@bebosudo, would you be open to reviewing this? Thank you! |
I've added @bebosudo to this issue for that feedback as I believe he tested it. :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately the proposed fix doesn't work when the tower db url contains extra parameters (like 99% of the cases) and only works with a db url without parameters like for the customer who pointed it out (see also this?), as I showed in this message:
[alberto@fedora]$ podman run --rm -it --entrypoint bash mysql:5.7
bash-4.2#
bash-4.2# TOWER_DB_URL="jdbc:mysql://tower.cluster-c1rjv6umdpvw.eu-west-2.rds.amazonaws.com:3306/tower?&usePipelineAuth=false&useBatchMultiSend=false"
bash-4.2# mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)@\1@')"
Invalid URI: Invalid connection option ''.
bash-4.2# TOWER_DB_URL="jdbc:mysql://tower.cluster-c1rjv6umdpvw.eu-west-2.rds.amazonaws.com:3306/tower"
bash-4.2# mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)@\1@')"
Please provide the password for '[email protected]:3306':
That's because mysqlsh doesn't accept extra parameters.
I proposed a fix that should work for both cases, your feedback would be appreciated @swampie @gwright99
bash-4.2# TOWER_DB_URL="jdbc:mysql://tower.cluster-c1rjv6umdpvw.eu-west-2.rds.amazonaws.com:3306/tower?&usePipelineAuth=false&useBatchMultiSend=false"
bash-4.2# mysqlsh --uri "$(echo $TOWER_DB_URL |cut -d'?' -f1 |sed -e 's@jdbc:\(.*\)@\1@')"
Please provide the password for '[email protected]:3306':
bash-4.2# TOWER_DB_URL="jdbc:mysql://tower.cluster-c1rjv6umdpvw.eu-west-2.rds.amazonaws.com:3306/tower"
bash-4.2# mysqlsh --uri "$(echo $TOWER_DB_URL |cut -d'?' -f1 |sed -e 's@jdbc:\(.*\)@\1@')"
Please provide the password for '[email protected]:3306':
platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml
Outdated
Show resolved
Hide resolved
platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml
Outdated
Show resolved
Hide resolved
Given the recent addition of a mandatory connection string modifier for v24.1+ (and all the various connection string modifiers that need to be used for various DB products < 24.1), I think we need to scrap the old way and go with @bebosudo's new approach. |
…8s/groundswell.yml Co-authored-by: Alberto Chiusole <[email protected]> Signed-off-by: Justine Geffen <[email protected]>
…8s/groundswell.yml Co-authored-by: Alberto Chiusole <[email protected]> Signed-off-by: Justine Geffen <[email protected]>
Thanks, @bebosudo! Much appreciated. @gwright99, please review/approve when you have a chance. Thank you! |
…8s/groundswell.yml to platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml Signed-off-by: Justine Geffen <[email protected]>
…8s/groundswell.yml to platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml Signed-off-by: Justine Geffen <[email protected]>
@bebosudo, following up on this for approval. Thank you! :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the regex looks correct now, I didn't test it
non-blocking: left some comments about possible improvements we could do, don't know if you prefer to follow up in a separate PR, up to you
platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml
Outdated
Show resolved
Hide resolved
platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml
Outdated
Show resolved
Hide resolved
platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml
Show resolved
Hide resolved
platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml
Outdated
Show resolved
Hide resolved
platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml
Outdated
Show resolved
Hide resolved
platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml
Outdated
Show resolved
Hide resolved
Co-authored-by: Alberto Chiusole <[email protected]> Signed-off-by: Justine Geffen <[email protected]>
Signed-off-by: Justine Geffen <[email protected]>
Updated groundswell manifest 24.1 Signed-off-by: Justine Geffen <[email protected]>
Thanks, @bebosudo! I updated this for 24.1 as well. |
Recreating PR https://github.com/seqeralabs/docs_old/pull/115