Add support for App Gateway VNet & minor formatting

simonkurtz-MSFT · simonkurtz-MSFT · commit daa8f5e8e68f · 2025-12-22T21:26:24.000-05:00
diff --git a/samples/authX-pro/create.ipynb b/samples/authX-pro/create.ipynb
@@ -40,7 +40,7 @@
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'authX-pro'\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",
+    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM, 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",
     "# Define the APIs and their operations and policies\n",
diff --git a/samples/authX/create.ipynb b/samples/authX/create.ipynb
@@ -40,7 +40,7 @@
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'authX'\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",
+    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM, 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",
     "# Define the APIs and their operations and policies\n",
diff --git a/samples/azure-maps/create.ipynb b/samples/azure-maps/create.ipynb
@@ -43,7 +43,7 @@
     "\n",
     "sample_folder    = 'azure-maps'\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",
+    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM, 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",
     "\n",
diff --git a/samples/general/create.ipynb b/samples/general/create.ipynb
@@ -39,7 +39,7 @@
     "\n",
     "sample_folder    = 'general'\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",
+    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM, 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",
     "# Define the APIs and their operations and policies\n",
diff --git a/samples/load-balancing/create.ipynb b/samples/load-balancing/create.ipynb
@@ -39,7 +39,7 @@
     "\n",
     "sample_folder    = 'load-balancing'\n",
     "rg_name          = get_infra_rg_name(deployment, index)\n",
-    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM_PE]\n",
+    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM, 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",
     "# Define the APIs and their operations and policies\n",
diff --git a/samples/oauth-3rd-party/create.ipynb b/samples/oauth-3rd-party/create.ipynb
@@ -50,7 +50,7 @@
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'oauth-3rd-party'\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",
+    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM, 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",
     "# OAuth credentials (required environment variables)\n",
diff --git a/samples/secure-blob-access/create.ipynb b/samples/secure-blob-access/create.ipynb
@@ -42,7 +42,7 @@
     "# Create the notebook helper with JWT support\n",
     "sample_folder    = 'secure-blob-access'\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",
+    "supported_infras = [INFRASTRUCTURE.AFD_APIM_PE, INFRASTRUCTURE.APIM_ACA, INFRASTRUCTURE.APPGW_APIM, 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",
     "# Blob storage configuration\n",
diff --git a/shared/bicep/modules/apim/v1/apim.bicep b/shared/bicep/modules/apim/v1/apim.bicep
@@ -143,4 +143,4 @@ output id string = apimService.id
 output name string = apimService.name
 output principalId string = apimService.identity.principalId
 output gatewayUrl string = apimService.properties.gatewayUrl
-output privateIpAddresses array = apimService.properties.privateIPAddresses
+output privateIpAddresses array = apimService.properties.privateIPAddresses ?? []
diff --git a/shared/python/console.py b/shared/python/console.py
@@ -156,8 +156,7 @@ def _print_log(message: str, prefix: str = '', color: str = '', output: str = ''
 
 def print_command(cmd: str = '') -> None:
     """Print a command message."""
-    # Two spaces after the cog as opposed to one elsewhere are intentional for formatting. Please don't change this.
-    _print_log(cmd, '⚙️  ', BOLD_B, blank_above = True, blank_below = True, level = logging.INFO)
+    _print_log(cmd, '⚙️ ', BOLD_B, blank_above = True, blank_below = True, level = logging.INFO)
 
 def print_error(msg: str, output: str = '', duration: str = '') -> None:
     """Print an error message."""
diff --git a/shared/python/infrastructures.py b/shared/python/infrastructures.py
@@ -232,7 +232,7 @@ def deploy_infrastructure(self, is_update: bool = False) -> utils.Output:
 
         try:
             os.chdir(infra_dir)
-            print_plain(f'📁 Changed working directory to: {infra_dir}')
+            print_plain(f'📁 Changed working directory to: {infra_dir}', blank_above = True)
 
             # Prepare deployment parameters and run directly to avoid path detection issues
             bicep_parameters_format = {
diff --git a/shared/python/utils.py b/shared/python/utils.py
@@ -695,7 +695,7 @@ def create_bicep_deployment_group_for_sample(sample_name: str, rg_name: str, rg_
 
         # Change to the sample directory to ensure params.json is written there
         os.chdir(sample_dir)
-        print_plain(f'📁 Changed working directory to: {sample_dir}')
+        print_plain(f'📁 Changed working directory to: {sample_dir}', blank_above = True)
 
         # Call the original deployment function
         return create_bicep_deployment_group(rg_name, rg_location, sample_name, bicep_parameters, bicep_parameters_file, rg_tags, is_debug)
