From 9d4f262f1f16ff9a4453b22d04924217e3b180e6 Mon Sep 17 00:00:00 2001
From: jack-lauristen_teradata <jack.lauritsen@teradata.com>
Date: Thu, 11 Jan 2024 11:14:49 -0800
Subject: [PATCH] include name prefix on nlb ip addresses

---
 deployments/azure/all-in-one.json   | 18 +++++++++---------
 deployments/azure/jupyter.json      | 18 +++++++++---------
 deployments/azure/modules/nlb.bicep |  4 ++--
 deployments/azure/workspaces.json   | 18 +++++++++---------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/deployments/azure/all-in-one.json b/deployments/azure/all-in-one.json
index 8131b53..24f387c 100644
--- a/deployments/azure/all-in-one.json
+++ b/deployments/azure/all-in-one.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "8475022372092204787"
+      "templateHash": "15418479916005263131"
     }
   },
   "parameters": {
@@ -651,7 +651,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.24.24.22086",
-              "templateHash": "296837087008094674"
+              "templateHash": "3385554541683646128"
             }
           },
           "parameters": {
@@ -682,7 +682,7 @@
             {
               "type": "Microsoft.Network/publicIPAddresses",
               "apiVersion": "2021-08-01",
-              "name": "inbound",
+              "name": "[format('{0}-inbound', parameters('name'))]",
               "location": "[parameters('location')]",
               "sku": {
                 "name": "Standard"
@@ -696,7 +696,7 @@
             {
               "type": "Microsoft.Network/publicIPAddresses",
               "apiVersion": "2021-08-01",
-              "name": "outbound",
+              "name": "[format('{0}-outbound', parameters('name'))]",
               "location": "[parameters('location')]",
               "sku": {
                 "name": "Standard"
@@ -721,7 +721,7 @@
                     "name": "[format('{0}Inbound', parameters('name'))]",
                     "properties": {
                       "publicIPAddress": {
-                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', 'inbound')]"
+                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name')))]"
                       }
                     }
                   },
@@ -729,7 +729,7 @@
                     "name": "[format('{0}Outbound', parameters('name'))]",
                     "properties": {
                       "publicIPAddress": {
-                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', 'outbound')]"
+                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-outbound', parameters('name')))]"
                       }
                     }
                   }
@@ -766,8 +766,8 @@
               },
               "tags": "[parameters('tags')]",
               "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', 'inbound')]",
-                "[resourceId('Microsoft.Network/publicIPAddresses', 'outbound')]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name')))]",
+                "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-outbound', parameters('name')))]"
               ]
             }
           ],
@@ -781,7 +781,7 @@
             },
             "PublicIp": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', 'inbound'), '2021-08-01').ipAddress]"
+              "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name'))), '2021-08-01').ipAddress]"
             }
           }
         }
diff --git a/deployments/azure/jupyter.json b/deployments/azure/jupyter.json
index 038db39..5597332 100644
--- a/deployments/azure/jupyter.json
+++ b/deployments/azure/jupyter.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "7118450702390745805"
+      "templateHash": "18234375492270445054"
     }
   },
   "parameters": {
@@ -475,7 +475,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.24.24.22086",
-              "templateHash": "296837087008094674"
+              "templateHash": "3385554541683646128"
             }
           },
           "parameters": {
@@ -506,7 +506,7 @@
             {
               "type": "Microsoft.Network/publicIPAddresses",
               "apiVersion": "2021-08-01",
-              "name": "inbound",
+              "name": "[format('{0}-inbound', parameters('name'))]",
               "location": "[parameters('location')]",
               "sku": {
                 "name": "Standard"
@@ -520,7 +520,7 @@
             {
               "type": "Microsoft.Network/publicIPAddresses",
               "apiVersion": "2021-08-01",
-              "name": "outbound",
+              "name": "[format('{0}-outbound', parameters('name'))]",
               "location": "[parameters('location')]",
               "sku": {
                 "name": "Standard"
@@ -545,7 +545,7 @@
                     "name": "[format('{0}Inbound', parameters('name'))]",
                     "properties": {
                       "publicIPAddress": {
-                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', 'inbound')]"
+                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name')))]"
                       }
                     }
                   },
@@ -553,7 +553,7 @@
                     "name": "[format('{0}Outbound', parameters('name'))]",
                     "properties": {
                       "publicIPAddress": {
-                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', 'outbound')]"
+                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-outbound', parameters('name')))]"
                       }
                     }
                   }
@@ -590,8 +590,8 @@
               },
               "tags": "[parameters('tags')]",
               "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', 'inbound')]",
-                "[resourceId('Microsoft.Network/publicIPAddresses', 'outbound')]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name')))]",
+                "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-outbound', parameters('name')))]"
               ]
             }
           ],
@@ -605,7 +605,7 @@
             },
             "PublicIp": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', 'inbound'), '2021-08-01').ipAddress]"
+              "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name'))), '2021-08-01').ipAddress]"
             }
           }
         }
diff --git a/deployments/azure/modules/nlb.bicep b/deployments/azure/modules/nlb.bicep
index c390734..7533f59 100644
--- a/deployments/azure/modules/nlb.bicep
+++ b/deployments/azure/modules/nlb.bicep
@@ -6,7 +6,7 @@ param jupyterHttpPort int = 0
 param tags object = {}
 
 resource lbPublicIPAddress 'Microsoft.Network/publicIPAddresses@2021-08-01' = {
-  name: 'inbound'
+  name: '${name}-inbound'
   location: location
   sku: {
     name: 'Standard'
@@ -19,7 +19,7 @@ resource lbPublicIPAddress 'Microsoft.Network/publicIPAddresses@2021-08-01' = {
 }
 
 resource lbPublicIPAddressOutbound 'Microsoft.Network/publicIPAddresses@2021-08-01' = {
-  name: 'outbound'
+  name: '${name}-outbound'
   location: location
   sku: {
     name: 'Standard'
diff --git a/deployments/azure/workspaces.json b/deployments/azure/workspaces.json
index 8731151..88536b5 100644
--- a/deployments/azure/workspaces.json
+++ b/deployments/azure/workspaces.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "11148566380890649802"
+      "templateHash": "14046707337037786478"
     }
   },
   "parameters": {
@@ -622,7 +622,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.24.24.22086",
-              "templateHash": "296837087008094674"
+              "templateHash": "3385554541683646128"
             }
           },
           "parameters": {
@@ -653,7 +653,7 @@
             {
               "type": "Microsoft.Network/publicIPAddresses",
               "apiVersion": "2021-08-01",
-              "name": "inbound",
+              "name": "[format('{0}-inbound', parameters('name'))]",
               "location": "[parameters('location')]",
               "sku": {
                 "name": "Standard"
@@ -667,7 +667,7 @@
             {
               "type": "Microsoft.Network/publicIPAddresses",
               "apiVersion": "2021-08-01",
-              "name": "outbound",
+              "name": "[format('{0}-outbound', parameters('name'))]",
               "location": "[parameters('location')]",
               "sku": {
                 "name": "Standard"
@@ -692,7 +692,7 @@
                     "name": "[format('{0}Inbound', parameters('name'))]",
                     "properties": {
                       "publicIPAddress": {
-                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', 'inbound')]"
+                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name')))]"
                       }
                     }
                   },
@@ -700,7 +700,7 @@
                     "name": "[format('{0}Outbound', parameters('name'))]",
                     "properties": {
                       "publicIPAddress": {
-                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', 'outbound')]"
+                        "id": "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-outbound', parameters('name')))]"
                       }
                     }
                   }
@@ -737,8 +737,8 @@
               },
               "tags": "[parameters('tags')]",
               "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', 'inbound')]",
-                "[resourceId('Microsoft.Network/publicIPAddresses', 'outbound')]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name')))]",
+                "[resourceId('Microsoft.Network/publicIPAddresses', format('{0}-outbound', parameters('name')))]"
               ]
             }
           ],
@@ -752,7 +752,7 @@
             },
             "PublicIp": {
               "type": "string",
-              "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', 'inbound'), '2021-08-01').ipAddress]"
+              "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', format('{0}-inbound', parameters('name'))), '2021-08-01').ipAddress]"
             }
           }
         }