Skip to content

Commit

Permalink
Merge pull request #1803 from buildpacks/fix/bom-display
Browse files Browse the repository at this point in the history
Fix small issue with deprecated BOM display
  • Loading branch information
jkutner authored Jun 21, 2023
2 parents 1f35e85 + 5bfef33 commit 1e2da27
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 12 deletions.
8 changes: 0 additions & 8 deletions internal/inspectimage/bom_display.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ type BOMEntryDisplay struct {
Version string `toml:"version,omitempty" json:"version,omitempty" yaml:"version,omitempty"`
Metadata map[string]interface{} `toml:"metadata" json:"metadata" yaml:"metadata"`
Buildpack dist.ModuleRef `json:"buildpacks" yaml:"buildpacks" toml:"buildpacks"`
Extension dist.ModuleRef `json:"extensions" yaml:"extensions" toml:"extensions"`
}

func NewBOMDisplay(info *client.ImageInfo) []BOMEntryDisplay {
Expand Down Expand Up @@ -68,13 +67,6 @@ func displayBOMWithExtension(bom []buildpack.BOMEntry) []BOMEntryDisplay {
},
Optional: entry.Buildpack.Optional,
},
Extension: dist.ModuleRef{
ModuleInfo: dist.ModuleInfo{
ID: entry.Buildpack.ID,
Version: entry.Buildpack.Version,
},
Optional: entry.Buildpack.Optional,
},
})
}

Expand Down
2 changes: 0 additions & 2 deletions internal/inspectimage/writer/bom_json_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ func testJSONBOM(t *testing.T, when spec.G, it spec.S) {
}
}
},
"extensions": {},
"buildpacks": {
"id": "test.bp.one.remote",
"version": "1.0.0"
Expand All @@ -68,7 +67,6 @@ func testJSONBOM(t *testing.T, when spec.G, it spec.S) {
}
}
},
"extensions": {},
"buildpacks": {
"id": "test.bp.one.remote",
"version": "1.0.0"
Expand Down
2 changes: 0 additions & 2 deletions internal/inspectimage/writer/bom_yaml_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ local:
int: 456
nested:
string: ''
extensions: {}
buildpacks:
id: test.bp.one.remote
version: 1.0.0
Expand All @@ -57,7 +56,6 @@ remote:
int: 123
nested:
string: anotherString
extensions: {}
buildpacks:
id: test.bp.one.remote
version: 1.0.0
Expand Down

0 comments on commit 1e2da27

Please sign in to comment.