oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 08:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Omit H1Digest when empty (#902)

Browse Source 
* Omit HD1Field when empty

Signed-off-by: Jonas Galvão Xavier <jonas.agx@gmail.com>

* update test-fixtures

Signed-off-by: Jonas Galvão Xavier <jonas.agx@gmail.com>
This commit is contained in:
Jonas Xavier 2022-03-21 11:59:10 -07:00 committed by GitHub
parent 03e193e577
commit 283db88dc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1244 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/constants.go
View File

@ -6,5 +6,5 @@ const (
// JSONSchemaVersion is the current schema version output by the JSON encoder // 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. // 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.1.1" JSONSchemaVersion = "3.2.1"
) )

4
internal/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden
View File

@ -88,7 +88,7 @@
} }
}, },
"schema": { "schema": {
"version": "3.1.1", "version": "3.2.1",
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.1.1.json" "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.1.json"
} }
} }

4
internal/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden
View File

@ -184,7 +184,7 @@
} }
}, },
"schema": { "schema": {
"version": "3.1.1", "version": "3.2.1",
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.1.1.json" "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.1.json"
} }
} }

4
internal/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden
View File

@ -111,7 +111,7 @@
} }
}, },
"schema": { "schema": {
"version": "3.1.1", "version": "3.2.1",
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.1.1.json" "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.1.json"
} }
} }

1236
schema/json/schema-3.2.1.json Normal file
View File

File diff suppressed because it is too large Load Diff

2
syft/pkg/golang_bin_metadata.go
View File

@ -5,5 +5,5 @@ type GolangBinMetadata struct {
BuildSettings map[string]string `json:"goBuildSettings,omitempty" cyclonedx:"goBuildSettings"` BuildSettings map[string]string `json:"goBuildSettings,omitempty" cyclonedx:"goBuildSettings"`
GoCompiledVersion string `json:"goCompiledVersion" cyclonedx:"goCompiledVersion"` GoCompiledVersion string `json:"goCompiledVersion" cyclonedx:"goCompiledVersion"`
Architecture string `json:"architecture" cyclonedx:"architecture"` Architecture string `json:"architecture" cyclonedx:"architecture"`
H1Digest string `json:"h1Digest" cyclonedx:"h1Digest"` H1Digest string `json:"h1Digest,omitempty" cyclonedx:"h1Digest"`
} }