2 files changed, 41 insertions, 1 deletions
diff --git a/app/services/environments/create_for_build_service.rb b/app/services/environments/create_for_build_service.rb
new file mode 100644
index 00000000000..c46b66ac5b3
--- /dev/null
+++ b/app/services/environments/create_for_build_service.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Environments
+  # This class creates an environment record for a build (a pipeline job).
+  class CreateForBuildService
+    def execute(build, merge_request: nil)
+      return unless build.instance_of?(::Ci::Build) && build.has_environment_keyword?
+
+      environment = to_resource(build, merge_request)
+
+      if environment.persisted?
+        build.persisted_environment = environment
+        build.assign_attributes(metadata_attributes: { expanded_environment_name: environment.name })
+      else
+        build.assign_attributes(status: :failed, failure_reason: :environment_creation_failure)
+      end
+
+      environment
+    end
+
+    private
+
+    # rubocop: disable Performance/ActiveRecordSubtransactionMethods
+    def to_resource(build, merge_request)
+      build.project.environments.safe_find_or_create_by(name: build.expanded_environment_name) do |environment|
+        # Initialize the attributes at creation
+        environment.auto_stop_in = expanded_auto_stop_in(build)
+        environment.tier = build.environment_tier_from_options
+        environment.merge_request = merge_request
+      end
+    end
+    # rubocop: enable Performance/ActiveRecordSubtransactionMethods
+
+    def expanded_auto_stop_in(build)
+      return unless build.environment_auto_stop_in
+
+      ExpandVariables.expand(build.environment_auto_stop_in, -> { build.simple_variables.sort_and_expand_all })
+    end
+  end
+end
diff --git a/app/services/environments/schedule_to_delete_review_apps_service.rb b/app/services/environments/schedule_to_delete_review_apps_service.rb
index b3b86689748..041b834f11b 100644
--- a/app/services/environments/schedule_to_delete_review_apps_service.rb
+++ b/app/services/environments/schedule_to_delete_review_apps_service.rb
@@ -58,7 +58,7 @@ module Environments
       else
         result.set_status(
           :bad_request,
-          error_message: "Failed to authorize deletions for some or all of the environments. Ask someone with more permissions to delete the environments."
+          error_message: "No environments found for scheduled deletion. Either your query did not match any environments (default parameters match environments that are 30 days or older), or you have insufficient permissions to delete matching environments."
         )
 
         result.set_unprocessable_entries(failed)