Add infra deployment cleanup

Author: simonkurtz-MSFT

infrastructure/afd-apim/clean-up.ipynb

@@ -19,9 +19,9 @@
     "from apimtypes import INFRASTRUCTURE\n",
     "\n",
     "deployment  = INFRASTRUCTURE.AFD_APIM_PE\n",
-    "index       = 1\n",
+    "indexes     = [1]\n",
     "\n",
-    "utils.cleanup_resources(deployment, utils.get_infra_rg_name(deployment, index))"
+    "utils.cleanup_infra_deployments(deployment, indexes)"
    ]
   }
  ],

infrastructure/apim-aca/clean-up.ipynb

@@ -19,9 +19,9 @@
     "from apimtypes import INFRASTRUCTURE\n",
     "\n",
     "deployment  = INFRASTRUCTURE.APIM_ACA\n",
-    "index       = 1\n",
+    "indexes     = [1]\n",
     "\n",
-    "utils.cleanup_resources(deployment, utils.get_infra_rg_name(deployment, index))"
+    "utils.cleanup_infra_deployments(deployment, indexes)"
    ]
   }
  ],

infrastructure/simple-apim/clean-up.ipynb

@@ -19,9 +19,9 @@
     "from apimtypes import INFRASTRUCTURE\n",
     "\n",
     "deployment  = INFRASTRUCTURE.SIMPLE_APIM\n",
-    "index       = 1\n",
+    "indexes     = [1]\n",
     "\n",
-    "utils.cleanup_resources(deployment, utils.get_infra_rg_name(deployment, index))"
+    "utils.cleanup_infra_deployments(deployment, indexes)"
    ]
   }
  ],
@@ -41,7 +41,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.9"
+   "version": "3.12.10"
   }
  },
  "nbformat": 4,

shared/python/utils.py

@@ -334,7 +334,7 @@ def _cleanup_resources(deployment_name: str, rg_name: str) -> None:
 #    PUBLIC METHODS
 # ------------------------------
 
-def cleanup_infra_deployment(deployment: INFRASTRUCTURE, indexes: int | list[int] | None = None) -> None:
+def cleanup_infra_deployments(deployment: INFRASTRUCTURE, indexes: int | list[int] | None = None) -> None:
     """
     Clean up infrastructure deployments by deployment enum and index/indexes.
     Obtains the infra resource group name for each index and calls the private cleanup method.

tests/python/test_utils.py

@@ -159,9 +159,9 @@ def test_cleanup_resources_smoke(monkeypatch):
 
 def test_cleanup_infra_deployment_single(monkeypatch):
     monkeypatch.setattr(utils, '_cleanup_resources', lambda deployment_name, rg_name: None)
-    utils.cleanup_infra_deployment(INFRASTRUCTURE.SIMPLE_APIM, None)
-    utils.cleanup_infra_deployment(INFRASTRUCTURE.SIMPLE_APIM, 1)
-    utils.cleanup_infra_deployment(INFRASTRUCTURE.SIMPLE_APIM, [1, 2])
+    utils.cleanup_infra_deployments(INFRASTRUCTURE.SIMPLE_APIM, None)
+    utils.cleanup_infra_deployments(INFRASTRUCTURE.SIMPLE_APIM, 1)
+    utils.cleanup_infra_deployments(INFRASTRUCTURE.SIMPLE_APIM, [1, 2])
 
 def test_cleanup_deployment_single(monkeypatch):
     monkeypatch.setattr(utils, '_cleanup_resources', lambda deployment_name, rg_name: None)