HMS-5913: add package dates from RHEL lifecycle #1106

rverdile · 2025-05-07T20:13:48Z

Summary

Adds package streams info to package_sources. Pulls package stream info from the roadmap API and adds it to package sources if the RPM name matches.

Also adds RHEL EoL as the end date for any package source that is not in the roadmap API. Uses the end date for the latest released version of the matching RHEL major version.

Testing steps

To test package streams:

Search for "nodejs" in a rhel9 repo
Under package sources, you should see both the node 16 module and the 16.14.0 package stream

To test the rhel lifecycle info:

When a RHEL package doesn't exist in the roadmap, the RHEL end date is used instead
Search with a codeready repo. For example, "help2man" in https://cdn.redhat.com/content/dist/rhel9/9/aarch64/codeready-builder/os/

jlsherrill · 2025-05-07T20:30:06Z

https://issues.redhat.com/browse/HMS-5913

Adds package streams info to package_sources. Pulls package stream info from the roadmap API and adds it to package sources if the RPM name matches. Also adds RHEL EoL as the end date for any package source that is not in the roadmap API. Uses the end date for the latest released version of the matching RHEL major version.

Copilot

Pull Request Overview

This PR adds package stream and RHEL lifecycle information to package sources by integrating with the roadmap API. Key changes include:

Retrieving and appending package stream details for RPMs via new roadmap API calls.
Adding fallback logic to include RHEL lifecycle end dates if package stream data is not available.
Updating tests, mocks, and cache interfaces to accommodate the new lifecycle functionality.

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
pkg/dao/rpms_test.go	Added test cases for RHEL repo configurations and lifecycle info.
pkg/dao/rpms.go	Updated search logic to add package sources and lifecycle info.
pkg/clients/roadmap_client/roadmap_client_mock.go	Added mocks for lifecycle API calls.
pkg/clients/roadmap_client/roadmap.go	Introduced lifecycle response types and functions.
pkg/clients/roadmap_client/client.go	Updated client interface for new lifecycle methods.
pkg/cache/redis.go	Added cache functions for RHEL lifecycle data.
pkg/cache/noop.go	Added no-op implementations for RHEL lifecycle caching.
pkg/cache/cache_mock.go	Added mocks for the new RHEL lifecycle cache functions.
pkg/cache/cache.go	Extended cache interface to include lifecycle methods.

Copilot · 2025-05-12T17:32:28Z

pkg/dao/rpms.go

+	}
+
+	packageMap := make(map[string]int)
+	for _, pkg := range res {


Accessing pkg.Versions[0] without checking if the Versions slice is non-empty might lead to a runtime panic. Please add a check to ensure the slice is not empty before attempting conversion.

Suggested change

for _, pkg := range res {

for _, pkg := range res {

if len(pkg.Versions) == 0 {

continue // Skip if Versions slice is empty

}

Copilot · 2025-05-12T17:32:29Z

pkg/cache/noop.go

@@ -64,3 +64,12 @@ func (c *noOpCache) GetRoadmapAppstreams(ctx context.Context) ([]byte, error) {
 // SetRoadmapAppstreams a NoOp version to store cached roadmap appstreams check
 func (c *noOpCache) SetRoadmapAppstreams(ctx context.Context, response []byte) {
 }
+
+// GetRoadmapAppstreams a NoOp version to fetch a cached roadmap rhel lifecycle check


[nitpick] The comment for GetRoadmapRhelLifecycle incorrectly refers to 'Appstreams' instead of 'RhelLifecycle'. Please update the comment to accurately describe its purpose.

Suggested change

// GetRoadmapAppstreams a NoOp version to fetch a cached roadmap rhel lifecycle check

// GetRoadmapRhelLifecycle a NoOp version to fetch a cached roadmap rhel lifecycle check

Copilot · 2025-05-12T17:32:29Z

pkg/cache/noop.go

+	return nil, NotFound
+}
+
+// SetRoadmapAppstreams a NoOp version to store cached roadmap rhel lifecycle check


[nitpick] The comment for SetRoadmapRhelLifecycle seems to be a copy of the Appstreams comment; please update it to correctly refer to storing the RHEL lifecycle information.

Suggested change

// SetRoadmapAppstreams a NoOp version to store cached roadmap rhel lifecycle check

// SetRoadmapRhelLifecycle a NoOp version to store cached roadmap RHEL lifecycle information

Copilot · 2025-05-12T17:32:29Z

pkg/dao/rpms.go

+	db := r.db.Debug().WithContext(ctx).
+		Select("DISTINCT ON(rpms.name) rpms.name as package_name", "rpms.summary", "rpms.uuid").


[nitpick] The use of db.Debug() may have been left unintentionally and can clutter production logs. Consider removing it or gating the debug logging for production use.

Suggested change

db := r.db.Debug().WithContext(ctx).

Select("DISTINCT ON(rpms.name) rpms.name as package_name", "rpms.summary", "rpms.uuid").

db := r.db.WithContext(ctx)

if config.Get().Debug { // Enable debug logging if the debug flag is set

db = db.Debug()

}

db = db.Select("DISTINCT ON(rpms.name) rpms.name as package_name", "rpms.summary", "rpms.uuid").

jlsherrill · 2025-05-12T20:21:13Z

pkg/clients/roadmap_client/roadmap.go

+		if startDate.Before(currentDate) || startDate.Equal(currentDate) {
+			if existing, found := rhelEolMap[item.Major]; !found || (item.Minor > existing.Minor) {
+				rhelEolMap[item.Major] = item
+			}


chatted privately, but we actually want to pick the earliest start date and latest end date for a given RHEL major release (9)

jlsherrill · 2025-05-12T20:26:20Z

pkg/cache/redis.go

+
+func (c *redisCache) SetRoadmapRhelLifecycle(ctx context.Context, response []byte) {
+	key := roadmapRhelLifecycleKey(ctx)
+	c.client.Set(ctx, key, string(response), config.Get().Clients.Redis.Expiration.SubscriptionCheck)


I think it probably makes sense to set this per service (for example subscription check should probably once an hour, but the roadmap expiration could be once per day). thoughts?

I thought subscription check is once a day, but I agree it should probably be separate. I'll fix that

jlsherrill added the qe-testing-needed label May 7, 2025

rverdile force-pushed the pkg-lifecycle-info branch 2 times, most recently from 5ffcf35 to afc5730 Compare May 8, 2025 20:02

rverdile marked this pull request as ready for review May 8, 2025 20:05

rverdile force-pushed the pkg-lifecycle-info branch from afc5730 to 7133cb6 Compare May 9, 2025 20:42

rverdile force-pushed the pkg-lifecycle-info branch from 7133cb6 to c49cc13 Compare May 9, 2025 20:47

jlsherrill requested a review from Copilot May 12, 2025 17:31

jlsherrill self-assigned this May 12, 2025

Copilot AI reviewed May 12, 2025

View reviewed changes

jlsherrill reviewed May 12, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HMS-5913: add package dates from RHEL lifecycle #1106

HMS-5913: add package dates from RHEL lifecycle #1106

rverdile commented May 7, 2025 •

edited

Loading

jlsherrill commented May 7, 2025

Copilot AI left a comment

Copilot AI May 12, 2025

Copilot AI May 12, 2025

Copilot AI May 12, 2025

Copilot AI May 12, 2025

jlsherrill May 12, 2025

jlsherrill May 12, 2025

rverdile May 12, 2025

	// GetRoadmapAppstreams a NoOp version to fetch a cached roadmap rhel lifecycle check
	// GetRoadmapRhelLifecycle a NoOp version to fetch a cached roadmap rhel lifecycle check

	// SetRoadmapAppstreams a NoOp version to store cached roadmap rhel lifecycle check
	// SetRoadmapRhelLifecycle a NoOp version to store cached roadmap RHEL lifecycle information

		db := r.db.Debug().WithContext(ctx).
		Select("DISTINCT ON(rpms.name) rpms.name as package_name", "rpms.summary", "rpms.uuid").

-	db := r.db.Debug().WithContext(ctx).
-		Select("DISTINCT ON(rpms.name) rpms.name as package_name", "rpms.summary", "rpms.uuid").
+	db := r.db.WithContext(ctx)
+	if config.Get().Debug { // Enable debug logging if the debug flag is set
+		db = db.Debug()
+	}
+	db = db.Select("DISTINCT ON(rpms.name) rpms.name as package_name", "rpms.summary", "rpms.uuid").

HMS-5913: add package dates from RHEL lifecycle #1106

Are you sure you want to change the base?

HMS-5913: add package dates from RHEL lifecycle #1106

Conversation

rverdile commented May 7, 2025 • edited Loading

Summary

Testing steps

jlsherrill commented May 7, 2025

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Copilot AI May 12, 2025

Choose a reason for hiding this comment

Copilot AI May 12, 2025

Choose a reason for hiding this comment

Copilot AI May 12, 2025

Choose a reason for hiding this comment

Copilot AI May 12, 2025

Choose a reason for hiding this comment

jlsherrill May 12, 2025

Choose a reason for hiding this comment

jlsherrill May 12, 2025

Choose a reason for hiding this comment

rverdile May 12, 2025

Choose a reason for hiding this comment

rverdile commented May 7, 2025 •

edited

Loading