private network

Signed-off-by: Piotr Karpala <[email protected]>

Author: karpikpl

.gitignore

@@ -23,4 +23,5 @@ pnpm-debug.log*
 *.sw?
 .azure
 
-api/public
+api/public
+test.http

azure-deploy/with-app-registration/azuredeploy.json

@@ -45,6 +45,13 @@
             "metadata": {
                 "description": "Docker image for metrics viewer - use default or replace with your own"
             }
+        },
+        "subnetId": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Subnet ID (at least /23) for the managed environment when deploying app without public access"
+            }
         }
     },
     "variables": {
@@ -140,6 +147,10 @@
                         "customerId": "[reference(concat('Microsoft.OperationalInsights/workspaces/', variables('workspaceName')), '2020-08-01').customerId]",
                         "sharedKey": "[listKeys(concat('Microsoft.OperationalInsights/workspaces/', variables('workspaceName')), '2020-08-01').primarySharedKey]"
                     }
+                },
+                "vnetConfiguration": {
+                    "infrastructureSubnetId" : "[parameters('subnetId')]",
+                    "internal": "[if(equals(parameters('subnetId'), ''), json('false'), json('true'))]"
                 }
             }
         },

azure-deploy/with-token/azuredeploy.json

@@ -21,14 +21,14 @@
         },
         "github-organization": {
             "type": "string",
-            "defaultValue":"",
+            "defaultValue": "",
             "metadata": {
                 "description": "GitHub Organization - provide only if application-scope is organization"
             }
         },
         "github-enterprise": {
             "type": "string",
-            "defaultValue":"",
+            "defaultValue": "",
             "metadata": {
                 "description": "GitHub Enterprise - provide only if application-scope is enterprise"
             }
@@ -39,12 +39,21 @@
             "metadata": {
                 "description": "Docker image for metrics viewer - use default or replace with your own"
             }
+        },
+        "subnetId": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Subnet ID (at least /23) for the managed environment when deploying app without public access"
+            }
         }
     },
     "variables": {
         "environmentName": "[concat(parameters('name'),'-env')]",
         "workspaceName": "[concat(parameters('name'),'-ai')]",
-        "app-scope": "[if(not(empty(parameters('github-organization'))), 'organization', if(not(empty(parameters('github-enterprise'))), 'enterprise', ''))]"
+        "app-scope": "[if(not(empty(parameters('github-organization'))), 'organization', if(not(empty(parameters('github-enterprise'))), 'enterprise', ''))]",
+        "vnetId": "[concat(split(parameters('subnetId'), '/subnets/')[0])]",
+        "dnsZoneName": "azurecontainerapps.io"
     },
     "resources": [
         {
@@ -130,9 +139,58 @@
                         "customerId": "[reference(concat('Microsoft.OperationalInsights/workspaces/', variables('workspaceName')), '2020-08-01').customerId]",
                         "sharedKey": "[listKeys(concat('Microsoft.OperationalInsights/workspaces/', variables('workspaceName')), '2020-08-01').primarySharedKey]"
                     }
+                },
+                "vnetConfiguration": {
+                    "infrastructureSubnetId": "[parameters('subnetId')]",
+                    "internal": "[if(equals(parameters('subnetId'), ''), json('false'), json('true'))]"
                 }
             }
         },
+        {
+            "type": "Microsoft.Network/privateDnsZones",
+            "apiVersion": "2020-06-01",
+            "name": "[variables('dnsZoneName')]",
+            "location": "global",
+            "condition": "[not(equals(parameters('subnetId'), ''))]",
+            "properties": {},
+            "dependsOn": [
+                "[concat('Microsoft.App/managedEnvironments/', variables('environmentName'))]"
+            ]
+        },
+        {
+            "type": "Microsoft.Network/privateDnsZones/A",
+            "apiVersion": "2020-06-01",
+            "name": "[concat(variables('dnsZoneName'), '/*')]",
+            "properties": {
+                "TTL": 3600,
+                "ARecords": [
+                    {
+                        "ipv4Address": "[reference(concat('Microsoft.App/managedEnvironments/', variables('environmentName')), '2024-02-02-preview').staticIp]"
+
+                    }
+                ]
+            },
+            "dependsOn": [
+                "[resourceId('Microsoft.Network/privateDnsZones', variables('dnsZoneName'))]",
+                "[concat('Microsoft.App/managedEnvironments/', variables('environmentName'))]"
+            ]
+        },
+        {
+            "type": "Microsoft.Network/privateDnsZones/virtualNetworkLinks",
+            "apiVersion": "2020-06-01",
+            "name": "[concat(variables('dnsZoneName'), '/', variables('environmentName'), '-vnet-link')]",
+            "location": "global",
+            "dependsOn": [
+                "[resourceId('Microsoft.Network/privateDnsZones', variables('dnsZoneName'))]"
+            ],
+            "condition": "[not(equals(parameters('subnetId'), ''))]",
+            "properties": {
+                "virtualNetwork": {
+                    "id": "[variables('vnetId')]"
+                },
+                "registrationEnabled": false
+            }
+        },
         {
             "apiVersion": "2020-08-01",
             "name": "[variables('workspaceName')]",
@@ -147,5 +205,19 @@
                 "workspaceCapping": {}
             }
         }
-    ]
+    ],
+    "outputs": {
+        "metrics-viewer-url": {
+            "type": "string",
+            "value": "[reference(concat('Microsoft.App/containerapps/', parameters('name')), '2024-02-02-preview').latestRevisionFqdn]"
+        },
+        "managed-environment-ip": {
+            "type": "string",
+            "value": "[reference(concat('Microsoft.App/managedEnvironments/', variables('environmentName')), '2024-02-02-preview').staticIp]"
+        },
+        "managed-environment-domain": {
+            "type": "string",
+            "value": "[reference(concat('Microsoft.App/managedEnvironments/', variables('environmentName')), '2024-02-02-preview').defaultDomain]"
+        }
+    }
 }