Merge pull request #267 from DataDog/anmarchenko/codeowners_parsing_bug

[SDTEST-1304] Fix inline comments handling when parsing CODEOWNERS files
DataDog · Dec 9, 2024 · fc3e0d1 · fc3e0d1
2 parents 8174017 + 1bbc99d
commit fc3e0d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/datadog/ci/codeowners/matcher.rb b/lib/datadog/ci/codeowners/matcher.rb
@@ -42,7 +42,7 @@ def parse(codeowners_file_path)
 
           File.open(codeowners_file_path, "r") do |f|
             f.each_line do |line|
-              line.strip!
+              line.strip!&.sub!(/#.*$/, "")
 
               next if line.empty?
               next if comment?(line)

diff --git a/spec/datadog/ci/codeowners/matcher_spec.rb b/spec/datadog/ci/codeowners/matcher_spec.rb
@@ -41,7 +41,7 @@
           <<-CODEOWNERS
             # Comment line
             /path/to/*.rb @owner3
-            /path/to/file.rb @owner1 @owner2
+            /path/to/file.rb @owner1 @owner2 #This is an inline comment.
           CODEOWNERS
         end