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
fc10e793
Commit
fc10e793
authored
Nov 10, 2020
by
Daniel Scholl
Browse files
Merge branch 'add_eg_rg_name_secret' into 'master'
Adding Event Grid resource group name as secret See merge request
!30
parents
54785ccf
fad41884
Changes
2
Hide whitespace changes
Inline
Side-by-side
infra/templates/osdu-r3-mvp/data_partition/secrets.tf
View file @
fc10e793
...
...
@@ -44,6 +44,7 @@ locals {
eventgrid_domain_key_name
=
format
(
"%s-key"
,
local
.
eventgrid_domain_name
)
eventgrid_records_topic_name
=
format
(
"%s-recordstopic"
,
local
.
eventgrid_domain_name
)
eventgrid_records_topic_endpoint
=
format
(
"https://%s.%s-1.eventgrid.azure.net/api/events"
,
local
.
eventgrid_records_topic
,
var
.
resource_group_location
)
event_grid_resourcegroup_name
=
format
(
"%s-eventgrid-resourcegroup"
,
var
.
data_partition_name
)
elastic_endpoint
=
format
(
"%s-elastic-endpoint"
,
var
.
data_partition_name
)
elastic_username
=
format
(
"%s-elastic-username"
,
var
.
data_partition_name
)
...
...
@@ -152,6 +153,11 @@ resource "azurerm_key_vault_secret" "recordstopic_name" {
key_vault_id
=
data
.
terraform_remote_state
.
central_resources
.
outputs
.
keyvault_id
}
resource
"azurerm_key_vault_secret"
"eventgrid_resource_group"
{
name
=
local
.
event_grid_resourcegroup_name
value
=
azurerm_resource_group
.
main
.
name
key_vault_id
=
data
.
terraform_remote_state
.
central_resources
.
outputs
.
keyvault_id
}
#-------------------------------
# Elastic
...
...
infra/templates/osdu-r3-mvp/data_partition/tests/unit/unit_test.go
View file @
fc10e793
...
...
@@ -49,7 +49,7 @@ func TestTemplate(t *testing.T) {
TfOptions
:
tfOptions
,
Workspace
:
workspace
,
PlanAssertions
:
nil
,
ExpectedResourceCount
:
8
5
,
ExpectedResourceCount
:
8
6
,
ExpectedResourceAttributeValues
:
resourceDescription
,
}
...
...
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