Skip to content

Bug 1808568: must-gather: when openshift-apiserver restarts, ignore wrong prefix #24641

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

Closed
sallyom wants to merge 1 commit into from
Closed

Bug 1808568: must-gather: when openshift-apiserver restarts, ignore wrong prefix #24641

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
6 changes: 5 additions & 1 deletion test/extended/cli/mustgather.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ var _ = g.Describe("[cli] oc adm must-gather", func() {
// make sure we do not log OAuth tokens
for _, auditDirectory := range auditDirectories {
eventsChecked := 0
wrongPrefix := 0
err := filepath.Walk(path.Join(auditDirectory...), func(path string, info os.FileInfo, err error) error {
g.By(path)
o.Expect(err).ToNot(o.HaveOccurred())
Expand All @@ -147,7 +148,9 @@ var _ = g.Describe("[cli] oc adm must-gather", func() {
if !strings.HasSuffix(text, "}") {
continue // ignore truncated data
}
o.Expect(text).To(o.HavePrefix(`{"kind":"Event",`))
if !strings.HasPrefix(text, `{"kind":"Event",`) {
wrongPrefix++
}
for _, token := range []string{"oauthaccesstokens", "oauthauthorizetokens", tokenName} {
o.Expect(text).ToNot(o.ContainSubstring(token))
}
Expand All @@ -162,6 +165,7 @@ var _ = g.Describe("[cli] oc adm must-gather", func() {
})
o.Expect(err).ToNot(o.HaveOccurred())
o.Expect(eventsChecked).To(o.BeNumerically(">", 10000))
o.Expect(wrongPrefix).To(o.BeNumerically("<", 5))
}
})

Expand Down