Skip to content

Commit b022193

Browse files
committed
wire up sub_folder_id var for example without make_source.sh doing translation
1 parent 3166692 commit b022193

File tree

8 files changed

+7
-18
lines changed

8 files changed

+7
-18
lines changed

examples/automatic-labelling-folder/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ this directory:
2121

2222
| Name | Description | Type | Default | Required |
2323
|------|-------------|:----:|:-----:|:-----:|
24-
| folder\_id | The ID of the folder to look for changes. | string | n/a | yes |
2524
| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
2625
| region | The region in which resources will be applied. | string | n/a | yes |
26+
| sub\_folder\_id | The ID of the folder to look for changes. | string | n/a | yes |
2727

2828
## Outputs
2929

examples/automatic-labelling-folder/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protoPayload.methodName="CreateProject"
4949
EOF
5050
name = random_pet.main.id
5151
project_id = var.project_id
52-
folder_id = var.folder_id
52+
folder_id = var.sub_folder_id
5353
}
5454

5555
module "localhost_function" {
@@ -59,7 +59,7 @@ module "localhost_function" {
5959
entry_point = "labelResource"
6060

6161
environment_variables = {
62-
FOLDER_ID = var.folder_id
62+
FOLDER_ID = var.sub_folder_id
6363
LABEL_KEY = "test"
6464
LABEL_VALUE = "foobar"
6565
}
@@ -89,7 +89,7 @@ resource "random_pet" "project_id" {
8989
resource "google_project" "test" {
9090
name = random_pet.project_id.id
9191
project_id = random_pet.project_id.id
92-
folder_id = var.folder_id
92+
folder_id = var.sub_folder_id
9393

9494
lifecycle {
9595
ignore_changes = [

examples/automatic-labelling-folder/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ variable "project_id" {
1919
description = "The ID of the project to which resources will be applied."
2020
}
2121

22-
variable "folder_id" {
22+
variable "sub_folder_id" {
2323
type = string
2424
description = "The ID of the folder to look for changes."
2525
}

examples/dynamic-files/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ this directory:
1919

2020
| Name | Description | Type | Default | Required |
2121
|------|-------------|:----:|:-----:|:-----:|
22-
| folder\_id | The ID of the folder to look for changes. | string | n/a | yes |
2322
| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
2423
| region | The region in which resources will be applied. | string | n/a | yes |
2524

examples/dynamic-files/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ variable "project_id" {
1919
description = "The ID of the project to which resources will be applied."
2020
}
2121

22-
variable "folder_id" {
23-
type = string
24-
description = "The ID of the folder to look for changes."
25-
}
26-
2722
variable "region" {
2823
type = string
2924
description = "The region in which resources will be applied."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ module "automatic_labelling_folder" {
1818
source = "../../../examples/automatic-labelling-folder"
1919

2020
project_id = var.project_id
21-
folder_id = var.folder_id
21+
folder_id = var.sub_folder_id
2222
region = var.region
2323
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ variable "project_id" {
1919
description = "The ID of the project to which resources will be applied."
2020
}
2121

22-
variable "folder_id" {
22+
variable "sub_folder_id" {
2323
type = string
2424
description = "The ID of the folder to look for changes."
2525
}

test/fixtures/dynamic-files/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ variable "project_id" {
1919
description = "The ID of the project to which resources will be applied."
2020
}
2121

22-
variable "folder_id" {
23-
type = string
24-
description = "The ID of the folder to look for changes."
25-
}
26-
2722
variable "region" {
2823
type = string
2924
description = "The region in which resources will be applied."

0 commit comments

Comments
 (0)