Skip to content

Commit 71a98e5

Browse files
Revert "Add new terraform sample - CDN XLB with Backend Bucket (#5869)" (#5915) (#4197)
This reverts commit 67449dd2d842d3dc669615c9e6ad33a03cbabcc3. Signed-off-by: Modular Magician <[email protected]>
1 parent 5224c67 commit 71a98e5

File tree

3 files changed

+3
-310
lines changed

3 files changed

+3
-310
lines changed

.changelog/5915.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/resource_compute_global_forwarding_rule_generated_test.go

Lines changed: 0 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -23,171 +23,6 @@ import (
2323
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
2424
)
2525

26-
func TestAccComputeGlobalForwardingRule_externalCdnLbWithBackendBucketExample(t *testing.T) {
27-
t.Parallel()
28-
29-
context := map[string]interface{}{
30-
"random_suffix": randString(t, 10),
31-
}
32-
33-
vcrTest(t, resource.TestCase{
34-
PreCheck: func() { testAccPreCheck(t) },
35-
Providers: testAccProvidersOiCS,
36-
CheckDestroy: testAccCheckComputeGlobalForwardingRuleDestroyProducer(t),
37-
Steps: []resource.TestStep{
38-
{
39-
Config: testAccComputeGlobalForwardingRule_externalCdnLbWithBackendBucketExample(context),
40-
},
41-
{
42-
ResourceName: "google_compute_global_forwarding_rule.default",
43-
ImportState: true,
44-
ImportStateVerify: true,
45-
ImportStateVerifyIgnore: []string{"network", "port_range", "target", "ip_address"},
46-
},
47-
},
48-
})
49-
}
50-
51-
func testAccComputeGlobalForwardingRule_externalCdnLbWithBackendBucketExample(context map[string]interface{}) string {
52-
return Nprintf(`
53-
# CDN load balancer with Cloud bucket as backend
54-
55-
# VPC
56-
resource "google_compute_network" "default" {
57-
name = "tf-test-cdn-network%{random_suffix}"
58-
provider = google-beta
59-
auto_create_subnetworks = false
60-
}
61-
62-
# backend subnet
63-
resource "google_compute_subnetwork" "default" {
64-
name = "tf-test-cdn-subnet%{random_suffix}"
65-
provider = google-beta
66-
ip_cidr_range = "10.0.1.0/24"
67-
region = "us-central1"
68-
network = google_compute_network.default.id
69-
}
70-
71-
# reserve IP address
72-
resource "google_compute_global_address" "default" {
73-
provider = google-beta
74-
name = "tf-test-cdn-static-ip%{random_suffix}"
75-
}
76-
77-
# forwarding rule
78-
resource "google_compute_global_forwarding_rule" "default" {
79-
name = "tf-test-cdn-forwarding-rule%{random_suffix}"
80-
provider = google-beta
81-
ip_protocol = "TCP"
82-
load_balancing_scheme = "EXTERNAL"
83-
port_range = "80"
84-
target = google_compute_target_http_proxy.default.id
85-
ip_address = google_compute_global_address.default.id
86-
}
87-
88-
# http proxy
89-
resource "google_compute_target_http_proxy" "default" {
90-
name = "tf-test-cdn-target-http-proxy%{random_suffix}"
91-
provider = google-beta
92-
url_map = google_compute_url_map.default.id
93-
}
94-
95-
# url map
96-
resource "google_compute_url_map" "default" {
97-
name = "tf-test-cdn-url-map%{random_suffix}"
98-
provider = google-beta
99-
default_service = google_compute_backend_bucket.default.id
100-
}
101-
102-
# backend bucket with CDN policy with default ttl settings
103-
resource "google_compute_backend_bucket" "default" {
104-
name = "tf-test-image-backend-bucket%{random_suffix}"
105-
description = "Contains beautiful images"
106-
bucket_name = google_storage_bucket.default.name
107-
enable_cdn = true
108-
cdn_policy {
109-
cache_mode = "CACHE_ALL_STATIC"
110-
client_ttl = 3600
111-
default_ttl = 3600
112-
max_ttl = 86400
113-
negative_caching = true
114-
serve_while_stale = 86400
115-
}
116-
}
117-
118-
# cdn backend bucket
119-
resource "google_storage_bucket" "default" {
120-
name = "tf-test-cdn-backend-storage-bucket%{random_suffix}"
121-
location = "US"
122-
uniform_bucket_level_access = true
123-
// delete bucket and contents on destroy.
124-
force_destroy = true
125-
// Assign specialty files
126-
website {
127-
main_page_suffix = "index.html"
128-
not_found_page = "404.html"
129-
}
130-
}
131-
132-
# make bucket public
133-
resource "google_storage_bucket_iam_member" "default" {
134-
bucket = google_storage_bucket.default.name
135-
role = "roles/storage.objectViewer"
136-
member = "allUsers"
137-
}
138-
139-
resource "google_storage_bucket_object" "index_page" {
140-
name = "index.html"
141-
source = "index.html"
142-
bucket = google_storage_bucket.default.name
143-
depends_on = [local_file.index_page]
144-
}
145-
146-
resource "google_storage_bucket_object" "error_page" {
147-
name = "404.html"
148-
source = "404.html"
149-
bucket = google_storage_bucket.default.name
150-
depends_on = [local_file.error_page]
151-
}
152-
153-
# image object for testing, try to access http://<your_lb_ip_address>/test.jpg
154-
resource "google_storage_bucket_object" "test_image" {
155-
name = "test.jpg"
156-
source = "test.jpg"
157-
content_type = "image/jpeg"
158-
bucket = google_storage_bucket.default.name
159-
depends_on = [null_resource.test_image]
160-
}
161-
162-
# cdn sample index page
163-
resource "local_file" "index_page" {
164-
filename = "index.html"
165-
content = <<-EOT
166-
<html><body>
167-
<h1>Congratulations on setting up Google Cloud CDN with Storage backend!</h1>
168-
</body></html>
169-
EOT
170-
}
171-
172-
# cdn default error page
173-
resource "local_file" "error_page" {
174-
filename = "404.html"
175-
content = <<-EOT
176-
<html><body>
177-
<h1>404 Error: Object you are looking for is no longer available!</h1>
178-
</body></html>
179-
EOT
180-
}
181-
182-
# cdn sample image
183-
resource "null_resource" "test_image" {
184-
provisioner "local-exec" {
185-
command = "wget -O test.jpg https://upload.wikimedia.org/wikipedia/commons/c/c8/Thank_you_001.jpg"
186-
}
187-
}
188-
`, context)
189-
}
190-
19126
func TestAccComputeGlobalForwardingRule_externalTcpProxyLbMigBackendExample(t *testing.T) {
19227
t.Parallel()
19328

website/docs/r/compute_global_forwarding_rule.html.markdown

Lines changed: 0 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -32,151 +32,6 @@ https://cloud.google.com/compute/docs/load-balancing/http/
3232

3333

3434

35-
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
36-
<a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_working_dir=external_cdn_lb_with_backend_bucket&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&open_in_editor=main.tf&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md" target="_blank">
37-
<img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
38-
</a>
39-
</div>
40-
## Example Usage - External Cdn Lb With Backend Bucket
41-
42-
43-
```hcl
44-
# CDN load balancer with Cloud bucket as backend
45-
46-
# VPC
47-
resource "google_compute_network" "default" {
48-
name = "cdn-network"
49-
provider = google-beta
50-
auto_create_subnetworks = false
51-
}
52-
53-
# backend subnet
54-
resource "google_compute_subnetwork" "default" {
55-
name = "cdn-subnet"
56-
provider = google-beta
57-
ip_cidr_range = "10.0.1.0/24"
58-
region = "us-central1"
59-
network = google_compute_network.default.id
60-
}
61-
62-
# reserve IP address
63-
resource "google_compute_global_address" "default" {
64-
provider = google-beta
65-
name = "cdn-static-ip"
66-
}
67-
68-
# forwarding rule
69-
resource "google_compute_global_forwarding_rule" "default" {
70-
name = "cdn-forwarding-rule"
71-
provider = google-beta
72-
ip_protocol = "TCP"
73-
load_balancing_scheme = "EXTERNAL"
74-
port_range = "80"
75-
target = google_compute_target_http_proxy.default.id
76-
ip_address = google_compute_global_address.default.id
77-
}
78-
79-
# http proxy
80-
resource "google_compute_target_http_proxy" "default" {
81-
name = "cdn-target-http-proxy"
82-
provider = google-beta
83-
url_map = google_compute_url_map.default.id
84-
}
85-
86-
# url map
87-
resource "google_compute_url_map" "default" {
88-
name = "cdn-url-map"
89-
provider = google-beta
90-
default_service = google_compute_backend_bucket.default.id
91-
}
92-
93-
# backend bucket with CDN policy with default ttl settings
94-
resource "google_compute_backend_bucket" "default" {
95-
name = "image-backend-bucket"
96-
description = "Contains beautiful images"
97-
bucket_name = google_storage_bucket.default.name
98-
enable_cdn = true
99-
cdn_policy {
100-
cache_mode = "CACHE_ALL_STATIC"
101-
client_ttl = 3600
102-
default_ttl = 3600
103-
max_ttl = 86400
104-
negative_caching = true
105-
serve_while_stale = 86400
106-
}
107-
}
108-
109-
# cdn backend bucket
110-
resource "google_storage_bucket" "default" {
111-
name = "cdn-backend-storage-bucket"
112-
location = "US"
113-
uniform_bucket_level_access = true
114-
// delete bucket and contents on destroy.
115-
force_destroy = true
116-
// Assign specialty files
117-
website {
118-
main_page_suffix = "index.html"
119-
not_found_page = "404.html"
120-
}
121-
}
122-
123-
# make bucket public
124-
resource "google_storage_bucket_iam_member" "default" {
125-
bucket = google_storage_bucket.default.name
126-
role = "roles/storage.objectViewer"
127-
member = "allUsers"
128-
}
129-
130-
resource "google_storage_bucket_object" "index_page" {
131-
name = "index.html"
132-
source = "index.html"
133-
bucket = google_storage_bucket.default.name
134-
depends_on = [local_file.index_page]
135-
}
136-
137-
resource "google_storage_bucket_object" "error_page" {
138-
name = "404.html"
139-
source = "404.html"
140-
bucket = google_storage_bucket.default.name
141-
depends_on = [local_file.error_page]
142-
}
143-
144-
# image object for testing, try to access http://<your_lb_ip_address>/test.jpg
145-
resource "google_storage_bucket_object" "test_image" {
146-
name = "test.jpg"
147-
source = "test.jpg"
148-
content_type = "image/jpeg"
149-
bucket = google_storage_bucket.default.name
150-
depends_on = [null_resource.test_image]
151-
}
152-
153-
# cdn sample index page
154-
resource "local_file" "index_page" {
155-
filename = "index.html"
156-
content = <<-EOT
157-
<html><body>
158-
<h1>Congratulations on setting up Google Cloud CDN with Storage backend!</h1>
159-
</body></html>
160-
EOT
161-
}
162-
163-
# cdn default error page
164-
resource "local_file" "error_page" {
165-
filename = "404.html"
166-
content = <<-EOT
167-
<html><body>
168-
<h1>404 Error: Object you are looking for is no longer available!</h1>
169-
</body></html>
170-
EOT
171-
}
172-
173-
# cdn sample image
174-
resource "null_resource" "test_image" {
175-
provisioner "local-exec" {
176-
command = "wget -O test.jpg https://upload.wikimedia.org/wikipedia/commons/c/c8/Thank_you_001.jpg"
177-
}
178-
}
179-
```
18035
## Example Usage - External Ssl Proxy Lb Mig Backend
18136

18237

0 commit comments

Comments
 (0)