Skip to content

Changes for API handler implementation update for OS Resource in apiv2 as per the day2 upgrade #257

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
daniele-moro merged 10 commits into from
Jun 13, 2025
Merged

Changes for API handler implementation update for OS Resource in apiv2 as per the day2 upgrade #257

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
116e452
Changes for modifying OS Resource with installed-packages-url for mut…
SushilLakra Jun 11, 2025
58527d4
Merge branch 'main' into itep-67227-modify-os-resource-br
SushilLakra Jun 11, 2025
7ef053b
Changes for API handler implementation update for OS Resource in apiv…
SushilLakra Jun 11, 2025
7c90143
Merge branch 'main' into itep-67228-hndlr-impl-update-br
SushilLakra Jun 12, 2025
24becb5
fix review comments + changes for merge conflicts
SushilLakra Jun 12, 2025
6cac49a
Merge branch 'main' into itep-67228-hndlr-impl-update-br
SushilLakra Jun 13, 2025
3c687b9
Review comments fixes
SushilLakra Jun 13, 2025
e8539e6
Merge branch 'itep-67228-hndlr-impl-update-br' of https://github.com/…
SushilLakra Jun 13, 2025
425b2b1
Merge branch 'main' into itep-67228-hndlr-impl-update-br
SushilLakra Jun 13, 2025
6168df7
Merge branch 'main' into itep-67228-hndlr-impl-update-br
SushilLakra Jun 13, 2025
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
85 changes: 43 additions & 42 deletions apiv2/internal/server/os.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ func toInvOSResource(osResource *osv1.OperatingSystemResource) (*inv_osv1.Operat
return &inv_osv1.OperatingSystemResource{}, nil
}
invOSResource := &inv_osv1.OperatingSystemResource{
Name: osResource.GetName(),
Architecture: osResource.GetArchitecture(),
KernelCommand: osResource.GetKernelCommand(),
UpdateSources: osResource.GetUpdateSources(),
ImageUrl: osResource.GetImageUrl(),
ImageId: osResource.GetImageId(),
Sha256: osResource.GetSha256(),
ProfileName: osResource.GetProfileName(),
ProfileVersion: osResource.GetProfileVersion(),
InstalledPackages: osResource.GetInstalledPackages(),
SecurityFeature: inv_osv1.SecurityFeature(osResource.GetSecurityFeature()),
OsType: inv_osv1.OsType(osResource.GetOsType()),
OsProvider: inv_osv1.OsProviderKind(osResource.GetOsProvider()),
Description: osResource.GetDescription(),
Metadata: osResource.GetMetadata(),
ExistingCvesUrl: osResource.GetExistingCvesUrl(),
ExistingCves: osResource.GetExistingCves(),
FixedCvesUrl: osResource.GetFixedCvesUrl(),
FixedCves: osResource.GetFixedCves(),
Name: osResource.GetName(),
Architecture: osResource.GetArchitecture(),
KernelCommand: osResource.GetKernelCommand(),
UpdateSources: osResource.GetUpdateSources(),
ImageUrl: osResource.GetImageUrl(),
ImageId: osResource.GetImageId(),
Sha256: osResource.GetSha256(),
ProfileName: osResource.GetProfileName(),
ProfileVersion: osResource.GetProfileVersion(),
InstalledPackagesUrl: osResource.GetInstalledPackagesUrl(),
SecurityFeature: inv_osv1.SecurityFeature(osResource.GetSecurityFeature()),
OsType: inv_osv1.OsType(osResource.GetOsType()),
OsProvider: inv_osv1.OsProviderKind(osResource.GetOsProvider()),
Description: osResource.GetDescription(),
Metadata: osResource.GetMetadata(),
ExistingCvesUrl: osResource.GetExistingCvesUrl(),
ExistingCves: osResource.GetExistingCves(),
FixedCvesUrl: osResource.GetFixedCvesUrl(),
FixedCves: osResource.GetFixedCves(),
Comment thread
daniele-moro marked this conversation as resolved.
Outdated
}

err := validator.ValidateMessage(invOSResource)
Expand All @@ -72,29 +72,30 @@ func fromInvOSResource(invOSResource *inv_osv1.OperatingSystemResource) *osv1.Op
return &osv1.OperatingSystemResource{}
}
osResource := &osv1.OperatingSystemResource{
ResourceId: invOSResource.GetResourceId(),
Name: invOSResource.GetName(),
Architecture: invOSResource.GetArchitecture(),
KernelCommand: invOSResource.GetKernelCommand(),
UpdateSources: invOSResource.GetUpdateSources(),
ImageUrl: invOSResource.GetImageUrl(),
ImageId: invOSResource.GetImageId(),
Sha256: invOSResource.GetSha256(),
ProfileName: invOSResource.GetProfileName(),
ProfileVersion: invOSResource.GetProfileVersion(),
InstalledPackages: invOSResource.GetInstalledPackages(),
SecurityFeature: osv1.SecurityFeature(invOSResource.GetSecurityFeature()),
OsType: osv1.OsType(invOSResource.GetOsType()),
OsProvider: osv1.OsProviderKind(invOSResource.GetOsProvider()),
OsResourceID: invOSResource.GetResourceId(),
Timestamps: GrpcToOpenAPITimestamps(invOSResource),
PlatformBundle: invOSResource.GetPlatformBundle(),
Description: invOSResource.GetDescription(),
Metadata: invOSResource.GetMetadata(),
ExistingCvesUrl: invOSResource.GetExistingCvesUrl(),
ExistingCves: invOSResource.GetExistingCves(),
FixedCvesUrl: invOSResource.GetFixedCvesUrl(),
FixedCves: invOSResource.GetFixedCves(),
ResourceId: invOSResource.GetResourceId(),
Name: invOSResource.GetName(),
Architecture: invOSResource.GetArchitecture(),
KernelCommand: invOSResource.GetKernelCommand(),
UpdateSources: invOSResource.GetUpdateSources(),
ImageUrl: invOSResource.GetImageUrl(),
ImageId: invOSResource.GetImageId(),
Sha256: invOSResource.GetSha256(),
ProfileName: invOSResource.GetProfileName(),
ProfileVersion: invOSResource.GetProfileVersion(),
InstalledPackages: invOSResource.GetInstalledPackages(),
InstalledPackagesUrl: invOSResource.GetInstalledPackagesUrl(),
SecurityFeature: osv1.SecurityFeature(invOSResource.GetSecurityFeature()),
OsType: osv1.OsType(invOSResource.GetOsType()),
OsProvider: osv1.OsProviderKind(invOSResource.GetOsProvider()),
OsResourceID: invOSResource.GetResourceId(),
Timestamps: GrpcToOpenAPITimestamps(invOSResource),
PlatformBundle: invOSResource.GetPlatformBundle(),
Description: invOSResource.GetDescription(),
Metadata: invOSResource.GetMetadata(),
ExistingCvesUrl: invOSResource.GetExistingCvesUrl(),
ExistingCves: invOSResource.GetExistingCves(),
FixedCvesUrl: invOSResource.GetFixedCvesUrl(),
FixedCves: invOSResource.GetFixedCves(),
}
return osResource
}
Expand Down
2 changes: 1 addition & 1 deletion inventory/pkg/testing/opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ func InstalledPackages(pkgs string) Opt[osv1.OperatingSystemResource] {
}
}

func InstalledPackagesURL(url string) Opt[osv1.OperatingSystemResource] {
func InstalledPackagesUrl(url string) Opt[osv1.OperatingSystemResource] {
Comment thread
daniele-moro marked this conversation as resolved.
Outdated
return func(t *osv1.OperatingSystemResource) {
t.InstalledPackagesUrl = url
}
Expand Down
Loading