From 7e3fbfbb65dffb2d057f9c21f309eb37e783ab0e Mon Sep 17 00:00:00 2001 From: Tomas Hykel Date: Thu, 28 May 2026 13:23:51 +0200 Subject: [PATCH] Revert "increase to 10 chars for good measure" This reverts commit 941230671cd9726af2bb8922509ef4c20ce21117. --- .../project_identifiers/revert_project_to_classic_service.rb | 2 +- .../revert_project_to_classic_service_spec.rb | 2 +- .../revert_instance_to_classic_ids_job_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/project_identifiers/revert_project_to_classic_service.rb b/app/services/project_identifiers/revert_project_to_classic_service.rb index ad62de8568d..da3a37a89b2 100644 --- a/app/services/project_identifiers/revert_project_to_classic_service.rb +++ b/app/services/project_identifiers/revert_project_to_classic_service.rb @@ -64,7 +64,7 @@ module ProjectIdentifiers def handle_update_failure(classic_id, error) Rails.logger.warn "#{self.class}: Could not set identifier '#{classic_id}' for project #{project.id}; " \ "falling back to a randomized suffix. (#{error.message})" - project.update!(identifier: "project-#{SecureRandom.alphanumeric(10).downcase}") + project.update!(identifier: "project-#{SecureRandom.alphanumeric(5).downcase}") end def identifier_generator diff --git a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb b/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb index af0805e9f53..8ab8640f559 100644 --- a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb +++ b/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb @@ -132,7 +132,7 @@ RSpec.describe ProjectIdentifiers::RevertProjectToClassicService do it "assigns a project-NNNNN fallback identifier" do described_class.new(project).call - expect(project.reload.identifier).to match(/\Aproject-[a-z0-9]{10}\z/) + expect(project.reload.identifier).to match(/\Aproject-[a-z0-9]{5}\z/) end it "logs a warning containing the project id and the conflicting identifier" do diff --git a/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb b/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb index 26e010aa268..0b65c2d61bb 100644 --- a/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb +++ b/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb @@ -156,7 +156,7 @@ RSpec.describe ProjectIdentifiers::RevertInstanceToClassicIdsJob do end it "assigns project_conflict a project-NNNNN fallback identifier" do - expect(project_conflict.reload.identifier).to match(/\Aproject-[a-z0-9]{10}\z/) + expect(project_conflict.reload.identifier).to match(/\Aproject-[a-z0-9]{5}\z/) end end end