Skip to content
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

Jump to bottom

Add Conan (C/C++) conan.lock file support #1230

Merged
merged 12 commits into from
Sep 29, 2022
Merged

Add Conan (C/C++) conan.lock file support #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
67d8f25
[CPP] add Conan conan.lock file support
hkwi Sep 28, 2022
96aac3a
update function based on linter error
spiffcs Sep 28, 2022
5ad3b0e
update struct to not be inline based on review
spiffcs Sep 28, 2022
e72dbe3
update conanLock with explicit json tags
spiffcs Sep 28, 2022
d44c78e
enhance Metadata with lockfile information
spiffcs Sep 28, 2022
010e58f
update ConanMetadata to better represent Ref
spiffcs Sep 28, 2022
fea2745
update conanlock to use pkg.ConanMetadata
spiffcs Sep 28, 2022
d3ed041
add new ConanLockMetadata
spiffcs Sep 28, 2022
c25aa38
generate new schema
spiffcs Sep 29, 2022
6401db3
update with correct metadata inclusion
spiffcs Sep 29, 2022
be74c52
remove duplicate type
spiffcs Sep 29, 2022
20560be
add PURL test back for ConanLockMetadata
spiffcs Sep 29, 2022
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
2 changes: 1 addition & 1 deletion internal/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ const (

// JSONSchemaVersion is the current schema version output by the JSON encoder
// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
JSONSchemaVersion = "3.3.2"
JSONSchemaVersion = "4.0.0"
kzantow marked this conversation as resolved.
Show resolved Hide resolved
)
32 changes: 18 additions & 14 deletions schema/json/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,24 @@ can be extended to include specific package metadata struct shapes in the future
// When a new package metadata definition is created it will need to be manually added here. The variable name does
// not matter as long as it is exported.
type artifactMetadataContainer struct {
Apk pkg.ApkMetadata
Alpm pkg.AlpmMetadata
Dpkg pkg.DpkgMetadata
Gem pkg.GemMetadata
Java pkg.JavaMetadata
Npm pkg.NpmPackageJSONMetadata
Python pkg.PythonPackageMetadata
Rpm pkg.RpmMetadata
Cargo pkg.CargoPackageMetadata
Go pkg.GolangBinMetadata
Php pkg.PhpComposerJSONMetadata
Dart pkg.DartPubMetadata
Dotnet pkg.DotnetDepsMetadata
Portage pkg.PortageMetadata
Apk pkg.ApkMetadata
Alpm pkg.AlpmMetadata
Dpkg pkg.DpkgMetadata
Gem pkg.GemMetadata
Java pkg.JavaMetadata
Npm pkg.NpmPackageJSONMetadata
Python pkg.PythonPackageMetadata
Rpm pkg.RpmMetadata
Cargo pkg.CargoPackageMetadata
Go pkg.GolangBinMetadata
Php pkg.PhpComposerJSONMetadata
Dart pkg.DartPubMetadata
Dotnet pkg.DotnetDepsMetadata
Portage pkg.PortageMetadata
Conan pkg.ConanMetadata
ConanLock pkg.ConanLockMetadata
KbPackage pkg.KbPackageMetadata
Hackage pkg.HackageMetadata
}

func main() {
Expand Down
Loading