Skip to content

Commit 968d63e

Browse files
fix(routing-key): enable routing key generation in a deterministic way
1 parent 0143dc8 commit 968d63e

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

modules/integrations/pub-sub/main.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ data "google_project" "project" {
2222

2323
data "sysdig_secure_tenant_external_id" "external_id" {}
2424

25-
# data "sysdig_secure_cloud_ingestion_assets" "assets" {}
25+
data "sysdig_secure_cloud_ingestion_assets" "assets" {}
2626

2727
data "sysdig_current_user" "user" {}
2828
#-----------------------------------------------------------------------------------------
@@ -33,6 +33,7 @@ locals {
3333
role_name = "SysdigIngestionAuthRole"
3434
key_name = "${var.project_id}-${data.sysdig_current_user.user.id}"
3535
routing_key = uuidv5("oid", local.key_name)
36+
ingestion_url = "${regex("^(.*)/[^/]+$", data.sysdig_secure_cloud_ingestion_assets.assets.gcp_metadata.ingestionURL)[0]}/${local.routing_key}"
3637
}
3738

3839

@@ -146,8 +147,7 @@ resource "google_pubsub_subscription" "ingestion_topic_push_subscription" {
146147
project = var.project_id
147148

148149
push_config {
149-
push_endpoint = "https://app-staging.sysdigcloud.com/api/cloudingestion/gcp/v2/${local.routing_key}"
150-
# push_endpoint = data.sysdig_secure_cloud_ingestion_assets.assets.gcp_metadata.ingestionURL
150+
push_endpoint = local.ingestion_url
151151
attributes = {
152152
x-goog-version = "v1"
153153
}
@@ -261,7 +261,6 @@ resource "sysdig_secure_cloud_auth_account_component" "gcp_pubsub_datasource" {
261261
push_subscription_name = google_pubsub_subscription.ingestion_topic_push_subscription.name
262262
push_endpoint = google_pubsub_subscription.ingestion_topic_push_subscription.push_config[0].push_endpoint
263263
routing_key = local.routing_key
264-
# routing_key = data.sysdig_secure_cloud_ingestion_assets.assets.gcp_routing_key
265264
}
266265
service_principal = {
267266
workload_identity_federation = {

modules/integrations/pub-sub/outputs.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@ output "pubsub_datasource_component_id" {
22
value = "${sysdig_secure_cloud_auth_account_component.gcp_pubsub_datasource.type}/${sysdig_secure_cloud_auth_account_component.gcp_pubsub_datasource.instance}"
33
description = "Component identifier of Webhook Datasource integration created in Sysdig Backend for Log Ingestion"
44
depends_on = [sysdig_secure_cloud_auth_account_component.gcp_pubsub_datasource]
5-
}
6-
7-
output "pubsub_datasource_routing_key" {
8-
value = local.routing_key
9-
description = "Component routing key identifier of Webhook Datasource"
105
}

0 commit comments

Comments
 (0)