Merge pull request #2588 from sebassem/arcbox_3.0

Remove terraform code and add code for Developer SKU of Bastion

azure_jumpstart_arcbox/bicep/main.bicep

@@ -48,6 +48,14 @@ param githubBranch string = 'arcbox_3.0'
 @description('Choice to deploy Bastion to connect to the client VM')
 param deployBastion bool = false
 
+@description('Bastion host Sku name. The Developer SKU is currently supported in a limited number of regions: https://learn.microsoft.com/azure/bastion/quickstart-developer-sku')
+@allowed([
+  'Basic'
+  'Standard'
+  'Developer'
+])
+param bastionSku string = 'Basic'
+
 @description('User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps')
 param githubUser string = 'microsoft'
 
@@ -173,6 +181,7 @@ module mgmtArtifactsAndPolicyDeployment 'mgmt/mgmtArtifacts.bicep' = {
     workspaceName: logAnalyticsWorkspaceName
     flavor: flavor
     deployBastion: deployBastion
+    bastionSku: bastionSku
     location: location
   }
 }

azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep

@@ -37,6 +37,14 @@ param sku string = 'pergb2018'
 @description('Choice to deploy Bastion to connect to the client VM')
 param deployBastion bool = false
 
+@description('Bastion host Sku name')
+@allowed([
+  'Basic'
+  'Standard'
+  'Developer'
+])
+param bastionSku string = 'Basic'
+
 @description('Name of the Network Security Group')
 param networkSecurityGroupName string = 'ArcBox-NSG'
 
@@ -77,7 +85,7 @@ var primarySubnet = [
     }
   }
 ]
-var bastionSubnet = [
+var bastionSubnet = bastionSku != 'Developer' ? [
   {
     name: 'AzureBastionSubnet'
     properties: {
@@ -87,7 +95,7 @@ var bastionSubnet = [
       }
     }
   }
-]
+] : []
 var dataOpsSubnets = [
   {
     name: aksSubnetName
@@ -458,11 +466,17 @@ resource publicIpAddress 'Microsoft.Network/publicIPAddresses@2022-01-01' = if (
   }
 }
 
-resource bastionHost 'Microsoft.Network/bastionHosts@2022-01-01' = if (deployBastion == true) {
+resource bastionHost 'Microsoft.Network/bastionHosts@2023-11-01' = if (deployBastion == true) {
   name: bastionName
   location: location
+  sku: {
+    name: bastionSku
+  }
   properties: {
-    ipConfigurations: [
+    virtualNetwork: bastionSku == 'Developer' ? {
+      id: arcVirtualNetwork.id
+    } : null
+    ipConfigurations: bastionSku != 'Developer' ? [
       {
         name: 'IpConf'
         properties: {
@@ -474,7 +488,7 @@ resource bastionHost 'Microsoft.Network/bastionHosts@2022-01-01' = if (deployBas
           }
         }
       }
-    ]
+    ] : null
   }
 }
 
@@ -492,6 +506,7 @@ module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   params: {
     name: keyVaultName
     enablePurgeProtection: false
+    enableSoftDelete: false
     location: location
   }
 }