From 6d671cfdd746d960716580d6d6b77213d9203b47 Mon Sep 17 00:00:00 2001 From: Abhishek Chowdhry Date: Wed, 9 Jun 2021 13:25:04 +0530 Subject: [PATCH 1/2] Added SB topic for LegalTags ans Subscribed it to EG --- infra/templates/osdu-r3-mvp/data_partition/main.tf | 9 +++++++++ .../osdu-r3-mvp/data_partition/terraform.tfvars | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/infra/templates/osdu-r3-mvp/data_partition/main.tf b/infra/templates/osdu-r3-mvp/data_partition/main.tf index b70be180..a5eef379 100644 --- a/infra/templates/osdu-r3-mvp/data_partition/main.tf +++ b/infra/templates/osdu-r3-mvp/data_partition/main.tf @@ -96,6 +96,7 @@ locals { eg_sbtopic_subscriber = "servicebusrecordstopic" eg_sbtopic_schema_subscriber = "servicebusschemachangedtopic" + eg_sbtopic_legaltags_subscriber = "servicebuslegaltagschangedtopic" eventgrid_name = "${local.base_name_21}-grid" eventgrid_records_topic = format("%s-recordstopic", local.eventgrid_name) eventgrid_schema_notification_topic = format("%s-schemachangedtopic", local.eventgrid_name) @@ -350,6 +351,14 @@ resource "azurerm_eventgrid_event_subscription" "service_bus_topic_subscriber" { service_bus_topic_endpoint_id = lookup(module.service_bus.topicsmap, "recordstopiceg") } +// Add a Service Bus Topic subscriber that act as EventHandler for legaltagschangedtopic +resource "azurerm_eventgrid_event_subscription" "service_bus_topic_subscriber_legaltags" { + name = local.eg_sbtopic_legaltags_subscriber + scope = lookup(module.event_grid.topics, local.eventgrid_legaltags_topic) + depends_on = [module.service_bus.id] + service_bus_topic_endpoint_id = lookup(module.service_bus.topicsmap, "legaltagschangedtopiceg") +} + // Add EventGrid EventSubscription Contributor access to Principal For Schema resource "azurerm_role_assignment" "event_grid_topics_role_schema" { count = length(local.rbac_principals) diff --git a/infra/templates/osdu-r3-mvp/data_partition/terraform.tfvars b/infra/templates/osdu-r3-mvp/data_partition/terraform.tfvars index 90494044..c87cecc9 100644 --- a/infra/templates/osdu-r3-mvp/data_partition/terraform.tfvars +++ b/infra/templates/osdu-r3-mvp/data_partition/terraform.tfvars @@ -314,5 +314,17 @@ sb_topics = [ forward_to = "" } ] + }, + { + name = "legaltagschangedtopiceg" + enable_partitioning = true + subscriptions = [ + { + name = "eg_sb_legaltagssubscription" + max_delivery_count = 5 + lock_duration = "PT5M" + forward_to = "" + } + ] } ] -- GitLab From 8a6cf0df1105831e2f263bc26adcf7bbb73feb78 Mon Sep 17 00:00:00 2001 From: Abhishek Chowdhry Date: Wed, 9 Jun 2021 14:07:08 +0530 Subject: [PATCH 2/2] Updating number of partition resources --- .../osdu-r3-mvp/data_partition/tests/unit/unit_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/templates/osdu-r3-mvp/data_partition/tests/unit/unit_test.go b/infra/templates/osdu-r3-mvp/data_partition/tests/unit/unit_test.go index 3f786fdb..6447a676 100644 --- a/infra/templates/osdu-r3-mvp/data_partition/tests/unit/unit_test.go +++ b/infra/templates/osdu-r3-mvp/data_partition/tests/unit/unit_test.go @@ -49,7 +49,7 @@ func TestTemplate(t *testing.T) { TfOptions: tfOptions, Workspace: workspace, PlanAssertions: nil, - ExpectedResourceCount: 122, + ExpectedResourceCount: 125, ExpectedResourceAttributeValues: resourceDescription, } -- GitLab