Fix wrong import

Author: simonkurtz-MSFT

TROUBLESHOOTING.md

@@ -33,7 +33,7 @@ ERROR: The content for this response was already consumed
    The following parameters were supplied, but do not correspond to any parameters defined in the template: 'parameterName'
    ```
 
-3. Check that all parameters in your notebook's `bicep_parameters` dictionary match the parameters defined in the `main.bicep` file. 
+3. Check that all parameters in your notebook's `bicep_parameters` dictionary match the parameters defined in the `main.bicep` file.
 
 **Example Fix:**
 If the error mentions `apimSku` parameter not found:
@@ -44,7 +44,7 @@ bicep_parameters = {
     'apimSku': { 'value': 'Developer' }  # This parameter doesn't exist
 }
 
-# ✅ Correct - only includes defined parameters  
+# ✅ Correct - only includes defined parameters
 bicep_parameters = {
     'apis': { 'value': [api.to_dict() for api in apis] }
 }
@@ -214,7 +214,7 @@ Scroll up to see what is executed.
 
 #### Bicep
 
-In one case, `%USERPROFILE%\.azure\bin` contained a `bicep.exe` file but with a zero-length. The CLI would recognize that the file is there but fail on execution. 
+In one case, `%USERPROFILE%\.azure\bin` contained a `bicep.exe` file but with a zero-length. The CLI would recognize that the file is there but fail on execution.
 
 1. Verify that bicep is indeed failing: `az bicep version`
 2. Delete `%USERPROFILE%\.azure\bin\bicep.exe`.
@@ -234,7 +234,7 @@ Resource group 'name' could not be found
 1. Create the infrastructure first by running the appropriate infrastructure deployment from the `/infrastructure/` folder
 2. Verify the resource group name matches the expected pattern:
    ```python
-   rg_name = utils.get_infra_rg_name(deployment, index)
+   rg_name = get_infra_rg_name(deployment, index)
    ```
 
 ### APIM Service Not Found

samples/_TEMPLATE/create.ipynb

@@ -18,6 +18,7 @@
     "import utils\n",
     "from apimtypes import *\n",
     "from console import print_error, print_ok\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -37,7 +38,7 @@
     "# ------------------------------\n",
     "\n",
     "sample_folder    = '_TEMPLATE'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.SIMPLE_APIM]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, index = index, apim_sku = apim_sku)\n",
     "\n",

samples/authX-pro/create.ipynb

@@ -18,6 +18,7 @@
     "import utils\n",
     "from apimtypes import *\n",
     "from console import print_error, print_ok\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -38,7 +39,7 @@
     "\n",
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'authX-pro'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE, INFRASTRUCTURE.SIMPLE_APIM]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, True, index = index, apim_sku = apim_sku)\n",
     "\n",

samples/authX/create.ipynb

@@ -18,6 +18,7 @@
     "import utils\n",
     "from apimtypes import *\n",
     "from console import print_error, print_ok\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -38,7 +39,7 @@
     "\n",
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'authX'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE, INFRASTRUCTURE.SIMPLE_APIM]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, True, index = index, apim_sku = apim_sku)\n",
     "\n",

samples/azure-maps/create.ipynb

@@ -22,6 +22,7 @@
     "import utils\n",
     "from apimtypes import *\n",
     "from console import print_error, print_info, print_ok\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -41,7 +42,7 @@
     "# ------------------------------\n",
     "\n",
     "sample_folder    = 'azure-maps'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE, INFRASTRUCTURE.SIMPLE_APIM]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, index = index, apim_sku = apim_sku)\n",
     "azure_maps_url   = 'https://atlas.microsoft.com'\n",

samples/general/create.ipynb

@@ -18,6 +18,7 @@
     "import utils\n",
     "from apimtypes import *\n",
     "from console import print_error, print_ok\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -37,7 +38,7 @@
     "# ------------------------------\n",
     "\n",
     "sample_folder    = 'general'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE, INFRASTRUCTURE.SIMPLE_APIM]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, index = index, apim_sku = apim_sku)\n",
     "\n",

samples/load-balancing/create.ipynb

@@ -18,6 +18,7 @@
     "import utils\n",
     "from apimtypes import *\n",
     "from console import print_error, print_info, print_message, print_ok\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -37,7 +38,7 @@
     "# ------------------------------\n",
     "\n",
     "sample_folder    = 'load-balancing'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, index = index, apim_sku = apim_sku)\n",
     "\n",

samples/oauth-3rd-party/create.ipynb

@@ -28,6 +28,7 @@
     "from apimtypes import *\n",
     "import os\n",
     "from console import print_error, print_info, print_ok\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -48,7 +49,7 @@
     "\n",
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'oauth-3rd-party'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE, INFRASTRUCTURE.SIMPLE_APIM]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, True, index = index, apim_sku = apim_sku)\n",
     "\n",

samples/secure-blob-access/create.ipynb

@@ -20,6 +20,7 @@
     "import utils\n",
     "from apimtypes import *\n",
     "from console import print_error, print_info, print_ok, print_val, print_warning\n",
+    "from azure_resources import get_infra_rg_name\n",
     "\n",
     "# ------------------------------\n",
     "#    USER CONFIGURATION\n",
@@ -40,7 +41,7 @@
     "\n",
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'secure-blob-access'\n",
-    "rg_name          = utils.get_infra_rg_name(deployment, index)\n",
+    "rg_name          = get_infra_rg_name(deployment, index)\n",
     "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE, INFRASTRUCTURE.SIMPLE_APIM]\n",
     "nb_helper        = utils.NotebookHelper(sample_folder, rg_name, rg_location, deployment, supported_infras, True, index = index, apim_sku = apim_sku)\n",
     "\n",