Replace the GovukGuix::BuildJob

With a service that performs the same function, and use the
MiniEnvironmentJob instead.

4 files changed, 4 insertions, 196 deletions

diff --git a/app/jobs/govuk_guix/build_job.rb b/app/jobs/govuk_guix/build_job.rb
deleted file mode 100644
index 94acd70..0000000
--- a/app/jobs/govuk_guix/build_job.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# GOV.UK Mini Environment Admin
-# Copyright © 2018  Christopher Baines <mail@cbaines.net>
-#
-# This file is part of the GOV.UK Mini Environment Admin.
-#
-# The GOV.UK Mini Environment Admin is free software: you can
-# redistribute it and/or modify it under the terms of the GNU Affero
-# General Public License as published by the Free Software Foundation,
-# either version 3 of the License, or (at your option) any later
-# version.
-#
-# The GOV.UK Mini Environment Admin is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with the GOV.UK Mini Environment Admin.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-class GovukGuix::BuildJob < GovukGuix::Job
-  DEFAULT_ARGUMENTS = {
-    'rails-environment' => 'production',
-    'use-high-ports' => 'false',
-    'fallback' => true
-  }.freeze
-
-  @retry_interval = 30
-
-  def run(mini_environment_id, options)
-    logger.info(self.class) do
-      "Building mini environment #{mini_environment_id}"
-    end
-
-    mini_environment = MiniEnvironment.find(mini_environment_id)
-
-    remote_host = options[:run_remotely_on_host]
-
-    if remote_host
-      # Copy the revision to the remote host, to ensure it's available
-      # there
-      run_command(
-        'guix',
-        'copy',
-        "--to=#{remote_host}",
-        mini_environment.govuk_guix_revision.store_path
-      )
-    end
-
-    output = run_command(
-      "#{mini_environment.govuk_guix_revision.store_path}/bin/govuk",
-      'system',
-      'build',
-      *hash_to_arguments(
-        DEFAULT_ARGUMENTS.merge(options[:arguments])
-      ),
-      *signon_user_arguments(mini_environment.signon_users),
-      *options[:services],
-      run_remotely_on_host: remote_host
-    )
-
-    build_output = output.last.strip
-    logger.debug(self.class) { "build_output: #{build_output}" }
-
-    mini_environment.update(
-      backend_data: {
-        build_output: build_output
-      }
-    )
-  end
-
-  def signon_user_to_sexp(signon_user)
-    keys = %w(name email role passphrase)
-
-    sexp_contents = keys.zip(
-      signon_user.values_at(*keys)
-    ).map do |(key, value)|
-      "#:#{key} \"#{value}\""
-    end
-
-    "(#{sexp_contents.join(' ')})"
-  end
-
-  def signon_user_arguments(signon_users)
-    signon_users.map do |signon_user|
-      "--signon-user=#{signon_user_to_sexp(signon_user)}"
-    end
-  end
-
-  def self.jobs(mini_environment_id)
-    QueJob
-      .where(
-        job_class: name
-      ).where(
-        "args->>0 = '#{mini_environment_id}'"
-      ).to_a
-  end
-end
diff --git a/app/jobs/govuk_guix/create_data_snapshot_job.rb b/app/jobs/govuk_guix/create_data_snapshot_job.rb
index f2075c7..91f3904 100644
--- a/app/jobs/govuk_guix/create_data_snapshot_job.rb
+++ b/app/jobs/govuk_guix/create_data_snapshot_job.rb
@@ -18,8 +18,9 @@
 # License along with the GOV.UK Mini Environment Admin.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-class GovukGuix::CreateDataSnapshotJob < GovukGuix::Job
+class GovukGuix::CreateDataSnapshotJob < Que::Job
   extend EnqueuedJobs
+  include ::ShellUtils
 
   @retry_interval = 30
 
diff --git a/app/jobs/govuk_guix/fetch_revision_job.rb b/app/jobs/govuk_guix/fetch_revision_job.rb
index c747c13..2787156 100644
--- a/app/jobs/govuk_guix/fetch_revision_job.rb
+++ b/app/jobs/govuk_guix/fetch_revision_job.rb
@@ -20,8 +20,9 @@
 
 require 'git'
 
-class GovukGuix::FetchRevisionJob < GovukGuix::Job
+class GovukGuix::FetchRevisionJob < Que::Job
   extend EnqueuedJobs
+  include ::ShellUtils
 
   REPOSITORY_DIRECTORY = 'tmp/cache/govuk-guix'.freeze
 
diff --git a/app/jobs/govuk_guix/job.rb b/app/jobs/govuk_guix/job.rb
deleted file mode 100644
index 5f95f4d..0000000
--- a/app/jobs/govuk_guix/job.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# GOV.UK Mini Environment Admin
-# Copyright © 2018  Christopher Baines <mail@cbaines.net>
-#
-# This file is part of the GOV.UK Mini Environment Admin.
-#
-# The GOV.UK Mini Environment Admin is free software: you can
-# redistribute it and/or modify it under the terms of the GNU Affero
-# General Public License as published by the Free Software Foundation,
-# either version 3 of the License, or (at your option) any later
-# version.
-#
-# The GOV.UK Mini Environment Admin is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with the GOV.UK Mini Environment Admin.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-require 'open3'
-require 'shellwords'
-
-class GovukGuix::Job < Que::Job
-  def run_command(*command, run_remotely_on_host: nil)
-    if run_remotely_on_host
-      command = command.map do |arg|
-        Shellwords.escape(arg)
-      end
-
-      command = [
-        'ssh',
-        run_remotely_on_host,
-        *command
-      ]
-    end
-
-    logger.debug("#{self.class}: Running command #{command.join(' ')}")
-
-    Open3.popen2e(*command) do |_stdin, stdout_and_stderr, wait_thr|
-      logger.info("#{self.class}: commmand running, pid #{wait_thr.pid}")
-
-      output = []
-      stdout_and_stderr.each_line do |line|
-        logger.debug(self.class) { line.chomp }
-        output << line
-      end
-
-      exit_status = wait_thr.value
-      unless exit_status == 0
-        logger.error(self.class) { "failed, exit status #{exit_status}" }
-
-        raise "Running #{command.join(' ')} failed:\n\n#{output.join}\n"
-      end
-
-      output
-    end
-  end
-
-  def read_json_file(filename, from_remote_host: nil)
-    if from_remote_host
-      command = [
-        'ssh',
-        from_remote_host,
-        'cat',
-        filename
-      ]
-
-      stdout_str, status = Open3.capture2(*command)
-
-      unless status.exitstatus == 0
-        logger.error(self.class) { "failed, exit status #{exit_status}" }
-
-        raise "Running #{command.join(' ')} failed:\n\n#{output.join}\n"
-      end
-
-      JSON.parse(stdout_str)
-    else
-      JSON.parse(File.read(filename))
-    end
-  end
-
-  def hash_to_arguments(hash)
-    hash.flat_map do |(key, value)|
-      transformed_key = key.to_s.tr('_', '-')
-
-      if value == true
-        ["--#{transformed_key}"]
-      elsif value.kind_of?(Array)
-        value.map { |x| "--#{transformed_key}=#{x}" }
-      else
-        ["--#{transformed_key}=#{value}"]
-      end
-    end
-  end
-end