jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lists: ensure correct pool is used for each list

Browse source
This commit is contained in:
Iain Learmonth 2022-09-27 09:22:57 +01:00
parent 339b02d815
commit ba2894c697
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/terraform/list/github.py
View file

@ -43,7 +43,7 @@ class ListGithubAutomation(ListAutomation):
repository = data.github_repository.repository_{{ list.id }}.name repository = data.github_repository.repository_{{ list.id }}.name
branch = "{{ list.branch }}" branch = "{{ list.branch }}"
file = "{{ list.filename }}" 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_message = "Managed by Terraform"
commit_author = "Terraform User" commit_author = "Terraform User"
commit_email = "terraform@api.otf.is" commit_email = "terraform@api.otf.is"

2
app/terraform/list/gitlab.py
View file

@ -43,7 +43,7 @@ class ListGitlabAutomation(ListAutomation):
project = data.gitlab_project.project_{{ list.id }}.id project = data.gitlab_project.project_{{ list.id }}.id
file_path = "{{ list.filename }}" file_path = "{{ list.filename }}"
branch = "{{ list.branch }}" 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_email = "{{ gitlab_author_email }}"
author_name = "{{ gitlab_author_name }}" author_name = "{{ gitlab_author_name }}"
commit_message = "{{ gitlab_commit_message }}" commit_message = "{{ gitlab_commit_message }}"

2
app/terraform/list/s3.py
View file

@ -40,7 +40,7 @@ class ListS3Automation(ListAutomation):
key = "{{ list.filename }}" key = "{{ list.filename }}"
source = "{{ list.format }}.json" source = "{{ list.format }}.json"
content_type = "application/json" content_type = "application/json"
etag = filemd5("{{ list.format }}.{{ list.encoding }}") etag = filemd5("{{ list.format }}.{{ list.pool.pool_name }}.{{ list.encoding }}")
} }
{% endfor %} {% endfor %}
""" """