Merge pull request #16 from Coalfire-CF/log-export

cloud storage log export for chronicle

README.md

@@ -54,10 +54,10 @@ No requirements.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_application_folder"></a> [application\_folder](#module\_application\_folder) | github.com/Coalfire-CF/terraform-google-folder | n/a |
-| <a name="module_destination"></a> [destination](#module\_destination) | github.com/Coalfire-CF/terraform-google-log-export/modules/pubsub | n/a |
+| <a name="module_destination"></a> [destination](#module\_destination) | github.com/Coalfire-CF/terraform-google-log-export//modules/storage | v1.0.4 |
 | <a name="module_gcs"></a> [gcs](#module\_gcs) | github.com/Coalfire-CF/terraform-google-cloud-storage | n/a |
 | <a name="module_kms"></a> [kms](#module\_kms) | github.com/Coalfire-CF/terraform-google-kms | n/a |
-| <a name="module_log_export"></a> [log\_export](#module\_log\_export) | github.com/Coalfire-CF/terraform-google-log-export | n/a |
+| <a name="module_log_export"></a> [log\_export](#module\_log\_export) | github.com/Coalfire-CF/terraform-google-log-export | v1.0.4 |
 | <a name="module_management_folder"></a> [management\_folder](#module\_management\_folder) | github.com/Coalfire-CF/terraform-google-folder | n/a |
 | <a name="module_management_project"></a> [management\_project](#module\_management\_project) | github.com/Coalfire-CF/terraform-google-project | n/a |
 | <a name="module_networking_folder"></a> [networking\_folder](#module\_networking\_folder) | github.com/Coalfire-CF/terraform-google-folder | n/a |
@@ -97,7 +97,7 @@ No requirements.
 | <a name="input_billing_account"></a> [billing\_account](#input\_billing\_account) | The ID of the billing account to associate projects with. | `string` | n/a | yes |
 | <a name="input_boolean_type_organization_policies"></a> [boolean\_type\_organization\_policies](#input\_boolean\_type\_organization\_policies) | List of boolean type org policies to apply. | `list(string)` | <pre>[<br>  "compute.disableNonFIPSMachineTypes",<br>  "compute.skipDefaultNetworkCreation",<br>  "sql.restrictPublicIp",<br>  "storage.publicAccessPrevention"<br>]</pre> | no |
 | <a name="input_bucket_prefix"></a> [bucket\_prefix](#input\_bucket\_prefix) | Prefix for buckets. | `string` | `"bkt"` | no |
-| <a name="input_create_log_sinks"></a> [create\_log\_sinks](#input\_create\_log\_sinks) | Whether or not to create log sinks | `bool` | `true` | no |
+| <a name="input_create_log_export"></a> [create\_log\_export](#input\_create\_log\_export) | Whether or not to create log export | `bool` | `true` | no |
 | <a name="input_folder_prefix"></a> [folder\_prefix](#input\_folder\_prefix) | Prefix for folders. | `string` | `"fldr"` | no |
 | <a name="input_group_org_admins"></a> [group\_org\_admins](#input\_group\_org\_admins) | Google Group for GCP Organization Administrators. | `string` | n/a | yes |
 | <a name="input_keyring_prefix"></a> [keyring\_prefix](#input\_keyring\_prefix) | Prefix for key rings. | `string` | `"kr"` | no |

log-sinks.tf

@@ -9,9 +9,9 @@ resource "random_string" "suffix_sink" {
 }
 
 module "log_export" {
-  source = "github.com/Coalfire-CF/terraform-google-log-export"
+  source = "github.com/Coalfire-CF/terraform-google-log-export?ref=v1.0.4"
 
-  count = var.create_log_sinks ? 1 : 0
+  count = var.create_log_export ? 1 : 0
 
   destination_uri = module.destination[0].destination_uri
   filter          = var.log_filter
@@ -28,18 +28,17 @@ module "log_export" {
 }
 
 module "destination" {
-  source = "github.com/Coalfire-CF/terraform-google-log-export/modules/pubsub"
+  source = "github.com/Coalfire-CF/terraform-google-log-export//modules/storage?ref=v1.0.4"
 
-  count = var.create_log_sinks ? 1 : 0
+  count = var.create_log_export ? 1 : 0
 
   project_id               = module.management_project.project_id
-  topic_name               = "${var.topic_prefix}-org-logs-${random_string.suffix_sink.result}"
+  storage_bucket_name      = "${var.bucket_prefix}-org-logs-${random_string.suffix_sink.result}"
   log_sink_writer_identity = module.log_export[0].writer_identity
-  create_subscriber        = true
-  kms_key_name             = module.kms.keys["pub-sub"]
+  location                 = var.region
+  kms_key_name             = module.kms.keys["cloud-storage"]
 
   depends_on = [
-    time_sleep.wait,
-    google_kms_crypto_key_iam_member.ps_account
+    time_sleep.wait
   ]
 }

variables.tf

@@ -108,8 +108,8 @@ variable "topic_prefix" {
   default     = "ps"
 }
 
-variable "create_log_sinks" {
-  description = "Whether or not to create log sinks"
+variable "create_log_export" {
+  description = "Whether or not to create log export"
   type        = bool
   default     = true
 }