Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
Deployment and Operations
infra-azure-provisioning
Commits
ae807c30
Commit
ae807c30
authored
Aug 19, 2021
by
Vivek Ojha
Browse files
Revert "Merge branch 'ad-app-feature-flag' into 'master'"
This reverts merge request
!452
parent
e756f2a2
Pipeline
#59767
passed with stages
in 10 minutes and 14 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
infra/templates/osdu-r3-mvp/central_resources/main.tf
View file @
ae807c30
...
@@ -302,7 +302,6 @@ module "service_principal" {
...
@@ -302,7 +302,6 @@ module "service_principal" {
module
"ad_application"
{
module
"ad_application"
{
count
=
var
.
enable_bring_your_own_ad_app
?
0
:
1
source
=
"../../../modules/providers/azure/ad-application"
source
=
"../../../modules/providers/azure/ad-application"
name
=
local
.
ad_app_name
name
=
local
.
ad_app_name
...
...
infra/templates/osdu-r3-mvp/central_resources/secrets.tf
View file @
ae807c30
...
@@ -154,10 +154,8 @@ resource "azurerm_key_vault_secret" "principal_object_id" {
...
@@ -154,10 +154,8 @@ resource "azurerm_key_vault_secret" "principal_object_id" {
// Add Application Information to KV
// Add Application Information to KV
resource
"azurerm_key_vault_secret"
"application_id"
{
resource
"azurerm_key_vault_secret"
"application_id"
{
count
=
var
.
enable_bring_your_own_ad_app
?
0
:
1
name
=
"aad-client-id"
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
key_vault_id
=
module
.
keyvault
.
keyvault_id
}
}
...
...
infra/templates/osdu-r3-mvp/central_resources/variables.tf
View file @
ae807c30
...
@@ -40,12 +40,6 @@ variable "feature_flag" {
...
@@ -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"
{
variable
"randomization_level"
{
description
=
"Number of additional random characters to include in resource names to insulate against unexpected resource name collisions."
description
=
"Number of additional random characters to include in resource names to insulate against unexpected resource name collisions."
type
=
number
type
=
number
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment