From 9a8c9716d8d25cc911af496157bba6630a9b3eda Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 8 Feb 2022 17:43:05 +0000 Subject: [PATCH] Revert "Add CDN load balancer with Cloud Storage buckets as backend (#5575)" (#5690) This reverts commit f81134583717a13e33cd94bf4e04ef5ec032d6fb. Signed-off-by: Modular Magician --- .changelog/5690.txt | 0 ...e_global_forwarding_rule_generated_test.go | 165 ------------------ ...mpute_global_forwarding_rule.html.markdown | 145 --------------- 3 files changed, 310 deletions(-) create mode 100644 .changelog/5690.txt diff --git a/.changelog/5690.txt b/.changelog/5690.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/google-beta/resource_compute_global_forwarding_rule_generated_test.go b/google-beta/resource_compute_global_forwarding_rule_generated_test.go index d12b8d08a8..c2c892fbfa 100644 --- a/google-beta/resource_compute_global_forwarding_rule_generated_test.go +++ b/google-beta/resource_compute_global_forwarding_rule_generated_test.go @@ -23,171 +23,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) -func TestAccComputeGlobalForwardingRule_externalCndLbWithBackendBucketExample(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": randString(t, 10), - } - - vcrTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, - CheckDestroy: testAccCheckComputeGlobalForwardingRuleDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeGlobalForwardingRule_externalCndLbWithBackendBucketExample(context), - }, - { - ResourceName: "google_compute_global_forwarding_rule.default", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"network", "port_range", "target", "ip_address"}, - }, - }, - }) -} - -func testAccComputeGlobalForwardingRule_externalCndLbWithBackendBucketExample(context map[string]interface{}) string { - return Nprintf(` -# CDN load balancer with Cloud bucket as backend - -# VPC -resource "google_compute_network" "default" { - name = "tf-test-cdn-network%{random_suffix}" - provider = google-beta - auto_create_subnetworks = false -} - -# backend subnet -resource "google_compute_subnetwork" "default" { - name = "tf-test-cdn-subnet%{random_suffix}" - provider = google-beta - ip_cidr_range = "10.0.1.0/24" - region = "us-central1" - network = google_compute_network.default.id -} - -# reserve IP address -resource "google_compute_global_address" "default" { - provider = google-beta - name = "tf-test-cdn-static-ip%{random_suffix}" -} - -# forwarding rule -resource "google_compute_global_forwarding_rule" "default" { - name = "tf-test-cdn-forwarding-rule%{random_suffix}" - provider = google-beta - ip_protocol = "TCP" - load_balancing_scheme = "EXTERNAL" - port_range = "80" - target = google_compute_target_http_proxy.default.id - ip_address = google_compute_global_address.default.id -} - -# http proxy -resource "google_compute_target_http_proxy" "default" { - name = "tf-test-cdn-target-http-proxy%{random_suffix}" - provider = google-beta - url_map = google_compute_url_map.default.id -} - -# url map -resource "google_compute_url_map" "default" { - name = "tf-test-cdn-url-map%{random_suffix}" - provider = google-beta - default_service = google_compute_backend_bucket.default.id -} - -# backend bucket with CDN policy with default ttl settings -resource "google_compute_backend_bucket" "default" { - name = "tf-test-image-backend-bucket%{random_suffix}" - description = "Contains beautiful images" - bucket_name = google_storage_bucket.default.name - enable_cdn = true - cdn_policy { - cache_mode = "CACHE_ALL_STATIC" - client_ttl = 3600 - default_ttl = 3600 - max_ttl = 86400 - negative_caching = true - serve_while_stale = 86400 - } -} - -# cdn backend bucket -resource "google_storage_bucket" "default" { - name = "tf-test-cdn-backend-storage-bucket%{random_suffix}" - location = "US" - uniform_bucket_level_access = true - // delete bucket and contents on destroy. - force_destroy = true - // Assign specialty files - website { - main_page_suffix = "index.html" - not_found_page = "404.html" - } -} - -# make bucket public -resource "google_storage_bucket_iam_member" "default" { - bucket = google_storage_bucket.default.name - role = "roles/storage.objectViewer" - member = "allUsers" -} - -resource "google_storage_bucket_object" "index_page" { - name = "index.html" - source = "index.html" - bucket = google_storage_bucket.default.name - depends_on = [local_file.index_page] -} - -resource "google_storage_bucket_object" "error_page" { - name = "404.html" - source = "404.html" - bucket = google_storage_bucket.default.name - depends_on = [local_file.error_page] -} - -# image object for testing, try to access http:///test.jpg -resource "google_storage_bucket_object" "test_image" { - name = "test.jpg" - source = "test.jpg" - content_type = "image/jpeg" - bucket = google_storage_bucket.default.name - depends_on = [null_resource.test_image] -} - -# cdn sample index page -resource "local_file" "index_page" { - filename = "index.html" - content = <<-EOT - -

Congratulations on setting up Google Cloud CDN with Storage backend!

- - EOT -} - -# cdn default error page -resource "local_file" "error_page" { - filename = "404.html" - content = <<-EOT - -

404 Error: Object you are looking for is no longer available!

- - EOT -} - -# cdn sample image -resource "null_resource" "test_image" { - provisioner "local-exec" { - command = "wget -O test.jpg https://upload.wikimedia.org/wikipedia/commons/c/c8/Thank_you_001.jpg" - } -} -`, context) -} - func TestAccComputeGlobalForwardingRule_externalTcpProxyLbMigBackendExample(t *testing.T) { t.Parallel() diff --git a/website/docs/r/compute_global_forwarding_rule.html.markdown b/website/docs/r/compute_global_forwarding_rule.html.markdown index 4f65180e85..6e92fe9b60 100644 --- a/website/docs/r/compute_global_forwarding_rule.html.markdown +++ b/website/docs/r/compute_global_forwarding_rule.html.markdown @@ -32,151 +32,6 @@ https://cloud.google.com/compute/docs/load-balancing/http/ -
- - Open in Cloud Shell - -
-## Example Usage - External Cnd Lb With Backend Bucket - - -```hcl -# CDN load balancer with Cloud bucket as backend - -# VPC -resource "google_compute_network" "default" { - name = "cdn-network" - provider = google-beta - auto_create_subnetworks = false -} - -# backend subnet -resource "google_compute_subnetwork" "default" { - name = "cdn-subnet" - provider = google-beta - ip_cidr_range = "10.0.1.0/24" - region = "us-central1" - network = google_compute_network.default.id -} - -# reserve IP address -resource "google_compute_global_address" "default" { - provider = google-beta - name = "cdn-static-ip" -} - -# forwarding rule -resource "google_compute_global_forwarding_rule" "default" { - name = "cdn-forwarding-rule" - provider = google-beta - ip_protocol = "TCP" - load_balancing_scheme = "EXTERNAL" - port_range = "80" - target = google_compute_target_http_proxy.default.id - ip_address = google_compute_global_address.default.id -} - -# http proxy -resource "google_compute_target_http_proxy" "default" { - name = "cdn-target-http-proxy" - provider = google-beta - url_map = google_compute_url_map.default.id -} - -# url map -resource "google_compute_url_map" "default" { - name = "cdn-url-map" - provider = google-beta - default_service = google_compute_backend_bucket.default.id -} - -# backend bucket with CDN policy with default ttl settings -resource "google_compute_backend_bucket" "default" { - name = "image-backend-bucket" - description = "Contains beautiful images" - bucket_name = google_storage_bucket.default.name - enable_cdn = true - cdn_policy { - cache_mode = "CACHE_ALL_STATIC" - client_ttl = 3600 - default_ttl = 3600 - max_ttl = 86400 - negative_caching = true - serve_while_stale = 86400 - } -} - -# cdn backend bucket -resource "google_storage_bucket" "default" { - name = "cdn-backend-storage-bucket" - location = "US" - uniform_bucket_level_access = true - // delete bucket and contents on destroy. - force_destroy = true - // Assign specialty files - website { - main_page_suffix = "index.html" - not_found_page = "404.html" - } -} - -# make bucket public -resource "google_storage_bucket_iam_member" "default" { - bucket = google_storage_bucket.default.name - role = "roles/storage.objectViewer" - member = "allUsers" -} - -resource "google_storage_bucket_object" "index_page" { - name = "index.html" - source = "index.html" - bucket = google_storage_bucket.default.name - depends_on = [local_file.index_page] -} - -resource "google_storage_bucket_object" "error_page" { - name = "404.html" - source = "404.html" - bucket = google_storage_bucket.default.name - depends_on = [local_file.error_page] -} - -# image object for testing, try to access http:///test.jpg -resource "google_storage_bucket_object" "test_image" { - name = "test.jpg" - source = "test.jpg" - content_type = "image/jpeg" - bucket = google_storage_bucket.default.name - depends_on = [null_resource.test_image] -} - -# cdn sample index page -resource "local_file" "index_page" { - filename = "index.html" - content = <<-EOT - -

Congratulations on setting up Google Cloud CDN with Storage backend!

- - EOT -} - -# cdn default error page -resource "local_file" "error_page" { - filename = "404.html" - content = <<-EOT - -

404 Error: Object you are looking for is no longer available!

- - EOT -} - -# cdn sample image -resource "null_resource" "test_image" { - provisioner "local-exec" { - command = "wget -O test.jpg https://upload.wikimedia.org/wikipedia/commons/c/c8/Thank_you_001.jpg" - } -} -``` ## Example Usage - External Ssl Proxy Lb Mig Backend