Skip to content

Commit 5898506

Browse files
fix(routing-key): enable routing key generation in a deterministic way
1 parent 50bd7eb commit 5898506

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

modules/integrations/pub-sub/main.tf

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@ 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

27+
data "sysdig_current_user" "user" {}
2728
#-----------------------------------------------------------------------------------------
2829
# These locals indicate the suffix to create unique name for resources
2930
#-----------------------------------------------------------------------------------------
3031
locals {
3132
suffix = var.suffix == null ? random_id.suffix[0].hex : var.suffix
3233
role_name = "SysdigIngestionAuthRole"
34+
key_name = "${var.project_id}-${data.sysdig_current_user.user.id}"
35+
routing_key = uuidv5("oid", local.key_name)
3336
}
3437

3538

@@ -143,7 +146,8 @@ resource "google_pubsub_subscription" "ingestion_topic_push_subscription" {
143146
project = var.project_id
144147

145148
push_config {
146-
push_endpoint = data.sysdig_secure_cloud_ingestion_assets.assets.gcp_metadata.ingestionURL
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
147151
attributes = {
148152
x-goog-version = "v1"
149153
}
@@ -256,7 +260,8 @@ resource "sysdig_secure_cloud_auth_account_component" "gcp_pubsub_datasource" {
256260
sink_name = var.is_organizational ? google_logging_organization_sink.ingestion_sink[0].name : google_logging_project_sink.ingestion_sink[0].name
257261
push_subscription_name = google_pubsub_subscription.ingestion_topic_push_subscription.name
258262
push_endpoint = google_pubsub_subscription.ingestion_topic_push_subscription.push_config[0].push_endpoint
259-
routing_key = data.sysdig_secure_cloud_ingestion_assets.assets.gcp_routing_key
263+
routing_key = local.routing_key
264+
# routing_key = data.sysdig_secure_cloud_ingestion_assets.assets.gcp_routing_key
260265
}
261266
service_principal = {
262267
workload_identity_federation = {

modules/integrations/pub-sub/outputs.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@ 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"
510
}

0 commit comments

Comments
 (0)