requested updates

Author: kpeder

README.md

@@ -55,7 +55,7 @@ module "localhost_function" {
 | bucket\_force\_destroy | When deleting the GCS bucket containing the cloud function, delete all objects in the bucket first. | bool | `"false"` | no |
 | bucket\_labels | A set of key/value label pairs to assign to the function source archive bucket. | map(string) | `<map>` | no |
 | bucket\_name | The name to apply to the bucket. Will default to a string of the function name. | string | `""` | no |
-| create\_bucket | Whether to create a new bucket or use an existing bucket with the bucket_name passed to the module. | bool | `"true"` | no |
+| create\_bucket | Whether to create a new bucket or use an existing one. If false, `bucket_name` should reference the name of the alternate bucket to use. | bool | `"true"` | no |
 | description | The description of the function. | string | `"Processes events."` | no |
 | entry\_point | The name of a method in the function source which will be invoked when the function is executed. | string | n/a | yes |
 | environment\_variables | A set of key/value environment variable pairs to assign to the function. | map(string) | `<map>` | no |

main.tf

@@ -48,19 +48,19 @@ data "archive_file" "main" {
 }
 
 resource "google_storage_bucket" "main" {
+  count              = var.create_bucket ? 1 : 0
   name               = coalesce(var.bucket_name, var.name)
   force_destroy      = var.bucket_force_destroy
   location           = var.region
   project            = var.project_id
   storage_class      = "REGIONAL"
   labels             = var.bucket_labels
   bucket_policy_only = true
-  count              = var.create_bucket == true ? 1 : 0
 }
 
 resource "google_storage_bucket_object" "main" {
   name                = "${data.archive_file.main.output_md5}-${basename(data.archive_file.main.output_path)}"
-  bucket              = var.create_bucket == true ? google_storage_bucket.main[0].name : var.bucket_name
+  bucket              = var.create_bucket ? google_storage_bucket.main[0].name : var.bucket_name
   source              = data.archive_file.main.output_path
   content_disposition = "attachment"
   content_encoding    = "gzip"
@@ -86,7 +86,7 @@ resource "google_cloudfunctions_function" "main" {
   labels                = var.labels
   runtime               = var.runtime
   environment_variables = var.environment_variables
-  source_archive_bucket = var.create_bucket == true ? google_storage_bucket.main[0].name : var.bucket_name
+  source_archive_bucket = var.create_bucket ? google_storage_bucket.main[0].name : var.bucket_name
   source_archive_object = google_storage_bucket_object.main.name
   project               = var.project_id
   region                = var.region

variables.tf

@@ -109,7 +109,7 @@ variable "bucket_name" {
 variable "create_bucket" {
   type        = bool
   default     = true
-  description = "Whether to create a new bucket or use an existing bucket with the bucket_name passed to the module."
+  description = "Whether to create a new bucket or use an existing one. If false, `bucket_name` should reference the name of the alternate bucket to use."
 }
 
 variable "bucket_force_destroy" {