diff --git a/backends/ent/example_test.go b/backends/ent/example_test.go index 62ddee6..8c7fe32 100644 --- a/backends/ent/example_test.go +++ b/backends/ent/example_test.go @@ -81,6 +81,20 @@ func Example() { // "id": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", // "version": "1", // "date": "2020-04-13T20:20:39Z", + // "tools": [ + // { + // "name": "Awesome Tool", + // "version": "9.1.2", + // "vendor": "Awesome Vendor" + // } + // ], + // "authors": [ + // { + // "name": "Samantha Wright", + // "email": "samantha.wright@example.com", + // "phone": "800-555-1212" + // } + // ], // "source_data": { // "format": "application/vnd.cyclonedx+json;version=1.5", // "hashes": { @@ -94,7 +108,7 @@ func Example() { // "node_list": { // "nodes": [ // { - // "id": "protobom-auto--000000001", + // "id": "protobom-auto--8046b0dda1038ced", // "name": "Acme Application", // "version": "9.1.1", // "primary_purpose": [ @@ -123,9 +137,27 @@ func Example() { // ] // }, // { - // "id": "protobom-auto--000000003", + // "id": "protobom-auto--ea967fe80f36775d", // "name": "mylibrary", // "version": "1.0.0", + // "suppliers": [ + // { + // "name": "Example, Inc.", + // "is_org": true, + // "url": "https://example.com", + // "contacts": [ + // { + // "name": "Example Support AMER Distribution", + // "email": "support@example.com", + // "phone": "800-555-1212" + // }, + // { + // "name": "Example Support APAC", + // "email": "support@apac.example.com" + // } + // ] + // } + // ], // "primary_purpose": [ // "LIBRARY" // ] @@ -134,10 +166,10 @@ func Example() { // "edges": [ // { // "type": "contains", - // "from": "protobom-auto--000000001", + // "from": "protobom-auto--8046b0dda1038ced", // "to": [ // "pkg:npm/acme/component@1.0.0", - // "protobom-auto--000000003" + // "protobom-auto--ea967fe80f36775d" // ] // }, // { @@ -149,7 +181,7 @@ func Example() { // } // ], // "root_elements": [ - // "protobom-auto--000000001" + // "protobom-auto--8046b0dda1038ced" // ] // } // } diff --git a/go.mod b/go.mod index 5aef594..a334449 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/ClickHouse/clickhouse-go/v2 v2.48.0 github.com/glebarez/go-sqlite v1.23.0 github.com/google/uuid v1.6.0 - github.com/protobom/protobom v0.6.0 + github.com/protobom/protobom v0.6.1 github.com/stretchr/testify v1.12.1 google.golang.org/api v0.297.0 google.golang.org/protobuf v1.36.12 @@ -24,7 +24,7 @@ require ( cloud.google.com/go/iam v1.12.0 // indirect cloud.google.com/go/monitoring v1.30.0 // indirect github.com/ClickHouse/ch-go v0.74.0 // indirect - github.com/CycloneDX/cyclonedx-go v0.11.0 // indirect + github.com/CycloneDX/cyclonedx-go v0.12.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.33.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.57.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.57.0 // indirect @@ -71,7 +71,7 @@ require ( github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/segmentio/asm v1.2.1 // indirect github.com/shopspring/decimal v1.4.0 // indirect - github.com/sirupsen/logrus v1.10.1 // indirect + github.com/sirupsen/logrus v1.10.2 // indirect github.com/spdx/tools-golang v0.5.7 // indirect github.com/spiffe/go-spiffe/v2 v2.7.0 // indirect github.com/zclconf/go-cty v1.16.1 // indirect diff --git a/go.sum b/go.sum index dea623a..0f751ab 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/ClickHouse/ch-go v0.74.0 h1:uYs2m4wIt0ZHSM1E72rg0maCfzhR2V3xWb/vZEgpe github.com/ClickHouse/ch-go v0.74.0/go.mod h1:sZ/r+8ttZMjyrP9PuFbgoVbth1ywIu2LIQNA2vgko6M= github.com/ClickHouse/clickhouse-go/v2 v2.48.0 h1:auzd4VkapQYhQF8F2Gog7s3x78Bi1JZmByxGbrw3C+4= github.com/ClickHouse/clickhouse-go/v2 v2.48.0/go.mod h1:lBjUCPRG6RpRQdMbkXq+JV8rY0/O5lw+Z7jShgReFjM= -github.com/CycloneDX/cyclonedx-go v0.11.0 h1:GokP8FiRC+foiuwWhSSLpSD5H4hSWtGnR3wo7apkBFI= -github.com/CycloneDX/cyclonedx-go v0.11.0/go.mod h1:vUvbCXQsEm48OI6oOlanxstwNByXjCZ2wuleUlwGEO8= +github.com/CycloneDX/cyclonedx-go v0.12.0 h1:/7Jum36UA6V043tQZ/fE3jf+Nf9gn/qxUFfd7QReMy8= +github.com/CycloneDX/cyclonedx-go v0.12.0/go.mod h1:V2577HhxDDCDLYfkm55WJrz16nHTfyQZwcWUBSG7Z28= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.33.0 h1:l7+6kwRMJNwdCvYdDl7Eax+wzEYHSnNY7zrrfbhDdTA= @@ -151,8 +151,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgm github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/protobom/protobom v0.6.0 h1:0PpSy4O6Tc0Fc9aoMiDaG9KBFFXQ8J53ru+X3XdjScg= -github.com/protobom/protobom v0.6.0/go.mod h1:PyjBMH46jqt8qZnupipYG4xgkDjlH2aRdYoZ5wUxeRY= +github.com/protobom/protobom v0.6.1 h1:UyyhZ1d87K80NRPMrr3y4ki5iLS/iu7fRwYuFeZ8eyU= +github.com/protobom/protobom v0.6.1/go.mod h1:mgzA5aVpUs4S5Ac2Y0+8dLkbhaeYddxtVF+P+fZZ1Pg= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= @@ -161,16 +161,16 @@ github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= -github.com/sirupsen/logrus v1.10.1 h1:xi4336Zh11WpU14fXR6I67V3yaTPQYwRx2WEtHbRg4Q= -github.com/sirupsen/logrus v1.10.1/go.mod h1:vsQHnG7xzNsxk3NrwboUiWPnIC3dmbjcGPykD7+tiHk= +github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo= +github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q= github.com/spdx/tools-golang v0.5.7 h1:+sWcKGnhwp3vLdMqPcLdA6QK679vd86cK9hQWH3AwCg= github.com/spdx/tools-golang v0.5.7/go.mod h1:jg7w0LOpoNAw6OxKEzCoqPC2GCTj45LyTlVmXubDsYw= github.com/spiffe/go-spiffe/v2 v2.7.0 h1:uXe1MflJoHw58wAUvxVlcM7WpKtijWG7I1UidcGh6g4= github.com/spiffe/go-spiffe/v2 v2.7.0/go.mod h1:47Q0Q9/AqGha8QLHp+kxpH4Wca7X7EnOtlIJy3mxZ3U= github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= -github.com/terminalstatic/go-xsd-validate v0.1.6 h1:TenYeQ3eY631qNi1/cTmLH/s2slHPRKTTHT+XSHkepo= -github.com/terminalstatic/go-xsd-validate v0.1.6/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw= +github.com/terminalstatic/go-xsd-validate v0.1.8 h1:UVrTCy1j3DhwaYTTUF+QYO/Nan13S0tf+Jwi+p45Bf0= +github.com/terminalstatic/go-xsd-validate v0.1.8/go.mod h1:1kb47fi2c6onlf+B7UrrQ9VYraOhcYwFm3iG+J6F4Zo= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=