feat(modular): address feedback for modular support for cdr/ciem, rebase and cleanup

Author: jose-pablo-camacho

modules/integrations/pub-sub/outputs.tf

@@ -1,4 +1,4 @@
-output "webhook_datasource_component_id" {
+output "pubsub_datasource_component_id" {
   value       = "${sysdig_secure_cloud_auth_account_component.gcp_webhook_datasource.type}/${sysdig_secure_cloud_auth_account_component.gcp_webhook_datasource.instance}"
   description = "Component identifier of Webhook Datasource integration created in Sysdig Backend for Log Ingestion"
   depends_on  = [sysdig_secure_cloud_auth_account_component.gcp_webhook_datasource]

test/examples/modular_organization/pub-sub.tf

@@ -3,7 +3,7 @@
 # installing additional Sysdig features.
 #---------------------------------------------------------------------------------------------
 
-module "webhook-datasource" {
+module "pub-sub" {
   source              = "../../../modules/integrations/pub-sub"
   project_id          = module.onboarding.project_id
   is_organizational   = module.onboarding.is_organizational
@@ -15,14 +15,14 @@ resource "sysdig_secure_cloud_auth_account_feature" "threat_detection" {
   account_id = module.onboarding.sysdig_secure_account_id
   type       = "FEATURE_SECURE_THREAT_DETECTION"
   enabled    = true
-  components = [ module.webhook-datasource.webhook_datasource_component_id ]
-  depends_on = [ module.webhook-datasource ]
+  components = [ module.pub-sub.pubsub_datasource_component_id ]
+  depends_on = [ module.pub-sub ]
 }
 
 resource "sysdig_secure_cloud_auth_account_feature" "identity_entitlement" {
   account_id = module.onboarding.sysdig_secure_account_id
   type       = "FEATURE_SECURE_IDENTITY_ENTITLEMENT"
   enabled    = true
-  components = [module.webhook-datasource.webhook_datasource_component_id]
+  components = [module.pub-sub.pubsub_datasource_component_id]
   depends_on = [sysdig_secure_cloud_auth_account_feature.config_posture, sysdig_secure_cloud_auth_account_feature.threat_detection]
 }

test/examples/modular_single_project/pub-sub.tf

@@ -3,7 +3,7 @@
 # installing additional Sysdig features.
 #---------------------------------------------------------------------------------------------
 
-module "webhook-datasource" {
+module "pub-sub" {
   source        = "../../../modules/integrations/pub-sub"
   project_id    = module.onboarding.project_id
   sysdig_secure_account_id = module.onboarding.sysdig_secure_account_id
@@ -13,14 +13,14 @@ resource "sysdig_secure_cloud_auth_account_feature" "threat_detection" {
   account_id = module.onboarding.sysdig_secure_account_id
   type       = "FEATURE_SECURE_THREAT_DETECTION"
   enabled    = true
-  components = [ module.webhook-datasource.webhook_datasource_component_id ]
-  depends_on = [ module.webhook-datasource ]
+  components = [ module.pub-sub.pubsub_datasource_component_id ]
+  depends_on = [ module.pub-sub ]
 }
 
 resource "sysdig_secure_cloud_auth_account_feature" "identity_entitlement" {
   account_id = module.onboarding.sysdig_secure_account_id
   type       = "FEATURE_SECURE_IDENTITY_ENTITLEMENT"
   enabled    = true
-  components = [module.webhook-datasource.webhook_datasource_component_id]
+  components = [module.pub-sub.pubsub_datasource_component_id]
   depends_on = [sysdig_secure_cloud_auth_account_feature.config_posture, sysdig_secure_cloud_auth_account_feature.threat_detection]
 }