Add latest changes from gitlab-org/gitlab@master

20 files changed, 241 insertions, 31 deletions

diff --git a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue
index dbcda0877b4..4df324b396c 100644
--- a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue
+++ b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue
@@ -33,7 +33,7 @@ export default {
           <p class="form-text text-muted">
             {{
               s__(
-                "ErrorTracking|If you self-host Sentry, enter the full URL of your Sentry instance. If you're using Sentry's hosted solution, enter https://sentry.io",
+                "ErrorTracking|If you self-host Sentry, enter your Sentry instance's full URL. If you use Sentry's hosted solution, enter https://sentry.io",
               )
             }}
           </p>
@@ -75,12 +75,12 @@ export default {
         </div>
       </div>
       <p v-if="connectError" class="gl-field-error">
-        {{ s__('ErrorTracking|Connection has failed. Re-check Auth Token and try again.') }}
+        {{ s__('ErrorTracking|Connection failed. Check Auth Token and try again.') }}
       </p>
       <p v-else class="form-text text-muted">
         {{
           s__(
-            "ErrorTracking|After adding your Auth Token, use the 'Connect' button to load projects",
+            'ErrorTracking|After adding your Auth Token, select the Connect button to load projects.',
           )
         }}
       </p>
diff --git a/app/assets/javascripts/error_tracking_settings/store/getters.js b/app/assets/javascripts/error_tracking_settings/store/getters.js
index 30828778574..f203a259b16 100644
--- a/app/assets/javascripts/error_tracking_settings/store/getters.js
+++ b/app/assets/javascripts/error_tracking_settings/store/getters.js
@@ -34,8 +34,8 @@ export const invalidProjectLabel = (state) => {
 export const projectSelectionLabel = (state) => {
   if (state.token) {
     return s__(
-      "ErrorTracking|Click 'Connect' to re-establish the connection to Sentry and activate the dropdown.",
+      'ErrorTracking|Click Connect to reestablish the connection to Sentry and activate the dropdown.',
     );
   }
-  return s__('ErrorTracking|To enable project selection, enter a valid Auth Token');
+  return s__('ErrorTracking|To enable project selection, enter a valid Auth Token.');
 };
diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js
index ff194d1a171..d85fd10be45 100644
--- a/app/assets/javascripts/mr_notes/init_notes.js
+++ b/app/assets/javascripts/mr_notes/init_notes.js
@@ -58,6 +58,8 @@ export default () => {
     created() {
       this.setActiveTab(window.mrTabs.getCurrentAction());
       this.setEndpoints(this.endpoints);
+
+      this.fetchMrMetadata();
     },
     mounted() {
       this.notesCountBadge = $('.issuable-details').find('.notes-tab .badge');
@@ -69,7 +71,7 @@ export default () => {
       window.mrTabs.eventHub.$off('MergeRequestTabChange', this.setActiveTab);
     },
     methods: {
-      ...mapActions(['setActiveTab', 'setEndpoints']),
+      ...mapActions(['setActiveTab', 'setEndpoints', 'fetchMrMetadata']),
       updateDiscussionTabCounter() {
         this.notesCountBadge.text(this.discussionTabCounter);
       },
diff --git a/app/assets/javascripts/mr_notes/stores/actions.js b/app/assets/javascripts/mr_notes/stores/actions.js
index d1874dcb214..bc66d1dd68f 100644
--- a/app/assets/javascripts/mr_notes/stores/actions.js
+++ b/app/assets/javascripts/mr_notes/stores/actions.js
@@ -1,3 +1,5 @@
+import axios from '~/lib/utils/axios_utils';
+
 import types from './mutation_types';
 
 export function setActiveTab({ commit }, tab) {
@@ -7,3 +9,24 @@ export function setActiveTab({ commit }, tab) {
 export function setEndpoints({ commit }, endpoints) {
   commit(types.SET_ENDPOINTS, endpoints);
 }
+
+export function setMrMetadata({ commit }, metadata) {
+  commit(types.SET_MR_METADATA, metadata);
+}
+
+export function fetchMrMetadata({ dispatch, state }) {
+  if (state.endpoints?.metadata) {
+    axios
+      .get(state.endpoints.metadata)
+      .then((response) => {
+        dispatch('setMrMetadata', response.data);
+      })
+      .catch(() => {
+        // https://gitlab.com/gitlab-org/gitlab/-/issues/324740
+        // We can't even do a simple console warning here because
+        // the pipeline will fail. However, the issue above will
+        // eventually handle errors appropriately.
+        // console.warn('Failed to load MR Metadata for the Overview tab.');
+      });
+  }
+}
diff --git a/app/assets/javascripts/mr_notes/stores/modules/index.js b/app/assets/javascripts/mr_notes/stores/modules/index.js
index 6e228c62a72..52e12ba664c 100644
--- a/app/assets/javascripts/mr_notes/stores/modules/index.js
+++ b/app/assets/javascripts/mr_notes/stores/modules/index.js
@@ -6,6 +6,7 @@ export default () => ({
   state: {
     endpoints: {},
     activeTab: null,
+    mrMetadata: {},
   },
   actions,
   getters,
diff --git a/app/assets/javascripts/mr_notes/stores/mutation_types.js b/app/assets/javascripts/mr_notes/stores/mutation_types.js
index 67fa63f882d..88cf6e48988 100644
--- a/app/assets/javascripts/mr_notes/stores/mutation_types.js
+++ b/app/assets/javascripts/mr_notes/stores/mutation_types.js
@@ -1,4 +1,5 @@
 export default {
   SET_ACTIVE_TAB: 'SET_ACTIVE_TAB',
   SET_ENDPOINTS: 'SET_ENDPOINTS',
+  SET_MR_METADATA: 'SET_MR_METADATA',
 };
diff --git a/app/assets/javascripts/mr_notes/stores/mutations.js b/app/assets/javascripts/mr_notes/stores/mutations.js
index 3843103f4d0..6af6adb4e18 100644
--- a/app/assets/javascripts/mr_notes/stores/mutations.js
+++ b/app/assets/javascripts/mr_notes/stores/mutations.js
@@ -7,4 +7,7 @@ export default {
   [types.SET_ENDPOINTS](state, endpoints) {
     Object.assign(state, { endpoints });
   },
+  [types.SET_MR_METADATA](state, metadata) {
+    Object.assign(state, { mrMetadata: metadata });
+  },
 };
diff --git a/app/assets/javascripts/pipeline_editor/index.js b/app/assets/javascripts/pipeline_editor/index.js
index c20eeac8f41..377905c54bb 100644
--- a/app/assets/javascripts/pipeline_editor/index.js
+++ b/app/assets/javascripts/pipeline_editor/index.js
@@ -3,7 +3,8 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
 import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
-import { EDITOR_APP_STATUS_LOADING } from './constants';
+import getCommitSha from './graphql/queries/client/commit_sha.graphql';
+import getCurrentBranch from './graphql/queries/client/current_branch.graphql';
 import { resolvers } from './graphql/resolvers';
 import typeDefs from './graphql/typedefs.graphql';
 import PipelineEditorApp from './pipeline_editor_app.vue';
@@ -41,12 +42,19 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => {
   const apolloProvider = new VueApollo({
     defaultClient: createDefaultClient(resolvers, { typeDefs }),
   });
+  const { cache } = apolloProvider.clients.defaultClient;
 
-  apolloProvider.clients.defaultClient.cache.writeData({
+  cache.writeQuery({
+    query: getCurrentBranch,
     data: {
       currentBranch: initialBranchName || defaultBranch,
+    },
+  });
+
+  cache.writeQuery({
+    query: getCommitSha,
+    data: {
       commitSha,
-      status: EDITOR_APP_STATUS_LOADING,
     },
   });
 
diff --git a/app/assets/javascripts/vue_shared/alert_details/index.js b/app/assets/javascripts/vue_shared/alert_details/index.js
index 50f2e63702b..8c2aceb0336 100644
--- a/app/assets/javascripts/vue_shared/alert_details/index.js
+++ b/app/assets/javascripts/vue_shared/alert_details/index.js
@@ -42,7 +42,8 @@ export default (selector) => {
     }),
   });
 
-  apolloProvider.clients.defaultClient.cache.writeData({
+  apolloProvider.clients.defaultClient.cache.writeQuery({
+    query: sidebarStatusQuery,
     data: {
       sidebarStatus: false,
     },
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index c48e5f40d99..2ced72aab7e 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -8,7 +8,6 @@ class Projects::CommitsController < Projects::ApplicationController
 
   prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) }
   around_action :allow_gitaly_ref_name_caching
-  before_action :disable_query_limiting, except: :commits_root
   before_action :require_non_empty_project
   before_action :assign_ref_vars, except: :commits_root
   before_action :authorize_download_code!
@@ -82,8 +81,4 @@ class Projects::CommitsController < Projects::ApplicationController
     @commits = @commits.with_latest_pipeline(@ref)
     @commits = set_commits_for_rendering(@commits)
   end
-
-  def disable_query_limiting
-    Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab-foss/issues/42330')
-  end
 end
diff --git a/app/finders/packages/go/package_finder.rb b/app/finders/packages/go/package_finder.rb
new file mode 100644
index 00000000000..4573417d11f
--- /dev/null
+++ b/app/finders/packages/go/package_finder.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Packages
+  module Go
+    class PackageFinder
+      delegate :exists?, to: :candidates
+
+      def initialize(project, module_name, module_version)
+        @project = project
+        @module_name = module_name
+        @module_version = module_version
+      end
+
+      def execute
+        candidates.first
+      end
+
+      private
+
+      def candidates
+        @project
+          .packages
+          .golang
+          .with_name(@module_name)
+          .with_version(@module_version)
+      end
+    end
+  end
+end
diff --git a/app/finders/packages/go/version_finder.rb b/app/finders/packages/go/version_finder.rb
index 8e2fab8ba35..6ee02b8c6f6 100644
--- a/app/finders/packages/go/version_finder.rb
+++ b/app/finders/packages/go/version_finder.rb
@@ -23,7 +23,8 @@ module Packages
         when String
           if pseudo_version? target
             semver = parse_semver(target)
-            commit = pseudo_version_commit(@mod.project, semver)
+            version = parse_pseudo_version(semver)
+            commit = validate_pseudo_version(@mod.project, version)
             Packages::Go::ModuleVersion.new(@mod, :pseudo, commit, name: target, semver: semver)
           else
             @mod.version_by(ref: target)
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 4c46f779893..16b30f193c7 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -24,6 +24,8 @@ class Issue < ApplicationRecord
   include Todoable
   include FromUnion
 
+  extend ::Gitlab::Utils::Override
+
   DueDateStruct                   = Struct.new(:title, :name).freeze
   NoDueDate                       = DueDateStruct.new('No Due Date', '0').freeze
   AnyDueDate                      = DueDateStruct.new('Any Due Date', '').freeze
@@ -448,8 +450,14 @@ class Issue < ApplicationRecord
 
   private
 
+  # Ensure that the metrics association is safely created and respecting the unique constraint on issue_id
+  override :ensure_metrics
   def ensure_metrics
-    super
+    if !association(:metrics).loaded? || metrics.blank?
+      metrics_record = Issue::Metrics.safe_find_or_create_by(issue: self)
+      self.metrics = metrics_record
+    end
+
     metrics.record!
   end
 
diff --git a/app/models/packages/go/module_version.rb b/app/models/packages/go/module_version.rb
index a50c78f8e69..fd575e6c96c 100644
--- a/app/models/packages/go/module_version.rb
+++ b/app/models/packages/go/module_version.rb
@@ -4,6 +4,7 @@ module Packages
   module Go
     class ModuleVersion
       include Gitlab::Utils::StrongMemoize
+      include Gitlab::Golang
 
       VALID_TYPES = %i[ref commit pseudo].freeze
 
@@ -81,6 +82,9 @@ module Packages
       end
 
       def valid?
+        # assume the module version is valid if a corresponding Package exists
+        return true if ::Packages::Go::PackageFinder.new(mod.project, mod.name, name).exists?
+
         @mod.path_valid?(major) && @mod.gomod_valid?(gomod)
       end
 
diff --git a/app/services/issue_rebalancing_service.rb b/app/services/issue_rebalancing_service.rb
index db5c5ddfb84..f9c3388204f 100644
--- a/app/services/issue_rebalancing_service.rb
+++ b/app/services/issue_rebalancing_service.rb
@@ -62,7 +62,7 @@ class IssueRebalancingService
 
   def run_update_query(values, query_name)
     Issue.connection.exec_query(<<~SQL, query_name)
-      WITH cte(cte_id, new_pos) AS (
+      WITH cte(cte_id, new_pos) AS #{Gitlab::Database::AsWithMaterialized.materialized_if_supported} (
        SELECT *
        FROM (VALUES #{values}) as t (id, pos)
       )
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 488c847dcbb..e63099a0820 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -75,16 +75,9 @@ module Notes
       increment_usage_counter(note)
       track_event(note, current_user)
 
-      if Feature.enabled?(:notes_create_service_tracking, project)
-        Gitlab::Tracking.event('Notes::CreateService', 'execute', **tracking_data_for(note))
-      end
-
       if note.for_merge_request? && note.diff_note? && note.start_of_discussion?
         Discussions::CaptureDiffNotePositionService.new(note.noteable, note.diff_file&.paths).execute(note.discussion)
       end
-
-      track_note_creation_usage_for_issues(note) if note.for_issue?
-      track_note_creation_usage_for_merge_requests(note) if note.for_merge_request?
     end
 
     def do_commands(note, update_params, message, only_commands)
@@ -111,6 +104,16 @@ module Notes
       }
     end
 
+    def track_event(note, user)
+      track_note_creation_usage_for_issues(note) if note.for_issue?
+      track_note_creation_usage_for_merge_requests(note) if note.for_merge_request?
+      track_usage_event(:incident_management_incident_comment, user.id) if note.for_issue? && note.noteable.incident?
+
+      if Feature.enabled?(:notes_create_service_tracking, project)
+        Gitlab::Tracking.event('Notes::CreateService', 'execute', **tracking_data_for(note))
+      end
+    end
+
     def tracking_data_for(note)
       label = Gitlab.ee? && note.author == User.visual_review_bot ? 'anonymous_visual_review_note' : 'note'
 
@@ -120,12 +123,6 @@ module Notes
       }
     end
 
-    def track_event(note, user)
-      return unless note.noteable.is_a?(Issue) && note.noteable.incident?
-
-      track_usage_event(:incident_management_incident_comment, user.id)
-    end
-
     def track_note_creation_usage_for_issues(note)
       Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_comment_added_action(author: note.author)
     end
@@ -135,3 +132,5 @@ module Notes
     end
   end
 end
+
+Notes::CreateService.prepend_if_ee('EE::Notes::CreateService')
diff --git a/app/services/packages/go/create_package_service.rb b/app/services/packages/go/create_package_service.rb
new file mode 100644
index 00000000000..4e8b8ef8d6b
--- /dev/null
+++ b/app/services/packages/go/create_package_service.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Packages
+  module Go
+    class CreatePackageService < BaseService
+      GoZipSizeError = Class.new(StandardError)
+
+      attr_accessor :version
+
+      def initialize(project, user = nil, version:)
+        super(project, user)
+
+        @version = version
+      end
+
+      def execute
+        # check for existing package to avoid SQL errors due to the index
+        package = ::Packages::Go::PackageFinder.new(version.mod.project, version.mod.name, version.name).execute
+        return package if package
+
+        # this can be expensive, so do it outside the transaction
+        files = {}
+        files[:mod] = prepare_file(version, :mod, version.gomod)
+        files[:zip] = prepare_file(version, :zip, version.archive.string)
+
+        ActiveRecord::Base.transaction do
+          # create new package and files
+          package = create_package
+          files.each { |type, (file, digests)| create_file(package, type, file, digests) }
+          package
+        end
+      end
+
+      private
+
+      def prepare_file(version, type, content)
+        file = CarrierWaveStringFile.new(content)
+        raise GoZipSizeError, "#{version.mod.name}@#{version.name}.#{type} exceeds size limit" if file.size > project.actual_limits.golang_max_file_size
+
+        digests = {
+          md5: Digest::MD5.hexdigest(content),
+          sha1: Digest::SHA1.hexdigest(content),
+          sha256: Digest::SHA256.hexdigest(content)
+        }
+
+        [file, digests]
+      end
+
+      def create_package
+        version.mod.project.packages.create!(
+          name: version.mod.name,
+          version: version.name,
+          package_type: :golang,
+          created_at: version.commit.committed_date
+        )
+      end
+
+      def create_file(package, type, file, digests)
+        CreatePackageFileService.new(package,
+          file: file,
+          size: file.size,
+          file_name: "#{version.name}.#{type}",
+          file_md5: digests[:md5],
+          file_sha1: digests[:sha1],
+          file_sha256: digests[:sha256]
+        ).execute
+      end
+    end
+  end
+end
diff --git a/app/services/packages/go/sync_packages_service.rb b/app/services/packages/go/sync_packages_service.rb
new file mode 100644
index 00000000000..c35d3600388
--- /dev/null
+++ b/app/services/packages/go/sync_packages_service.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Packages
+  module Go
+    class SyncPackagesService < BaseService
+      include Gitlab::Golang
+
+      def initialize(project, ref, path = '')
+        super(project)
+
+        @ref = ref
+        @path = path
+
+        raise ArgumentError, 'project is required' unless project
+        raise ArgumentError, 'ref is required' unless ref
+        raise ArgumentError, "ref #{ref} not found" unless project.repository.find_tag(ref) || project.repository.find_branch(ref)
+      end
+
+      def execute_async
+        Packages::Go::SyncPackagesWorker.perform_async(project.id, @ref, @path)
+      end
+    end
+  end
+end
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index d405b00dc32..3dbb087d8d8 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -1083,6 +1083,14 @@
   :weight: 1
   :idempotent:
   :tags: []
+- :name: package_repositories:packages_go_sync_packages
+  :feature_category: :package_registry
+  :has_external_dependencies:
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: package_repositories:packages_maven_metadata_sync
   :feature_category: :package_registry
   :has_external_dependencies:
diff --git a/app/workers/packages/go/sync_packages_worker.rb b/app/workers/packages/go/sync_packages_worker.rb
new file mode 100644
index 00000000000..e41f27f2252
--- /dev/null
+++ b/app/workers/packages/go/sync_packages_worker.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Packages
+  module Go
+    class SyncPackagesWorker
+      include ApplicationWorker
+      include Gitlab::Golang
+
+      queue_namespace :package_repositories
+      feature_category :package_registry
+
+      deduplicate :until_executing
+      idempotent!
+
+      def perform(project_id, ref_name, path)
+        project = Project.find_by_id(project_id)
+        return unless project && project.repository.find_tag(ref_name)
+
+        module_name = go_path(project, path)
+        mod = Packages::Go::ModuleFinder.new(project, module_name).execute
+        return unless mod
+
+        ver = Packages::Go::VersionFinder.new(mod).find(ref_name)
+        return unless ver
+
+        Packages::Go::CreatePackageService.new(project, nil, version: ver).execute
+
+      rescue ::Packages::Go::CreatePackageService::GoZipSizeError => ex
+        Gitlab::ErrorTracking.log_exception(ex)
+      end
+    end
+  end
+end