From 7045ed5408272dcbbca20a483190596e25223521 Mon Sep 17 00:00:00 2001
From: Rutger Wessels <rwessels@gitlab.com>
Date: Wed, 24 Jul 2024 15:42:55 +0200
Subject: [PATCH] Enable Organization presence validation for update templates
 rake task

---
 lib/tasks/gitlab/update_templates.rake               | 12 ++++++++----
 .../disable_namespace_organization_validation.yml    |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake
index 8a87f565e168f7..2e7e5b5bbd3e3f 100644
--- a/lib/tasks/gitlab/update_templates.rake
+++ b/lib/tasks/gitlab/update_templates.rake
@@ -37,9 +37,13 @@ namespace :gitlab do
 
     tmp_namespace_path = "tmp-project-import-#{Time.now.to_i}"
     puts "Creating temporary namespace #{tmp_namespace_path}"
-    tmp_namespace = Namespace.with_disabled_organization_validation do
-      Namespace.create!(owner: admin, name: tmp_namespace_path, path: tmp_namespace_path, type: Namespaces::UserNamespace.sti_name)
-    end
+    tmp_namespace = Namespace.create!(
+      owner: admin,
+      name: tmp_namespace_path,
+      path: tmp_namespace_path,
+      type: Namespaces::UserNamespace.sti_name,
+      organization: tmp_organization
+    )
 
     templates = if template_names.empty?
                   Gitlab::ProjectTemplate.all
@@ -56,7 +60,7 @@ namespace :gitlab do
       }
 
       puts "Creating project for #{template.title}"
-      project = Namespace.with_disabled_organization_validation { Projects::CreateService.new(admin, params).execute }
+      project = Projects::CreateService.new(admin, params).execute
 
       unless project.persisted?
         raise "Failed to create project: #{project.errors.messages}"
diff --git a/spec/support/helpers/disable_namespace_organization_validation.yml b/spec/support/helpers/disable_namespace_organization_validation.yml
index 0751e8597a06b6..63cf1f1ffc95af 100644
--- a/spec/support/helpers/disable_namespace_organization_validation.yml
+++ b/spec/support/helpers/disable_namespace_organization_validation.yml
@@ -67,4 +67,3 @@
 - spec/services/groups/nested_create_service_spec.rb
 - spec/services/resource_access_tokens/create_service_spec.rb
 - spec/tasks/gitlab/seed/runner_fleet_rake_spec.rb
-- spec/tasks/gitlab/update_templates_rake_spec.rb
-- 
GitLab