Merge branch 'main' into feat/service-accounts

Author: hamir-suspect

github_hooks/.rubocop.yml

@@ -1,6 +1,6 @@
 inherit_from: .rubocop_todo.yml
 
-require:
+plugins:
   - rubocop-rails
   - rubocop-factory_bot
   - rubocop-rspec

github_hooks/.rubocop_todo.yml

@@ -540,7 +540,12 @@ RSpec/ExpectInHook:
 # Offense count: 2
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - 'spec/lib/repo_host/repository/hook_spec.rb'
+    - 'spec/lib/repo_host/repository_spec.rb'
+
+RSpec/SpecFilePathSuffix:
   Exclude:
     - 'spec/lib/repo_host/repository/hook_spec.rb'
     - 'spec/lib/repo_host/repository_spec.rb'

github_hooks/app/controllers/pages_controller.rb

@@ -1,6 +1,6 @@
 class PagesController < ApplicationController
 
-  def is_alive # rubocop:disable Naming/PredicateName
+  def alive?
     render :plain => "yes"
   end
 

github_hooks/app/models/branch.rb

@@ -16,7 +16,7 @@ class Branch < ActiveRecord::Base
   def self.find_or_create_for_workflow(workflow)
     branch = workflow.project.branches.find_or_create_by(:name => workflow.payload.branch)
 
-    if workflow.payload.is_pull_request?
+    if workflow.payload.pull_request?
       options = {
         :pull_request_number => workflow.payload.pull_request_number,
         :pull_request_name => workflow.payload.pull_request_name,

github_hooks/config/environments/production.rb

@@ -55,7 +55,7 @@
   config.log_level = ENV.fetch("LOG_LEVEL", "info")
 
   config.lograge.enabled = true
-  config.lograge.ignore_actions = ["PagesController#is_alive"]
+  config.lograge.ignore_actions = ["PagesController#alive?"]
 
   config.lograge.custom_options = lambda do |event|
     { :time => event.time }

github_hooks/config/routes.rb

@@ -2,5 +2,5 @@
   post "/github" => "projects#repo_host_post_commit_hook"
 
   # liveness and readiness probe
-  get "/is_alive" => "pages#is_alive"
+  get "/is_alive" => "pages#alive?"
 end

github_hooks/lib/internal_api/repo_proxy/repo_proxy_server.rb

@@ -152,7 +152,7 @@ def create_for_github_project(req, logger)
         end
 
         label =
-          if workflow.payload.is_pull_request?
+          if workflow.payload.pull_request?
             workflow.pull_request_number.to_s
           elsif workflow.payload.tag_created?
             workflow.payload.tag_name
@@ -309,15 +309,15 @@ def pr_mergeable(hook)
       end
 
       def branch_name(hook)
-        if hook.payload.is_pull_request?
+        if hook.payload.pull_request?
           hook.payload.pr_base_branch_name.to_s
         else
           hook.branch_name.to_s
         end
       end
 
       def type(hook)
-        if hook.payload.is_pull_request?
+        if hook.payload.pull_request?
           InternalApi::RepoProxy::Hook::Type::PR
         elsif hook.payload.tag?
           InternalApi::RepoProxy::Hook::Type::TAG

github_hooks/lib/presenter_base.rb

@@ -18,9 +18,7 @@ def routes
 
   alias_method :r, :routes
 
-  def helpers
-    ApplicationController.helpers
-  end
+  delegate :helpers, to: ApplicationController
 
   alias_method :h, :helpers
 

github_hooks/lib/repo_host/bitbucket/payload.rb

@@ -55,7 +55,7 @@ def issue_number
 
     # ❌
     def branch_created?
-      if is_pull_request?
+      if pull_request?
         pull_request_opened?
       else
         @data["created"] && @data["ref"].starts_with?("refs/heads/")
@@ -69,7 +69,7 @@ def tag_created?
 
     # ✔️
     def branch_deleted?
-      if is_pull_request?
+      if pull_request?
         pull_request_closed?
       else
         first_push_change["closed"]
@@ -83,7 +83,7 @@ def force_pushed?
 
     # ✔️
     def includes_ci_skip?
-      return false if is_pull_request? || head_commit_message.nil?
+      return false if pull_request? || head_commit_message.nil?
 
       ::Semaphore::SkipCi.new.call(head_commit_message)
     end
@@ -136,7 +136,7 @@ def author_avatar_url
     end
 
     # ✔️
-    def is_pull_request? # rubocop:disable Naming/PredicateName
+    def pull_request?
       @data["pullrequest"].present?
     end
 
@@ -145,12 +145,10 @@ def repo_url
       @data.dig("repository", "links", "html", "href")
     end
 
-    def is_draft_pull_request? # rubocop:disable Naming/PredicateName
+    def draft_pull_request?
       false
     end
 
-    alias_method :pull_request?, :is_pull_request?
-
     # ❌
     def pull_request_within_repo?
       return false unless pull_request?
@@ -316,13 +314,13 @@ def single?
     end
 
     def extract_action
-      if is_pull_request?
+      if pull_request?
         "undefined"
       end
     end
 
     def extract_branch
-      if is_pull_request?
+      if pull_request?
         pull_request_branch_name
       elsif pr_comment?
         "pull-request-#{issue_number}"
@@ -338,7 +336,7 @@ def extract_branch
 
     # ✔️
     def extract_commits
-      unless is_pull_request?
+      unless pull_request?
         extract_commits_from_push
       end
     end
@@ -355,7 +353,7 @@ def extract_commits_from_push
     end
 
     def extract_head
-      if is_pull_request?
+      if pull_request?
         pr_head_sha
       elsif @data["head_commit"]
         # If head commit exists, use that one to extract the commit.
@@ -372,7 +370,7 @@ def extract_head
     end
 
     def extract_prev_head
-      if is_pull_request?
+      if pull_request?
         "0000000000000000000000000000000000000000"
       else
         first_push_change.dig("old", "target", "hash")

github_hooks/lib/repo_host/git/payload.rb

@@ -15,7 +15,7 @@ def pull_request?
     end
     alias is_pull_request? pull_request?
 
-    def is_draft_pull_request? # rubocop:disable Naming/PredicateName
+    def draft_pull_request?
       false
     end