Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

2 files changed, 32 insertions, 94 deletions

diff --git a/scripts/api/create_issue_discussion.rb b/scripts/api/create_issue_discussion.rb
new file mode 100644
index 00000000000..74a9f3ae378
--- /dev/null
+++ b/scripts/api/create_issue_discussion.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'gitlab'
+require_relative 'default_options'
+
+class CreateIssueDiscussion
+  def initialize(options)
+    @project = options.fetch(:project)
+
+    # Force the token to be a string so that if api_token is nil, it's set to '',
+    # allowing unauthenticated requests (for forks).
+    api_token = options.delete(:api_token).to_s
+
+    warn "No API token given." if api_token.empty?
+
+    @client = Gitlab.client(
+      endpoint: options.delete(:endpoint) || API::DEFAULT_OPTIONS[:endpoint],
+      private_token: api_token
+    )
+  end
+
+  def execute(discussion_data)
+    client.post(
+      "/projects/#{client.url_encode project}/issues/#{discussion_data.delete(:issue_iid)}/discussions",
+      body: discussion_data
+    )
+  end
+
+  private
+
+  attr_reader :project, :client
+end
diff --git a/scripts/api/download_job_artifact.rb b/scripts/api/download_job_artifact.rb
deleted file mode 100755
index 394ad8f3a3d..00000000000
--- a/scripts/api/download_job_artifact.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'optparse'
-require 'fileutils'
-require 'uri'
-require 'cgi'
-require 'net/http'
-require_relative 'default_options'
-
-class ArtifactFinder
-  def initialize(options)
-    @project = options.delete(:project)
-    @job_id = options.delete(:job_id)
-    @api_token = options.delete(:api_token)
-    @endpoint = options.delete(:endpoint) || API::DEFAULT_OPTIONS[:endpoint]
-    @artifact_path = options.delete(:artifact_path)
-
-    warn "No API token given." unless api_token
-  end
-
-  def execute
-    url = "#{endpoint}/projects/#{CGI.escape(project)}/jobs/#{job_id}/artifacts"
-
-    if artifact_path
-      FileUtils.mkdir_p(File.dirname(artifact_path))
-      url += "/#{artifact_path}"
-    end
-
-    fetch(url)
-  end
-
-  private
-
-  attr_reader :project, :job_id, :api_token, :endpoint, :artifact_path
-
-  def fetch(uri_str, limit = 10)
-    raise 'Too many HTTP redirects' if limit == 0
-
-    uri = URI(uri_str)
-    request = Net::HTTP::Get.new(uri)
-    request['Private-Token'] = api_token if api_token
-
-    Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-      http.request(request) do |response|
-        case response
-        when Net::HTTPSuccess then
-          File.open(artifact_path || 'artifacts.zip', 'w') do |file|
-            response.read_body(&file.method(:write))
-          end
-        when Net::HTTPRedirection then
-          location = response['location']
-          warn "Redirected (#{limit - 1} redirections remaining)."
-          fetch(location, limit - 1)
-        else
-          raise "Unexpected response: #{response.value}"
-        end
-      end
-    end
-  end
-end
-
-if $PROGRAM_NAME == __FILE__
-  options = API::DEFAULT_OPTIONS.dup
-
-  OptionParser.new do |opts|
-    opts.on("-p", "--project PROJECT", String, "Project where to find the job (defaults to $CI_PROJECT_ID)") do |value|
-      options[:project] = value
-    end
-
-    opts.on("-j", "--job-id JOB_ID", String, "A job ID") do |value|
-      options[:job_id] = value
-    end
-
-    opts.on("-a", "--artifact-path ARTIFACT_PATH", String, "A valid artifact path") do |value|
-      options[:artifact_path] = value
-    end
-
-    opts.on("-t", "--api-token API_TOKEN", String, "A value API token with the `read_api` scope") do |value|
-      options[:api_token] = value
-    end
-
-    opts.on("-E", "--endpoint ENDPOINT", String, "The API endpoint for the API token. (defaults to $CI_API_V4_URL and fallback to https://gitlab.com/api/v4)") do |value|
-      options[:endpoint] = value
-    end
-
-    opts.on("-h", "--help", "Prints this help") do
-      puts opts
-      exit
-    end
-  end.parse!
-
-  ArtifactFinder.new(options).execute
-end