Skip to content

Commit dbcbf68

Browse files
modular-magicianmodular-magician
authored
Fixed dos line endings (#14568) (#1051)
[upstream:bcd0f6c4ae27a33208dad156ec9378ef604dad5e] Signed-off-by: Modular Magician <[email protected]>
1 parent 0a31267 commit dbcbf68

File tree

6 files changed

+151
-151
lines changed
  • network_connectivity_hub_basic
  • network_connectivity_hub_with_export_psc
  • region_network_endpoint_group_appengine_empty
  • region_network_endpoint_group_appengine
  • region_network_endpoint_group_cloudrun
  • region_network_endpoint_group_functions

6 files changed

+151
-151
lines changed

‎network_connectivity_hub_basic/main.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
resource "google_network_connectivity_hub" "primary" {
2-
name = "basic-${local.name_suffix}"
3-
description = "A sample hub"
4-
labels = {
5-
label-one = "value-one"
6-
}
7-
}
1+
resource "google_network_connectivity_hub" "primary" {
2+
name = "basic-${local.name_suffix}"
3+
description = "A sample hub"
4+
labels = {
5+
label-one = "value-one"
6+
}
7+
}

‎network_connectivity_hub_with_export_psc/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
resource "google_network_connectivity_hub" "primary" {
2-
name = "basic-${local.name_suffix}"
3-
description = "A sample hub with Private Service Connect transitivity is enabled"
4-
export_psc = true
5-
}
1+
resource "google_network_connectivity_hub" "primary" {
2+
name = "basic-${local.name_suffix}"
3+
description = "A sample hub with Private Service Connect transitivity is enabled"
4+
export_psc = true
5+
}

‎region_network_endpoint_group_appengine/main.tf

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
1-
// App Engine Example
2-
resource "google_compute_region_network_endpoint_group" "appengine_neg" {
3-
name = "appengine-neg-${local.name_suffix}"
4-
network_endpoint_type = "SERVERLESS"
5-
region = "us-central1"
6-
app_engine {
7-
service = google_app_engine_flexible_app_version.appengine_neg.service
8-
version = google_app_engine_flexible_app_version.appengine_neg.version_id
9-
}
10-
}
11-
12-
resource "google_app_engine_flexible_app_version" "appengine_neg" {
13-
version_id = "v1"
14-
service = "appengine-neg-${local.name_suffix}"
15-
runtime = "nodejs"
16-
flexible_runtime_settings {
17-
operating_system = "ubuntu22"
18-
runtime_version = "20"
19-
}
20-
21-
entrypoint {
22-
shell = "node ./app.js"
23-
}
24-
25-
deployment {
26-
zip {
27-
source_url = "https://storage.googleapis.com/${google_storage_bucket.appengine_neg.name}/${google_storage_bucket_object.appengine_neg.name}"
28-
}
29-
}
30-
31-
liveness_check {
32-
path = "/"
33-
}
34-
35-
readiness_check {
36-
path = "/"
37-
}
38-
39-
env_variables = {
40-
port = "8080"
41-
}
42-
43-
handlers {
44-
url_regex = ".*\\/my-path\\/*"
45-
security_level = "SECURE_ALWAYS"
46-
login = "LOGIN_REQUIRED"
47-
auth_fail_action = "AUTH_FAIL_ACTION_REDIRECT"
48-
49-
static_files {
50-
path = "my-other-path"
51-
upload_path_regex = ".*\\/my-path\\/*"
52-
}
53-
}
54-
55-
automatic_scaling {
56-
cool_down_period = "120s"
57-
cpu_utilization {
58-
target_utilization = 0.5
59-
}
60-
}
61-
62-
delete_service_on_destroy = true
63-
}
64-
65-
resource "google_storage_bucket" "appengine_neg" {
66-
name = "appengine-neg-${local.name_suffix}"
67-
location = "US"
68-
uniform_bucket_level_access = true
69-
}
70-
71-
resource "google_storage_bucket_object" "appengine_neg" {
72-
name = "hello-world.zip"
73-
bucket = google_storage_bucket.appengine_neg.name
74-
source = "./test-fixtures/hello-world.zip"
1+
// App Engine Example
2+
resource "google_compute_region_network_endpoint_group" "appengine_neg" {
3+
name = "appengine-neg-${local.name_suffix}"
4+
network_endpoint_type = "SERVERLESS"
5+
region = "us-central1"
6+
app_engine {
7+
service = google_app_engine_flexible_app_version.appengine_neg.service
8+
version = google_app_engine_flexible_app_version.appengine_neg.version_id
9+
}
10+
}
11+
12+
resource "google_app_engine_flexible_app_version" "appengine_neg" {
13+
version_id = "v1"
14+
service = "appengine-neg-${local.name_suffix}"
15+
runtime = "nodejs"
16+
flexible_runtime_settings {
17+
operating_system = "ubuntu22"
18+
runtime_version = "20"
19+
}
20+
21+
entrypoint {
22+
shell = "node ./app.js"
23+
}
24+
25+
deployment {
26+
zip {
27+
source_url = "https://storage.googleapis.com/${google_storage_bucket.appengine_neg.name}/${google_storage_bucket_object.appengine_neg.name}"
28+
}
29+
}
30+
31+
liveness_check {
32+
path = "/"
33+
}
34+
35+
readiness_check {
36+
path = "/"
37+
}
38+
39+
env_variables = {
40+
port = "8080"
41+
}
42+
43+
handlers {
44+
url_regex = ".*\\/my-path\\/*"
45+
security_level = "SECURE_ALWAYS"
46+
login = "LOGIN_REQUIRED"
47+
auth_fail_action = "AUTH_FAIL_ACTION_REDIRECT"
48+
49+
static_files {
50+
path = "my-other-path"
51+
upload_path_regex = ".*\\/my-path\\/*"
52+
}
53+
}
54+
55+
automatic_scaling {
56+
cool_down_period = "120s"
57+
cpu_utilization {
58+
target_utilization = 0.5
59+
}
60+
}
61+
62+
delete_service_on_destroy = true
63+
}
64+
65+
resource "google_storage_bucket" "appengine_neg" {
66+
name = "appengine-neg-${local.name_suffix}"
67+
location = "US"
68+
uniform_bucket_level_access = true
69+
}
70+
71+
resource "google_storage_bucket_object" "appengine_neg" {
72+
name = "hello-world.zip"
73+
bucket = google_storage_bucket.appengine_neg.name
74+
source = "./test-fixtures/hello-world.zip"
7575
}

‎region_network_endpoint_group_appengine_empty/main.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// App Engine Example
2-
resource "google_compute_region_network_endpoint_group" "appengine_neg" {
3-
name = "appengine-neg-${local.name_suffix}"
4-
network_endpoint_type = "SERVERLESS"
5-
region = "us-central1"
6-
app_engine {
7-
}
1+
// App Engine Example
2+
resource "google_compute_region_network_endpoint_group" "appengine_neg" {
3+
name = "appengine-neg-${local.name_suffix}"
4+
network_endpoint_type = "SERVERLESS"
5+
region = "us-central1"
6+
app_engine {
7+
}
88
}

‎region_network_endpoint_group_cloudrun/main.tf

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
// Cloud Run Example
2-
resource "google_compute_region_network_endpoint_group" "cloudrun_neg" {
3-
name = "cloudrun-neg-${local.name_suffix}"
4-
network_endpoint_type = "SERVERLESS"
5-
region = "us-central1"
6-
cloud_run {
7-
service = google_cloud_run_service.cloudrun_neg.name
8-
}
9-
}
10-
11-
resource "google_cloud_run_service" "cloudrun_neg" {
12-
name = "cloudrun-neg-${local.name_suffix}"
13-
location = "us-central1"
14-
15-
template {
16-
spec {
17-
containers {
18-
image = "us-docker.pkg.dev/cloudrun/container/hello"
19-
}
20-
}
21-
}
22-
23-
traffic {
24-
percent = 100
25-
latest_revision = true
26-
}
1+
// Cloud Run Example
2+
resource "google_compute_region_network_endpoint_group" "cloudrun_neg" {
3+
name = "cloudrun-neg-${local.name_suffix}"
4+
network_endpoint_type = "SERVERLESS"
5+
region = "us-central1"
6+
cloud_run {
7+
service = google_cloud_run_service.cloudrun_neg.name
8+
}
9+
}
10+
11+
resource "google_cloud_run_service" "cloudrun_neg" {
12+
name = "cloudrun-neg-${local.name_suffix}"
13+
location = "us-central1"
14+
15+
template {
16+
spec {
17+
containers {
18+
image = "us-docker.pkg.dev/cloudrun/container/hello"
19+
}
20+
}
21+
}
22+
23+
traffic {
24+
percent = 100
25+
latest_revision = true
26+
}
2727
}

‎region_network_endpoint_group_functions/main.tf

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
// Cloud Functions Example
2-
resource "google_compute_region_network_endpoint_group" "function_neg" {
3-
name = "function-neg-${local.name_suffix}"
4-
network_endpoint_type = "SERVERLESS"
5-
region = "us-central1"
6-
cloud_function {
7-
function = google_cloudfunctions_function.function_neg.name
8-
}
9-
}
10-
11-
resource "google_cloudfunctions_function" "function_neg" {
12-
name = "function-neg-${local.name_suffix}"
13-
description = "My function"
14-
runtime = "nodejs20"
15-
16-
available_memory_mb = 128
17-
source_archive_bucket = google_storage_bucket.bucket.name
18-
source_archive_object = google_storage_bucket_object.archive.name
19-
trigger_http = true
20-
timeout = 60
21-
entry_point = "helloGET"
22-
}
23-
24-
resource "google_storage_bucket" "bucket" {
25-
name = "cloudfunctions-function-example-bucket-${local.name_suffix}"
26-
location = "US"
27-
}
28-
29-
resource "google_storage_bucket_object" "archive" {
30-
name = "index.zip"
31-
bucket = google_storage_bucket.bucket.name
32-
source = "path/to/index.zip-${local.name_suffix}"
1+
// Cloud Functions Example
2+
resource "google_compute_region_network_endpoint_group" "function_neg" {
3+
name = "function-neg-${local.name_suffix}"
4+
network_endpoint_type = "SERVERLESS"
5+
region = "us-central1"
6+
cloud_function {
7+
function = google_cloudfunctions_function.function_neg.name
8+
}
9+
}
10+
11+
resource "google_cloudfunctions_function" "function_neg" {
12+
name = "function-neg-${local.name_suffix}"
13+
description = "My function"
14+
runtime = "nodejs20"
15+
16+
available_memory_mb = 128
17+
source_archive_bucket = google_storage_bucket.bucket.name
18+
source_archive_object = google_storage_bucket_object.archive.name
19+
trigger_http = true
20+
timeout = 60
21+
entry_point = "helloGET"
22+
}
23+
24+
resource "google_storage_bucket" "bucket" {
25+
name = "cloudfunctions-function-example-bucket-${local.name_suffix}"
26+
location = "US"
27+
}
28+
29+
resource "google_storage_bucket_object" "archive" {
30+
name = "index.zip"
31+
bucket = google_storage_bucket.bucket.name
32+
source = "path/to/index.zip-${local.name_suffix}"
3333
}

0 commit comments

Comments
 (0)