Skip to content

[apache] Update apache/httpd plugin for RHEL10#3990

Merged
TurboTurtle merged 1 commit into
sosreport:mainfrom
dwolstroRH:update-apache-plugin
Jun 1, 2025
Merged

[apache] Update apache/httpd plugin for RHEL10#3990
TurboTurtle merged 1 commit into
sosreport:mainfrom
dwolstroRH:update-apache-plugin

Conversation

@dwolstroRH

Copy link
Copy Markdown
Contributor

Related: SUPDEV-168


Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines

  • Is the commit message split over multiple lines and hard-wrapped at 72 characters?
  • Is the subject and message clear and concise?
  • Does the subject start with [plugin_name] if submitting a plugin patch or a [section_name] if part of the core sosreport code?
  • Does the commit contain a Signed-off-by: First Lastname email@example.com?
  • Are any related Issues or existing PRs properly referenced via a Closes (Issue) or Resolved (PR) line?
  • Are all passwords or private data gathered by this PR obfuscated?

@packit-as-a-service

Copy link
Copy Markdown

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo yum install -y dnf-plugins-core on RHEL 8
  • sudo dnf install -y dnf-plugins-core on Fedora
  • dnf copr enable packit/sosreport-sos-3990
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

Comment thread sos/report/plugins/apache.py Outdated
self.add_copy_spec(f"{ldir}/{log}")

self.add_copy_spec([
"/var/lib/httpd/*"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

minor nit, add comma at the end, if there are new changes afterwards, it would be a one-line change rather than 2

@arif-ali arif-ali left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a few minor points, otherwise all good

Comment thread sos/report/plugins/apache.py Outdated
])

self.add_forbidden_path([
"/var/lib/httpd/*.pem"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

same as above for the comma

Comment thread sos/report/plugins/apache.py Outdated
r"\1 ********,")
self.do_path_regex_sub('/var/lib/httpd/.*json',
r"(\"e\"\s*:|\"n\"\s*:)(.*[^,]$)",
r"\1 ********")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

they style we prefer is below, could we amend the above 2 to go in line please.

        self.do_path_regex_sub(
            '/var/lib/httpd/.*json',
            r"(\"e\"\s*:|\"n\"\s*:)(.*[^,]$)",
            r"\1 ********"
        )

@arif-ali arif-ali added Status/Need More Info Feedback is required to reproduce issue or to continue work Kind/RedHat RedHat related item labels Apr 16, 2025
@dwolstroRH dwolstroRH force-pushed the update-apache-plugin branch from c23b1c5 to 6048fa8 Compare April 17, 2025 20:27

@TurboTurtle TurboTurtle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Linting comment below, otherwise looks good overall.

Comment thread sos/report/plugins/apache.py Outdated
Comment on lines +160 to +167
'/var/lib/httpd/.*json',
r"(\"e\"\s*:|\"n\"\s*:)(.*[,]$)",
r"\1 ********,"
)
self.do_path_regex_sub(
'/var/lib/httpd/.*json',
r"(\"e\"\s*:|\"n\"\s*:)(.*[^,]$)",
r"\1 ********"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

CI is failing due to indentation level. Each of these lines should be nested one level inside the method call, e.g.

self.do_path_regex_sub(
    '/var/lib/httpd/.*json',
    r"(\"e\"\s*:|\"n\"\s*:)(.*[,]$)",
    r"\1 ********,"
)

@arif-ali

Copy link
Copy Markdown
Member

@dwolstroRH any updates on this one, some minor issues and this would be good.

Related: SUPDEV-168

Signed-off-by: David Wolstromer <dwolstro@redhat.com>
@dwolstroRH dwolstroRH force-pushed the update-apache-plugin branch from 6048fa8 to 81fb90b Compare May 30, 2025 19:25
@pmoravec pmoravec added Reviewed/Needs 2nd Ack Require a 2nd ack from a maintainer and removed Status/Need More Info Feedback is required to reproduce issue or to continue work labels Jun 1, 2025
@TurboTurtle TurboTurtle added Reviewed/Ready for Merge Has been reviewed, ready for merge Kind/Collection New or updated command or file collection and removed Reviewed/Needs 2nd Ack Require a 2nd ack from a maintainer labels Jun 1, 2025
@TurboTurtle TurboTurtle merged commit 056b015 into sosreport:main Jun 1, 2025
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Kind/Collection New or updated command or file collection Kind/RedHat RedHat related item Reviewed/Ready for Merge Has been reviewed, ready for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants