aboutsummaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2019-01-06 11:18:05 +0000
committerChristopher Baines <mail@cbaines.net>2019-01-06 11:18:05 +0000
commit1c097bf9041939b286c1d2f764f65bcf017cd117 (patch)
tree61b0cc6510503ac80948882c74a420a327dd510b /app/models
parent9d3799ccefc4c9a546132f085dd9980a2cc9b7b6 (diff)
downloadgovuk-mini-environment-admin-1c097bf9041939b286c1d2f764f65bcf017cd117.tar
govuk-mini-environment-admin-1c097bf9041939b286c1d2f764f65bcf017cd117.tar.gz
Support archiving govuk-guix revisions
Diffstat (limited to 'app/models')
-rw-r--r--app/models/backends/terraform_aws/backend_methods.rb2
-rw-r--r--app/models/backends/terraform_libvirt/backend_methods.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/backends/terraform_aws/backend_methods.rb b/app/models/backends/terraform_aws/backend_methods.rb
index d6665a1..b7545d1 100644
--- a/app/models/backends/terraform_aws/backend_methods.rb
+++ b/app/models/backends/terraform_aws/backend_methods.rb
@@ -82,7 +82,7 @@ module Backends::TerraformAws::BackendMethods
def in_use_store_paths
[
- GovukGuix::Revision.pluck(:store_path),
+ GovukGuix::Revision.where(archived: false).pluck(:store_path),
available_data_snapshots.pluck(:store_path),
mini_environments.pluck(:backend_data).map { |x| x&.dig('build_output') }
].flatten.compact
diff --git a/app/models/backends/terraform_libvirt/backend_methods.rb b/app/models/backends/terraform_libvirt/backend_methods.rb
index 85cd427..20ae379 100644
--- a/app/models/backends/terraform_libvirt/backend_methods.rb
+++ b/app/models/backends/terraform_libvirt/backend_methods.rb
@@ -56,7 +56,7 @@ module Backends::TerraformLibvirt::BackendMethods
def in_use_store_paths
[
- GovukGuix::Revision.pluck(:store_path),
+ GovukGuix::Revision.where(archived: false).pluck(:store_path),
available_data_snapshots.pluck(:store_path),
mini_environments.pluck(:backend_data).map { |x| x.dig('build_output') }
].flatten.compact