Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix formatting on Cloud Functions docs #2469

Merged
merged 2 commits into from
Oct 15, 2019
Merged

Fix formatting on Cloud Functions docs #2469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ccf17
Fix formatting on Cloud Functions docs
rileykarson Oct 15, 2019
666ab65
Update tracked submodules -> HEAD on Tue Oct 15 16:57:00 UTC 2019
modular-magician Oct 15, 2019
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: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from 1db04e to a0dfdc
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from b4b3a5 to c39a62
32 changes: 15 additions & 17 deletions third_party/terraform/website/docs/r/cloudfunctions_function.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ to be invoked. See below examples for how to set up the appropriate permissions,
or view the [Cloud Functions IAM resources](/docs/providers/google/r/cloudfunctions_cloud_function_iam.html)
for Cloud Functions.

## Example Usage

Secured function with a user allowed to invoke:
## Example Usage - Public Function

```hcl
resource "google_storage_bucket" "bucket" {
Expand All @@ -43,30 +41,21 @@ resource "google_cloudfunctions_function" "function" {
source_archive_bucket = "${google_storage_bucket.bucket.name}"
source_archive_object = "${google_storage_bucket_object.archive.name}"
trigger_http = true
timeout = 60
entry_point = "helloGET"
labels = {
my-label = "my-label-value"
}

environment_variables = {
MY_ENV_VAR = "my-env-var-value"
}
}

# Add IAM member for a user who can invoke the function (no admin actions)
# IAM entry for all users to invoke the function
resource "google_cloudfunctions_function_iam_member" "invoker" {
project = "${google_cloudfunctions_function.function.project}"
region = "${google_cloudfunctions_function.function.region}"
cloud_function = "${google_cloudfunctions_function.function.name}"

role = "roles/cloudfunctions.invoker"
member = "user:[email protected]"
member = "allUsers"
}
```

A publically invocable function (similar behavior to functions created before
private-by-default):
## Example Usage - Single User

```hcl
resource "google_storage_bucket" "bucket" {
Expand All @@ -88,19 +77,28 @@ resource "google_cloudfunctions_function" "function" {
source_archive_bucket = "${google_storage_bucket.bucket.name}"
source_archive_object = "${google_storage_bucket_object.archive.name}"
trigger_http = true
timeout = 60
entry_point = "helloGET"
labels = {
my-label = "my-label-value"
}

environment_variables = {
MY_ENV_VAR = "my-env-var-value"
}
}

# Add IAM member for a user who can invoke the function (no admin actions)
# IAM entry for a single user to invoke the function
resource "google_cloudfunctions_function_iam_member" "invoker" {
project = "${google_cloudfunctions_function.function.project}"
region = "${google_cloudfunctions_function.function.region}"
cloud_function = "${google_cloudfunctions_function.function.name}"

role = "roles/cloudfunctions.invoker"
member = "allUsers"
member = "user:[email protected]"
}
```

## Argument Reference

The following arguments are supported:
Expand Down