From bd714482cb2836499fe186162cc058a143d7fd7b Mon Sep 17 00:00:00 2001 From: Anthony Woo Date: Thu, 22 Aug 2024 10:46:35 -0700 Subject: [PATCH 1/2] log project name when creating a release --- app/controllers/integrations/base_controller.rb | 2 +- test/controllers/integrations/base_controller_test.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/integrations/base_controller.rb b/app/controllers/integrations/base_controller.rb index fa34a2e94a..4ee9558afa 100644 --- a/app/controllers/integrations/base_controller.rb +++ b/app/controllers/integrations/base_controller.rb @@ -18,7 +18,7 @@ def create create_release = project.create_release?(branch, service_type, service_name) record_log( :info, - "Create release for branch [#{branch}], service_type [#{service_type}], service_name [#{service_name}]: " \ + "Create release for project [#{project.name}], branch [#{branch}], service_type [#{service_type}], service_name [#{service_name}]: " \ "#{create_release}" ) release = find_or_create_release if create_release diff --git a/test/controllers/integrations/base_controller_test.rb b/test/controllers/integrations/base_controller_test.rb index 92df696c5f..708ecb214d 100644 --- a/test/controllers/integrations/base_controller_test.rb +++ b/test/controllers/integrations/base_controller_test.rb @@ -109,7 +109,7 @@ class BaseTestController < Integrations::BaseController # rubocop:disable Lint/C post :create, params: {test_route: true, token: token, foo: "bar"} assert_response :success result = WebhookRecorder.read(project) - log = "INFO: Create release for branch [master], service_type [ci], service_name [base_test]: true\n" + log = "INFO: Create release for project [Foo], branch [master], service_type [ci], service_name [base_test]: true\n" project.reload result.fetch(:log).must_equal log @@ -192,7 +192,7 @@ class BaseTestController < Integrations::BaseController # rubocop:disable Lint/C post :create, params: {test_route: true, token: token} expected_messages = <<~MESSAGES - INFO: Create release for branch [master], service_type [ci], service_name [base_test]: true + INFO: Create release for project [Foo], branch [master], service_type [ci], service_name [base_test]: true INFO: Deploying #{deploy1.id} to Staging INFO: Deploying #{deploy2.id} to Production MESSAGES @@ -221,7 +221,7 @@ class BaseTestController < Integrations::BaseController # rubocop:disable Lint/C post :create, params: {test_route: true, token: token, includes: 'status_urls'} expected_messages = <<~MESSAGES - INFO: Create release for branch [master], service_type [ci], service_name [base_test]: true + INFO: Create release for project [Foo], branch [master], service_type [ci], service_name [base_test]: true INFO: Deploying #{deploy1.id} to Staging INFO: Deploying #{deploy2.id} to Production MESSAGES @@ -241,7 +241,7 @@ class BaseTestController < Integrations::BaseController # rubocop:disable Lint/C post :create, params: {test_route: true, token: token} message = <<~MSG - INFO: Create release for branch [master], service_type [ci], service_name [base_test]: true + INFO: Create release for project [Foo], branch [master], service_type [ci], service_name [base_test]: true ERROR: Failed deploying to Staging: Stage is locked INFO: Deploying #{Deploy.first.id} to Production MSG From a44f65db4404b05c91faed4cd3dff979a7db5322 Mon Sep 17 00:00:00 2001 From: Anthony Woo Date: Thu, 22 Aug 2024 13:42:16 -0700 Subject: [PATCH 2/2] rubocop --- app/controllers/integrations/base_controller.rb | 4 ++-- test/controllers/integrations/base_controller_test.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/integrations/base_controller.rb b/app/controllers/integrations/base_controller.rb index 4ee9558afa..7c5b683c58 100644 --- a/app/controllers/integrations/base_controller.rb +++ b/app/controllers/integrations/base_controller.rb @@ -18,8 +18,8 @@ def create create_release = project.create_release?(branch, service_type, service_name) record_log( :info, - "Create release for project [#{project.name}], branch [#{branch}], service_type [#{service_type}], service_name [#{service_name}]: " \ - "#{create_release}" + "Create release for project [#{project.name}], branch [#{branch}], service_type [#{service_type}], " \ + "service_name [#{service_name}]: #{create_release}" ) release = find_or_create_release if create_release else diff --git a/test/controllers/integrations/base_controller_test.rb b/test/controllers/integrations/base_controller_test.rb index 708ecb214d..8165d86da4 100644 --- a/test/controllers/integrations/base_controller_test.rb +++ b/test/controllers/integrations/base_controller_test.rb @@ -109,7 +109,8 @@ class BaseTestController < Integrations::BaseController # rubocop:disable Lint/C post :create, params: {test_route: true, token: token, foo: "bar"} assert_response :success result = WebhookRecorder.read(project) - log = "INFO: Create release for project [Foo], branch [master], service_type [ci], service_name [base_test]: true\n" + log = "INFO: Create release for project [Foo], branch [master], service_type [ci], " \ + "service_name [base_test]: true\n" project.reload result.fetch(:log).must_equal log