fix: add correct terraform attribute for Pub Sub Audit log generation (#1265)

Author: djmctavish

integration/gcp_generation_test.go

@@ -182,6 +182,45 @@ func TestGenerationPubSubAuditlogOnlyGcp(t *testing.T) {
 	assert.Equal(t, buildTf, tfResult)
 }
 
+func TestGenerationPubSubAuditlogOrgGcp(t *testing.T) {
+	os.Setenv("LW_NOCACHE", "true")
+	defer os.Setenv("LW_NOCACHE", "")
+	var final string
+
+	tfResult := runGcpGenerateTest(t,
+		func(c *expect.Console) {
+			expectsCliOutput(t, c, []MsgRspHandler{
+				MsgRsp{cmd.QuestionGcpEnableConfiguration, "n"},
+				MsgRsp{cmd.QuestionGcpEnableAuditLog, "y"},
+				MsgRsp{cmd.QuestionGcpProjectID, projectId},
+				MsgRsp{cmd.QuestionGcpOrganizationIntegration, "y"},
+				MsgRsp{cmd.QuestionGcpOrganizationID, organizationId},
+				MsgRsp{cmd.QuestionGcpServiceAccountCredsPath, ""},
+				MsgRsp{cmd.QuestionGcpConfigureAdvanced, "y"},
+				MsgMenu{cmd.GcpAdvancedOptAuditLog, 0},
+				MsgRsp{cmd.QuestionUsePubSubAudit, "y"},
+				MsgRsp{cmd.QuestionGcpUseExistingSink, "n"},
+				MsgRsp{cmd.QuestionGcpCustomFilter, ""},
+				MsgRsp{cmd.QuestionGcpAnotherAdvancedOpt, "n"},
+				MsgRsp{cmd.QuestionRunTfPlan, "n"},
+			})
+
+			final, _ = c.ExpectEOF()
+		},
+		"generate",
+		"cloud-account",
+		"gcp",
+	)
+
+	assertTerraformSaved(t, final)
+
+	buildTf, _ := gcp.NewTerraform(false, true, true,
+		gcp.WithProjectId(projectId),
+		gcp.WithOrganizationIntegration(true),
+		gcp.WithOrganizationId(organizationId),
+	).Generate()
+	assert.Equal(t, buildTf, tfResult)
+}
 func TestGenerationAuditlogEnableUBLA(t *testing.T) {
 	os.Setenv("LW_NOCACHE", "true")
 	defer os.Setenv("LW_NOCACHE", "")

lwgenerate/gcp/gcp.go

@@ -611,7 +611,12 @@ func createAuditLog(args *GenerateGcpTfConfigurationArgs) (*hclwrite.Block, erro
 			// if organization integration is true, override configModuleName to use the organization level module
 			configurationModuleName = "gcp_organization_level_config"
 			auditLogModuleName = "gcp_organization_level_audit_log"
-			attributes["org_integration"] = args.OrganizationIntegration
+			// Determine if this is the a pub-sub audit log
+			if args.UsePubSubAudit {
+				attributes["integration_type"] = "ORGANIZATION"
+			} else {
+				attributes["org_integration"] = args.OrganizationIntegration
+			}
 			attributes["organization_id"] = args.GcpOrganizationId
 
 			if len(args.FoldersToInclude) > 0 {

lwgenerate/gcp/gcp_test.go

@@ -932,7 +932,7 @@ var moduleImportOrganizationLevelAuditLogWithConfiguration = `module "gcp_organi
 var moduleImportOrganizationLevelPubSubAuditLogWithConfiguration = `module "gcp_organization_level_audit_log" {
   source                       = "lacework/pub-sub-audit-log/gcp"
   version                      = "~> 0.2"
-  org_integration              = true
+  integration_type             = "ORGANIZATION"
   organization_id              = "123456789"
   service_account_name         = module.gcp_organization_level_config.service_account_name
   service_account_private_key  = module.gcp_organization_level_config.service_account_private_key
@@ -949,10 +949,10 @@ var moduleImportOrganizationLevelAuditLogWithoutConfiguration = `module "gcp_org
 `
 
 var moduleImportOrganizationLevelPubSubAuditLogWithoutConfiguration = `module "gcp_organization_level_audit_log" {
-  source          = "lacework/pub-sub-audit-log/gcp"
-  version         = "~> 0.2"
-  org_integration = true
-  organization_id = "123456789"
+  source           = "lacework/pub-sub-audit-log/gcp"
+  version          = "~> 0.2"
+  integration_type = "ORGANIZATION"
+  organization_id  = "123456789"
 }
 `
 var moduleImportOrganizationLevelAuditLogCustomIntegrationName = `module "gcp_organization_level_audit_log" {
@@ -966,8 +966,8 @@ var moduleImportOrganizationLevelAuditLogCustomIntegrationName = `module "gcp_or
 var moduleImportOrganizationLevelPubSubAuditLogCustomIntegrationName = `module "gcp_organization_level_audit_log" {
   source                    = "lacework/pub-sub-audit-log/gcp"
   version                   = "~> 0.2"
+  integration_type          = "ORGANIZATION"
   lacework_integration_name = "custom_integration_name"
-  org_integration           = true
   organization_id           = "123456789"
 }
 `