Purge old workhorse_helper methods

- Purge the workhorse helper methods that had been refactored out from
  other files and clean up the affected spec tests to pass

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>

files/gitlab-cookbooks/gitlab/libraries/helpers/web_server_helper.rb

@@ -19,7 +19,7 @@ class WebServerHelper
       gitlab_url = node['gitlab']['gitlab-rails']['internal_api_url']
       # If no internal_api_url is specified, default to Workhorse settings
-      workhorse_url = workhorse_helper.listen_address
+      workhorse_url = node['gitlab']['gitlab-workhorse']['listen_addr']
       relative_path = Gitlab['gitlab_workhorse']['relative_url']
       gitlab_url ||= workhorse_helper.unix_socket? ? "http+unix://#{ERB::Util.url_encode(workhorse_url)}" : "http://#{workhorse_url}#{relative_path}"
       gitlab_relative_path = relative_path || '' if workhorse_helper.unix_socket?

files/gitlab-cookbooks/gitlab/recipes/gitlab-healthcheck.rb

@@ -28,8 +28,8 @@ if node['gitlab']['nginx']['enable']
 else
   # Always use http for workhorse
   schema = 'http'
-  use_socket = node['gitlab']['gitlab-workhorse']['listen_network'] == "unix"
-  host = use_socket ? 'localhost' : workhorse_helper.listen_address
+  use_socket = workhorse_helper.unix_socket?
+  host = use_socket ? 'localhost' : node['gitlab']['gitlab-workhorse']['listen_addr']
 end
 template "/opt/gitlab/etc/gitlab-healthcheck-rc" do
@@ -38,7 +38,7 @@ template "/opt/gitlab/etc/gitlab-healthcheck-rc" do
   variables(
     {
       use_socket: use_socket,
-      socket_path: use_socket ? workhorse_helper.listen_address : '',
+      socket_path: use_socket ? node['gitlab']['gitlab-workhorse']['listen_addr'] : '',
       url: "#{schema}://#{host}#{Gitlab['gitlab_rails']['gitlab_relative_url']}/help"
     }
   )

files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-workhorse-run.erb

@@ -21,7 +21,7 @@ exec chpst -e /opt/gitlab/etc/gitlab-workhorse/env -P \
   /opt/gitlab/embedded/bin/gitlab-workhorse \
     -listenNetwork <%= node['gitlab']['gitlab-workhorse']['listen_network'] %> \
     -listenUmask <%= node['gitlab']['gitlab-workhorse']['listen_umask'] %> \
-    -listenAddr <%= GitlabWorkhorseHelper.new(node).listen_address %> \
+    -listenAddr <%= node['gitlab']['gitlab-workhorse']['listen_addr'] %> \
     -authBackend <%= node['gitlab']['gitlab-workhorse']['auth_backend'] %><%= node['gitlab']['gitlab-workhorse']['relative_url'] %> \
     <% if node['gitlab']['gitlab-workhorse']['auth_socket'] %>
     -authSocket <%= node['gitlab']['gitlab-workhorse']['auth_socket'] %> \

spec/chef/recipes/gitaly_spec.rb

@@ -501,7 +501,7 @@ RSpec.describe 'gitaly' do
     context 'with a socket directory set' do
       before do
-        stub_gitlab_rb(gitlab_workhorse: { listen_addr: '/fake/workhorse/socket', sockets_directory: '/fake/workhorse/sockets' })
+        stub_gitlab_rb(gitlab_workhorse: { sockets_directory: '/fake/workhorse/sockets' })
       end
       it 'create config file with provided values' do

spec/chef/recipes/gitlab-shell_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe 'gitlab::gitlab-shell' do
       context 'with sockets_directory defined' do
         before do
-          stub_gitlab_rb(gitlab_workhorse: { listen_addr: '/fake/workhorse/socket', 'sockets_directory': '/fake/workhorse/sockets/' })
+          stub_gitlab_rb(gitlab_workhorse: { 'sockets_directory': '/fake/workhorse/sockets/' })
         end
         it 'create config file with provided values' do