other pr comments and docs

Author: taylorludwig

README.md

@@ -66,7 +66,7 @@ module "localhost_function" {
 | region | The region in which resources will be applied. | string | n/a | yes |
 | runtime | The runtime in which the function will be executed. | string | n/a | yes |
 | service\_account\_email | The service account to run the function as. | string | `""` | no |
-| 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\_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 |
 

examples/automatic-labelling-folder/README.md

@@ -21,9 +21,9 @@ this directory:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| folder\_id | The ID of the folder to look for changes. | string | n/a | yes |
 | project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
 | region | The region in which resources will be applied. | string | n/a | yes |
-| sub\_folder\_id | The ID of the folder to look for changes. | string | n/a | yes |
 
 ## Outputs
 

examples/automatic-labelling-folder/main.tf

@@ -49,7 +49,7 @@ protoPayload.methodName="CreateProject"
 EOF
   name       = random_pet.main.id
   project_id = var.project_id
-  folder_id  = var.sub_folder_id
+  folder_id  = var.folder_id
 }
 
 module "localhost_function" {
@@ -59,7 +59,7 @@ module "localhost_function" {
   entry_point = "labelResource"
 
   environment_variables = {
-    FOLDER_ID   = var.sub_folder_id
+    FOLDER_ID   = var.folder_id
     LABEL_KEY   = "test"
     LABEL_VALUE = "foobar"
   }
@@ -89,7 +89,7 @@ resource "random_pet" "project_id" {
 resource "google_project" "test" {
   name       = random_pet.project_id.id
   project_id = random_pet.project_id.id
-  folder_id  = var.sub_folder_id
+  folder_id  = var.folder_id
 
   lifecycle {
     ignore_changes = [

examples/automatic-labelling-folder/variables.tf

@@ -19,7 +19,7 @@ variable "project_id" {
   description = "The ID of the project to which resources will be applied."
 }
 
-variable "sub_folder_id" {
+variable "folder_id" {
   type        = string
   description = "The ID of the folder to look for changes."
 }

examples/dynamic-files/README.md

@@ -27,7 +27,6 @@ this directory:
 | Name | Description |
 |------|-------------|
 | function\_name | The name of the function created |
-| project\_id | The ID of the project to which resources are applied. |
 | random\_file\_string | The content of the terraform created file in the source directory. |
 | region | The region in which resources are applied. |
 

examples/dynamic-files/main.tf

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-terraform {
-  required_version = "~> 0.12.0"
-}
-
 resource "random_pet" "main" {
   length    = 2
   separator = "-"

examples/dynamic-files/outputs.tf

@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-output "project_id" {
-  value       = var.project_id
-  description = "The ID of the project to which resources are applied."
-}
-
 output "region" {
   value       = var.region
   description = "The region in which resources are applied."

examples/dynamic-files/versions.tf

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_version = "~> 0.12.6"
+}

test/fixtures/automatic-labelling-folder/main.tf

@@ -17,7 +17,7 @@
 module "automatic_labelling_folder" {
   source = "../../../examples/automatic-labelling-folder"
 
-  project_id    = var.project_id
-  sub_folder_id = var.sub_folder_id
-  region        = var.region
+  project_id = var.project_id
+  folder_id  = var.sub_folder_id
+  region     = var.region
 }