Merge pull request #37 from nick4fake/fix/31

#31: Remove unnecessary element code, double check TF 0.12 migr…

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.1.0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.4.6
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

README.md

@@ -27,7 +27,7 @@ module "log_export" {
   log_sink_name          = "storage_example_logsink"
   parent_resource_id     = "sample-project"
   parent_resource_type   = "project"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {
@@ -49,11 +49,11 @@ so that all dependencies are met.
 |------|-------------|:----:|:-----:|:-----:|
 | destination\_uri | The self_link URI of the destination resource (This is available as an output coming from one of the destination submodules) | string | n/a | yes |
 | filter | The filter to apply when exporting logs. Only log entries that match the filter are exported. Default is '' which exports all logs. | string | `""` | no |
-| include\_children | Only valid if 'organization' or 'folder' is chosen as var.parent_resource.type. Determines whether or not to include children organizations/folders in the sink export. If true, logs associated with child projects are also exported; otherwise only logs relating to the provided organization/folder are included. | string | `"false"` | no |
+| include\_children | Only valid if 'organization' or 'folder' is chosen as var.parent_resource.type. Determines whether or not to include children organizations/folders in the sink export. If true, logs associated with child projects are also exported; otherwise only logs relating to the provided organization/folder are included. | bool | `"false"` | no |
 | log\_sink\_name | The name of the log sink to be created. | string | n/a | yes |
 | parent\_resource\_id | The ID of the GCP resource in which you create the log sink. If var.parent_resource_type is set to 'project', then this is the Project ID (and etc). | string | n/a | yes |
 | parent\_resource\_type | The GCP resource in which you create the log sink. The value must not be computed, and must be one of the following: 'project', 'folder', 'billing_account', or 'organization'. | string | `"project"` | no |
-| unique\_writer\_identity | Whether or not to create a unique identity associated with this sink. If false (the default), then the writer_identity used is serviceAccount:cloud-logs@system.gserviceaccount.com. If true, then a unique service account is created and used for the logging sink. | string | `"false"` | no |
+| unique\_writer\_identity | Whether or not to create a unique identity associated with this sink. If false (the default), then the writer_identity used is serviceAccount:cloud-logs@system.gserviceaccount.com. If true, then a unique service account is created and used for the logging sink. | bool | `"false"` | no |
 
 ## Outputs
 

examples/bigquery/billing_account/main.tf

@@ -24,7 +24,7 @@ module "log_export" {
   log_sink_name          = "bigquery_example_logsink"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "billing_account"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {

examples/bigquery/billing_account/variables.tf

@@ -16,8 +16,10 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which BigQuery dataset destination will be created."
+  type        = string
 }

examples/bigquery/folder/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,7 +31,7 @@ module "log_export" {
   log_sink_name          = "bigquery_folder_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "folder"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {

examples/bigquery/folder/variables.tf

@@ -16,8 +16,10 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which BigQuery dataset destination will be created."
+  type        = string
 }

examples/bigquery/organization/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,7 +31,7 @@ module "log_export" {
   log_sink_name          = "bigquery_org_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "organization"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {

examples/bigquery/organization/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which BigQuery dataset destination will be created."
+  type        = string
 }
 

examples/bigquery/project/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,7 +31,7 @@ module "log_export" {
   log_sink_name          = "bigquery_project_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "project"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {

examples/bigquery/project/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which BigQuery dataset destination will be created."
+  type        = string
 }
 

examples/pubsub/billing_account/main.tf

@@ -24,14 +24,14 @@ module "log_export" {
   log_sink_name          = "pubsub_example_logsink"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "billing_account"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {
   source                   = "../../..//modules/pubsub"
   project_id               = var.project_id
   topic_name               = "pubsub-example"
   log_sink_writer_identity = module.log_export.writer_identity
-  create_subscriber        = "true"
+  create_subscriber        = true
 }
 

examples/pubsub/billing_account/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which pubsub topic destination will be created."
+  type        = string
 }
 

examples/pubsub/folder/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,14 +31,14 @@ module "log_export" {
   log_sink_name          = "pubsub_folder_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "folder"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {
   source                   = "../../..//modules/pubsub"
   project_id               = var.project_id
   topic_name               = "pubsub-folder-${random_string.suffix.result}"
   log_sink_writer_identity = module.log_export.writer_identity
-  create_subscriber        = "true"
+  create_subscriber        = true
 }
 

examples/pubsub/folder/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which pubsub topic destination will be created."
+  type        = string
 }
 

examples/pubsub/organization/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,14 +31,14 @@ module "log_export" {
   log_sink_name          = "pubsub_org_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "organization"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {
   source                   = "../../..//modules/pubsub"
   project_id               = var.project_id
   topic_name               = "pubsub-org-${random_string.suffix.result}"
   log_sink_writer_identity = module.log_export.writer_identity
-  create_subscriber        = "true"
+  create_subscriber        = true
 }
 

examples/pubsub/organization/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which pubsub topic destination will be created."
+  type        = string
 }
 

examples/pubsub/project/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,14 +31,14 @@ module "log_export" {
   log_sink_name          = "pubsub_project_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "project"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {
   source                   = "../../..//modules/pubsub"
   project_id               = var.project_id
   topic_name               = "pubsub-project-${random_string.suffix.result}"
   log_sink_writer_identity = module.log_export.writer_identity
-  create_subscriber        = "true"
+  create_subscriber        = true
 }
 

examples/pubsub/project/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which pubsub topic destination will be created."
+  type        = string
 }
 

examples/splunk-sink/main.tf

@@ -31,6 +31,6 @@ module "destination" {
   project_id               = var.project_id
   topic_name               = "splunk-sink"
   log_sink_writer_identity = module.log_export.writer_identity
-  create_subscriber        = "true"
+  create_subscriber        = true
 }
 

examples/splunk-sink/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which pubsub topic destination will be created."
+  type        = string
 }
 

examples/storage/billing_account/main.tf

@@ -24,7 +24,7 @@ module "log_export" {
   log_sink_name          = "storage_example_logsink"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "billing_account"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {

examples/storage/billing_account/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which storage bucket destination will be created."
+  type        = string
 }
 

examples/storage/folder/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,7 +31,7 @@ module "log_export" {
   log_sink_name          = "storage_folder_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "folder"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {

examples/storage/folder/variables.tf

@@ -16,9 +16,11 @@
 
 variable "project_id" {
   description = "The ID of the project in which the log export will be created."
+  type        = string
 }
 
 variable "parent_resource_id" {
   description = "The ID of the project in which storage bucket destination will be created."
+  type        = string
 }
 

examples/storage/organization/main.tf

@@ -20,8 +20,8 @@ provider "google" {
 
 resource "random_string" "suffix" {
   length  = 4
-  upper   = "false"
-  special = "false"
+  upper   = false
+  special = false
 }
 
 module "log_export" {
@@ -31,7 +31,7 @@ module "log_export" {
   log_sink_name          = "storage_org_${random_string.suffix.result}"
   parent_resource_id     = var.parent_resource_id
   parent_resource_type   = "organization"
-  unique_writer_identity = "true"
+  unique_writer_identity = true
 }
 
 module "destination" {