From 8c411e39bc368a2b06aae8a5d4480b061019f05f Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Fri, 27 May 2022 15:24:34 +0100 Subject: [PATCH] proxy: ensure use of only active proxies for smart proxy --- app/terraform/proxy/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/terraform/proxy/__init__.py b/app/terraform/proxy/__init__.py index 462317e..18727b1 100644 --- a/app/terraform/proxy/__init__.py +++ b/app/terraform/proxy/__init__.py @@ -20,7 +20,6 @@ def update_smart_proxy_instance(group_id: int, provider: str, region: str, instance_id: str) -> None: - print("SMART PROXY") instance = SmartProxy.query.filter( SmartProxy.group_id == group_id, SmartProxy.region == region, @@ -176,9 +175,9 @@ class ProxyAutomation(TerraformAutomation): subs_filter https://{{ origin.domain_name }}/ /; subs_filter "\\\"https://{{ origin.domain_name }}\\\"" /; {%- for asset_origin in origin.group.origins | selectattr("assets") -%} - {%- for asset_proxy in asset_origin.proxies | selectattr("provider", "equalto", provider) -%} + {%- for asset_proxy in asset_origin.proxies | selectattr("provider", "equalto", provider) | selectattr("deprecated", "none") | selectattr("destroyed", "none") -%} {%- if loop.first %} - subs_filter https://{{ asset_origin.domain_name }}/ {{ asset_proxy.url }}/ + subs_filter https://{{ asset_origin.domain_name }}/ {{ asset_proxy.url }}/; {%- endif -%} {%- endfor -%} {%- endfor %}