Remove form web_hook controller and add into gitlab controller. havin…

…g to pull parent function down. added to spec file.
gocd · Jan 24, 2018 · febbf35 · febbf35
1 parent 37984d4
commit febbf35
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/server/webapp/WEB-INF/rails.new/app/controllers/api/web_hooks/git_lab_controller.rb b/server/webapp/WEB-INF/rails.new/app/controllers/api/web_hooks/git_lab_controller.rb
@@ -21,6 +21,39 @@ class GitLabController < WebHookController
       before_action :allow_only_push_event
       before_action :verify_payload
 
+      def notify
+        possible_urls = %W(
+          https://#{repo_host_name}/#{repo_full_name}
+          https://#{repo_host_name}/#{repo_full_name}/
+          https://#{repo_host_name}/#{repo_full_name}.git
+          https://#{repo_host_name}/#{repo_full_name}.git/
+          http://#{repo_host_name}/#{repo_full_name}
+          http://#{repo_host_name}/#{repo_full_name}/
+          http://#{repo_host_name}/#{repo_full_name}.git
+          http://#{repo_host_name}/#{repo_full_name}.git/
+          git://#{repo_host_name}/#{repo_full_name}
+          git://#{repo_host_name}/#{repo_full_name}/
+          git://#{repo_host_name}/#{repo_full_name}.git
+          git://#{repo_host_name}/#{repo_full_name}.git/
+          git@#{repo_host_name}:#{repo_full_name}
+          git@#{repo_host_name}:#{repo_full_name}/
+          git@#{repo_host_name}:#{repo_full_name}.git
+          git@#{repo_host_name}:#{repo_full_name}.git/
+          gitlab@#{repo_host_name}:#{repo_full_name}
+          gitlab@#{repo_host_name}:#{repo_full_name}/
+          gitlab@#{repo_host_name}:#{repo_full_name}.git
+          gitlab@#{repo_host_name}:#{repo_full_name}.git/
+        )
+
+        Rails.logger.info("[WebHook] Noticed a git push to #{repo_host_name}/#{repo_full_name} on branch #{repo_branch}")
+
+        if material_update_service.updateGitMaterial(repo_branch, possible_urls)
+          render text: 'OK!', content_type: 'text/plain', status: :accepted, layout: nil
+        else
+          render text: 'No matching materials!', content_type: 'text/plain', status: :accepted, layout: nil
+        end
+      end
+
       protected
 
       def repo_branch

diff --git a/server/webapp/WEB-INF/rails.new/app/controllers/api/web_hooks/web_hook_controller.rb b/server/webapp/WEB-INF/rails.new/app/controllers/api/web_hooks/web_hook_controller.rb
@@ -35,10 +35,6 @@ def notify
           git@#{repo_host_name}:#{repo_full_name}/
           git@#{repo_host_name}:#{repo_full_name}.git
           git@#{repo_host_name}:#{repo_full_name}.git/
-          gitlab@#{repo_host_name}:#{repo_full_name}
-          gitlab@#{repo_host_name}:#{repo_full_name}/
-          gitlab@#{repo_host_name}:#{repo_full_name}.git
-          gitlab@#{repo_host_name}:#{repo_full_name}.git/
         )
 
         Rails.logger.info("[WebHook] Noticed a git push to #{repo_host_name}/#{repo_full_name} on branch #{repo_branch}")

diff --git a/server/webapp/WEB-INF/rails.new/spec/controllers/api/web_hooks/git_lab_controller_spec.rb b/server/webapp/WEB-INF/rails.new/spec/controllers/api/web_hooks/git_lab_controller_spec.rb
@@ -73,7 +73,11 @@
                             git@gitlab.example.com:org/repo
                             git@gitlab.example.com:org/repo/
                             git@gitlab.example.com:org/repo.git
-                            git@gitlab.example.com:org/repo.git/)
+                            git@gitlab.example.com:org/repo.git/
+                            gitlab@gitlab.example.com:org/repo
+                            gitlab@gitlab.example.com:org/repo/
+                            gitlab@gitlab.example.com:org/repo.git
+                            gitlab@gitlab.example.com:org/repo.git/)
 
         expect(@material_update_service)
           .to receive(:updateGitMaterial)