Merge pull request #119 from github-copilot-resources/bugfix/infra

karpikpl · web-flow · commit 6dab436d154c · 2024-11-21T07:15:00.000-05:00
diff --git a/azure-deploy/with-app-registration/azuredeploy.json b/azure-deploy/with-app-registration/azuredeploy.json
@@ -148,10 +148,7 @@
                         "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'))]"
-                }
+                "vnetConfiguration": "[if(equals(parameters('subnetId'), ''), json('{}'), json(concat('{ \"infrastructureSubnetId\": \"', parameters('subnetId'), '\", \"internal\": true }')) )]"
             }
         },
         {
diff --git a/azure-deploy/with-token/azuredeploy.json b/azure-deploy/with-token/azuredeploy.json
@@ -138,10 +138,7 @@
                         "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'))]"
-                }
+                "vnetConfiguration": "[if(equals(parameters('subnetId'), ''), json('{}'), json(concat('{ \"infrastructureSubnetId\": \"', parameters('subnetId'), '\", \"internal\": true }')) )]"
             }
         },
         {

Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,7 @@`
`148`	`148`	`"sharedKey": "[listKeys(concat('Microsoft.OperationalInsights/workspaces/', variables('workspaceName')), '2020-08-01').primarySharedKey]"`
`149`	`149`	`}`
`150`	`150`	`},`
`151`		`- "vnetConfiguration": {`
`152`		`- "infrastructureSubnetId": "[parameters('subnetId')]",`
`153`		`- "internal": "[if(equals(parameters('subnetId'), ''), json('false'), json('true'))]"`
`154`		`- }`
	`151`	`+ "vnetConfiguration": "[if(equals(parameters('subnetId'), ''), json('{}'), json(concat('{ \"infrastructureSubnetId\": \"', parameters('subnetId'), '\", \"internal\": true }')) )]"`
`155`	`152`	`}`
`156`	`153`	`},`
`157`	`154`	`{`
Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,7 @@`
`138`	`138`	`"sharedKey": "[listKeys(concat('Microsoft.OperationalInsights/workspaces/', variables('workspaceName')), '2020-08-01').primarySharedKey]"`
`139`	`139`	`}`
`140`	`140`	`},`
`141`		`- "vnetConfiguration": {`
`142`		`- "infrastructureSubnetId": "[parameters('subnetId')]",`
`143`		`- "internal": "[if(equals(parameters('subnetId'), ''), json('false'), json('true'))]"`
`144`		`- }`
	`141`	`+ "vnetConfiguration": "[if(equals(parameters('subnetId'), ''), json('{}'), json(concat('{ \"infrastructureSubnetId\": \"', parameters('subnetId'), '\", \"internal\": true }')) )]"`
`145`	`142`	`}`
`146`	`143`	`},`
`147`	`144`	`{`