fix: only apply logName to filter when not already present (#962)

googleapis · Dec 2, 2020 · f1fbbc4 · f1fbbc4
1 parent 3d63d5f
commit f1fbbc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/log.ts b/src/log.ts
@@ -536,9 +536,9 @@ class Log implements LogSeverityFunctions {
     const options = extend({}, opts as GetEntriesRequest);
     const projectId = await this.logging.auth.getProjectId();
     this.formattedName_ = Log.formatName_(projectId, this.name);
-    if (options.filter) {
+    if (options.filter && !options.filter.includes('logName=')) {
       options.filter = `(${options.filter}) AND logName="${this.formattedName_}"`;
-    } else {
+    } else if (!options.filter) {
       options.filter = `logName="${this.formattedName_}"`;
     }
     return this.logging.getEntries(options);

diff --git a/test/log.ts b/test/log.ts
@@ -279,6 +279,14 @@ describe('Log', () => {
       await log.getEntries(options);
       assert(log.logging.getEntries.calledWithExactly(expectedOptions));
     });
+
+    it('should not add logName filter if already present', async () => {
+      const filter = `logName="${LOG_NAME_FORMATTED}" AND custom filter`;
+      const options = {filter};
+
+      await log.getEntries(options);
+      assert(log.logging.getEntries.calledWithExactly({filter}));
+    });
   });
 
   describe('getEntriesStream', () => {