From 2f919e2bf807cb105d71b66549fbc196c2ac9946 Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:12:16 +0300
Subject: [PATCH 1/6] remove terraform from code

---
 azure_jumpstart_arcbox/terraform/main.tf      | 320 -----------
 .../terraform/modules/clientVm/main.tf        | 291 ----------
 .../terraform/modules/kubernetes/aks/main.tf  | 190 -------
 .../modules/kubernetes/ubuntuCapi/main.tf     | 185 -------
 .../modules/kubernetes/ubuntuRancher/main.tf  | 175 ------
 .../terraform/modules/mgmt/addsVM/main.tf     | 171 ------
 .../modules/mgmt/mgmtArtifacts/main.tf        | 496 ------------------
 .../terraform/modules/mgmt/mgmtPolicy/main.tf | 103 ----
 .../modules/mgmt/mgmtStorage/main.tf          |  43 --
 9 files changed, 1974 deletions(-)
 delete mode 100644 azure_jumpstart_arcbox/terraform/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/clientVm/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/kubernetes/aks/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuCapi/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuRancher/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/mgmt/addsVM/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtArtifacts/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtPolicy/main.tf
 delete mode 100644 azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtStorage/main.tf

diff --git a/azure_jumpstart_arcbox/terraform/main.tf b/azure_jumpstart_arcbox/terraform/main.tf
deleted file mode 100644
index e8d3a13577..0000000000
--- a/azure_jumpstart_arcbox/terraform/main.tf
+++ /dev/null
@@ -1,320 +0,0 @@
-# Configure the Azure provider
-terraform {
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "~> 2.65"
-    }
-  }
-
-  required_version = ">= 0.14.9"
-}
-
-provider "azurerm" {
-  features {}
-}
-
-variable "azure_location" {
-  type        = string
-  description = "Azure Location"
-  default     = "eastus"
-}
-
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-  default     = "ArcBox-RG"
-}
-
-variable "client_vm_name" {
-  type        = string
-  description = "The name of the client virtual machine."
-  default     = "ArcBox-Client"
-}
-
-variable "capi_vm_name" {
-  type        = string
-  description = "The name of the client virtual machine."
-  default     = "ArcBox-CAPI-MGMT"
-}
-
-variable "rancher_vm_name" {
-  type        = string
-  description = "The name of the client virtual machine."
-  default     = "ArcBox-K3s"
-}
-
-variable "virtual_network_name" {
-  type        = string
-  description = "ArcBox vNET name."
-  default     = "ArcBox-vNET"
-}
-
-variable "subnet_name" {
-  type        = string
-  description = "ArcBox subnet name."
-  default     = "ArcBox-Subnet"
-}
-
-variable "workspace_name" {
-  type        = string
-  description = "Log Analytics workspace name."
-  default     = "ArcBox-Workspace"
-}
-
-variable "github_username" {
-  type        = string
-  description = "User's github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
-  default     = "microsoft"
-}
-
-variable "github_repo" {
-  type        = string
-  description = "Specify a GitHub repo (used for testing purposes)"
-  default     = "microsoft"
-}
-
-variable "github_branch" {
-  type        = string
-  description = "Specify a GitHub branch (used for testing purposes)"
-  default     = "main"
-}
-
-variable "spn_client_id" {
-  type        = string
-  description = "Arc Service Principal clientID."
-}
-
-variable "spn_client_secret" {
-  type        = string
-  description = "Arc Service Principal client secret."
-  sensitive   = true
-}
-
-variable "spn_tenant_id" {
-  type        = string
-  description = "Arc Service Principal tenantID."
-}
-
-variable "client_admin_username" {
-  type        = string
-  description = "Username for the client virtual machine."
-  default     = "arcdemo"
-}
-
-variable "client_admin_password" {
-  type        = string
-  description = "Password for Windows admin account. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long."
-  default     = "ArcPassword123!!"
-  sensitive   = true
-}
-
-variable "client_admin_ssh" {
-  type        = string
-  description = "SSH Key for the Linux VM's."
-  sensitive   = true
-}
-
-variable "deploy_bastion" {
-  type        = bool
-  description = "Choice to deploy Azure Bastion"
-  default     = false
-}
-
-variable "addsDomainName" {
-  type        = string
-  description = "Active directory domain services domain name"
-  default     = "jumpstart.local"
-}
-
-### This should be swapped to a lower-case value to avoid case sensitivity ###
-variable "deployment_flavor" {
-  type        = string
-  description = "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', or 'DevOps'."
-  default     = "ITPro"
-
-  validation {
-    condition     = contains(["ITPro", "DevOps", "DataOps"], var.deployment_flavor)
-    error_message = "Valid options for Deployment Flavor: 'Full', 'ITPro', 'DevOps' and 'DataOps'."
-  }
-}
-##############################################################################
-
-locals {
-  template_base_url            = "https://raw.githubusercontent.com/${var.github_repo}/azure_arc/${var.github_branch}/azure_jumpstart_arcbox/"
-  capi_arc_data_cluster_name   = "ArcBox-CAPI-Data"
-  k3s_arc_data_cluster_name    = var.rancher_vm_name
-  aks_arc_data_cluster_name    = "ArcBox-AKS-Data"
-  aks_dr_arc_data_cluster_name = "ArcBox-AKS-DR-Data"
-}
-
-resource "random_string" "guid" {
-  length  = 4
-  special = false
-}
-
-resource "azurerm_resource_group" "rg" {
-  name     = var.resource_group_name
-  location = var.azure_location
-}
-
-module "management_storage" {
-  source = "./modules/mgmt/mgmtStorage"
-
-  resource_group_name = azurerm_resource_group.rg.name
-
-  depends_on = [azurerm_resource_group.rg]
-}
-
-module "management_artifacts" {
-  source = "./modules/mgmt/mgmtArtifacts"
-
-  resource_group_name  = azurerm_resource_group.rg.name
-  spn_client_id        = var.spn_client_id
-  virtual_network_name = var.virtual_network_name
-  subnet_name          = var.subnet_name
-  workspace_name       = var.workspace_name
-  deploy_bastion       = var.deploy_bastion
-  deployment_flavor    = var.deployment_flavor
-  depends_on           = [azurerm_resource_group.rg]
-}
-
-module "management_policy" {
-  source = "./modules/mgmt/mgmtPolicy"
-
-  resource_group_name = azurerm_resource_group.rg.name
-  workspace_name      = var.workspace_name
-  workspace_id        = module.management_artifacts.workspace_id
-  deployment_flavor   = var.deployment_flavor
-
-  depends_on = [azurerm_resource_group.rg]
-}
-
-module "client_vm" {
-  source = "./modules/clientVm"
-
-  resource_group_name          = azurerm_resource_group.rg.name
-  vm_name                      = var.client_vm_name
-  virtual_network_name         = var.virtual_network_name
-  subnet_name                  = var.subnet_name
-  template_base_url            = local.template_base_url
-  storage_account_name         = module.management_storage.storage_account_name
-  workspace_name               = var.workspace_name
-  spn_client_id                = var.spn_client_id
-  spn_client_secret            = var.spn_client_secret
-  spn_tenant_id                = var.spn_tenant_id
-  deployment_flavor            = var.deployment_flavor
-  admin_username               = var.client_admin_username
-  admin_password               = var.client_admin_password
-  github_username              = var.github_username
-  github_repo                  = var.github_repo
-  github_branch                = var.github_branch
-  deploy_bastion               = var.deploy_bastion
-  capi_arc_data_cluster_name   = "${local.capi_arc_data_cluster_name}-${random_string.guid.result}"
-  k3s_arc_cluster_name         = "${local.k3s_arc_data_cluster_name}-${random_string.guid.result}"
-  aks_arc_data_cluster_name    = "${local.aks_arc_data_cluster_name}-${random_string.guid.result}"
-  aks_dr_arc_data_cluster_name = "${local.aks_dr_arc_data_cluster_name}-${random_string.guid.result}"
-
-  depends_on = [
-    azurerm_resource_group.rg,
-    module.management_artifacts,
-    module.management_storage,
-    random_string.guid,
-    module.adds_vm
-  ]
-}
-
-module "adds_vm" {
-  source                 = "./modules/mgmt/addsVM"
-  count                  = var.deployment_flavor == "DataOps" ? 1 : 0
-  resource_group_name    = azurerm_resource_group.rg.name
-  adds_Domain_Name       = var.addsDomainName
-  deploy_bastion         = var.deploy_bastion
-  windows_Admin_Username = var.client_admin_username
-  windows_Admin_password = var.client_admin_password
-  template_base_url      = local.template_base_url
-  depends_on = [
-    azurerm_resource_group.rg,
-    module.management_artifacts,
-    module.management_storage
-  ]
-}
-
-module "capi_vm" {
-  source = "./modules/kubernetes/ubuntuCapi"
-  count  = contains(["DevOps", "DataOps"], var.deployment_flavor) ? 1 : 0
-
-  resource_group_name        = azurerm_resource_group.rg.name
-  vm_name                    = var.capi_vm_name
-  virtual_network_name       = var.virtual_network_name
-  subnet_name                = var.subnet_name
-  template_base_url          = local.template_base_url
-  storage_account_name       = module.management_storage.storage_account_name
-  spn_client_id              = var.spn_client_id
-  spn_client_secret          = var.spn_client_secret
-  spn_tenant_id              = var.spn_tenant_id
-  admin_username             = var.client_admin_username
-  admin_ssh_key              = var.client_admin_ssh
-  workspace_name             = var.workspace_name
-  deploy_bastion             = var.deploy_bastion
-  deployment_flavor          = var.deployment_flavor
-  capi_arc_data_cluster_name = "${local.capi_arc_data_cluster_name}-${random_string.guid.result}"
-
-  depends_on = [
-    azurerm_resource_group.rg,
-    module.management_artifacts,
-    module.management_storage,
-    random_string.guid,
-    module.adds_vm
-  ]
-}
-
-module "rancher_vm" {
-  source = "./modules/kubernetes/ubuntuRancher"
-  count  = contains(["DevOps"], var.deployment_flavor) ? 1 : 0
-
-  resource_group_name  = azurerm_resource_group.rg.name
-  vm_name              = "${local.k3s_arc_data_cluster_name}-${random_string.guid.result}"
-  virtual_network_name = var.virtual_network_name
-  subnet_name          = var.subnet_name
-  template_base_url    = local.template_base_url
-  storage_account_name = module.management_storage.storage_account_name
-  spn_client_id        = var.spn_client_id
-  spn_client_secret    = var.spn_client_secret
-  spn_tenant_id        = var.spn_tenant_id
-  admin_username       = var.client_admin_username
-  admin_ssh_key        = var.client_admin_ssh
-  workspace_name       = var.workspace_name
-  deploy_bastion       = var.deploy_bastion
-
-  depends_on = [
-    azurerm_resource_group.rg,
-    module.management_artifacts,
-    module.management_storage,
-    random_string.guid
-  ]
-}
-
-module "aks_clusters" {
-  source = "./modules/kubernetes/aks"
-  count  = var.deployment_flavor == "DataOps" ? 1 : 0
-
-  resource_group_name = azurerm_resource_group.rg.name
-  spn_client_id       = var.spn_client_id
-  spn_client_secret   = var.spn_client_secret
-  spn_tenant_id       = var.spn_tenant_id
-  ssh_rsa_public_key  = var.client_admin_ssh
-  aks_cluster_name    = "${local.aks_arc_data_cluster_name}-${random_string.guid.result}"
-  aks_dr_cluster_name = "${local.aks_dr_arc_data_cluster_name}-${random_string.guid.result}"
-
-  depends_on = [
-    azurerm_resource_group.rg,
-    module.management_artifacts,
-    module.management_storage,
-    module.adds_vm
-  ]
-}
-
-output "clientVmLogonUserName" {
-  value = var.deployment_flavor == "DataOps" ? "${var.client_admin_username}@${var.addsDomainName}" : null
-}
diff --git a/azure_jumpstart_arcbox/terraform/modules/clientVm/main.tf b/azure_jumpstart_arcbox/terraform/modules/clientVm/main.tf
deleted file mode 100644
index 3280856a15..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/clientVm/main.tf
+++ /dev/null
@@ -1,291 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-
-variable "vm_name" {
-  type        = string
-  description = "The name of the client virtual machine."
-}
-
-variable "capi_arc_data_cluster_name" {
-  type        = string
-  description = "The name of the CAPI cluster"
-  default     = "ArcBox-CAPI-Data"
-}
-
-variable "k3s_arc_cluster_name" {
-  type        = string
-  description = "The name of the K3s cluster"
-  default     = "ArcBox-K3s"
-}
-
-variable "aks_arc_data_cluster_name" {
-  type        = string
-  description = "The name of the AKS cluster"
-  default     = "ArcBox-AKS-Data"
-}
-
-variable "aks_dr_arc_data_cluster_name" {
-  type        = string
-  description = "The name of the AKS cluster"
-  default     = "ArcBox-AKS-DR-Data"
-}
-
-variable "os_sku" {
-  type        = string
-  description = "The Windows version for the client VM."
-  default     = "2022-datacenter-g2"
-}
-
-variable "admin_username" {
-  type        = string
-  description = "Username for the Windows client virtual machine."
-}
-
-variable "admin_password" {
-  type        = string
-  description = "Password for Windows admin account. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long."
-  sensitive   = true
-}
-
-variable "virtual_network_name" {
-  type        = string
-  description = "ArcBox vNET name."
-}
-
-variable "subnet_name" {
-  type        = string
-  description = "ArcBox subnet name."
-}
-
-variable "template_base_url" {
-  type        = string
-  description = "Base URL for the GitHub repo where the ArcBox artifacts are located."
-}
-
-variable "data_controller_username" {
-  type        = string
-  description = "Arc Data Controller user name."
-  default     = "arcdemo"
-}
-
-variable "data_controller_password" {
-  type        = string
-  description = "Arc Data Controller password"
-  default     = "ArcPassword123!!"
-  sensitive   = true
-}
-
-variable "accept_eula" {
-  type        = string
-  description = "Accept EULA for all ArcBox scripts."
-  default     = "yes"
-}
-
-variable "storage_account_name" {
-  type        = string
-  description = "Name for the staging storage account used to hold kubeconfig."
-}
-
-variable "workspace_name" {
-  type        = string
-  description = "Log Analytics workspace name."
-}
-
-variable "spn_client_id" {
-  type        = string
-  description = "Arc Service Principal clientID."
-}
-
-variable "spn_client_secret" {
-  type        = string
-  description = "Arc Service Principal client secret."
-  sensitive   = true
-}
-
-variable "spn_tenant_id" {
-  type        = string
-  description = "Arc Service Principal tenantID."
-}
-
-variable "deployment_flavor" {
-  type        = string
-  description = "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', 'DevOps' and 'DataOps'."
-}
-
-variable "github_username" {
-  type        = string
-  description = "Specify a GitHub username for ArcBox DevOps"
-  default     = "microsoft"
-}
-
-variable "github_repo" {
-  type        = string
-  description = "Specify a GitHub repo (used for testing purposes)"
-}
-
-variable "github_branch" {
-  type        = string
-  description = "Specify a GitHub branch (used for testing purposes)"
-}
-
-variable "trigger_at_logon" {
-  type        = bool
-  description = "Whether or not the automation scripts will trigger at log on, or at startup. True for AtLogon, False for AtStartup."
-  default     = true
-}
-
-variable "deploy_bastion" {
-  type       = bool
-  description = "Choice to deploy Bastion to connect to the client VM"
-  default = false
-}
-
-### THESE ARE LEGACY VARIABLES FOR BACKWARDS COMPATIBILITY WITH LEGACY SCRIPT FUNCTIONS ###
-
-variable "spn_authority" {
-  type        = string
-  description = "Authority for Service Principal authentication"
-  default     = "https://login.microsoftonline.com"
-}
-
-variable "registry_username" {
-  type        = string
-  description = "Registry username"
-  default     = "registryUser"
-}
-
-variable "registry_password" {
-  type        = string
-  description = "Registry password"
-  default     = "registrySecret"
-  sensitive   = true
-}
-
-variable "data_controller_name" {
-  type        = string
-  description = "Arc Data Controller name."
-  default     = "arcdatactrl"
-}
-
-variable "sql_mi_name" {
-  type        = string
-  description = "Arc Data Controller name."
-  default     = "arcdatactrl"
-}
-
-variable "postgres_name" {
-  type        = string
-  description = "Name of PostgreSQL server group."
-  default     = "arcpg"
-}
-
-variable "postgres_worker_node_count" {
-  type        = number
-  description = "Number of PostgreSQL worker nodes."
-  default     = 3
-}
-
-variable "postgres_data_size" {
-  type        = number
-  description = "Size of data volumes in MB."
-  default     = 1024
-}
-
-variable "postgres_service_type" {
-  type        = string
-  description = "How PostgreSQL service is accessed through Kubernetes CNI."
-  default     = "LoadBalancer"
-}
-###########################################################################################
-
-locals {
-    bastion_name           = "ArcBox-Bastion"
-    public_ip_name         = var.deploy_bastion == false ? "${var.vm_name}-PIP" : "${local.bastion_name}-PIP"
-    network_interface_name = "${var.vm_name}-NIC"
-    bastionSubnetIpPrefix  = "172.16.3.64/26"
-}
-
-data "azurerm_subscription" "primary" {
-}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-data "azurerm_subnet" "subnet" {
-  name                 = var.subnet_name
-  virtual_network_name = var.virtual_network_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-}
-
-resource "azurerm_public_ip" "pip" {
-  count               = var.deploy_bastion == false ? 1: 0
-  name                = local.public_ip_name
-  resource_group_name = data.azurerm_resource_group.rg.name
-  location            = data.azurerm_resource_group.rg.location
-  allocation_method   = "Static"
-}
-
-resource "azurerm_network_interface" "nic" {
-  name                = local.network_interface_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-
-  ip_configuration {
-    name                          = "ipconfig1"
-    subnet_id                     = data.azurerm_subnet.subnet.id
-    private_ip_address_allocation = "Dynamic"
-    public_ip_address_id          = var.deploy_bastion == false ? azurerm_public_ip.pip[0].id : null
-  }
-}
-resource "azurerm_virtual_machine" "client" {
-  name                  = var.vm_name
-  location              = data.azurerm_resource_group.rg.location
-  resource_group_name   = data.azurerm_resource_group.rg.name
-  network_interface_ids = [ azurerm_network_interface.nic.id ]
-    vm_size             = var.deployment_flavor == "DevOps" ? "Standard_B4ms" : var.deployment_flavor == "DataOps" ? "Standard_D8s_v4" : "Standard_D16s_v4"
-
-
-  storage_image_reference {
-    publisher = "MicrosoftWindowsServer"
-    offer     = "WindowsServer"
-    sku       = var.os_sku
-    version   = "latest"
-  }
-  storage_os_disk {
-    name              = "${var.vm_name}-OS_Disk"
-    caching           = "ReadWrite"
-    create_option     = "FromImage"
-    managed_disk_type = "Premium_LRS"
-    disk_size_gb      = 1024
-  }
-  os_profile {
-    computer_name  = var.vm_name
-    admin_username = var.admin_username
-    admin_password = var.admin_password
-  }
-  os_profile_windows_config {
-    provision_vm_agent        = true
-    enable_automatic_upgrades = false
-  }
-}
-
-resource "azurerm_virtual_machine_extension" "custom_script" {
-  name                       = var.vm_name
-  virtual_machine_id         = azurerm_virtual_machine.client.id
-  publisher                  = "Microsoft.Compute"
-  type                       = "CustomScriptExtension"
-  type_handler_version       = "1.10"
-  auto_upgrade_minor_version = true
-
-  settings = <<SETTINGS
-    {
-      "fileUris": [
-          "${var.template_base_url}artifacts/Bootstrap.ps1"
-      ],
-      "commandToExecute": "powershell.exe -ExecutionPolicy Bypass -File Bootstrap.ps1 -adminUsername ${var.admin_username} -adminPassword ${var.admin_password} -spnClientId ${var.spn_client_id} -spnClientSecret ${var.spn_client_secret} -spnTenantId ${var.spn_tenant_id} -spnAuthority ${var.spn_authority} -subscriptionId ${data.azurerm_subscription.primary.subscription_id} -resourceGroup ${data.azurerm_resource_group.rg.name} -azdataUsername ${var.data_controller_username} -azdataPassword ${var.data_controller_password} -acceptEula ${var.accept_eula} -registryUsername ${var.registry_username} -registryPassword ${var.registry_password} -arcDcName ${var.data_controller_name} -azureLocation ${data.azurerm_resource_group.rg.location} -mssqlmiName ${var.sql_mi_name} -POSTGRES_NAME ${var.postgres_name} -POSTGRES_WORKER_NODE_COUNT ${var.postgres_worker_node_count} -POSTGRES_DATASIZE ${var.postgres_data_size} -POSTGRES_SERVICE_TYPE ${var.postgres_service_type} -stagingStorageAccountName ${var.storage_account_name} -workspaceName ${var.workspace_name} -templateBaseUrl ${var.template_base_url} -flavor ${var.deployment_flavor} -automationTriggerAtLogon ${var.trigger_at_logon} -capiArcDataClusterName ${var.capi_arc_data_cluster_name} -k3sArcClusterName ${var.k3s_arc_cluster_name} -aksArcClusterName ${var.aks_arc_data_cluster_name} -aksdrArcClusterName ${var.aks_dr_arc_data_cluster_name} -githubUser ${var.github_username}"
-    }
-SETTINGS
-}
diff --git a/azure_jumpstart_arcbox/terraform/modules/kubernetes/aks/main.tf b/azure_jumpstart_arcbox/terraform/modules/kubernetes/aks/main.tf
deleted file mode 100644
index cf40744e1a..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/kubernetes/aks/main.tf
+++ /dev/null
@@ -1,190 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-variable "aks_cluster_name" {
-  type        = string
-  description = "The name of the Kubernetes cluster resource"
-  default     = "ArcBox-AKS-Data"
-}
-
-variable "aks_dr_cluster_name" {
-  type        = string
-  description = "The name of the DR Kubernetes cluster resource"
-  default     = "ArcBox-AKS-DR-Data"
-}
-
-variable "dns_prefix_primary" {
-  type        = string
-  description = "Optional DNS prefix to use with hosted Kubernetes API server FQDN"
-  default     = "arcdata"
-}
-
-variable "dns_prefix_secondary" {
-  type        = string
-  description = "Optional DNS prefix to use with hosted Kubernetes API server FQDN"
-  default     = "arcdata"
-}
-
-variable "agent_count" {
-  type        = number
-  description = "The number of nodes for the cluster"
-  default     = 3
-}
-
-variable "agent_vm_size" {
-  type        = string
-  description = "The size of the VM."
-  default     = "Standard_D8s_v4"
-}
-
-variable "linux_admin_Username" {
-  type        = string
-  description = "User name for the Linux Virtual Machines"
-  default     = "arcdemo"
-}
-
-variable "ssh_rsa_public_key" {
-  type        = string
-  description = "Configure all linux machines with the SSH RSA public key string. Your key should include three parts, for example ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm"
-}
-
-variable "spn_client_id" {
-  type        = string
-  description = "Arc Service Principal clientID."
-}
-
-variable "spn_client_secret" {
-  type        = string
-  description = "Arc Service Principal client secret."
-  sensitive   = true
-}
-
-variable "spn_tenant_id" {
-  type        = string
-  description = "Tenant Id"
-}
-
-
-
-variable "enable_rbac" {
-  type        = bool
-  description = "boolean flag to turn on and off of RBAC"
-  default     = true
-}
-
-variable "os_type" {
-  type        = string
-  description = "The type of operating system"
-  default     = "Linux"
-}
-
-variable "Kubernetes_version" {
-  type        = string
-  description = "The version of Kubernetes"
-  default     = "1.26.6"
-}
-
-locals {
-  service_cidr_primary         = "10.20.64.0/19"
-  dns_service_ip_primary       = "10.20.64.10"
-  docker_bridge_cidr_primary   = "172.17.0.1/16"
-  service_cidr_secondary       = "172.20.64.0/19"
-  dns_service_ip_secondary     = "172.20.64.10"
-  docker_bridge_cidr_secondary = "192.168.0.1/16"
-  virtual_network_name         = "ArcBox-VNet"
-  aks_subnet_name              = "ArcBox-AKS-Subnet"
-  dr_virtual_network_name      = "ArcBox-DR-VNet"
-  dr_subnet_name               = "ArcBox-DR-Subnet"
-}
-
-data "azurerm_subscription" "primary" {
-}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-data "azurerm_subnet" "aks_subnet" {
-  name                 = local.aks_subnet_name
-  virtual_network_name = local.virtual_network_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-}
-
-data "azurerm_subnet" "aks_dr_subnet" {
-  name                 = local.dr_subnet_name
-  virtual_network_name = local.dr_virtual_network_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-}
-
-resource "azurerm_kubernetes_cluster" "aks_primary" {
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-  name                = var.aks_cluster_name
-  kubernetes_version                = var.Kubernetes_version
-  role_based_access_control_enabled = var.enable_rbac
-  dns_prefix                        = var.dns_prefix_primary
-  default_node_pool {
-    name            = "agentpool"
-    vm_size         = var.agent_vm_size
-    node_count      = var.agent_count
-    type            = "VirtualMachineScaleSets"
-    vnet_subnet_id  = data.azurerm_subnet.aks_subnet.id
-  }
-  network_profile {
-    network_plugin     = "azure"
-    service_cidr       = local.service_cidr_primary
-    dns_service_ip     = local.dns_service_ip_primary
-    docker_bridge_cidr = local.docker_bridge_cidr_primary
-  }
-  linux_profile {
-    admin_username = var.linux_admin_Username
-    ssh_key {
-      key_data = file(var.ssh_rsa_public_key)
-    }
-  }
-  azure_active_directory_role_based_access_control {
-    managed   = true
-    tenant_id = var.spn_tenant_id
-  }
-  service_principal {
-    client_id     = var.spn_client_id
-    client_secret = var.spn_client_secret
-  }
-}
-
-resource "azurerm_kubernetes_cluster" "aks_dr_primary" {
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-  name                = var.aks_dr_cluster_name
-  kubernetes_version                = var.Kubernetes_version
-  role_based_access_control_enabled = var.enable_rbac
-  dns_prefix                        = var.dns_prefix_primary
-  default_node_pool {
-    name            = "agentpool"
-    vm_size         = var.agent_vm_size
-    node_count      = var.agent_count
-    type            = "VirtualMachineScaleSets"
-    vnet_subnet_id  = data.azurerm_subnet.aks_dr_subnet.id
-  }
-  network_profile {
-    network_plugin     = "azure"
-    service_cidr       = local.service_cidr_secondary
-    dns_service_ip     = local.dns_service_ip_secondary
-    docker_bridge_cidr = local.docker_bridge_cidr_secondary
-  }
-  linux_profile {
-    admin_username = var.linux_admin_Username
-    ssh_key {
-      key_data = file(var.ssh_rsa_public_key)
-    }
-  }
-  service_principal {
-    client_id     = var.spn_client_id
-    client_secret = var.spn_client_secret
-  }
-  azure_active_directory_role_based_access_control {
-    managed   = true
-    tenant_id = var.spn_tenant_id
-  }
-}
diff --git a/azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuCapi/main.tf b/azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuCapi/main.tf
deleted file mode 100644
index ae5bab052d..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuCapi/main.tf
+++ /dev/null
@@ -1,185 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-
-variable "vm_name" {
-  type        = string
-  description = "The name of the capi virtual machine"
-}
-
-variable "capi_arc_data_cluster_name" {
-  type        = string
-  description = "The name of the capi virtual machine"
-  default     = "ArcBox-CAPI-Data"
-}
-
-variable "vm_size" {
-  type        = string
-  description = "The size of the capi virtual machine"
-  default     = "Standard_B4ms"
-}
-
-variable "os_sku" {
-  type        = string
-  description = "The Linux version for the capi VM"
-  default     = "22_04-lts-gen2"
-  ### Add limit list, currently only 20.04-LTS ###
-}
-
-variable "admin_username" {
-  type        = string
-  description = "Username for the Linux capi virtual machine"
-}
-
-variable "admin_ssh_key" {
-  type        = string
-  description = "SSH Key for the Linux VM's"
-  sensitive   = true
-}
-
-variable "virtual_network_name" {
-  type        = string
-  description = "ArcBox VNET name"
-}
-
-variable "subnet_name" {
-  type        = string
-  description = "ArcBox subnet name"
-}
-
-variable "template_base_url" {
-  type        = string
-  description = "Base URL for the GitHub repo where the ArcBox artifacts are located"
-}
-
-variable "storage_account_name" {
-  type        = string
-  description = "Name for the staging storage account used to hold kubeconfig"
-}
-
-variable "spn_client_id" {
-  type        = string
-  description = "Arc Service Principal clientID"
-}
-
-variable "spn_client_secret" {
-  type        = string
-  description = "Arc Service Principal client secret"
-  sensitive   = true
-}
-
-variable "spn_tenant_id" {
-  type        = string
-  description = "Arc Service Principal tenantID"
-}
-
-variable "workspace_name" {
-  type        = string
-  description = "Log Analytics workspace name"
-}
-
-variable "deploy_bastion" {
-  type       = bool
-  description = "Choice to deploy Bastion to connect to the client VM"
-  default = false
-}
-
-variable "deployment_flavor" {
-  type        = string
-  description = "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', 'DevOps' and 'DataOps'."
-}
-
-locals {
-    public_ip_name         = "${var.vm_name}-PIP"
-    network_interface_name = "${var.vm_name}-NIC"
-    bastionSubnetIpPrefix  = "172.16.3.64/26"
-}
-
-data "azurerm_subscription" "primary" {
-}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-data "azurerm_subnet" "subnet" {
-  name                 = var.subnet_name
-  virtual_network_name = var.virtual_network_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-}
-
-resource "azurerm_public_ip" "pip" {
-  name                = local.public_ip_name
-  resource_group_name = data.azurerm_resource_group.rg.name
-  location            = data.azurerm_resource_group.rg.location
-  allocation_method   = "Static"
-  count               = var.deploy_bastion == false ? 1: 0
-}
-
-resource "azurerm_network_interface" "nic" {
-  name                = local.network_interface_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-
-  ip_configuration {
-    name                          = "ipconfig1"
-    subnet_id                     = data.azurerm_subnet.subnet.id
-    private_ip_address_allocation = "Dynamic"
-    public_ip_address_id          = var.deploy_bastion == false ? azurerm_public_ip.pip[0].id : null
-  }
-}
-resource "azurerm_virtual_machine" "client" {
-  name                  = var.vm_name
-  location              = data.azurerm_resource_group.rg.location
-  resource_group_name   = data.azurerm_resource_group.rg.name
-  network_interface_ids = [ azurerm_network_interface.nic.id ]
-  vm_size               = var.vm_size
-
-  storage_image_reference {
-    publisher = "canonical"
-    offer     = "0001-com-ubuntu-server-jammy"
-    sku       = var.os_sku
-    version   = "latest"
-  }
-  storage_os_disk {
-    name              = "${var.vm_name}-OS_Disk"
-    caching           = "ReadWrite"
-    create_option     = "FromImage"
-    managed_disk_type = "Premium_LRS"
-  }
-  os_profile {
-    computer_name  = var.vm_name
-    admin_username = var.admin_username
-    admin_password = "ArcPassword123!!" ### TEMPORARY ###
-  }
-
-  os_profile_linux_config {
-      ssh_keys {
-        key_data = file(var.admin_ssh_key)
-        path = "/home/${var.admin_username}/.ssh/authorized_keys"
-      }
-      disable_password_authentication = false
-  }
-}
-
-resource "azurerm_virtual_machine_extension" "custom_script" {
-  name                       = var.vm_name
-  virtual_machine_id         = azurerm_virtual_machine.client.id
-  publisher                  = "Microsoft.Azure.Extensions"
-  type                       = "CustomScript"
-  type_handler_version       = "2.0"
-  auto_upgrade_minor_version = true
-  timeouts {
-    create = "60m"
-  }
-
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "fileUris": [
-          "${var.template_base_url}artifacts/installCAPI.sh"
-      ],
-      "commandToExecute": "bash installCAPI.sh ${var.admin_username} ${var.spn_client_id} ${var.spn_client_secret} ${var.spn_tenant_id} ${var.vm_name} ${data.azurerm_resource_group.rg.location} ${var.storage_account_name} ${var.workspace_name} ${var.capi_arc_data_cluster_name} ${var.template_base_url} ${var.deployment_flavor}"
-    }
-PROTECTED_SETTINGS
-}
diff --git a/azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuRancher/main.tf b/azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuRancher/main.tf
deleted file mode 100644
index bbdb7a70d4..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/kubernetes/ubuntuRancher/main.tf
+++ /dev/null
@@ -1,175 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-
-variable "vm_name" {
-  type        = string
-  description = "The name of the capi virtual machine."
-  default     = "ArcBox-K3s"
-}
-
-variable "vm_size" {
-  type        = string
-  description = "The size of the capi virtual machine."
-  default     = "Standard_B4ms"
-}
-
-variable "os_sku" {
-  type        = string
-  description = "The Linux version for the Rancher VM."
-  default     = "22_04-lts-gen2"
-
-  validation {
-    condition     = contains(["22_04-lts-gen2"], var.os_sku)
-    error_message = "Valid options for OS Sku: '22_04-lts-gen2'."
-  }
-}
-
-variable "admin_username" {
-  type        = string
-  description = "Username for the Linux Rancher virtual machine."
-}
-
-variable "admin_ssh_key" {
-  type        = string
-  description = "SSH Key for the Linux VM's."
-  sensitive   = true
-}
-
-variable "virtual_network_name" {
-  type        = string
-  description = "ArcBox vNET name."
-}
-
-variable "subnet_name" {
-  type        = string
-  description = "ArcBox subnet name."
-}
-
-variable "template_base_url" {
-  type        = string
-  description = "Base URL for the GitHub repo where the ArcBox artifacts are located."
-}
-
-variable "storage_account_name" {
-  type        = string
-  description = "Name for the staging storage account used to hold kubeconfig."
-}
-
-variable "spn_client_id" {
-  type        = string
-  description = "Arc Service Principal clientID."
-}
-
-variable "spn_client_secret" {
-  type        = string
-  description = "Arc Service Principal client secret."
-  sensitive   = true
-}
-
-variable "spn_tenant_id" {
-  type        = string
-  description = "Arc Service Principal tenantID."
-}
-
-variable "workspace_name" {
-  type        = string
-  description = "Log Analytics workspace name."
-}
-
-variable "deploy_bastion" {
-  type       = bool
-  description = "Choice to deploy Bastion to connect to the client VM"
-  default = false
-}
-
-locals {
-    public_ip_name         = "${var.vm_name}-PIP"
-    network_interface_name = "${var.vm_name}-NIC"
-    bastionSubnetIpPrefix  = "172.16.3.64/26"
-}
-
-data "azurerm_subscription" "primary" {
-}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-data "azurerm_subnet" "subnet" {
-  name                 = var.subnet_name
-  virtual_network_name = var.virtual_network_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-}
-
-resource "azurerm_public_ip" "pip" {
-  name                = local.public_ip_name
-  resource_group_name = data.azurerm_resource_group.rg.name
-  location            = data.azurerm_resource_group.rg.location
-  allocation_method   = "Static"
-  count               = var.deploy_bastion == false ? 1: 0
-}
-resource "azurerm_network_interface" "nic" {
-  name                = local.network_interface_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-
-  ip_configuration {
-    name                          = "ipconfig1"
-    subnet_id                     = data.azurerm_subnet.subnet.id
-    private_ip_address_allocation = "Dynamic"
-    public_ip_address_id          = var.deploy_bastion == false ? azurerm_public_ip.pip[0].id : null
-  }
-}
-resource "azurerm_virtual_machine" "client" {
-  name                  = var.vm_name
-  location              = data.azurerm_resource_group.rg.location
-  resource_group_name   = data.azurerm_resource_group.rg.name
-  network_interface_ids = [ azurerm_network_interface.nic.id ]
-  vm_size               = var.vm_size
-
-  storage_image_reference {
-    publisher = "canonical"
-    offer     = "0001-com-ubuntu-server-jammy"
-    sku       = var.os_sku
-    version   = "latest"
-  }
-  storage_os_disk {
-    name              = "${var.vm_name}-OS_Disk"
-    caching           = "ReadWrite"
-    create_option     = "FromImage"
-    managed_disk_type = "Premium_LRS"
-  }
-  os_profile {
-    computer_name  = var.vm_name
-    admin_username = var.admin_username
-    admin_password = "ArcPassword123!!" ### TEMPORARY ###
-  }
-
-  os_profile_linux_config {
-      ssh_keys {
-        key_data = file(var.admin_ssh_key)
-        path = "/home/${var.admin_username}/.ssh/authorized_keys"
-      }
-      disable_password_authentication = false
-  }
-}
-
-resource "azurerm_virtual_machine_extension" "custom_script" {
-  name                       = var.vm_name
-  virtual_machine_id         = azurerm_virtual_machine.client.id
-  publisher                  = "Microsoft.Azure.Extensions"
-  type                       = "CustomScript"
-  type_handler_version       = "2.0"
-  auto_upgrade_minor_version = true
-
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "fileUris": [
-          "${var.template_base_url}artifacts/installK3s.sh"
-      ],
-      "commandToExecute": "bash installK3s.sh ${var.admin_username} ${var.spn_client_id} ${var.spn_client_secret} ${var.spn_tenant_id} ${var.vm_name} ${data.azurerm_resource_group.rg.location} ${var.storage_account_name} ${var.workspace_name} ${var.deploy_bastion}"
-    }
-PROTECTED_SETTINGS
-}
diff --git a/azure_jumpstart_arcbox/terraform/modules/mgmt/addsVM/main.tf b/azure_jumpstart_arcbox/terraform/modules/mgmt/addsVM/main.tf
deleted file mode 100644
index 4c29aca6e2..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/mgmt/addsVM/main.tf
+++ /dev/null
@@ -1,171 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-variable "adds_Domain_Name" {
-  type        = string
-  description = "The FQDN of the domain'"
-  default     = "jumpstart.local"
-}
-
-variable "adds_VM_Name" {
-  type        = string
-  description = "The name of your Virtual Machine."
-  default     = "ArcBox-ADDS"
-}
-
-variable "windows_Admin_Username" {
-  type        = string
-  description = "Username for the Virtual Machine."
-  default     = "arcdemo"
-}
-
-variable "windows_Admin_password" {
-  type        = string
-  description = "Password for the Virtual Machine."
-  default     = "ArcPassword123!!"
-  sensitive   = true
-}
-
-variable "windows_OS_version" {
-  type        = string
-  description = "The Windows version for the client VM."
-  default     = "2022-datacenter-g2"
-}
-
-variable "vm_size" {
-  type        = string
-  description = "The size of the VM."
-  default     = "Standard_B2ms"
-}
-
-variable "deploy_bastion" {
-  type        = bool
-  description = "Choice to deploy Bastion to connect to the client VM"
-  default     = false
-}
-
-variable "template_base_url" {
-  type        = string
-  description = "Base URL for the GitHub repo where the ArcBox artifacts are located."
-}
-
-locals {
-  bastion_name            = "ArcBox-Bastion"
-  public_ip_name          = var.deploy_bastion == false ? "${var.adds_VM_Name}-PIP" : "${local.bastion_name}-PIP"
-  network_interface_name  = "${var.adds_VM_Name}-NIC"
-  virtual_network_name    = "ArcBox-VNet"
-  dr_virtual_network_name = "ArcBox-DR-VNet"
-  dc_subnet_name          = "ArcBox-DC-Subnet"
-  adds_private_ip_address = "10.16.2.100"
-  os_disk_type            = "Premium_LRS"
-}
-
-data "azurerm_subscription" "primary" {
-}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-data "azurerm_virtual_network" "vnet" {
-  name                = local.virtual_network_name
-  resource_group_name = var.resource_group_name
-}
-
-data "azurerm_virtual_network" "dr_vnet" {
-  name                = local.dr_virtual_network_name
-  resource_group_name = var.resource_group_name
-}
-
-data "azurerm_subnet" "subnet" {
-  name                 = local.dc_subnet_name
-  virtual_network_name = local.virtual_network_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-}
-
-resource "azurerm_public_ip" "pip" {
-  count               = var.deploy_bastion == false ? 1 : 0
-  name                = local.public_ip_name
-  resource_group_name = data.azurerm_resource_group.rg.name
-  location            = data.azurerm_resource_group.rg.location
-  allocation_method   = "Static"
-}
-
-resource "azurerm_network_interface" "nic" {
-  name                = local.network_interface_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-
-  ip_configuration {
-    name                          = "ipconfig1"
-    subnet_id                     = data.azurerm_subnet.subnet.id
-    private_ip_address_allocation = "Static"
-    private_ip_address            = local.adds_private_ip_address
-    public_ip_address_id          = var.deploy_bastion == false ? azurerm_public_ip.pip[0].id : null
-  }
-}
-resource "azurerm_virtual_machine" "adds" {
-  name                  = var.adds_VM_Name
-  location              = data.azurerm_resource_group.rg.location
-  resource_group_name   = data.azurerm_resource_group.rg.name
-  network_interface_ids = [azurerm_network_interface.nic.id]
-  vm_size               = var.vm_size
-
-  storage_image_reference {
-    publisher = "MicrosoftWindowsServer"
-    offer     = "WindowsServer"
-    sku       = var.windows_OS_version
-    version   = "latest"
-  }
-  storage_os_disk {
-    name              = "${var.adds_VM_Name}-OS_Disk"
-    caching           = "ReadWrite"
-    create_option     = "FromImage"
-    managed_disk_type = "Premium_LRS"
-    disk_size_gb      = 1024
-  }
-  os_profile {
-    computer_name  = var.adds_VM_Name
-    admin_username = var.windows_Admin_Username
-    admin_password = var.windows_Admin_password
-  }
-  os_profile_windows_config {
-    provision_vm_agent        = true
-    enable_automatic_upgrades = false
-  }
-}
-
-resource "azurerm_virtual_machine_extension" "custom_script" {
-  name                       = var.adds_VM_Name
-  virtual_machine_id         = azurerm_virtual_machine.adds.id
-  publisher                  = "Microsoft.Compute"
-  type                       = "CustomScriptExtension"
-  type_handler_version       = "1.10"
-  auto_upgrade_minor_version = true
-
-  settings = <<SETTINGS
-    {
-      "fileUris": [
-          "${var.template_base_url}artifacts/SetupADDS.ps1"
-      ],
-      "commandToExecute": "powershell.exe -ExecutionPolicy Bypass -File SetupADDS.ps1 -domainName ${var.adds_Domain_Name} -domainAdminUsername  ${var.windows_Admin_Username} -domainAdminPassword  ${var.windows_Admin_password} -templateBaseUrl ${var.template_base_url}"
-    }
-SETTINGS
-}
-
-resource "azurerm_virtual_network_dns_servers" "update_dns_servers" {
-  virtual_network_id = data.azurerm_virtual_network.vnet.id
-  dns_servers        = ["10.16.2.100", "168.63.129.16"]
-  depends_on = [
-    azurerm_virtual_machine_extension.custom_script
-  ]
-}
-
-resource "azurerm_virtual_network_dns_servers" "update_dns_servers_dr" {
-  virtual_network_id = data.azurerm_virtual_network.dr_vnet.id
-  dns_servers        = ["10.16.2.100", "168.63.129.16"]
-  depends_on = [
-    azurerm_virtual_machine_extension.custom_script
-  ]
-}
diff --git a/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtArtifacts/main.tf b/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtArtifacts/main.tf
deleted file mode 100644
index 1e81950da3..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtArtifacts/main.tf
+++ /dev/null
@@ -1,496 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-
-variable "spn_client_id" {
-  type        = string
-  description = "Arc Service Principal clientID."
-}
-
-variable "virtual_network_name" {
-  type        = string
-  description = "ArcBox vNET name."
-}
-
-variable "subnet_name" {
-  type        = string
-  description = "ArcBox subnet name."
-}
-
-variable "aks_subnet_name" {
-  type        = string
-  description = "ArcBox AKS subnet name."
-  default     = "ArcBox-AKS-Subnet"
-}
-
-variable "dc_subnet_name" {
-  type        = string
-  description = "ArcBox DC subnet name."
-  default     = "ArcBox-DC-Subnet"
-}
-
-variable "dr_virtual_network_name" {
-  type        = string
-  description = "DR Virtual network."
-  default     = "ArcBox-DR-VNet"
-}
-
-variable "dr_subnet_name" {
-  type        = string
-  description = "ArcBox DR subnet name."
-  default     = "ArcBox-DR-Subnet"
-}
-
-
-variable "workspace_name" {
-  type        = string
-  description = "Log Analytics workspace name."
-}
-
-variable "deploy_bastion" {
-  type        = bool
-  description = "Choice to deploy Bastion to connect to the client VM"
-  default     = false
-}
-
-variable "deployment_flavor" {
-  type        = string
-  description = "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', 'DevOps' and 'DataOps'."
-}
-
-variable "dns_servers" {
-  type        = list(string)
-  description = "DNS Server configuration."
-  default = []
-}
-
-locals {
-  vnet_address_space         = ["10.16.0.0/16"]
-  subnet_address_prefix      = "10.16.1.0/24"
-  aksSubnetPrefix            = "10.16.76.0/22"
-  dcSubnetPrefix             = "10.16.2.0/24"
-  drAddressPrefix            = ["172.16.0.0/16"]
-  drSubnetPrefix             = "172.16.128.0/17"
-  bastionSubnetName          = "AzureBastionSubnet"
-  nsg_name                   = "ArcBox-NSG"
-  bastion_nsg_name           = "ArcBox-Bastion-NSG"
-  bastionSubnetRef           = "${azurerm_virtual_network.vnet.id}/subnets/${local.bastionSubnetName}"
-  bastionName                = "ArcBox-Bastion"
-  bastionSubnetIpPrefix      = "10.16.3.64/26"
-  bastionPublicIpAddressName = "${local.bastionName}-PIP"
-
-  solutions = [
-    {
-      name   = "Security"
-      flavor = ["ITPro", "DevOps", "DataOps"]
-    }
-  ]
-}
-
-resource "random_string" "random" {
-  length  = 13
-  special = false
-  numeric  = true
-  upper   = false
-}
-
-data "azurerm_client_config" "current" {}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-resource "azurerm_virtual_network" "vnet" {
-  name                = var.virtual_network_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-  address_space       = local.vnet_address_space
-  
-  subnet {
-    name           = var.subnet_name
-    address_prefix = local.subnet_address_prefix
-    security_group = azurerm_network_security_group.nsg.id
-  }
-
-}
-
-resource "azurerm_virtual_network" "drVnet" {
-  count               = var.deployment_flavor == "DataOps" ? 1 : 0
-  name                = var.dr_virtual_network_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-  address_space       = local.drAddressPrefix
-
-  subnet {
-    name           = var.dr_subnet_name
-    address_prefix = local.drSubnetPrefix
-    security_group = azurerm_network_security_group.nsg.id
-  }
-
-}
-
-resource "azurerm_subnet" "AzureBastionSubnet" {
-  count                = var.deploy_bastion == true ? 1 : 0
-  name                 = "AzureBastionSubnet"
-  resource_group_name  = data.azurerm_resource_group.rg.name
-  virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = [local.bastionSubnetIpPrefix]
-}
-
-resource "azurerm_subnet" "aksSubnet" {
-  count                = var.deployment_flavor == "DataOps" ? 1 : 0
-  name                 = var.aks_subnet_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-  virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = [local.aksSubnetPrefix]
-}
-
-resource "azurerm_subnet" "dcSubnet" {
-  count                = var.deployment_flavor == "DataOps" ? 1 : 0
-  name                 = var.dc_subnet_name
-  resource_group_name  = data.azurerm_resource_group.rg.name
-  virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = [local.dcSubnetPrefix]
-}
-
-resource "azurerm_subnet_network_security_group_association" "BastionSubnetNsg" {
-  count                     = var.deploy_bastion == true ? 1 : 0
-  subnet_id                 = azurerm_subnet.AzureBastionSubnet[0].id
-  network_security_group_id = azurerm_network_security_group.bastion_nsg[0].id
-}
-
-resource "azurerm_subnet_network_security_group_association" "aksSubnetNsg" {
-  count                = var.deployment_flavor == "DataOps" ? 1 : 0
-  subnet_id                 = azurerm_subnet.aksSubnet[0].id
-  network_security_group_id = azurerm_network_security_group.nsg.id
-}
-
-resource "azurerm_subnet_network_security_group_association" "dcSubnetNsg" {
-  count                = var.deployment_flavor == "DataOps" ? 1 : 0
-  subnet_id                 = azurerm_subnet.dcSubnet[0].id
-  network_security_group_id = azurerm_network_security_group.nsg.id
-}
-
-resource "azurerm_network_security_group" "nsg" {
-  name                = local.nsg_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-}
-
-resource "azurerm_network_security_group" "bastion_nsg" {
-  count               = var.deploy_bastion == true ? 1 : 0
-  name                = local.bastion_nsg_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-}
-
-resource "azurerm_virtual_network_peering" "virtualNetworkName_peering_to_DR_vnet" {
-  count                     = var.deployment_flavor == "DataOps" ? 1 : 0
-  resource_group_name       = data.azurerm_resource_group.rg.name
-  name                      = "peering-to-DR-vnet"
-  virtual_network_name      = azurerm_virtual_network.vnet.name
-  allow_forwarded_traffic   = true
-  allow_gateway_transit     = false
-  use_remote_gateways       = false
-  remote_virtual_network_id = azurerm_virtual_network.drVnet[0].id
-}
-
-resource "azurerm_virtual_network_peering" "drVirtualNetworkName_peering_to_primary_vnet" {
-  count                     = var.deployment_flavor == "DataOps" ? 1 : 0
-  resource_group_name       = data.azurerm_resource_group.rg.name
-  name                      = "peering-to-primary-vnet"
-  virtual_network_name      = azurerm_virtual_network.drVnet[0].name
-  allow_forwarded_traffic   = true
-  allow_gateway_transit     = false
-  use_remote_gateways       = false
-  remote_virtual_network_id = azurerm_virtual_network.vnet.id
-}
-
-resource "azurerm_network_security_rule" "allow_k8s_80" {
-  name                        = "allow_k8s_80"
-  access                      = "Allow"
-  priority                    = 1003
-  source_address_prefix       = "*"
-  destination_port_range      = "80"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "allow_k8s_8080" {
-  name                        = "allow_k8s_8080"
-  access                      = "Allow"
-  priority                    = 1004
-  source_address_prefix       = "*"
-  destination_port_range      = "8080"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "allow_k8s_443" {
-  name                        = "allow_k8s_443"
-  access                      = "Allow"
-  priority                    = 1005
-  source_address_prefix       = "*"
-  destination_port_range      = "443"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "allow_k8s_kubelet" {
-  name                        = "allow_k8s_kubelet"
-  access                      = "Allow"
-  priority                    = 1006
-  source_address_prefix       = "*"
-  destination_port_range      = "10250"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "allow_traefik_lb_external" {
-  name                        = "allow_traefik_lb_external"
-  access                      = "Allow"
-  priority                    = 1007
-  source_address_prefix       = "*"
-  destination_port_range      = "32323"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "allow_SQLMI_traffic" {
-  name                        = "allow_SQLMI_traffic"
-  access                      = "Allow"
-  priority                    = 1008
-  source_address_prefix       = "*"
-  destination_port_range      = "11433"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "allow_Postgresql_traffic" {
-  name                        = "allow_Postgresql_traffic"
-  access                      = "Allow"
-  priority                    = 1009
-  source_address_prefix       = "*"
-  destination_port_range      = "15432"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "allow_SQLMI_mirroring_traffic" {
-  name                        = "allow_SQLMI_mirroring_traffic"
-  access                      = "Allow"
-  priority                    = 1012
-  source_address_prefix       = "*"
-  destination_port_range      = "5022"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.nsg.name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_https_inbound" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_https_inbound"
-  access                      = "Allow"
-  priority                    = 1010
-  source_address_prefix       = "Internet"
-  destination_port_range      = "443"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_gateway_manager_inbound" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_gateway_manager_inbound"
-  access                      = "Allow"
-  priority                    = 1011
-  source_address_prefix       = "GatewayManager"
-  destination_port_range      = "443"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_load_balancer_inbound" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_load_balancer_inbound"
-  access                      = "Allow"
-  priority                    = 1012
-  source_address_prefix       = "AzureLoadBalancer"
-  destination_port_range      = "443"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Inbound"
-  destination_address_prefix  = "*"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_host_comms" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_host_comms"
-  access                      = "Allow"
-  priority                    = 1013
-  source_address_prefix       = "VirtualNetwork"
-  destination_port_ranges     = ["8080", "5701"]
-  source_port_range           = "*"
-  protocol                    = "*"
-  direction                   = "Inbound"
-  destination_address_prefix  = "VirtualNetwork"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_ssh_rdp_outbound" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_ssh_rdp_outbound"
-  access                      = "Allow"
-  priority                    = 1014
-  source_address_prefix       = "*"
-  source_port_range           = "*"
-  protocol                    = "*"
-  direction                   = "Outbound"
-  destination_address_prefix  = "VirtualNetwork"
-  destination_port_ranges     = ["22", "3389"]
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_azure_cloud_outbound" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_azure_cloud_outbound"
-  access                      = "Allow"
-  priority                    = 1015
-  source_address_prefix       = "*"
-  destination_port_range      = "443"
-  source_port_range           = "*"
-  protocol                    = "TCP"
-  direction                   = "Outbound"
-  destination_address_prefix  = "AzureCloud"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_get_session_info" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_get_session_info"
-  access                      = "Allow"
-  priority                    = 1016
-  source_address_prefix       = "*"
-  destination_port_ranges     = ["80", "443"]
-  source_port_range           = "*"
-  protocol                    = "*"
-  direction                   = "Outbound"
-  destination_address_prefix  = "Internet"
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_network_security_rule" "bastion_allow_bastion_comms" {
-  count                       = var.deploy_bastion == true ? 1 : 0
-  name                        = "bastion_allow_bastion_comms"
-  access                      = "Allow"
-  priority                    = 1017
-  source_address_prefix       = "VirtualNetwork"
-  source_port_range           = "*"
-  protocol                    = "*"
-  direction                   = "Outbound"
-  destination_address_prefix  = "VirtualNetwork"
-  destination_port_ranges     = ["8080", "5701"]
-  resource_group_name         = data.azurerm_resource_group.rg.name
-  network_security_group_name = azurerm_network_security_group.bastion_nsg[0].name
-}
-
-resource "azurerm_log_analytics_workspace" "workspace" {
-  name                = var.workspace_name
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-  sku                 = "PerGB2018"
-  retention_in_days   = 30
-}
-
-resource "azurerm_log_analytics_solution" "update_solution" {
-  for_each = { for i, v in local.solutions : i => v
-    if contains(v.flavor, var.deployment_flavor)
-  }
-  solution_name         = each.value.name
-  location              = data.azurerm_resource_group.rg.location
-  resource_group_name   = data.azurerm_resource_group.rg.name
-  workspace_resource_id = azurerm_log_analytics_workspace.workspace.id
-  workspace_name        = azurerm_log_analytics_workspace.workspace.name
-
-  plan {
-    publisher = "Microsoft"
-    product   = "OMSGallery/${each.value.name}"
-  }
-}
-
-resource "azurerm_public_ip" "publicIpAddress" {
-  count                   = var.deploy_bastion == true ? 1 : 0
-  resource_group_name     = data.azurerm_resource_group.rg.name
-  name                    = local.bastionPublicIpAddressName
-  location                = data.azurerm_resource_group.rg.location
-  allocation_method       = "Static"
-  ip_version              = "IPv4"
-  idle_timeout_in_minutes = 4
-  sku                     = "Standard"
-
-}
-
-resource "azurerm_bastion_host" "bastionHost" {
-  name                = local.bastionName
-  location            = data.azurerm_resource_group.rg.location
-  resource_group_name = data.azurerm_resource_group.rg.name
-  count               = var.deploy_bastion == true ? 1 : 0
-  depends_on = [
-    azurerm_public_ip.publicIpAddress
-  ]
-  ip_configuration {
-    name                 = "IpConf"
-    public_ip_address_id = azurerm_public_ip.publicIpAddress[0].id
-    subnet_id            = azurerm_subnet.AzureBastionSubnet[0].id
-  }
-
-}
-
-output "workspace_id" {
-  value = azurerm_log_analytics_workspace.workspace.id
-}
diff --git a/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtPolicy/main.tf b/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtPolicy/main.tf
deleted file mode 100644
index 7f5fc22907..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtPolicy/main.tf
+++ /dev/null
@@ -1,103 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-
-variable "workspace_name" {
-  type        = string
-  description = "Log Analytics workspace name."
-}
-
-variable "workspace_id" {
-  type        = string
-  description = "Log Analytics workspace id."
-}
-
-variable "deployment_flavor" {
-  type        = string
-  description = "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', and 'DevOps'."
-}
-
-locals {
-  policies = [
-      {
-          name   = "(ArcBox) Enable Azure Monitor for Hybrid VMs with AMA"
-          id     = "/providers/Microsoft.Authorization/policySetDefinitions/59e9c3eb-d8df-473b-8059-23fd38ddd0f0"
-          params = { "logAnalyticsWorkspace": { "value": "${var.workspace_id}" }}
-          role   = [ "Log Analytics Contributor", "Azure Connected Machine Resource Administrator", "Monitoring Contributor" ]
-          flavor = ["ITPro" ]
-      },
-      {
-          name   = "(ArcBox) Tag resources"
-          id     = "/providers/Microsoft.Authorization/policyDefinitions/4f9dc7db-30c1-420c-b61a-e1d640128d26"
-          params = { "tagName": { "value": "project" }, "tagValue": { "value": "jumpstart_arcbox" }}
-          role   = "Tag Contributor"
-          flavor = [ "DevOps", "ITPro" , "DataOps" ]
-      },
-      {
-          name   = "(ArcBox) Enable Azure Defender on Kubernetes clusters"
-          id     = "/providers/Microsoft.Authorization/policyDefinitions/708b60a6-d253-4fe0-9114-4be4c00f012c"
-          params = {}
-          role   = "Log Analytics Contributor"
-          flavor = [ "DevOps" ]
-      }
-  ]
-}
-
-data "azurerm_subscription" "primary" {
-}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-resource "azurerm_resource_group_policy_assignment" "policies" {
-  for_each             = { for i, v in local.policies: i => v 
-                           if contains(v.flavor, var.deployment_flavor)
-                         }
-  name                 = each.value.name
-  location             = data.azurerm_resource_group.rg.location
-  resource_group_id    = data.azurerm_resource_group.rg.id
-  policy_definition_id = each.value.id
-  identity {
-      type = "SystemAssigned"
-  }
-  parameters = <<PARAMETERS
-${jsonencode(each.value.params)}
-PARAMETERS
-}
-
-resource "azurerm_role_assignment" "policy_AMA_role_0" {
-  count                = contains(local.policies[0].flavor, var.deployment_flavor) ? 1 : 0
-  scope                = data.azurerm_resource_group.rg.id
-  role_definition_name = local.policies[0].role[0]
-  principal_id         = azurerm_resource_group_policy_assignment.policies[0].identity[0].principal_id
-}
-
-resource "azurerm_role_assignment" "policy_AMA_role_1" {
-  count                = contains(local.policies[0].flavor, var.deployment_flavor) ? 1 : 0
-  scope                = data.azurerm_resource_group.rg.id
-  role_definition_name = local.policies[0].role[1]
-  principal_id         = azurerm_resource_group_policy_assignment.policies[0].identity[0].principal_id
-}
-
-resource "azurerm_role_assignment" "policy_AMA_role_2" {
-  count                = contains(local.policies[0].flavor, var.deployment_flavor) ? 1 : 0
-  scope                = data.azurerm_resource_group.rg.id
-  role_definition_name = local.policies[0].role[2]
-  principal_id         = azurerm_resource_group_policy_assignment.policies[0].identity[0].principal_id
-}
-
-resource "azurerm_role_assignment" "policy_tagging_resources" {
-  count                = contains(local.policies[1].flavor, var.deployment_flavor) ? 1 : 0
-  scope                = data.azurerm_resource_group.rg.id
-  role_definition_name = local.policies[1].role
-  principal_id         = azurerm_resource_group_policy_assignment.policies[1].identity[0].principal_id
-}
-
-resource "azurerm_role_assignment" "policy_defender_kubernetes" {
-  count                = contains(local.policies[2].flavor, var.deployment_flavor) ? 1 : 0
-  scope                = data.azurerm_resource_group.rg.id
-  role_definition_name = local.policies[2].role
-  principal_id         = azurerm_resource_group_policy_assignment.policies[2].identity[0].principal_id
-}
\ No newline at end of file
diff --git a/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtStorage/main.tf b/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtStorage/main.tf
deleted file mode 100644
index d8df8d4c65..0000000000
--- a/azure_jumpstart_arcbox/terraform/modules/mgmt/mgmtStorage/main.tf
+++ /dev/null
@@ -1,43 +0,0 @@
-variable "resource_group_name" {
-  type        = string
-  description = "Azure Resource Group"
-}
-
-variable "storage_account_type" {
-  type        = string
-  description = "Storage Account type"
-  default     = "Standard"
-
-  validation {
-    condition     = contains(["Standard", "Premium"], var.storage_account_type)
-    error_message = "Valid values for var: storage_account_type are (Standard or Premium)."
-  }
-}
-
-data "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
-}
-
-resource "random_string" "random" {
-  length  = 13
-  special = false
-  numeric  = true
-  upper   = false
-}
-
-locals {
-  storage_account_name = "arcbox${random_string.random.result}"
-}
-
-resource "azurerm_storage_account" "storage" {
-  name                     = local.storage_account_name
-  resource_group_name      = data.azurerm_resource_group.rg.name
-  location                 = data.azurerm_resource_group.rg.location
-  account_tier             = var.storage_account_type
-  account_replication_type = "LRS"
-  enable_https_traffic_only = true
-}
-
-output "storage_account_name" {
-  value = azurerm_storage_account.storage.name
-}

From 7761c96d1a161fd2980dcade701e43720c8eb27c Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:30:41 +0300
Subject: [PATCH 2/6] add bastion developer

---
 azure_jumpstart_arcbox/bicep/main.bicep         |  9 +++++++++
 .../bicep/mgmt/mgmtArtifacts.bicep              | 17 ++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/azure_jumpstart_arcbox/bicep/main.bicep b/azure_jumpstart_arcbox/bicep/main.bicep
index 780dfc1a2f..0b9f1f4257 100644
--- a/azure_jumpstart_arcbox/bicep/main.bicep
+++ b/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')
+@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
   }
 }
diff --git a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
index 21e7ebb4d6..8b65f89aa5 100644
--- a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
+++ b/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,9 +466,12 @@ 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: [
       {

From d7a5687eb03a8c5af678904f4375ee85d8e04212 Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:35:05 +0300
Subject: [PATCH 3/6] disable soft delete

---
 azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
index 8b65f89aa5..881bf1f34b 100644
--- a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
+++ b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
@@ -503,6 +503,7 @@ module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   params: {
     name: keyVaultName
     enablePurgeProtection: false
+    enableSoftDelete: false
     location: location
   }
 }

From f87d9ffa1bc29a37f00fea39d38559a87e34ec9b Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:39:13 +0300
Subject: [PATCH 4/6] refactor: Update bastionHost IP configuration logic

---
 azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
index 881bf1f34b..b0e755282b 100644
--- a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
+++ b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
@@ -473,7 +473,7 @@ resource bastionHost 'Microsoft.Network/bastionHosts@2023-11-01' = if (deployBas
     name: bastionSku
   }
   properties: {
-    ipConfigurations: [
+    ipConfigurations: bastionSku != 'Developer' ? [
       {
         name: 'IpConf'
         properties: {
@@ -485,7 +485,7 @@ resource bastionHost 'Microsoft.Network/bastionHosts@2023-11-01' = if (deployBas
           }
         }
       }
-    ]
+    ] : null
   }
 }
 

From c2b76c982a55311738475f5ea84b0abdd8f34b87 Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:41:34 +0300
Subject: [PATCH 5/6] feat: Add virtual network configuration for bastion host

---
 azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
index b0e755282b..1a33da45c2 100644
--- a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
+++ b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
@@ -473,6 +473,9 @@ resource bastionHost 'Microsoft.Network/bastionHosts@2023-11-01' = if (deployBas
     name: bastionSku
   }
   properties: {
+    virtualNetwork: bastionSku == 'Developer' ? {
+      id: arcVirtualNetwork.id
+    } : null
     ipConfigurations: bastionSku != 'Developer' ? [
       {
         name: 'IpConf'

From 766c75135bf5e09ee9b86cc67288a570d84291e2 Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:49:05 +0300
Subject: [PATCH 6/6] chore: Update bastion host SKU name description

---
 azure_jumpstart_arcbox/bicep/main.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure_jumpstart_arcbox/bicep/main.bicep b/azure_jumpstart_arcbox/bicep/main.bicep
index 0b9f1f4257..b8593d12bb 100644
--- a/azure_jumpstart_arcbox/bicep/main.bicep
+++ b/azure_jumpstart_arcbox/bicep/main.bicep
@@ -48,7 +48,7 @@ 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')
+@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'