Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

6 files changed, 109 insertions, 17 deletions

diff --git a/app/models/concerns/ci/artifactable.rb b/app/models/concerns/ci/artifactable.rb
index ee8e98ec1bf..3fdbd6a8789 100644
--- a/app/models/concerns/ci/artifactable.rb
+++ b/app/models/concerns/ci/artifactable.rb
@@ -10,8 +10,17 @@ module Ci
     STORE_COLUMN = :file_store
     NotSupportedAdapterError = Class.new(StandardError)
     FILE_FORMAT_ADAPTERS = {
+      # While zip is a streamable file format, performing streaming
+      # reads requires that each entry in the zip has certain headers
+      # present at the front of the entry. These headers are OPTIONAL
+      # according to the file format specification. GitLab Runner uses
+      # Go's `archive/zip` to create zip archives, which does not include
+      # these headers. Go maintainers have expressed that they don't intend
+      # to support them: https://github.com/golang/go/issues/23301#issuecomment-363240781
+      #
+      # If you need GitLab to be able to read Artifactables, store them in
+      # raw or gzip format instead of zip.
       gzip: Gitlab::Ci::Build::Artifacts::Adapters::GzipStream,
-      zip: Gitlab::Ci::Build::Artifacts::Adapters::ZipStream,
       raw: Gitlab::Ci::Build::Artifacts::Adapters::RawStream
     }.freeze
 
diff --git a/app/models/concerns/ci/has_deployment_name.rb b/app/models/concerns/ci/has_deployment_name.rb
deleted file mode 100644
index 887653e846e..00000000000
--- a/app/models/concerns/ci/has_deployment_name.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Ci
-  module HasDeploymentName
-    extend ActiveSupport::Concern
-
-    def count_user_deployment?
-      deployment_name?
-    end
-
-    def deployment_name?
-      self.class::DEPLOYMENT_NAMES.any? { |n| name.downcase.include?(n) }
-    end
-  end
-end
diff --git a/app/models/concerns/ci/lockable.rb b/app/models/concerns/ci/lockable.rb
new file mode 100644
index 00000000000..31ba93775e2
--- /dev/null
+++ b/app/models/concerns/ci/lockable.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Ci
+  module Lockable
+    extend ActiveSupport::Concern
+
+    included do
+      # `locked` will be populated from the source of truth on Ci::Pipeline
+      # in order to clean up expired job artifacts in a performant way.
+      # The values should be the same as `Ci::Pipeline.lockeds` with the
+      # additional value of `unknown` to indicate rows that have not
+      # yet been populated from the parent Ci::Pipeline
+      enum locked: {
+        unlocked: 0,
+        artifacts_locked: 1,
+        unknown: 2
+      }, _prefix: :artifact
+    end
+  end
+end
diff --git a/app/models/concerns/ci/metadatable.rb b/app/models/concerns/ci/metadatable.rb
index 8c3a05c23f0..71b26b70bbf 100644
--- a/app/models/concerns/ci/metadatable.rb
+++ b/app/models/concerns/ci/metadatable.rb
@@ -34,7 +34,7 @@ module Ci
     end
 
     def ensure_metadata
-      metadata || build_metadata(project: project)
+      metadata || build_metadata(project: project, partition_id: partition_id)
     end
 
     def degenerated?
diff --git a/app/models/concerns/ci/partitionable.rb b/app/models/concerns/ci/partitionable.rb
new file mode 100644
index 00000000000..710ee1ba64f
--- /dev/null
+++ b/app/models/concerns/ci/partitionable.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Ci
+  ##
+  # This module implements a way to set the `partion_id` value on a dependent
+  # resource from a parent record.
+  # Usage:
+  #
+  #     class PipelineVariable < Ci::ApplicationRecord
+  #       include Ci::Partitionable
+  #
+  #       belongs_to :pipeline
+  #       partitionable scope: :pipeline
+  #       # Or
+  #       partitionable scope: ->(record) { record.partition_value }
+  #
+  #
+  module Partitionable
+    extend ActiveSupport::Concern
+    include ::Gitlab::Utils::StrongMemoize
+
+    included do
+      before_validation :set_partition_id, on: :create
+      validates :partition_id, presence: true
+
+      def set_partition_id
+        return if partition_id_changed? && partition_id.present?
+        return unless partition_scope_value
+
+        self.partition_id = partition_scope_value
+      end
+    end
+
+    class_methods do
+      private
+
+      def partitionable(scope:)
+        define_method(:partition_scope_value) do
+          strong_memoize(:partition_scope_value) do
+            record = scope.to_proc.call(self)
+            record.respond_to?(:partition_id) ? record.partition_id : record
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/concerns/ci/track_environment_usage.rb b/app/models/concerns/ci/track_environment_usage.rb
new file mode 100644
index 00000000000..45d9cdeeb59
--- /dev/null
+++ b/app/models/concerns/ci/track_environment_usage.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Ci
+  module TrackEnvironmentUsage
+    extend ActiveSupport::Concern
+
+    def track_deployment_usage
+      return unless user_id.present? && count_user_deployment?
+
+      Gitlab::Utils::UsageData.track_usage_event('ci_users_executing_deployment_job', user_id)
+    end
+
+    def track_verify_environment_usage
+      return unless user_id.present? && verifies_environment?
+
+      Gitlab::Utils::UsageData.track_usage_event('ci_users_executing_verify_environment_job', user_id)
+    end
+
+    def verifies_environment?
+      has_environment? && environment_action == 'verify'
+    end
+
+    def count_user_deployment?
+      deployment_name?
+    end
+
+    def deployment_name?
+      self.class::DEPLOYMENT_NAMES.any? { |n| name.downcase.include?(n) }
+    end
+  end
+end