Skip to content

ROX-33339: Sensor support for refresh image cache TTL message #19837

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.

Sign up for GitHub

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

Merged
clickboo merged 2 commits into from
Apr 8, 2026
Merged

ROX-33339: Sensor support for refresh image cache TTL message #19837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f71c251
ROX-33339: Sensor support for refresh image cache TTL message
clickboo Apr 4, 2026
579f6be
code review comment: refactor to move ImageKey proto location out of …
clickboo Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions central/image/service/service_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,11 +1261,11 @@ func (s *serviceImpl) DeleteImages(ctx context.Context, request *v1.DeleteImages

if features.FlattenImageData.Enabled() {
// Extract ImageV2 ID and SHA from search results
keys := make([]*central.InvalidateImageCache_ImageKey, 0, len(results))
keys := make([]*central.ImageKey, 0, len(results))
for _, res := range results {
if res.FieldValues != nil {
// Set both ImageId (SHA for old sensors) and ImageIdV2 (ImageV2 ID for new sensors)
keys = append(keys, &central.InvalidateImageCache_ImageKey{
keys = append(keys, &central.ImageKey{
ImageId: res.FieldValues[strings.ToLower(search.ImageSHA.String())], // SHA for backward compatibility
ImageIdV2: res.ID, // ImageV2 ID for new sensors
ImageFullName: res.FieldValues[strings.ToLower(search.ImageName.String())],
Expand All @@ -1283,9 +1283,9 @@ func (s *serviceImpl) DeleteImages(ctx context.Context, request *v1.DeleteImages
})
}
} else {
keys := make([]*central.InvalidateImageCache_ImageKey, 0, len(idSlice))
keys := make([]*central.ImageKey, 0, len(idSlice))
for _, id := range idSlice {
keys = append(keys, &central.InvalidateImageCache_ImageKey{
keys = append(keys, &central.ImageKey{
ImageId: id,
})
}
Expand Down
2 changes: 1 addition & 1 deletion central/image/service/service_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ func TestDeleteImages_V2(t *testing.T) {
expectedMsg := &central.MsgToSensor{
Msg: &central.MsgToSensor_InvalidateImageCache{
InvalidateImageCache: &central.InvalidateImageCache{
ImageKeys: []*central.InvalidateImageCache_ImageKey{
ImageKeys: []*central.ImageKey{
{
ImageId: "sha256:abc123",
ImageIdV2: "image-uuid-1",
Expand Down
6 changes: 3 additions & 3 deletions central/vulnmgmt/vulnerabilityrequest/manager/requestmgr/manager_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ func (m *managerImpl) reprocessDeployments(requestID string, affectedImages ...s
}

func (m *managerImpl) reprocessImage(_ string, affectedImages ...string) error {
imageKeys := make([]*central.InvalidateImageCache_ImageKey, 0, len(affectedImages))
imageKeys := make([]*central.ImageKey, 0, len(affectedImages))
for _, imgID := range affectedImages {
if features.FlattenImageData.Enabled() {
image, found, err := m.imagesV2.GetImageMetadata(allAccessCtx, imgID)
Expand All @@ -459,7 +459,7 @@ func (m *managerImpl) reprocessImage(_ string, affectedImages ...string) error {
if !found {
continue
}
imageKeys = append(imageKeys, &central.InvalidateImageCache_ImageKey{
imageKeys = append(imageKeys, &central.ImageKey{
ImageId: image.GetDigest(),
ImageIdV2: image.GetId(),
ImageFullName: image.GetName().GetFullName(),
Expand All @@ -472,7 +472,7 @@ func (m *managerImpl) reprocessImage(_ string, affectedImages ...string) error {
if !found {
continue
}
imageKeys = append(imageKeys, &central.InvalidateImageCache_ImageKey{
imageKeys = append(imageKeys, &central.ImageKey{
ImageId: imgID,
ImageFullName: image.GetName().GetFullName(),
})
Expand Down
355 changes: 213 additions & 142 deletions generated/internalapi/central/sensor_iservice.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading