zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for consistent function bundles

This commit is contained in:
Andras Gyomrey 2021-11-06 13:48:22 +00:00
parent b062d73db5
commit 1da5bde47b
8 changed files with 71 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloud-operations/asset-inventory-feed-remediation/main.tf
View File

@ -88,8 +88,10 @@ module "cf" {
lifecycle_delete_age = null
}
bundle_config = {
source_dir = "cf"
output_path = var.bundle_path
source_dir = "cf"
output_path = var.bundle_path
output_file_mode = null
excludes = null
}
service_account = module.service-account.email
trigger_config = {

6
cloud-operations/quota-monitoring/main.tf
View File

@ -60,8 +60,10 @@ module "cf" {
lifecycle_delete_age = null
}
bundle_config = {
source_dir = "cf"
output_path = var.bundle_path
source_dir = "cf"
output_path = var.bundle_path
output_file_mode = null
excludes = null
}
# https://github.com/hashicorp/terraform-provider-archive/issues/40
# https://issuetracker.google.com/issues/155215191

6
cloud-operations/scheduled-asset-inventory-export-bq/main.tf
View File

@ -80,8 +80,10 @@ module "cf" {
lifecycle_delete_age = null
}
bundle_config = {
source_dir = "cf"
output_path = var.bundle_path
source_dir = "cf"
output_path = var.bundle_path
output_file_mode = null
excludes = null
}
service_account = module.service-account.email
trigger_config = {

58
modules/cloud-function/README.md
View File

@ -21,8 +21,10 @@ module "cf-http" {
name = "test-cf-http"
bucket_name = "test-cf-bundles"
bundle_config = {
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
}
# tftest:skip
@ -39,8 +41,10 @@ module "cf-http" {
name = "test-cf-http"
bucket_name = "test-cf-bundles"
bundle_config = {
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
trigger_config = {
event = "google.pubsub.topic.publish"
@ -62,8 +66,10 @@ module "cf-http" {
name = "test-cf-http"
bucket_name = "test-cf-bundles"
bundle_config = {
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
iam = {
"roles/cloudfunctions.invoker" = ["allUsers"]
@ -87,8 +93,10 @@ module "cf-http" {
lifecycle_delete_age = 1
}
bundle_config = {
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
}
# tftest:skip
@ -105,8 +113,10 @@ module "cf-http" {
name = "test-cf-http"
bucket_name = "test-cf-bundles"
bundle_config = {
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
service_account_create = true
}
@ -122,21 +132,43 @@ module "cf-http" {
name = "test-cf-http"
bucket_name = "test-cf-bundles"
bundle_config = {
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
service_account = local.service_account_email
}
# tftest:skip
```
### Custom bundle config
In order to help prevent `archive_zip.output_md5` from changing cross platform (e.g. Cloud Build vs your local development environment), you'll have to make sure that the files included in the zip are always the same. On top of this, Terraform recommends to additionally (set the octal file mode to "0666")[https://registry.terraform.io/providers/hashicorp/archive/latest/docs/data-sources/archive_file#output_file_mode] to ensure that the modes of the archived files don't vary either.
```hcl
module "cf-http" {
source = "./modules/cloud-function"
project_id = "my-project"
name = "test-cf-http"
bucket_name = "test-cf-bundles"
bundle_config = {
source_dir = "my-cf-source-folder"
output_path = "bundle.zip"
output_file_mode = "0666"
excludes = ["__pycache__"]
}
}
# tftest:skip
```
<!-- BEGIN TFDOC -->
## Variables
| name | description | type | required | default |
|---|---|:---: |:---:|:---:|
| bucket_name | Name of the bucket that will be used for the function code. It will be created with prefix prepended if bucket_config is not null. | <code title="">string</code> | ✓ | |
| bundle_config | Cloud function source folder and generated zip bundle paths. Output path defaults to '/tmp/bundle.zip' if null. | <code title="object&#40;&#123;&#10;source_dir &#61; string&#10;output_path &#61; string&#10;&#125;&#41;">object({...})</code> | ✓ | |
| bundle_config | Cloud function source folder and generated zip bundle paths. Output path defaults to '/tmp/bundle.zip' if null. | <code title="object&#40;&#123;&#10;source_dir &#61; string&#10;output_path &#61; string&#10;output_file_mode &#61; string&#10;excludes &#61; list&#40;string&#41;&#10;&#125;&#41;">object({...})</code> | ✓ | |
| name | Name used for cloud function and associated resources. | <code title="">string</code> | ✓ | |
| project_id | Project id used for all resources. | <code title="">string</code> | ✓ | |
| *bucket_config* | Enable and configure auto-created bucket. Set fields to null to use defaults. | <code title="object&#40;&#123;&#10;location &#61; string&#10;lifecycle_delete_age &#61; number&#10;&#125;&#41;">object({...})</code> | | <code title="">null</code> |

2
modules/cloud-function/main.tf
View File

@ -137,6 +137,8 @@ data "archive_file" "bundle" {
? "/tmp/bundle.zip"
: var.bundle_config.output_path
)
output_file_mode = var.bundle_config.output_file_mode
excludes = var.bundle_config.excludes
}
resource "google_service_account" "service_account" {

6
modules/cloud-function/variables.tf
View File

@ -31,8 +31,10 @@ variable "bucket_name" {
variable "bundle_config" {
description = "Cloud function source folder and generated zip bundle paths. Output path defaults to '/tmp/bundle.zip' if null."
type = object({
source_dir = string
output_path = string
source_dir = string
output_path = string
output_file_mode = string
excludes = list(string)
})
}

6
networking/private-cloud-function-from-onprem/main.tf
View File

@ -206,8 +206,10 @@ module "function-hello" {
bucket_name = "${var.name}-tf-cf-deploy"
ingress_settings = "ALLOW_INTERNAL_ONLY"
bundle_config = {
source_dir = "${path.module}/assets"
output_path = "bundle.zip"
source_dir = "${path.module}/assets"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
bucket_config = {
location = var.region

6
tests/modules/cloud_function/fixture/main.tf
View File

@ -20,8 +20,10 @@ module "test" {
name = "test"
bucket_name = var.bucket_name
bundle_config = {
source_dir = "bundle"
output_path = "bundle.zip"
source_dir = "bundle"
output_path = "bundle.zip"
output_file_mode = null
excludes = null
}
iam = {
"roles/cloudfunctions.invoker" = ["allUsers"]