dependabot-common 0.134.2 → 0.135.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0aee377b66b5d3f01d1179fc2e0fd74af78e19ec1e599df3cdbd33f0ddce83
-  data.tar.gz: 69dceffc5ffd585b9334e6a423b7f83cdfee05356153745e008689014f58c2a0
+  metadata.gz: bb9241efa54ea5f5abb737f0f9834a5f4c75827d8150f9ad9277015e5be30fef
+  data.tar.gz: fbbacbc6ff52a4824cde4f5b8088c3532c1745c4dcf5af8b93f73f2ccbf25c6c
 SHA512:
-  metadata.gz: 05d0810790fdbe28267121eb5925ad2f4c09237fb2f653e2d278e9f11797b5a6b6a891159ddf3f9341c822e7f230602787c4066c0c0f3a35843f22779bc1cf8d
-  data.tar.gz: 041a97b12c437c40f27667a0e29c786366f1a99a32e0f08de71fe1124e9e21d480f5b0a33386d77e8d39485ec66c7cce993a873cd6d97efb41debffa61de5c78
+  metadata.gz: 4dad05be71eec18d9edbed5ae5d7537167c679412b6295e80aa4dcac6e559aef9ce25632e9a71c11d1b978e087afc846110e3dcb5d3006ea6dbfbd2caee71002
+  data.tar.gz: 4f4721d909bd2da3563779409432c34d9787f68209852bef348e54081f91aac3e93fc87656cd8731772144db7e9c8ede20dc6fc508acff072fe11af89bfffbda

data/lib/dependabot/clients/azure.rb

@@ -183,6 +183,28 @@ module Dependabot
           "/_apis/git/repositories/" + source.unscoped_repo +
           "/pullrequests?api-version=5.0", content.to_json)
       end
+
+      def pull_request(pull_request_id)
+        response = get(source.api_endpoint +
+          source.organization + "/" + source.project +
+          "/_apis/git/pullrequests/" + pull_request_id)
+
+        JSON.parse(response.body)
+      end
+
+      def update_ref(branch_name, old_commit, new_commit)
+        content = [
+          {
+            name: "refs/heads/" + branch_name,
+            oldObjectId: old_commit,
+            newObjectId: new_commit
+          }
+        ]
+
+        post(source.api_endpoint + source.organization + "/" + source.project +
+          "/_apis/git/repositories/" + source.unscoped_repo +
+          "/refs?api-version=5.0", content.to_json)
+      end
       # rubocop:enable Metrics/ParameterLists
 
       def get(url)

data/lib/dependabot/pull_request_updater.rb

@@ -27,6 +27,7 @@ module Dependabot
       case source.provider
       when "github" then github_updater.update
       when "gitlab" then gitlab_updater.update
+      when "azure" then azure_updater.update
       else raise "Unsupported provider #{source.provider}"
       end
     end
@@ -56,5 +57,16 @@ module Dependabot
         pull_request_number: pull_request_number
       )
     end
+
+    def azure_updater
+      Azure.new(
+        source: source,
+        base_commit: base_commit,
+        old_commit: old_commit,
+        files: files,
+        credentials: credentials,
+        pull_request_number: pull_request_number
+      )
+    end
   end
 end

data/lib/dependabot/pull_request_updater/azure.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require "dependabot/clients/azure"
+require "securerandom"
+
+module Dependabot
+  class PullRequestUpdater
+    class Azure
+      OBJECT_ID_FOR_BRANCH_DELETE = "0000000000000000000000000000000000000000"
+
+      attr_reader :source, :files, :base_commit, :old_commit, :credentials,
+                  :pull_request_number
+
+      def initialize(source:, files:, base_commit:, old_commit:,
+                     credentials:, pull_request_number:)
+        @source = source
+        @files = files
+        @base_commit = base_commit
+        @old_commit = old_commit
+        @credentials = credentials
+        @pull_request_number = pull_request_number
+      end
+
+      def update
+        return unless pull_request_exists? && source_branch_exists?
+
+        update_source_branch
+      end
+
+      private
+
+      def azure_client_for_source
+        @azure_client_for_source ||=
+          Dependabot::Clients::Azure.for_source(
+            source: source,
+            credentials: credentials
+          )
+      end
+
+      def pull_request_exists?
+        pull_request
+      rescue Dependabot::Clients::Azure::NotFound
+        false
+      end
+
+      def source_branch_exists?
+        azure_client_for_source.branch(source_branch_name)
+      rescue Dependabot::Clients::Azure::NotFound
+        false
+      end
+
+      # Currently the PR diff in ADO shows difference in commits instead of actual diff in files.
+      # This workaround is done to get the target branch commit history on the source branch alongwith file changes
+      def update_source_branch
+        # 1) Push the file changes to a newly created temporary branch (from base commit)
+        new_commit = create_temp_branch
+        # 2) Update PR source branch to point to the temp branch head commit.
+        update_branch(source_branch_name, old_source_branch_commit, new_commit)
+        # 3) Delete temp branch
+        update_branch(temp_branch_name, new_commit, OBJECT_ID_FOR_BRANCH_DELETE)
+      end
+
+      def pull_request
+        @pull_request ||=
+          azure_client_for_source.pull_request(pull_request_number.to_s)
+      end
+
+      def source_branch_name
+        @source_branch_name ||= pull_request&.fetch("sourceRefName")&.gsub("refs/heads/", "")
+      end
+
+      def create_temp_branch
+        response = azure_client_for_source.create_commit(
+          temp_branch_name,
+          base_commit,
+          commit_message,
+          files,
+          nil
+        )
+
+        JSON.parse(response.body).fetch("refUpdates").first.fetch("newObjectId")
+      end
+
+      def temp_branch_name
+        @temp_branch_name ||=
+          "#{source_branch_name}-temp-#{SecureRandom.uuid[0..6]}"
+      end
+
+      def update_branch(branch_name, old_commit, new_commit)
+        azure_client_for_source.update_ref(
+          branch_name,
+          old_commit,
+          new_commit
+        )
+      end
+
+      # For updating source branch, we require the latest commit for the source branch.
+      def commit_being_updated
+        @commit_being_updated ||=
+          azure_client_for_source.commits(source_branch_name).first
+      end
+
+      def old_source_branch_commit
+        commit_being_updated.fetch("commitId")
+      end
+
+      def commit_message
+        commit_being_updated.fetch("comment")
+      end
+    end
+  end
+end

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.134.2"
+  VERSION = "0.135.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.134.2
+  version: 0.135.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -417,6 +417,7 @@ files:
 - lib/dependabot/pull_request_creator/message_builder/metadata_presenter.rb
 - lib/dependabot/pull_request_creator/pr_name_prefixer.rb
 - lib/dependabot/pull_request_updater.rb
+- lib/dependabot/pull_request_updater/azure.rb
 - lib/dependabot/pull_request_updater/github.rb
 - lib/dependabot/pull_request_updater/gitlab.rb
 - lib/dependabot/security_advisory.rb