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

ComponentTypeList should be List in machine output #2230

Merged
merged 1 commit into from
Oct 7, 2019
Merged

ComponentTypeList should be List in machine output #2230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 pkg/catalog/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func ListComponents(client *occlient.Client) (ComponentTypeList, error) {

return ComponentTypeList{
TypeMeta: metav1.TypeMeta{
Kind: "ComponentTypeList",
Kind: "List",
APIVersion: "odo.openshift.io/v1alpha1",
},
Items: catalogList,
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func componentTests(args ...string) {

// Since components catalog is constantly changing, we simply check to see if this command passes.. rather than checking the JSON each time.
output := helper.CmdShouldPass("odo", "catalog", "list", "components", "-o", "json")
Expect(output).To(ContainSubstring("ComponentTypeList"))
Expect(output).To(ContainSubstring("List"))
})

It("binary component should not fail when --context is not set", func() {
Expand Down