profiles/internal/ipc: Give ErrGlobMatchesOmitted its own error ID
MultiPart: 2/2
Change-Id: I391be9bccd719164fd206dfee6f124aa6dc36709
diff --git a/profiles/internal/ipc/glob_test.go b/profiles/internal/ipc/glob_test.go
index 28c88b3..4f2ac23 100644
--- a/profiles/internal/ipc/glob_test.go
+++ b/profiles/internal/ipc/glob_test.go
@@ -240,7 +240,7 @@
t.Errorf("unexpected number of errors for (%q, %q). Got %v, expected %v", tc.name, tc.pattern, len(globErrors), tc.numErrors)
}
for _, gerr := range globErrors {
- if got, expected := verror.ErrorID(gerr.Error), verror.ErrNoAccess.ID; got != expected {
+ if got, expected := verror.ErrorID(gerr.Error), reserved.ErrGlobMatchesOmitted.ID; got != expected {
t.Errorf("unexpected error for (%q, %q): Got %v, expected %v", tc.name, tc.pattern, got, expected)
}
// This error message is purposely vague to avoid leaking information that
@@ -248,7 +248,7 @@
// We check the actual error string to make sure that we don't start
// leaking new information by accident.
expectedStr := fmt.Sprintf(
- `ipc.test:"%s".__Glob: Access denied: some matches might have been omitted`,
+ `ipc.test:"%s".__Glob: some matches might have been omitted`,
tc.name)
if got := gerr.Error.Error(); got != expectedStr {
t.Errorf("unexpected error string: Got %q, expected %q", got, expectedStr)
diff --git a/profiles/internal/ipc/reserved.go b/profiles/internal/ipc/reserved.go
index aa9cbdb..df5d5c6 100644
--- a/profiles/internal/ipc/reserved.go
+++ b/profiles/internal/ipc/reserved.go
@@ -330,7 +330,7 @@
}
}
if someMatchesOmitted {
- call.Send(naming.VDLGlobReplyError{naming.GlobError{Error: ipc.NewErrGlobMatchesOmitted(call.Context())}})
+ call.Send(naming.VDLGlobReplyError{naming.GlobError{Error: reserved.NewErrGlobMatchesOmitted(call.Context())}})
}
return nil
}
