From bb790668bf4c2c0de0876480dbf2d11903f22ba5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 4 Jul 2018 11:28:34 +0100 Subject: Pass the terraform credentials to the remote state configuration This fixes the mini environment Terraform working, now that the backend is protected by basic authentication. --- app/models/backends/terraform_aws/mini_environment_methods.rb | 6 +++++- app/models/backends/terraform_libvirt/mini_environment_methods.rb | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/models/backends/terraform_aws/mini_environment_methods.rb b/app/models/backends/terraform_aws/mini_environment_methods.rb index bdb0ab4..36fd70d 100644 --- a/app/models/backends/terraform_aws/mini_environment_methods.rb +++ b/app/models/backends/terraform_aws/mini_environment_methods.rb @@ -100,6 +100,8 @@ module Backends::TerraformAws::MiniEnvironmentMethods end def terraform_variables(mini_environment) + credentials = TerraformHttpBackendController.credentials + common_terraform_variables.merge( slug: mini_environment.name.parameterize, start_command: mini_environment.backend_data['build_output'], @@ -110,7 +112,9 @@ module Backends::TerraformAws::MiniEnvironmentMethods .routes .url_helpers .terraform_http_backend_path(terraform_state_id) - ) + ), + backend_remote_state_username: credentials[:name], + backend_remote_state_password: credentials[:password] ) end end diff --git a/app/models/backends/terraform_libvirt/mini_environment_methods.rb b/app/models/backends/terraform_libvirt/mini_environment_methods.rb index 4bf6adb..9b68d49 100644 --- a/app/models/backends/terraform_libvirt/mini_environment_methods.rb +++ b/app/models/backends/terraform_libvirt/mini_environment_methods.rb @@ -97,6 +97,7 @@ module Backends::TerraformLibvirt::MiniEnvironmentMethods end def terraform_variables(mini_environment) + credentials = TerraformHttpBackendController.credentials slug = mini_environment.name.parameterize { @@ -111,7 +112,9 @@ module Backends::TerraformLibvirt::MiniEnvironmentMethods .routes .url_helpers .terraform_http_backend_path(terraform_state_id) - ) + ), + backend_remote_state_username: credentials[:name], + backend_remote_state_password: credentials[:password] } end end -- cgit v1.2.3