Add refactoring changes

Author: simonkurtz-MSFT

samples/azure-maps/create.ipynb

@@ -29,10 +29,10 @@
     "azure_maps_url = 'https://atlas.microsoft.com'  # OPTIONAL: ENTER THE AZURE MAPS URL IF DIFFERENT FROM DEFAULT\n",
     "\n",
     "# 2) Service-defined parameters (please do not change these)\n",
-    "rg_name = utils.get_infra_rg_name(deployment, index)\n",
-    "supported_infrastructures = [INFRASTRUCTURE.SIMPLE_APIM, INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA]             # ENTER SUPPORTED INFRASTRUCTURES HERE, e.g., [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.AFD_APIM_FE]\n",
-    "utils.validate_infrastructure(deployment, supported_infrastructures)\n",
+    "rg_name       = utils.get_infra_rg_name(deployment, index)\n",
     "sample_folder = \"azure-maps\"\n",
+    "nb_helper     = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.SIMPLE_APIM])\n",
+    "\n",
     "# 3) Define the APIs and their operations and policies\n",
     "\n",
     "# Policies\n",
@@ -48,7 +48,6 @@
     "api1 = API('map-api', 'Map API', '/map', 'This is the proxy for Azure Maps', operations=[mapApi_v2_default_get, mapApi_v1_async_post,mapApi_v2_geocode_get], tags = tags, serviceUrl=azure_maps_url)\n",
     "\n",
     "# APIs Array\n",
-    "# apis: List[API] = [api1, apin]\n",
     "apis: List[API] = [api1]\n",
     "\n",
     "# 4) Set up the named values, for this specific sample, we are using some of the named values in the API policies defined above that can't be known at this point in the process. For those named values, we are setting them in the main.bicep file.\n",
@@ -82,19 +81,11 @@
     "    'namedValues': {'value': [nv.to_dict() for nv in nvs]}\n",
     "}\n",
     "\n",
-    "# 2) Infrastructure must be in place before samples can be layered on top\n",
-    "if not utils.does_resource_group_exist(rg_name):\n",
-    "    utils.print_error(f'The specified infrastructure resource group and its resources must exist first. Please check that the user-defined parameters above are correctly referencing an existing infrastructure. If it does not yet exist, run the desired infrastructure in the /infra/ folder first.')\n",
-    "    raise SystemExit(1)\n",
-    "\n",
-    "# 3) Run the deployment\n",
-    "output = utils.create_bicep_deployment_group_for_sample(sample_folder, rg_name, rg_location, bicep_parameters)\n",
+    "# 2) Deploy the bicep template\n",
+    "output = nb_helper.deploy_bicep(bicep_parameters)\n",
     "\n",
-    "# 4) Print a deployment summary, if successful; otherwise, exit with an error\n",
-    "if not output.success:\n",
-    "    raise SystemExit('Deployment failed')\n",
-    "\n",
-    "if output.success and output.json_data:\n",
+    "if output.json_data:\n",
+    "    apim_name = output.get('apimServiceName', 'APIM Service Name')\n",
     "    apim_gateway_url = output.get('apimResourceGatewayURL', 'APIM API Gateway URL')\n",
     "\n",
     "utils.print_ok('Deployment completed')"
@@ -122,7 +113,7 @@
     "from apimrequests import ApimRequests\n",
     "import json\n",
     "\n",
-    "tests = ApimTesting(\"AuthX-Pro Sample Tests\")\n",
+    "tests = ApimTesting(\"AuthX-Pro Sample Tests\", sample_folder, deployment)\n",
     "reqs = ApimRequests(apim_gateway_url)\n",
     "\n",
     "# 1) Issue a direct request to API Management\n",
@@ -145,6 +136,7 @@
     "        {\"query\": \"?query=Champ de Mars, 5 Avenue Anatole France, 75007 Paris, France&limit=1\"}\n",
     "    ]\n",
     "}, msg = 'Calling Async Geocode Batch v1 API with Share Key Auth. Expect initial 202, then a 200 on the polling response', timeout=120, poll_interval=3)\n",
+    "\n",
     "# confirm the response contains \"summary\": { \"successfulRequests\": 5, \"totalRequests\": 5}\n",
     "tests.verify('summary' in output and 'successfulRequests' in output and json.loads(output)['summary']['successfulRequests'] == 5, True)\n",
     "\n",
@@ -156,9 +148,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": ".venv",
+   "display_name": "APIM Samples Python 3.12",
    "language": "python",
-   "name": "python3"
+   "name": "apim-samples"
   },
   "language_info": {
    "codemirror_mode": {
@@ -170,7 +162,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.11"
+   "version": "3.12.10"
   }
  },
  "nbformat": 4,