fix: default bucket name behavior (#42)

* fix default behaviour

* fix default runtime, bump setup, devtools

* regen docs

Author: bharathkkb

Makefile

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

README.md

@@ -47,7 +47,7 @@ Then perform the following commands on the root folder:
 | function\_event\_trigger\_failure\_policy\_retry | A toggle to determine if the function should be retried on failure. | bool | `"false"` | no |
 | function\_labels | A set of key/value label pairs to assign to the function. | map(string) | `<map>` | no |
 | function\_name | The name to apply to the function | string | n/a | yes |
-| function\_runtime | The runtime in which the function will be executed. | string | `"nodejs6"` | no |
+| function\_runtime | The runtime in which the function will be executed. | string | `"nodejs10"` | no |
 | function\_service\_account\_email | The service account to run the function as. | string | `""` | no |
 | function\_source\_archive\_bucket\_labels | A set of key/value label pairs to assign to the function source archive bucket. | map(string) | `<map>` | no |
 | function\_source\_dependent\_files | A list of any terraform created `local_file`s that the module will wait for before creating the archive. | object | `<list>` | no |

build/int.cloudbuild.yaml

@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'

build/lint.cloudbuild.yaml

@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'

main.tf

@@ -50,6 +50,11 @@ module "pubsub_topic" {
 	Cloud Function Resource Definitions
  *****************************************/
 
+resource "random_id" "suffix" {
+
+  byte_length = 4
+}
+
 module "main" {
   source  = "terraform-google-modules/event-function/google"
   version = "~> 1.2"
@@ -70,7 +75,7 @@ module "main" {
   available_memory_mb                = var.function_available_memory_mb
   bucket_force_destroy               = var.bucket_force_destroy
   bucket_labels                      = var.function_source_archive_bucket_labels
-  bucket_name                        = var.bucket_name
+  bucket_name                        = var.bucket_name == "" ? "${var.project_id}-scheduled-function-${random_id.suffix.hex}" : var.bucket_name
   description                        = var.function_description
   environment_variables              = var.function_environment_variables
   event_trigger_failure_policy_retry = var.function_event_trigger_failure_policy_retry

test/setup/main.tf

@@ -16,16 +16,18 @@
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 3.0"
+  version = "~> 9.0"
 
-  name              = "ci-scheduled-function"
-  random_project_id = "true"
-  org_id            = var.org_id
-  folder_id         = var.folder_id
-  billing_account   = var.billing_account
+  name                 = "ci-scheduled-function"
+  random_project_id    = "true"
+  org_id               = var.org_id
+  folder_id            = var.folder_id
+  billing_account      = var.billing_account
+  skip_gcloud_download = true
 
   activate_apis = [
     "cloudresourcemanager.googleapis.com",
+    "cloudbuild.googleapis.com",
     "storage-api.googleapis.com",
     "serviceusage.googleapis.com",
     "cloudfunctions.googleapis.com",
@@ -38,7 +40,7 @@ module "project" {
 
 module "app-engine" {
   source  = "terraform-google-modules/project-factory/google//modules/app_engine"
-  version = "~> 3.0"
+  version = "~> 9.0"
 
   location_id = "us-central"
 

test/setup/versions.tf

@@ -19,9 +19,9 @@ terraform {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 3.35.0"
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
+  version = "~> 3.35.0"
 }

variables.tf

@@ -74,7 +74,7 @@ variable "function_labels" {
 
 variable "function_runtime" {
   type        = string
-  default     = "nodejs6"
+  default     = "nodejs10"
   description = "The runtime in which the function will be executed."
 }