diff options
author | Christopher Baines <mail@cbaines.net> | 2018-03-26 21:01:51 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2018-04-03 21:57:39 +0100 |
commit | a210b2363f962de59c2b9287bf675fafe386adc7 (patch) | |
tree | 51b46250363a93516813939743a35bc51559df09 /app/models/backends | |
parent | 7eaab4794bf107976bf7ec07a7a06f1bd27f3201 (diff) | |
download | govuk-mini-environment-admin-a210b2363f962de59c2b9287bf675fafe386adc7.tar govuk-mini-environment-admin-a210b2363f962de59c2b9287bf675fafe386adc7.tar.gz |
Appease Rubocop
Diffstat (limited to 'app/models/backends')
-rw-r--r-- | app/models/backends/terraform.rb | 2 | ||||
-rw-r--r-- | app/models/backends/terraform_aws.rb | 14 | ||||
-rw-r--r-- | app/models/backends/terraform_libvirt.rb | 10 |
3 files changed, 12 insertions, 14 deletions
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 |