Refactor Azure Maps sample notebook and Bicep templates for improved clarity and functionality

Author: anotherRedbeard

samples/azure-maps/create.ipynb

@@ -32,20 +32,20 @@
     "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",
-    "\n",
+    "sample_folder = \"azure-maps\"\n",
     "# 3) Define the APIs and their operations and policies\n",
     "\n",
     "# Policies\n",
     "# Named values must be set up a bit differently as they need to have two surrounding curly braces\n",
-    "map_async_geocode_batch_v1_keyauth_post_xml = utils.read_policy_xml('map_async_geocode_batch_v1_keyauth_post.xml')\n",
-    "map_default_route_v2_aad_get_xml = utils.read_policy_xml('map_default_route_v2_aad_get.xml')\n",
-    "map_geocode_v2_aad_get_xml = utils.read_policy_xml('map_geocode_v2_aad_get.xml')\n",
+    "map_async_geocode_batch_v1_keyauth_post_xml = utils.read_policy_xml('map_async_geocode_batch_v1_keyauth_post.xml', sample_name=sample_folder)\n",
+    "map_default_route_v2_aad_get_xml = utils.read_policy_xml('map_default_route_v2_aad_get.xml', sample_name=sample_folder)\n",
+    "map_geocode_v2_aad_get_xml = utils.read_policy_xml('map_geocode_v2_aad_get.xml', sample_name=sample_folder)\n",
     "\n",
     "# Map API \n",
     "mapApi_v2_default_get = GET_APIOperation2('get-default-route','Get default route','/default/*','This is the default route that will allow all requests to go through to the backend api',map_default_route_v2_aad_get_xml)\n",
     "mapApi_v1_async_post = APIOperation('async-geocode-batch','Async Geocode Batch','/geocode/batch/async',HTTP_VERB.POST, 'Post geocode batch async endpoint',map_async_geocode_batch_v1_keyauth_post_xml)\n",
     "mapApi_v2_geocode_get = GET_APIOperation2('get-geocode','Get Geocode','/geocode','Get geocode endpoint',map_geocode_v2_aad_get_xml)\n",
-    "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, mapApi_v2_foo], tags = tags, serviceUrl=azure_maps_url)\n",
+    "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",
@@ -88,7 +88,7 @@
     "    raise SystemExit(1)\n",
     "\n",
     "# 3) Run the deployment\n",
-    "output = utils.create_bicep_deployment_group(rg_name, rg_location, deployment, bicep_parameters)\n",
+    "output = utils.create_bicep_deployment_group(sample_folder, rg_name, rg_location, bicep_parameters)\n",
     "\n",
     "# 4) Print a deployment summary, if successful; otherwise, exit with an error\n",
     "if not output.success:\n",

samples/azure-maps/main.bicep

@@ -17,8 +17,6 @@ param appInsightsName string = 'appi-${resourceSuffix}'
 param userAssignedIdentityName string = 'uami-maps-${resourceSuffix}'
 param apis array = []
 
-// [ADD RELEVANT PARAMETERS HERE]
-
 // ------------------
 //    RESOURCES
 // ------------------