From ba2894c697651a2415152dfaecc1e0e00f9948f5 Mon Sep 17 00:00:00 2001
From: Iain Learmonth <irl@sr2.uk>
Date: Tue, 27 Sep 2022 09:22:57 +0100
Subject: [PATCH] lists: ensure correct pool is used for each list

---
 app/terraform/list/github.py | 2 +-
 app/terraform/list/gitlab.py | 2 +-
 app/terraform/list/s3.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/terraform/list/github.py b/app/terraform/list/github.py
index 694ab04..c83179f 100644
--- a/app/terraform/list/github.py
+++ b/app/terraform/list/github.py
@@ -43,7 +43,7 @@ class ListGithubAutomation(ListAutomation):
       repository          = data.github_repository.repository_{{ list.id }}.name
       branch              = "{{ list.branch }}"
       file                = "{{ list.filename }}"
-      content             = file("{{ list.format }}.{{ list.encoding }}")
+      content             = file("{{ list.format }}.{{ list.pool.pool_name }}.{{ list.encoding }}")
       commit_message      = "Managed by Terraform"
       commit_author       = "Terraform User"
       commit_email        = "terraform@api.otf.is"
diff --git a/app/terraform/list/gitlab.py b/app/terraform/list/gitlab.py
index 9e797d6..71b4c67 100644
--- a/app/terraform/list/gitlab.py
+++ b/app/terraform/list/gitlab.py
@@ -43,7 +43,7 @@ class ListGitlabAutomation(ListAutomation):
       project        = data.gitlab_project.project_{{ list.id }}.id
       file_path      = "{{ list.filename }}"
       branch         = "{{ list.branch }}"
-      content        = base64encode(file("{{ list.format }}.{{ list.encoding }}"))
+      content        = base64encode(file("{{ list.format }}.{{ list.pool.pool_name }}.{{ list.encoding }}"))
       author_email   = "{{ gitlab_author_email }}"
       author_name    = "{{ gitlab_author_name }}"
       commit_message = "{{ gitlab_commit_message }}"
diff --git a/app/terraform/list/s3.py b/app/terraform/list/s3.py
index 9d722d9..1911944 100644
--- a/app/terraform/list/s3.py
+++ b/app/terraform/list/s3.py
@@ -40,7 +40,7 @@ class ListS3Automation(ListAutomation):
       key                 = "{{ list.filename }}"
       source              = "{{ list.format }}.json"
       content_type        = "application/json"
-      etag                = filemd5("{{ list.format }}.{{ list.encoding }}")
+      etag                = filemd5("{{ list.format }}.{{ list.pool.pool_name }}.{{ list.encoding }}")
     }
     {% endfor %}
     """