Merge branch 'revert-d1b32ceb' into 'master'

Revert "Merge branch 'ad-app-feature-flag' into 'master'"

See merge request !456

infra/templates/osdu-r3-mvp/central_resources/main.tf

@@ -302,7 +302,6 @@ module "service_principal" {
 
 
 module "ad_application" {
-  count  = var.enable_bring_your_own_ad_app ? 0 : 1
   source = "../../../modules/providers/azure/ad-application"
 
   name                       = local.ad_app_name

infra/templates/osdu-r3-mvp/central_resources/secrets.tf

@@ -154,10 +154,8 @@ resource "azurerm_key_vault_secret" "principal_object_id" {
 
 // Add Application Information to KV
 resource "azurerm_key_vault_secret" "application_id" {
-  count = var.enable_bring_your_own_ad_app ? 0 : 1
-
   name         = "aad-client-id"
-  value        = var.enable_bring_your_own_ad_app ? "" : module.ad_application.id
+  value        = module.ad_application.id
   key_vault_id = module.keyvault.keyvault_id
 }
 

infra/templates/osdu-r3-mvp/central_resources/variables.tf

@@ -40,12 +40,6 @@ variable "feature_flag" {
   }
 }
 
-variable "enable_bring_your_own_ad_app" {
-  description = "Feature flag for BYOA"
-  default     = true
-  type        = bool
-}
-
 variable "randomization_level" {
   description = "Number of additional random characters to include in resource names to insulate against unexpected resource name collisions."
   type        = number