Remove unused configuration and code

app.json

@@ -7,9 +7,6 @@
     },
     "RACK_ENV": {
       "required": true
-    },
-    "ES_HOST": {
-      "required": true
     }
   },
   "formation": {},

app/views/datasets/_additional_info.html.erb

@@ -22,7 +22,6 @@
             <% if i['access_constraints'] %>
               <dt><%= t('.inspire_access_constraints') %></dt>
               <% constraints = i['access_constraints'] %>
-              <% pp constraints %>
               <dd><%= constraints.is_a?(String) ? constraints : constraints.first || t('.inspire_access_constraints_unspecified') %></dd>
             <% end %>
             <% if i['guid'] %>

app/views/layouts/application.html.erb

@@ -23,87 +23,6 @@
     </script>
   <% end %>
 
-<script>
-<% if Rails.application.config.analytics_tracking_id.present? %>
-  var analyticsInit = function() {
-      var consentCookie = window.GOVUK.getConsentCookie();
-
-      if (consentCookie && consentCookie["usage"]) {
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga')
-
-        ga('create', '<%= Rails.application.config.analytics_tracking_id %>', 'auto')
-        var dimensions = {}
-
-        $(document).ready(function() {
-          dimensions['dimension11'] = 'find-open-data'
-          ga('send', 'pageview', dimensions)
-          $('[data-ga-event]').on('click', sendAnalyticsEvent)
-        })
-
-        // Analytics event firing
-        function sendAnalyticsEvent() {
-          var eventType = $(this).data('ga-event')
-          var orgName = $(this).data('ga-publisher')
-          var eventParams = {}
-          switch (eventType) {
-            case 'download':
-              eventParams = {
-                hitType: 'event',
-                eventCategory: 'datafile',
-                eventAction: 'download',
-                eventLabel: $(this).attr('href'),
-                dimension4: orgName,
-                dimension5: $(this).data('ga-format'),
-                dimension11: 'find-open-data'
-              }
-              break
-            case 'contact':
-              eventParams = {
-                hitType: 'event',
-                eventCategory: 'contact-details',
-                eventAction: 'click',
-                eventLabel: orgName,
-                dimension4: orgName,
-                dimension11: 'find-open-data'
-              }
-              break
-            case 'preview':
-              eventParams = {
-                hitType: 'event',
-                eventCategory: 'datafile-preview',
-                eventAction: 'click',
-                eventLabel: $(this).attr('href'),
-                dimension4: orgName,
-                dimension5: $(this).data('ga-format'),
-                dimension11: 'find-open-data'
-              }
-              break
-            case 'preview-download':
-              eventParams = {
-                hitType: 'event',
-                eventCategory: 'datafile-preview',
-                eventAction: 'download',
-                eventLabel: $(this).attr('href'),
-                dimension4: orgName,
-                dimension5: $(this).data('ga-format'),
-                dimension11: 'find-open-data'
-              }
-              break
-          }
-          ga('send', eventParams)
-        }
-      }
-  };
-<% else %>
-  var analyticsInit = function() { /* Analytics not configured. */ };
-<% end %>
-window.GOVUK = window.GOVUK || {};
-window.GOVUK.analyticsInit = analyticsInit;
-</script>
-
     <meta charset="utf-8">
     <title><%= content_for?(:page_title) ? yield(:page_title) + " - " + t('.site_name') : t('.site_name') %></title>
 

config/application.rb

@@ -19,22 +19,6 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
-if ENV["VCAP_SERVICES"]
-  services = JSON.parse(ENV["VCAP_SERVICES"])
-
-  if services.key?("user-provided")
-    # Extract UPSes and pull out secrets configs
-    user_provided_services = services["user-provided"].select { |s| s["name"].include?("secrets") }
-    credentials = user_provided_services.map { |s| s["credentials"] }.reduce(:merge)
-
-    # Take each credential and assign to ENV
-    credentials.each do |k, v|
-      # Don't overwrite existing env vars
-      ENV[k.upcase] ||= v
-    end
-  end
-end
-
 module FindDataBeta
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
@@ -46,14 +30,7 @@ class Application < Rails::Application
     # https://github.com/alphagov/govuk-frontend/issues/1350
     config.assets.css_compressor = nil
 
-    config.action_dispatch.rescue_responses["Datafile::DatafileNotFound"] = :not_found
-    config.action_dispatch.rescue_responses["Dataset::DatasetNotFound"] = :not_found
-    config.exceptions_app = routes
-
-    config.analytics_tracking_id = ENV["GA_TRACKING_ID"]
     config.i18n.load_path += Dir[Rails.root.join("config/locales/**/**/*.{rb,yml}")]
-    config.filter_parameters << :password
-    config.filter_parameters << :password_confirmation
 
     config.ssl_options = { hsts: { expires: 1.week } }
 

config/environments/test.rb

@@ -22,9 +22,6 @@
     "Cache-Control" => "public, max-age=#{1.hour.to_i}",
   }
 
-  # Trun off debug mode to speed up feature tests
-  config.assets.debug = false
-
   # Precompile assets to speed up feature tests
   config.assets.compress = true
 

config/initializers/kaminari_config.rb

@@ -3,12 +3,3 @@
 end
 
 Kaminari::Hooks.init if defined?(Kaminari::Hooks)
-
-# This is a workaround suggested by the Kaminari team to fix a security issue:
-#  https://github.com/kaminari/kaminari/security/advisories/GHSA-r5jw-62xg-j433
-#
-# Ideally we would upgrade to Kaminari 1.2, but we can't because:
-#  https://github.com/elastic/elasticsearch-rails/issues/966
-module Kaminari::Helpers
-  PARAM_KEY_EXCEPT_LIST = %i[authenticity_token commit utf8 _method script_name original_script_name].freeze
-end

docker/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR $APP_HOME
 COPY Gemfile* .ruby-version ./
 RUN bundle install
 COPY . ./
-RUN ES_HOST=x rails assets:precompile && rm -fr log
+RUN rails assets:precompile && rm -fr log
 
 
 FROM $base_image

test-environment.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 # source this script before running tests to set the correct env vars
 export RAILS_ENV=test
-export ES_INDEX=datasets-test
 export CKAN_DOMAIN=testdomain