code_ownership 1.32.14 → 1.32.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c54909c0c5a072df5080509fc4668dc9770fd83d77af60b7469e9cfb0560266d
-  data.tar.gz: 6854819e28031063796f639714943a8f61eacb31cf8d665c06f4434e01530f20
+  metadata.gz: 7a5c5f4a43ef44ffca514c001aa9eae7042bcdf445913afaa15adf40520e1d6d
+  data.tar.gz: e6cb1255f18886edabdd09086ed86d616742b9683311b657e7ba4c418baff443
 SHA512:
-  metadata.gz: 9fe8a85e433ee7eded9c939f23e112304e06e7c90debe840d4ba5810ba274f7d021df890e9da1c83eded7c8999eb0377be82513470ca8e2ef3a6e2bb5a505a2e
-  data.tar.gz: f33c0630d6f3014a07caa9b042897e8aab71fed3ec649566b6c189d2b20ad02e973162542efb6828a91616cf911756d353c1544ccd3e9c88c56f988e0c493967
+  metadata.gz: ede48eace0e4e7096671816ba0c1264fad5d3ea465ba5473a5724da95623e4982e5058b81f8eca0df39602889d88a3ea041cdb12fbb0a9e489b029fe32fa8579
+  data.tar.gz: 55c7bd2a181710065712eb211b969dbefbfb9d83daedbfec324816cc8aae38fd1161ddde6b049370866a00d75b6a4df5d374629a5a619cabbb8f8e1e8b511182

data/README.md

@@ -125,7 +125,7 @@ CodeOwnership comes with a validation function to ensure the following things ar
 1) Only one mechanism is defining file ownership. That is -- you can't have a file annotation on a file owned via package-based or glob-based ownership. This helps make ownership behavior more clear by avoiding concerns about precedence.
 2) All teams referenced as an owner for any file or package is a valid team (i.e. it's in the list of `CodeTeams.all`).
 3) All files have ownership. You can specify in `unowned_globs` to represent a TODO list of files to add ownership to.
-3) The `.github/CODEOWNERS` file is up to date. This is automatically corrected and staged unless specified otherwise with `bin/codeownership validate --skip-autocorrect --skip-stage`. You can turn this validation off by setting `skip_codeowners_validation: true` in `code_ownership.yml`.
+3) The `.github/CODEOWNERS` file is up to date. This is automatically corrected and staged unless specified otherwise with `bin/codeownership validate --skip-autocorrect --skip-stage`. You can turn this validation off by setting `skip_codeowners_validation: true` in `config/code_ownership.yml`.
 
 CodeOwnership also allows you to specify which globs and file extensions should be considered ownable.
 

data/lib/code_ownership/private/ownership_mappers/file_annotations.rb

@@ -47,10 +47,19 @@ module CodeOwnership
           override.params(cache: GlobsToOwningTeamMap, files: T::Array[String]).returns(GlobsToOwningTeamMap)
         end
         def update_cache(cache, files)
-          cache.merge!(globs_to_owner(files))
+          # We map files to nil owners so that files whose annotation have been removed will be properly
+          # overwritten (i.e. removed) from the cache.
+          updated_cache_for_files = globs_to_owner(files)
+          cache.merge!(updated_cache_for_files)
+
           invalid_files = cache.keys.select do |file|
-            !Private.file_tracked?(file)
+            # If a file is not tracked, it should be removed from the cache
+            !Private.file_tracked?(file) ||
+            # If a file no longer has a file annotation (i.e. `globs_to_owner` doesn't map it)
+            # it should be removed from the cache
+            !updated_cache_for_files.key?(file)
           end
+
           invalid_files.each do |invalid_file|
             cache.delete(invalid_file)
           end

data/lib/code_ownership/private/team_plugins/github.rb

@@ -18,6 +18,28 @@ module CodeOwnership
             raw_github['do_not_add_to_codeowners_file'] || false
           )
         end
+
+        sig { override.params(teams: T::Array[CodeTeams::Team]).returns(T::Array[String]) }
+        def self.validation_errors(teams)
+          all_github_teams = teams.flat_map { |team| self.for(team).github.team }
+
+          teams_used_more_than_once = all_github_teams.tally.select do |_team, count|
+            count > 1
+          end
+
+          errors = T.let([], T::Array[String])
+
+          if teams_used_more_than_once.any?
+            errors << <<~ERROR
+              The following teams are specified multiple times:
+              Each code team must have a unique GitHub team in order to write the CODEOWNERS file correctly.
+
+              #{teams_used_more_than_once.keys.join("\n")}
+            ERROR
+          end
+
+          errors
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_ownership
 version: !ruby/object:Gem::Version
-  version: 1.32.14
+  version: 1.32.16
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_teams