danger 8.4.1 → 8.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbecb15ac329fa5977840fe99a41c752b85ecec9669542d0f6002b8f3c374031
-  data.tar.gz: aa412e3e48efc2fbcac2302b3ce64c960f939c5dbc86a045c5be3d32dfb9df61
+  metadata.gz: 423862c4ae06fbd90dbc52ae126b171c3af53da1867f6051db5e1e00cd1cb09e
+  data.tar.gz: 45d13ff59705d33a756f8a221ef597f8c29f534511a9cd310241d2730b118e59
 SHA512:
-  metadata.gz: adfe653dfe86b47a1ee68b08a69f7b35f0e80979fe4f25725290091aa2fa5ede790331a8bce16f09efd4a1f9690c5df03d17e87516ff6ef6c19514a1d2e00044
-  data.tar.gz: 23b29baa8b821356398a8802f914019b3327fe2f68285cd1f8bebcef507d2beb0b2ee5259621337d247b4d3c110bc2cd1891dbaf2e9caa3da8e2737250d39499
+  metadata.gz: 3a1e23473e3012edb47a6860ca50a4e0e12512ade5c2796b79720c71ba049c034060893505a5264df3ee36439ae702dffe1cc9472da4e6357d2cef7ba81e24b8
+  data.tar.gz: 4e186a0412277f4d3add84821f39529900c9faec5439ccd62329bc24e6a753c19feafe68208f9ff3b7fe8b12e64ba8b31379b7af5273f24dfa230ec804f12648

data/lib/danger/ci_source/support/pull_request_finder.rb

@@ -137,7 +137,7 @@ module Danger
 
     def client
       scm_provider = find_scm_provider(remote_url)
-    
+
       case scm_provider
       when :bitbucket_cloud
         require "danger/request_sources/bitbucket_cloud_api"
@@ -151,8 +151,15 @@ module Danger
 
       when :github
         require "octokit"
-        Octokit::Client.new(access_token: ENV["DANGER_GITHUB_API_TOKEN"], api_endpoint: api_url)
-
+        access_token = ENV["DANGER_GITHUB_API_TOKEN"]
+        bearer_token = ENV["DANGER_GITHUB_BEARER_TOKEN"]
+        if bearer_token && !bearer_token.empty?
+          Octokit::Client.new(bearer_token: bearer_token, api_endpoint: api_url)
+        elsif access_token && !access_token.empty?
+          Octokit::Client.new(access_token: access_token, api_endpoint: api_url)
+        else
+          raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN` or `DANGER_GITHUB_BEARER_TOKEN`"
+        end
       else
         raise "SCM provider not supported: #{scm_provider}"
       end

data/lib/danger/request_sources/github/github.rb

@@ -17,7 +17,7 @@ module Danger
       attr_accessor :pr_json, :issue_json, :support_tokenless_auth, :dismiss_out_of_range_messages
 
       def self.env_vars
-        ["DANGER_GITHUB_API_TOKEN"]
+        ["DANGER_GITHUB_API_TOKEN", "DANGER_GITHUB_BEARER_TOKEN"]
       end
 
       def self.optional_env_vars
@@ -30,7 +30,8 @@ module Danger
         self.support_tokenless_auth = false
         self.dismiss_out_of_range_messages = false
 
-        @token = @environment["DANGER_GITHUB_API_TOKEN"]
+        @access_token = @environment["DANGER_GITHUB_API_TOKEN"]
+        @bearer_token = @environment["DANGER_GITHUB_BEARER_TOKEN"]
       end
 
       def get_pr_from_branch(repo_name, branch_name, owner)
@@ -45,7 +46,7 @@ module Danger
       end
 
       def validates_as_api_source?
-        (@token && !@token.empty?) || self.environment["DANGER_USE_LOCAL_GIT"]
+        valid_bearer_token? || valid_access_token? || self.environment["DANGER_USE_LOCAL_GIT"]
       end
 
       def scm
@@ -72,12 +73,16 @@ module Danger
       end
 
       def client
-        raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN`" if !@token && !support_tokenless_auth
+        raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN` or `DANGER_GITHUB_BEARER_TOKEN`" if !valid_access_token? && !valid_bearer_token? && !support_tokenless_auth
         @client ||= begin
           Octokit.configure do |config|
             config.connection_options[:ssl] = { verify: verify_ssl }
           end
-          Octokit::Client.new(access_token: @token, auto_paginate: true, api_endpoint: api_url)
+          if valid_bearer_token?
+            Octokit::Client.new(bearer_token: @bearer_token, auto_paginate: true, api_endpoint: api_url)
+          elsif valid_access_token?
+            Octokit::Client.new(access_token: @access_token, auto_paginate: true, api_endpoint: api_url)
+          end
         end
       end
 
@@ -493,6 +498,14 @@ module Danger
 
       private
 
+      def valid_access_token?
+        @access_token && !@access_token.empty?
+      end
+
+      def valid_bearer_token?
+        @bearer_token && !@bearer_token.empty?
+      end
+
       def regular_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
         {
           warnings: warnings.reject(&:inline?),

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.4.1".freeze
+  VERSION = "8.4.2".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 8.4.1
+  version: 8.4.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide