entitlements-github-plugin 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4cbb307760618dcde3accef28dd587ce5a37cb8049ce7c0819634be60725cf1
-  data.tar.gz: 8aaad78f84fa9011cad4788e57f777ae820cd3f4a5ac6efc828dbb5d4b7e9b58
+  metadata.gz: 3c6ee79046e0d905bacf0c96d8dde4065be86a0e0c38c03b0056c90e9be33d16
+  data.tar.gz: 6ea93769603533deb1fff5e5dc91f7664483c1c2021d1a3836679cbfab11512d
 SHA512:
-  metadata.gz: e277789bd072b042003e42970eb5c91d12520ea0332759f050c7c3774bbee8bbd54d68c1f7c552594f8e8aedd16e5d37dabd9d2be7597f581de637b0f205d1c1
-  data.tar.gz: d0d2ee3e7f4f6ba4ff909b880b5de0cf9f16d6940a4e90b81350fc80cc6bacb38059765cbe780bc85aad29fa3aca1d6d78aae5da7264aed3c7f9d89dd3074b37
+  metadata.gz: b9d1ea8afcd7139f51d85eee6286408fe98dbcd62913f79f944e9cb131c0b725774523ec08de86ad231f13e87c5f0371dfddcc72446c9648ac8907d97bf0ea29
+  data.tar.gz: 6b31074867e389095bc34c33bcfa94dc954f2e2bdcaef8230417f1dd64bec66a0acec7fc896d0a7464b2025cba1b2f8e8e6faab3a81f12be5e1b1feff7924a15

data/lib/entitlements/backend/github_team/provider.rb

@@ -198,6 +198,23 @@ module Entitlements
               Entitlements.logger.info "CHANGE github_parent_team from #{existing_parent_team} to #{changed_parent_team} for #{existing_group.dn} in #{github.org}"
             end
           end
+
+          existing_maintainers = existing_group.metadata_fetch_if_exists("team_maintainers")
+          changed_maintainers = group.metadata_fetch_if_exists("team_maintainers")
+          if existing_maintainers != changed_maintainers
+            base_diff[:metadata] ||= {}
+            if existing_maintainers.nil? && !changed_maintainers.nil?
+              base_diff[:metadata][:team_maintainers] = "add"
+              Entitlements.logger.info "ADD github_team_maintainers #{changed_maintainers} to #{existing_group.dn} in #{github.org}"
+            elsif !existing_maintainers.nil? && changed_maintainers.nil?
+              base_diff[:metadata][:team_maintainers] = "remove"
+              Entitlements.logger.info "REMOVE (NOOP) github_team_maintainers #{existing_maintainers} from #{existing_group.dn} in #{github.org}"
+            else
+              base_diff[:metadata][:team_maintainers] = "change"
+              Entitlements.logger.info "CHANGE github_team_maintainers from #{existing_maintainers} to #{changed_maintainers} for #{existing_group.dn} in #{github.org}"
+            end
+          end
+
           base_diff
         end
 

data/lib/entitlements/backend/github_team/service.rb

@@ -104,6 +104,10 @@ module Entitlements
                   end
                 end
 
+                maintainers = teamdata[:members].select { |u| teamdata[:roles][u] == "maintainer" }
+                team_metadata = team_metadata || {}
+                team_metadata = team_metadata.merge({"team_maintainers" => maintainers.any? ? maintainers.join(",") : nil})
+
                 team = Entitlements::Backend::GitHubTeam::Models::Team.new(
                   team_id: teamdata[:team_id],
                   team_name: team_identifier,
@@ -326,11 +330,12 @@ module Entitlements
         # team_slug - Identifier of the team to retrieve.
         #
         # Returns a data structure with team data.
-        Contract String => { members: C::ArrayOf[String], team_id: Integer, parent_team_name: C::Or[String, nil] }
+        Contract String => { members: C::ArrayOf[String], team_id: Integer, parent_team_name: C::Or[String, nil], roles: C::HashOf[String => String] }
         def graphql_team_data(team_slug)
           cursor = nil
           team_id = nil
           result = []
+          roles = {}
           sanity_counter = 0
 
           while sanity_counter < 100
@@ -348,6 +353,7 @@ module Entitlements
                       node {
                         login
                       }
+                      role
                       cursor
                     }
                   }
@@ -375,12 +381,17 @@ module Entitlements
             buffer = edges.map { |e| e.fetch("node").fetch("login").downcase }
             result.concat buffer
 
+            edges.each do |e|
+              role = e.fetch("role").downcase
+              roles[e.fetch("node").fetch("login").downcase] = role
+            end
+
             cursor = edges.last.fetch("cursor")
             next if cursor && buffer.size == max_graphql_results
             break
           end
 
-          { members: result, team_id:, parent_team_name: }
+          { members: result, team_id:, parent_team_name:, roles: }
         end
 
         # Ensure that the given team ID actually matches up to the team slug on GitHub. This is in place

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Entitlements
   module Version
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entitlements-github-plugin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - GitHub, Inc. Security Ops
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts