Add latest changes from gitlab-org/gitlab@master

5 files changed, 155 insertions, 0 deletions

diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb
index 11a41149274..904f32c2780 100644
--- a/lib/gitlab/github_import/client.rb
+++ b/lib/gitlab/github_import/client.rb
@@ -99,6 +99,14 @@ module Gitlab
         each_object(:releases, *args)
       end
 
+      def branches(*args)
+        each_object(:branches, *args)
+      end
+
+      def branch_protection(repo_name, branch_name)
+        with_rate_limit { octokit.branch_protection(repo_name, branch_name) }
+      end
+
       # Fetches data from the GitHub API and yields a Page object for every page
       # of data, without loading all of them into memory.
       #
diff --git a/lib/gitlab/github_import/importer/protected_branch_importer.rb b/lib/gitlab/github_import/importer/protected_branch_importer.rb
new file mode 100644
index 00000000000..16215fdce8e
--- /dev/null
+++ b/lib/gitlab/github_import/importer/protected_branch_importer.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module GithubImport
+    module Importer
+      class ProtectedBranchImporter
+        attr_reader :protected_branch, :project, :client
+
+        # protected_branch - An instance of
+        #   `Gitlab::GithubImport::Representation::ProtectedBranch`.
+        # project - An instance of `Project`
+        # client - An instance of `Gitlab::GithubImport::Client`
+        def initialize(protected_branch, project, client)
+          @protected_branch = protected_branch
+          @project = project
+          @client = client
+        end
+
+        def execute
+          # The creator of the project is always allowed to create protected
+          # branches, so we skip the authorization check in this service class.
+          ProtectedBranches::CreateService
+            .new(project, project.creator, params)
+            .execute(skip_authorization: true)
+        end
+
+        private
+
+        def params
+          {
+            name: protected_branch.id,
+            push_access_levels_attributes: [{ access_level: Gitlab::Access::MAINTAINER }],
+            merge_access_levels_attributes: [{ access_level: Gitlab::Access::MAINTAINER }],
+            allow_force_push: allow_force_push?
+          }
+        end
+
+        def allow_force_push?
+          if ProtectedBranch.protected?(project, protected_branch.id)
+            ProtectedBranch.allow_force_push?(project, protected_branch.id) && protected_branch.allow_force_pushes
+          else
+            protected_branch.allow_force_pushes
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/github_import/importer/protected_branches_importer.rb b/lib/gitlab/github_import/importer/protected_branches_importer.rb
new file mode 100644
index 00000000000..be3ac3d17c1
--- /dev/null
+++ b/lib/gitlab/github_import/importer/protected_branches_importer.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module GithubImport
+    module Importer
+      class ProtectedBranchesImporter
+        include ParallelScheduling
+
+        # The method that will be called for traversing through all the objects to
+        # import, yielding them to the supplied block.
+        def each_object_to_import
+          repo = project.import_source
+
+          protected_branches = client.branches(repo).select { |branch| branch.protection.enabled }
+          protected_branches.each do |protected_branch|
+            object = client.branch_protection(repo, protected_branch.name)
+            next if object.nil? || already_imported?(object)
+
+            yield object
+
+            Gitlab::GithubImport::ObjectCounter.increment(project, object_type, :fetched)
+            mark_as_imported(object)
+          end
+        end
+
+        def importer_class
+          ProtectedBranchImporter
+        end
+
+        def representation_class
+          Gitlab::GithubImport::Representation::ProtectedBranch
+        end
+
+        def sidekiq_worker_class
+          ImportProtectedBranchWorker
+        end
+
+        def object_type
+          :protected_branch
+        end
+
+        def collection_method
+          :protected_branches
+        end
+
+        def id_for_already_imported_cache(protected_branch)
+          protected_branch.name
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/github_import/representation/protected_branch.rb b/lib/gitlab/github_import/representation/protected_branch.rb
new file mode 100644
index 00000000000..b80b7cf1076
--- /dev/null
+++ b/lib/gitlab/github_import/representation/protected_branch.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module GithubImport
+    module Representation
+      class ProtectedBranch
+        include ToHash
+        include ExposeAttribute
+
+        attr_reader :attributes
+
+        expose_attribute :id, :allow_force_pushes
+
+        # Builds a Branch Protection info from a GitHub API response.
+        # Resource structure details:
+        # https://docs.github.com/en/rest/branches/branch-protection#get-branch-protection
+        # branch_protection - An instance of `Sawyer::Resource` containing the protection details.
+        def self.from_api_response(branch_protection, _additional_object_data = {})
+          branch_name = branch_protection.url.match(%r{/branches/(\S{1,255})/protection$})[1]
+
+          hash = {
+            id: branch_name,
+            allow_force_pushes: branch_protection.allow_force_pushes.enabled
+          }
+
+          new(hash)
+        end
+
+        # Builds a new Protection using a Hash that was built from a JSON payload.
+        def self.from_json_hash(raw_hash)
+          new(Representation.symbolize_hash(raw_hash))
+        end
+
+        # attributes - A Hash containing the raw Protection details. The keys of this
+        #              Hash (and any nested hashes) must be symbols.
+        def initialize(attributes)
+          @attributes = attributes
+        end
+
+        def github_identifiers
+          { id: id }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/github_import/sequential_importer.rb b/lib/gitlab/github_import/sequential_importer.rb
index 6bc37337799..ab37bc92ee7 100644
--- a/lib/gitlab/github_import/sequential_importer.rb
+++ b/lib/gitlab/github_import/sequential_importer.rb
@@ -16,6 +16,7 @@ module Gitlab
       ].freeze
 
       PARALLEL_IMPORTERS = [
+        Importer::ProtectedBranchesImporter,
         Importer::PullRequestsImporter,
         Importer::IssuesImporter,
         Importer::DiffNotesImporter,