Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/release-please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
releaseType: terraform-module
handleGHRelease: true
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Make will use bash instead of sh
SHELL := /usr/bin/env bash

DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.0
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
REGISTRY_URL := gcr.io/cloud-foundation-cicd

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ module "localhost_function" {
| environment\_variables | A set of key/value environment variable pairs to assign to the function. | map(string) | `<map>` | no |
| event\_trigger | A source that fires events in response to a condition in another service. | map(string) | n/a | yes |
| event\_trigger\_failure\_policy\_retry | A toggle to determine if the function should be retried on failure. | bool | `"false"` | no |
| ingress\_settings | The ingress settings for the function | string | `"ALLOW_ALL"` | no |
| labels | A set of key/value label pairs to assign to the Cloud Function. | map(string) | `<map>` | no |
| name | The name to apply to any nameable resources. | string | n/a | yes |
| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
Expand All @@ -70,8 +71,6 @@ module "localhost_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 |
| source\_directory | The pathname of the directory which contains the function source code. | string | n/a | yes |
| timeout\_s | The amount of time in seconds allotted for the execution of the function. | number | `"60"` | no |
| ingress\_settings | The ingress settings for the function | string | `"ALLOW_ALL"` | no |


## Outputs

Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ tags:
- 'lint'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
6 changes: 3 additions & 3 deletions examples/automatic-labelling-folder/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*/

terraform {
required_version = "~> 0.12.0"
required_version = ">= 0.12"
}

provider "archive" {
version = "~> 1.0"
}

provider "google" {
version = "~> 2.1"
version = "~> 3.39"
}

provider "random" {
Expand Down Expand Up @@ -69,7 +69,7 @@ module "localhost_function" {
project_id = var.project_id
region = var.region
source_directory = "${path.module}/function_source"
runtime = "nodejs8"
runtime = "nodejs10"
}

resource "null_resource" "wait_for_function" {
Expand Down
6 changes: 3 additions & 3 deletions examples/automatic-labelling-from-localhost/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*/

terraform {
required_version = "~> 0.12.0"
required_version = ">= 0.12"
}

provider "archive" {
version = "~> 1.0"
}

provider "google" {
version = "~> 2.1"
version = "~> 3.39"
}

provider "random" {
Expand Down Expand Up @@ -61,7 +61,7 @@ module "localhost_function" {
project_id = var.project_id
region = var.region
source_directory = "${path.module}/function_source"
runtime = "nodejs8"
runtime = "nodejs10"
}

resource "null_resource" "wait_for_function" {
Expand Down
6 changes: 3 additions & 3 deletions examples/automatic-labelling-from-repository/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*/

terraform {
required_version = "~> 0.12.0"
required_version = ">= 0.12"
}

provider "archive" {
version = "~> 1.0"
}

provider "google" {
version = "~> 2.1"
version = "~> 3.39"
}

provider "random" {
Expand Down Expand Up @@ -80,7 +80,7 @@ module "repository_function" {

description = "Labels resource with owner information."
entry_point = "labelResource"
runtime = "nodejs8"
runtime = "nodejs10"

environment_variables = {
LABEL_KEY = "principal-email"
Expand Down
4 changes: 2 additions & 2 deletions examples/delete-vms-without-cmek/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*/

terraform {
required_version = "~> 0.12.0"
required_version = ">= 0.12"
}

provider "archive" {
version = "~> 1.0"
}

provider "google" {
version = "~> 2.1"
version = "~> 3.39"
}

provider "random" {
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-files/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module "localhost_function" {
project_id = var.project_id
region = var.region
source_directory = "${path.module}/function_source"
runtime = "nodejs8"
runtime = "nodejs10"

source_dependent_files = [local_file.file]
}
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-files/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = "~> 0.12.6"
required_version = ">= 0.12"
}
5 changes: 3 additions & 2 deletions test/setup/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource "google_folder" "ci_event_func_subfolder" {

module "project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 3.0"
version = "~> 9.0"

name = local.project_name
random_project_id = true
Expand All @@ -42,6 +42,7 @@ module "project" {
"cloudresourcemanager.googleapis.com",
"storage-api.googleapis.com",
"serviceusage.googleapis.com",
"cloudbuild.googleapis.com",
"cloudfunctions.googleapis.com",
"storage-component.googleapis.com",
"sourcerepo.googleapis.com",
Expand All @@ -51,7 +52,7 @@ module "project" {

module "network" {
source = "terraform-google-modules/network/google"
version = "~> 1.2"
version = "~> 2.5"

project_id = module.project.project_id
network_name = "test-network"
Expand Down
4 changes: 2 additions & 2 deletions test/setup/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ terraform {
}

provider "google" {
version = "~> 2.12.0"
version = "~> 3.39.0"
}

provider "google-beta" {
version = "~> 2.12.0"
version = "~> 3.39.0"
}
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,5 @@ variable "event_trigger_failure_policy_retry" {
variable "ingress_settings" {
type = string
default = "ALLOW_ALL"
description = "Ingress settings for the Cloud Function"
description = "The ingress settings for the function"
}