-
Notifications
You must be signed in to change notification settings - Fork 196
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
uyuni-proxy-tftpd: fix issue replacing FQDNs for proxies (bsc#1236601) #9763
uyuni-proxy-tftpd: fix issue replacing FQDNs for proxies (bsc#1236601) #9763
Conversation
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.
+1, thanks for additionally fixing the style/linting on the file!
👋 Hello! Thanks for contributing to our project. You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/9763/checks If you are unsure the failing tests are related to your code, you can check the "reference jobs". These are jobs that run on a scheduled time with code from master. If they fail for the same reason as your build, it means the tests or the infrastructure are broken. If they do not fail, but yours do, it means it is related to your code. Reference tests: KNOWN ISSUES Sometimes the build can fail when pulling new jar files from download.opensuse.org . This is a known limitation. Given this happens rarely, when it does, all you need to do is rerun the test. Sorry for the inconvenience. For more tips on troubleshooting, see the troubleshooting guide. Happy hacking! |
882fc7a
to
e79b13d
Compare
7562534
to
d780830
Compare
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.
Using re.sub()
with \b
makes sense 👍
BTW, it's a bit hard to review PRs that reformat files and change logic within them. Personally I'd prefer it if we kept these files as they are and reformat them at once. That way we can also add the reformat git commit to .git-blame-ignore-revs
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.
From my POV, this looks good to me. I would suggest that you squash all commits into 2 commits:
- 1st commit for functional changes
- 2nd commit for formatting only
That way, we can add the formatting commit to the git-blame-ignore-revs
file as Alex suggests, and at the same time, we can do both in one PR.
This will dismiss my +1, but to me, that is OK and if those are the only changes, you can still take my dismissed review as +1.
I'm surprised that we first deleted part of the code and then put it back in, but I trust that this is correct and we cannot remove those parts just yet. Let's just not add commits like "remove X" and then "revert remove X" into master
please :)
Finally, I see the chlog is failing - not sure if we have to do something about that, as I believe the fail is a false positive.
d780830
to
a58048e
Compare
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.
LGTM 🚀, just make sure to merge with a merge commit to keep the git sha1 (assuming squash & merge / rebase & merge options are still available)
|
What does this PR change?
This PR does the following things:
fix issue replacing FQDNs on
uyuni-proxy-tftpd
containerThe current "replacing" mechanism was causing collitions, i.a. when server FQDN is
foobar.example.domain
and there are other references toaafoobar.example.domain
. The current code will wrongly replace both cases.This PR fixes the match/replace code to detect avoid this situation.
fix wrong IP set on
susemanager-tftpsync-recv.conf
fileThe apache2 configuration that allows files to be received from the upstream server need to contain the IP address of the server, and not from the proxy.
### drop code and references towe cannot do this until older proxy versions are deprecated.susemanager-tftpsync
andsusemanager-tftpsync-recv
.These packages are not used anymore on containerized environment. The replacement is the
uyuni-proxy-tftpd
container.GUI diff
No difference.
Documentation
No documentation needed: only internal and user invisible changes
DONE
Test coverage
No tests: this should be tested in our acceptance tests
DONE
Links
Issue(s): https://github.com/SUSE/spacewalk/issues/26312
Changelogs
Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository
If you don't need a changelog check, please mark this checkbox:
If you uncheck the checkbox after the PR is created, you will need to re-run
changelog_test
(see below)Re-run a test
If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:
Before you merge
Check How to branch and merge properly!