From d45b558606da472351bf90b929092dd89517847b Mon Sep 17 00:00:00 2001 From: Max Martin Date: Tue, 2 Jun 2026 09:58:39 +0100 Subject: [PATCH 1/6] Add parameter to payload in e2etests/conftest to disable service vault backup in test environments --- e2e_tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e_tests/conftest.py b/e2e_tests/conftest.py index 39589e1696..10305a46b4 100644 --- a/e2e_tests/conftest.py +++ b/e2e_tests/conftest.py @@ -46,7 +46,8 @@ async def create_or_get_test_workspace( "display_name": f"E2E {description} workspace ({auth_type} AAD)", "description": f"{template_name} test workspace for E2E tests", "auth_type": auth_type, - "address_space_size": "small" + "address_space_size": "small", + "enable_backup": False } } if config.TEST_WORKSPACE_APP_PLAN != "": From 904c61460f638724bd0addd87e2b25130b223a31 Mon Sep 17 00:00:00 2001 From: Max Martin Date: Wed, 3 Jun 2026 10:56:33 +0100 Subject: [PATCH 2/6] change payload type to string --- e2e_tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e_tests/conftest.py b/e2e_tests/conftest.py index 10305a46b4..717b601fb4 100644 --- a/e2e_tests/conftest.py +++ b/e2e_tests/conftest.py @@ -47,7 +47,7 @@ async def create_or_get_test_workspace( "description": f"{template_name} test workspace for E2E tests", "auth_type": auth_type, "address_space_size": "small", - "enable_backup": False + "enable_backup": "false" } } if config.TEST_WORKSPACE_APP_PLAN != "": From 185628ec2d3fdac0087b493e03d0ae595e6ae46e Mon Sep 17 00:00:00 2001 From: Max Martin Date: Wed, 3 Jun 2026 14:05:51 +0100 Subject: [PATCH 3/6] Incorporated terraform changes to fix public IP issue --- core/terraform/appgateway/appgateway.tf | 2 +- core/terraform/firewall/firewall.tf | 2 +- e2e_tests/conftest.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/terraform/appgateway/appgateway.tf b/core/terraform/appgateway/appgateway.tf index 5afcfbb8ab..e029acebba 100644 --- a/core/terraform/appgateway/appgateway.tf +++ b/core/terraform/appgateway/appgateway.tf @@ -7,7 +7,7 @@ resource "azurerm_public_ip" "appgwpip" { domain_name_label = var.tre_id tags = local.tre_core_tags - lifecycle { ignore_changes = [tags, zones] } + lifecycle { ignore_changes = [tags, zones, ip_tags] } } resource "azurerm_user_assigned_identity" "agw_id" { diff --git a/core/terraform/firewall/firewall.tf b/core/terraform/firewall/firewall.tf index 008fbfabbb..35337cf7a1 100644 --- a/core/terraform/firewall/firewall.tf +++ b/core/terraform/firewall/firewall.tf @@ -7,7 +7,7 @@ resource "azurerm_public_ip" "fwtransit" { sku = "Standard" tags = var.tre_core_tags - lifecycle { ignore_changes = [tags, zones] } + lifecycle { ignore_changes = [tags, zones, ip_tags] } } moved { diff --git a/e2e_tests/conftest.py b/e2e_tests/conftest.py index 717b601fb4..10305a46b4 100644 --- a/e2e_tests/conftest.py +++ b/e2e_tests/conftest.py @@ -47,7 +47,7 @@ async def create_or_get_test_workspace( "description": f"{template_name} test workspace for E2E tests", "auth_type": auth_type, "address_space_size": "small", - "enable_backup": "false" + "enable_backup": False } } if config.TEST_WORKSPACE_APP_PLAN != "": From fc654b6ff3826192a35d1a599e708da91b8dbb90 Mon Sep 17 00:00:00 2001 From: Max Martin Date: Wed, 3 Jun 2026 14:17:27 +0100 Subject: [PATCH 4/6] Readd string change --- e2e_tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e_tests/conftest.py b/e2e_tests/conftest.py index 10305a46b4..717b601fb4 100644 --- a/e2e_tests/conftest.py +++ b/e2e_tests/conftest.py @@ -47,7 +47,7 @@ async def create_or_get_test_workspace( "description": f"{template_name} test workspace for E2E tests", "auth_type": auth_type, "address_space_size": "small", - "enable_backup": False + "enable_backup": "false" } } if config.TEST_WORKSPACE_APP_PLAN != "": From 1ea17b43a84164059a6ff7db25255e77b513be27 Mon Sep 17 00:00:00 2001 From: Max Martin Date: Thu, 4 Jun 2026 15:04:56 +0100 Subject: [PATCH 5/6] Change variable back to a boolean --- e2e_tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e_tests/conftest.py b/e2e_tests/conftest.py index 717b601fb4..10305a46b4 100644 --- a/e2e_tests/conftest.py +++ b/e2e_tests/conftest.py @@ -47,7 +47,7 @@ async def create_or_get_test_workspace( "description": f"{template_name} test workspace for E2E tests", "auth_type": auth_type, "address_space_size": "small", - "enable_backup": "false" + "enable_backup": False } } if config.TEST_WORKSPACE_APP_PLAN != "": From 7e6dcf11120770c830ba73bcb8dc2d216245a694 Mon Sep 17 00:00:00 2001 From: Max Martin Date: Thu, 4 Jun 2026 16:20:09 +0100 Subject: [PATCH 6/6] Updated code and api versions --- api_app/_version.py | 2 +- core/version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api_app/_version.py b/api_app/_version.py index 7923a95d33..57a322dfc2 100644 --- a/api_app/_version.py +++ b/api_app/_version.py @@ -1 +1 @@ -__version__ = "0.25.16" +__version__ = "0.25.17" diff --git a/core/version.txt b/core/version.txt index 54ea27795b..12d80d0630 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.16.16" +__version__ = "0.16.17"