Next available IP range calculator only considers active workspaces (#…

…1849)
microsoft · May 17, 2022 · d7fd8db · d7fd8db
1 parent fad5dcb
commit d7fd8db
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/api_app/_version.py b/api_app/_version.py
@@ -1 +1 @@
-__version__ = "0.2.27"
+__version__ = "0.2.28"
diff --git a/api_app/db/repositories/workspaces.py b/api_app/db/repositories/workspaces.py
@@ -37,6 +37,11 @@ def workspaces_query_string():
     def active_workspaces_query_string():
         return f'SELECT * FROM c WHERE c.resourceType = "{ResourceType.Workspace}" AND {IS_ACTIVE_CLAUSE}'
 
+    def get_workspaces(self) -> List[Workspace]:
+        query = WorkspaceRepository.workspaces_query_string()
+        workspaces = self.query(query=query)
+        return parse_obj_as(List[Workspace], workspaces)
+
     def get_active_workspaces(self) -> List[Workspace]:
         query = WorkspaceRepository.active_workspaces_query_string()
         workspaces = self.query(query=query)
@@ -107,11 +112,11 @@ def validate_address_space(self, address_space):
         if (address_space is None):
             raise InvalidInput("Missing 'address_space' from properties.")
 
-        allocated_networks = [x.properties["address_space"] for x in self.get_active_workspaces()]
+        allocated_networks = [x.properties["address_space"] for x in self.get_workspaces()]
         return is_network_available(allocated_networks, address_space)
 
     def get_new_address_space(self, cidr_netmask: int = 24):
-        networks = [x.properties["address_space"] for x in self.get_active_workspaces()]
+        networks = [x.properties["address_space"] for x in self.get_workspaces()]
 
         new_address_space = generate_new_cidr(networks, cidr_netmask)
         return new_address_space

diff --git a/api_app/tests_ma/test_db/test_repositories/test_workpaces_repository.py b/api_app/tests_ma/test_db/test_repositories/test_workpaces_repository.py
@@ -40,6 +40,14 @@ def workspace():
     return workspace
 
 
+def test_get_workspaces_queries_db(workspace_repo):
+    workspace_repo.container.query_items = MagicMock()
+    expected_query = workspace_repo.workspaces_query_string()
+
+    workspace_repo.get_workspaces()
+    workspace_repo.container.query_items.assert_called_once_with(query=expected_query, enable_cross_partition_query=True)
+
+
 def test_get_active_workspaces_queries_db(workspace_repo):
     workspace_repo.container.query_items = MagicMock()
     expected_query = workspace_repo.active_workspaces_query_string()

diff --git a/devops/scripts/control_tre.sh b/devops/scripts/control_tre.sh
@@ -17,6 +17,8 @@ if [[ $(az group list --output json --query "[?name=='rg-${TRE_ID}'] | length(@)
 fi
 
 az config set extension.use_dynamic_install=yes_without_prompt
+az extension add --name azure-firewall
+az --version
 
 if [[ "$1" == *"start"* ]]; then
   if [[ $(az network firewall list --output json --query "[?resourceGroup=='rg-${TRE_ID}'&&name=='fw-${TRE_ID}'] | length(@)") != 0 ]]; then