Appease Rubocop

6 files changed, 34 insertions, 34 deletions

diff --git a/app/jobs/govuk_guix/generate_start_command_job.rb b/app/jobs/govuk_guix/generate_start_command_job.rb
index 4bd14a2..9820dcc 100644
--- a/app/jobs/govuk_guix/generate_start_command_job.rb
+++ b/app/jobs/govuk_guix/generate_start_command_job.rb
@@ -2,30 +2,30 @@ class GovukGuix::GenerateStartCommandJob < GovukGuix::Job
   @retry_interval = 30
 
   def run(mini_environment_id)
-    logger.info "GovukGuix::GenerateStartCommandJob: Building mini environment #{mini_environment_id}"
+    logger.info "#{self.class}: Building mini environment #{mini_environment_id}"
 
     mini_environment = MiniEnvironment.find(mini_environment_id)
 
     slug = mini_environment.name.parameterize
-    
+
     command = [
       "#{mini_environment.govuk_guix_revision.store_path}/bin/govuk",
-      "system",
-      "build",
-      "--rails-environment=production",
+      'system',
+      'build',
+      '--rails-environment=production',
       "--app-domain=#{slug}.aws.cbaines.net",
       "--web-domain=www.#{slug}.aws.cbaines.net",
-      "--use-high-ports=false",
-      "--use-https=certbot",
-      "--fallback",
+      '--use-high-ports=false',
+      '--use-https=certbot',
+      '--fallback',
       'whitehall',
       'government-frontend'
     ]
 
     run_command(command) do |output|
       store_path = output.last.strip
-      logger.debug("GovukGuix::GenerateStartCommandJob: start_command: #{store_path}")
-      
+      logger.debug("#{self.class}: start_command: #{store_path}")
+
       mini_environment.update(
         backend_data: {
           start_command: store_path
diff --git a/app/jobs/govuk_guix/generate_vm_image_and_system_job.rb b/app/jobs/govuk_guix/generate_vm_image_and_system_job.rb
index c47e458..1c84577 100644
--- a/app/jobs/govuk_guix/generate_vm_image_and_system_job.rb
+++ b/app/jobs/govuk_guix/generate_vm_image_and_system_job.rb
@@ -2,23 +2,25 @@ class GovukGuix::GenerateVmImageAndSystemJob < GovukGuix::Job
   @retry_interval = 30
 
   def run(mini_environment_id)
-    logger.info "#{self.class}: Building mini environment #{mini_environment_id}"
+    logger.info(
+      "#{self.class}: Building mini environment #{mini_environment_id}"
+    )
 
     mini_environment = MiniEnvironment.find(mini_environment_id)
 
     slug = mini_environment.name.parameterize
-    
+
     command = [
       "#{mini_environment.govuk_guix_revision.store_path}/bin/govuk",
-      "system",
-      "build",
-      "--rails-environment=production",
+      'system',
+      'build',
       '--type=vm-image-and-system',
+      '--rails-environment=production',
       "--app-domain=#{slug}.aws.cbaines.net",
       "--web-domain=www.#{slug}.aws.cbaines.net",
-      "--use-high-ports=false",
-      "--use-https=certbot",
-      "--fallback",
+      '--use-high-ports=false',
+      '--use-https=certbot',
+      '--fallback',
       'whitehall',
       'government-frontend'
     ]
@@ -26,7 +28,7 @@ class GovukGuix::GenerateVmImageAndSystemJob < GovukGuix::Job
     run_command(command) do |output|
       store_path = output.last.strip
       logger.debug "#{self.class}: vm_image_and_system: #{store_path}"
-      
+
       mini_environment.update(
         backend_data: {
           vm_image_and_system: store_path
diff --git a/app/jobs/govuk_guix/job.rb b/app/jobs/govuk_guix/job.rb
index b9b8bef..295f77d 100644
--- a/app/jobs/govuk_guix/job.rb
+++ b/app/jobs/govuk_guix/job.rb
@@ -4,7 +4,7 @@ class GovukGuix::Job < Que::Job
   def run_command(command)
     logger.debug("#{self.class}: Running command #{command.join(' ')}")
 
-    Open3.popen2e(*command) do |stdin, stdout_and_stderr, wait_thr|
+    Open3.popen2e(*command) do |_stdin, stdout_and_stderr, wait_thr|
       logger.info("#{self.class}: commmand running, pid #{wait_thr.pid}")
 
       output = []
diff --git a/app/models/backends/terraform.rb b/app/models/backends/terraform.rb
index e1f937f..896876d 100644
--- a/app/models/backends/terraform.rb
+++ b/app/models/backends/terraform.rb
@@ -15,7 +15,7 @@ module Backends::Terraform
         )
     )
   end
-  
+
   def terraform_plugin_dir
     ENV['PATH'].split(':').first
   end
diff --git a/app/models/backends/terraform_aws.rb b/app/models/backends/terraform_aws.rb
index 246af8b..7f908e8 100644
--- a/app/models/backends/terraform_aws.rb
+++ b/app/models/backends/terraform_aws.rb
@@ -16,10 +16,10 @@ class Backends::TerraformAws < ApplicationRecord
 
   has_many :mini_environments, as: :backend
 
-  self.table_name = "terraform_aws_backends"
+  self.table_name = 'terraform_aws_backends'
 
   def self.label
-    "Amazon Web Services"
+    'Amazon Web Services'
   end
 
   def type_and_id
@@ -31,7 +31,7 @@ class Backends::TerraformAws < ApplicationRecord
       mini_environment.id
     )
   end
-  
+
   def start(mini_environment)
     logger.info "Setting up #{mini_environment.name}"
 
@@ -73,16 +73,14 @@ class Backends::TerraformAws < ApplicationRecord
 
   def terraform_variables(mini_environment)
     mini_environment.backend_data.merge(
-      aws_region: self.aws_region,
+      aws_region: aws_region,
       slug: mini_environment.name.parameterize,
       ssh_public_key: ssh_public_key,
-      start_command: mini_environment.start_command,
+      start_command: mini_environment.start_command
     )
   end
 
   def ssh_public_key
-    File.open("#{ENV['HOME']}/.ssh/id_rsa.pub") do |file|
-      file.readline()
-    end
+    File.open("#{ENV['HOME']}/.ssh/id_rsa.pub", &:readline)
   end
 end
diff --git a/app/models/backends/terraform_libvirt.rb b/app/models/backends/terraform_libvirt.rb
index c769cad..e7c24d7 100644
--- a/app/models/backends/terraform_libvirt.rb
+++ b/app/models/backends/terraform_libvirt.rb
@@ -11,11 +11,11 @@
 
 class Backends::TerraformLibvirt < ApplicationRecord
   has_many :mini_environments, as: :backend
-  
-  self.table_name = "terraform_libvirt_backends"
+
+  self.table_name = 'terraform_libvirt_backends'
 
   def self.label
-    "libvirt"
+    'libvirt'
   end
 
   def type_and_id
@@ -64,8 +64,8 @@ class Backends::TerraformLibvirt < ApplicationRecord
 
   def terraform_variables(mini_environment)
     mini_environment.backend_data.merge(
-      uri: self.uri,
-      machine_name: mini_environment.name.parameterize,
+      uri: uri,
+      machine_name: mini_environment.name.parameterize
     )
   end