Skip to content

Commit 6aa4ccd

Browse files
committed
Allow multiples repos and GitHub Apps
Refactor GitHub integration to create pull request if missing and improve app retrieval logging Signed-off-by: Rodrigo Nardi <rnardi@netdef.org>
1 parent 59a4a2c commit 6aa4ccd

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

lib/github/build_plan.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ def create_pull_request
9797
end
9898

9999
def start_new_execution
100+
create_pull_request if @pull_request.nil?
101+
102+
@check_suite.pull_request = @pull_request
103+
100104
Github::UserInfo.new(@payload.dig('pull_request', 'user', 'id'), check_suite: @check_suite)
101105

102106
@bamboo_plan_run = BambooCi::PlanRun.new(@check_suite, logger_level: @logger.level)

lib/github/check.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,11 @@ def authenticate_app
279279
def github_app_by_repo
280280
app =
281281
@config['github_apps'].find do |entry|
282-
entry.key? :repo and entry[:repo] == @check_suite.pull_request.repository
282+
entry.key? 'repo' and entry['repo'] == @check_suite.pull_request.repository
283283
end
284284

285+
@logger.info("github_app_by_repo: #{app.inspect}")
286+
285287
create_app(app) unless app.nil?
286288
end
287289

lib/github/user_info.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ module Github
1212
class UserInfo
1313
def initialize(github_id, pull_request: nil, check_suite: nil, audit_retry: nil)
1414
@github_id = github_id
15-
@github = Github::Check.new nil
16-
@info = @github.fetch_username(github_id)
1715

1816
@pull_request = pull_request
1917
@check_suite = check_suite
2018
@audit_retry = audit_retry
2119

20+
@github = Github::Check.new(@check_suite)
21+
@info = @github.fetch_username(github_id)
22+
2223
@logger = GithubLogger.instance.create('github_user_info.log', Logger::INFO)
2324

2425
@logger.info("Fetching user info for github_id: #{@github_id}")

0 commit comments

Comments
 (0)