entitlements-github-plugin 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41951a6ab48f3605dd85973777867619620b508e2a7ac1f1ec78451dbcf42170
-  data.tar.gz: 400ab0cb03e6b8dfda7945a07eb51a1d5665615ea0bb535598a35b920c857dca
+  metadata.gz: f2b0df98e7f69e4f2189cf5a2e4edf7308faf18c8c307263c21bbf03e6e25e32
+  data.tar.gz: 411e9f69958ffc3685613befb69bce451a1ff18e4b087782ef143e9e7ce989a2
 SHA512:
-  metadata.gz: c32214124e1949acc3679157620d7dddc795a3951cbc1935626a17a9295ecb5b2ef3e4784450b3b8bd2afd3d1a910e952df298867520c452ac7aa0d1c2f637ba
-  data.tar.gz: bb1a5adacf8ad4fed75717a3a09d020297c4941ff3d518c62772a7e6139990352984732f4bcf607fb77d9295b3e447620b15135bb63c641e5f40a55535434707
+  metadata.gz: ed27dd9f70d393b25a3cc8b0f3b5bac2c013d5aafe2030e423ee0a2d40476e2f90e81f61e5e46a6848bddc524b14da987f7dec9eed1ab8b4ee24ed2d2aa7312e
+  data.tar.gz: 344da39e0b7af4638393a4ffe21ee15ebbe70b90172edc0b8b674d93b08e92035b53fea1f20062953de7f6249c873ad0280205074d877c324cb18febf7373fe6

data/lib/entitlements/service/github.rb

@@ -183,7 +183,7 @@ module Entitlements
       end
 
       # Get data from the predictive updates cache if it's available and valid, or else get it
-      # from GraphQL API. This is a shim between readers and `members_and_roles_from_graphql`.
+      # from the API. This is a shim between readers and `members_and_roles_from_api`.
       #
       # Takes no parameters.
       #
@@ -194,7 +194,7 @@ module Entitlements
         member_from_cache = Entitlements::Data::Groups::Cached.members("cn=member,#{ou}")
 
         # If we do not have *both* admins and members, we need to call the API
-        return [members_and_roles_from_graphql, false] unless admin_from_cache && member_from_cache
+        return [members_and_roles_from_api, false] unless admin_from_cache && member_from_cache
 
         # Convert the Sets of strings into the expected hash structure.
         Entitlements.logger.debug "Loading organization members and roles for #{org} from cache"
@@ -203,6 +203,16 @@ module Entitlements
         [result, true]
       end
 
+      # Use GraphQL in GitHub Actions, where entitlements-caches can answer it, and REST elsewhere.
+      #
+      # Takes no parameters.
+      #
+      # Returns Hash of { "username" => "ROLE" } where "ROLE" is from GraphQL Enum.
+      Contract C::None => C::HashOf[String => String]
+      def members_and_roles_from_api
+        ENV["GITHUB_RUN_ID"] ? members_and_roles_from_graphql : members_and_roles_from_rest
+      end
+
       # Query GraphQL API to get a list of members and their roles.
       #
       # Takes no parameters.

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Entitlements
   module Version
-    VERSION = "1.2.8"
+    VERSION = "1.2.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entitlements-github-plugin
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - GitHub, Inc. Security Ops