Merge pull request #10770 from alphagov/GOVUK_DATA_SYNC_PERIOD

Expose GOVUK_DATA_SYNC_PERIOD ENV variable for govuk_app_config

modules/govuk/lib/puppet/parser/functions/data_sync_times.rb

@@ -0,0 +1,38 @@
+module Puppet::Parser::Functions
+  newfunction(:data_sync_times, :type => :rvalue, :doc => <<-EOS
+Return information about the data sync times, depending on the argument passed
+    EOS
+  ) do |args|
+    start_hour = 22
+    start_minute = 0
+    finish_hour = 8
+	finish_minute = 0
+	expected_args = 1
+
+    if args.size != expected_args
+      raise ArgumentError, "data_sync_times: Wrong number of arguments " +
+      "(given #{args.size}, expected #{expected_args})"
+    end
+
+    type = args[0]
+
+    case type
+    when 'time_range'
+      "#{start_hour}:#{start_minute}-#{finish_hour}:#{finish_minute}"
+    when 'start_time'
+      "#{start_hour}:#{start_minute}"
+    when 'start_hour'
+      start_hour
+    when 'start_minute'
+      start_minute
+    when 'finish_time'
+      "#{finish_hour}:#{finish_minute}"
+    when 'finish_hour'
+      finish_hour
+    when 'finish_minute'
+      finish_minute
+    else
+      raise ArgumentError, "data_sync_times: Unknown argument #{type}"
+    end
+  end
+end

modules/govuk/manifests/deploy/config.pp

@@ -127,6 +127,12 @@
     'GOVUK_CSP_REPORT_URI': value      => $csp_report_uri;
   }
 
+  if $::aws_migration and ($::aws_environment != 'production') {
+    govuk_envvar {
+      'GOVUK_DATA_SYNC_PERIOD': value => data_sync_times('time_range');
+    }
+  }
+
   if $::aws_migration {
     $app_domain_internal = hiera('app_domain_internal')
 

modules/govuk_data_sync_in_progress/manifests/init.pp

@@ -17,12 +17,6 @@
 ) {
   $fact_path = '/etc/govuk/env.d/FACTER_data_sync_in_progress'
 
-  $start_hour = 22
-  $start_minute = 0
-
-  $finish_hour = 8
-  $finish_minute = 00
-
   if !defined(File[$fact_path]) {
     file { $fact_path:
       ensure  => present,
@@ -35,35 +29,35 @@
     cron { 'data_sync_started':
       command => "echo 'true' > ${fact_path}",
       user    => 'deploy',
-      hour    => $start_hour,
-      minute  => $start_minute,
+      hour    => data_sync_times('start_hour'),
+      minute  => data_sync_times('start_minute'),
     }
   }
 
   if !defined(Cron['data_sync_finished']) {
     cron { 'data_sync_finished':
       command => "echo '' > ${$fact_path}",
       user    => 'deploy',
-      hour    => $finish_hour,
-      minute  => $finish_minute,
+      hour    => data_sync_times('finish_hour'),
+      minute  => data_sync_times('finish_minute'),
     }
   }
 
   if $start_command {
     cron { "data_sync_started_${title}":
       command => $start_command,
       user    => 'deploy',
-      hour    => $start_hour,
-      minute  => $start_minute,
+      hour    => data_sync_times('start_hour'),
+      minute  => data_sync_times('start_minute'),
     }
   }
 
   if $finish_command {
     cron { "data_sync_finished_${title}":
       command => $finish_command,
       user    => 'deploy',
-      hour    => $finish_hour,
-      minute  => $finish_minute,
+      hour    => data_sync_times('finish_hour'),
+      minute  => data_sync_times('finish_minute'),
     }
   }
 }

modules/monitoring/manifests/contacts.pp

@@ -54,9 +54,8 @@
   $midday = '11:00'
   $office_day_end = '16:30'
   $midnight_day_end = '24:00'
-  # This should match up with the govuk_data_sync_in_progress class
-  $data_sync_start = '22:00'
-  $data_sync_end = '08:00'
+  $data_sync_start = data_sync_times('start_time')
+  $data_sync_end = data_sync_times('finish_time')
 
   $all_day = "${midnight_day_start}-${midnight_day_end}"
   $office_day = "${office_day_start}-${office_day_end}"