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.

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

Fix small issue with deprecated BOM display #1803

Merged
merged 2 commits into from
Jun 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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