From 6c7f7aa907b71f64260854d6a99ab4e8c7f1b30b Mon Sep 17 00:00:00 2001 From: Emily Ye Date: Tue, 2 Oct 2018 12:15:14 -0700 Subject: [PATCH 01/32] actually add composer docs to sidebar --- website/google.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/google.erb b/website/google.erb index d5c89174be1..16725ae1d9d 100644 --- a/website/google.erb +++ b/website/google.erb @@ -174,6 +174,15 @@ + > + Google Cloud Composer Resources + + + > Google Cloud Functions Resources
    From 645eab7ceda6f9f6d41dbe9f36cb938b7b65d40d Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 5 Oct 2018 12:32:57 -0700 Subject: [PATCH 02/32] Add new generated tests for examples (#2111) --- ..._compute_ssl_certificate_generated_test.go | 200 ++++++++++++++++++ ...ompute_target_http_proxy_generated_test.go | 89 ++++++++ ...mpute_target_https_proxy_generated_test.go | 98 +++++++++ ...compute_target_ssl_proxy_generated_test.go | 75 +++++++ ...compute_target_tcp_proxy_generated_test.go | 71 +++++++ ...urce_compute_vpn_gateway_generated_test.go | 107 ++++++++++ ...ource_compute_vpn_tunnel_generated_test.go | 108 ++++++++++ .../r/compute_ssl_certificate.html.markdown | 71 +++++-- .../r/compute_target_http_proxy.html.markdown | 7 +- .../compute_target_https_proxy.html.markdown | 6 +- .../r/compute_target_ssl_proxy.html.markdown | 18 +- .../r/compute_target_tcp_proxy.html.markdown | 11 +- .../docs/r/compute_vpn_gateway.html.markdown | 15 +- .../docs/r/compute_vpn_tunnel.html.markdown | 46 ++-- 14 files changed, 841 insertions(+), 81 deletions(-) create mode 100644 google/resource_compute_ssl_certificate_generated_test.go create mode 100644 google/resource_compute_target_http_proxy_generated_test.go create mode 100644 google/resource_compute_target_https_proxy_generated_test.go create mode 100644 google/resource_compute_target_ssl_proxy_generated_test.go create mode 100644 google/resource_compute_target_tcp_proxy_generated_test.go create mode 100644 google/resource_compute_vpn_gateway_generated_test.go create mode 100644 google/resource_compute_vpn_tunnel_generated_test.go diff --git a/google/resource_compute_ssl_certificate_generated_test.go b/google/resource_compute_ssl_certificate_generated_test.go new file mode 100644 index 00000000000..eea2d517cdb --- /dev/null +++ b/google/resource_compute_ssl_certificate_generated_test.go @@ -0,0 +1,200 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccComputeSslCertificate_sslCertificateBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeSslCertificateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeSslCertificate_sslCertificateBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_ssl_certificate.default", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"private_key", "name_prefix"}, + }, + }, + }) +} + +func testAccComputeSslCertificate_sslCertificateBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_ssl_certificate" "default" { + name_prefix = "my-certificate-" + description = "a description" + private_key = "${file("test-fixtures/ssl_cert/test.key")}" + certificate = "${file("test-fixtures/ssl_cert/test.crt")}" + + lifecycle { + create_before_destroy = true + } +} +`, + ) +} + +func TestAccComputeSslCertificate_sslCertificateRandomProviderExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeSslCertificateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeSslCertificate_sslCertificateRandomProviderExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_ssl_certificate.default", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"private_key"}, + }, + }, + }) +} + +func testAccComputeSslCertificate_sslCertificateRandomProviderExample(val string) string { + return fmt.Sprintf(` +# You may also want to control name generation explicitly: +resource "google_compute_ssl_certificate" "default" { + # The name will contain 8 random hex digits, + # e.g. "my-certificate-48ab27cd2a" + name = "${random_id.certificate.hex}" + private_key = "${file("test-fixtures/ssl_cert/test.key")}" + certificate = "${file("test-fixtures/ssl_cert/test.crt")}" + + lifecycle { + create_before_destroy = true + } +} + +resource "random_id" "certificate" { + byte_length = 4 + prefix = "my-certificate-" + + # For security, do not expose raw certificate values in the output + keepers { + private_key = "${base64sha256(file("test-fixtures/ssl_cert/test.key"))}" + certificate = "${base64sha256(file("test-fixtures/ssl_cert/test.crt"))}" + } +} +`, + ) +} + +func TestAccComputeSslCertificate_sslCertificateTargetHttpsProxiesExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeSslCertificateDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeSslCertificate_sslCertificateTargetHttpsProxiesExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_ssl_certificate.default", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"private_key", "name_prefix"}, + }, + }, + }) +} + +func testAccComputeSslCertificate_sslCertificateTargetHttpsProxiesExample(val string) string { + return fmt.Sprintf(` +// Using with Target HTTPS Proxies +// +// SSL certificates cannot be updated after creation. In order to apply +// the specified configuration, Terraform will destroy the existing +// resource and create a replacement. To effectively use an SSL +// certificate resource with a Target HTTPS Proxy resource, it's +// recommended to specify create_before_destroy in a lifecycle block. +// Either omit the Instance Template name attribute, specify a partial +// name with name_prefix, or use random_id resource. Example: + +resource "google_compute_ssl_certificate" "default" { + name_prefix = "my-certificate-" + private_key = "${file("test-fixtures/ssl_cert/test.key")}" + certificate = "${file("test-fixtures/ssl_cert/test.crt")}" + + lifecycle { + create_before_destroy = true + } +} + +resource "google_compute_target_https_proxy" "default" { + name = "test-proxy-%s" + url_map = "${google_compute_url_map.default.self_link}" + ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] +} + +resource "google_compute_url_map" "default" { + name = "url-map-%s" + description = "a description" + + default_service = "${google_compute_backend_service.default.self_link}" + + host_rule { + hosts = ["mysite.com"] + path_matcher = "allpaths" + } + + path_matcher { + name = "allpaths" + default_service = "${google_compute_backend_service.default.self_link}" + + path_rule { + paths = ["/*"] + service = "${google_compute_backend_service.default.self_link}" + } + } +} + +resource "google_compute_backend_service" "default" { + name = "backend-service-%s" + port_name = "http" + protocol = "HTTP" + timeout_sec = 10 + + health_checks = ["${google_compute_http_health_check.default.self_link}"] +} + +resource "google_compute_http_health_check" "default" { + name = "http-health-check-%s" + request_path = "/" + check_interval_sec = 1 + timeout_sec = 1 +} +`, val, val, val, val, + ) +} diff --git a/google/resource_compute_target_http_proxy_generated_test.go b/google/resource_compute_target_http_proxy_generated_test.go new file mode 100644 index 00000000000..c9825298d32 --- /dev/null +++ b/google/resource_compute_target_http_proxy_generated_test.go @@ -0,0 +1,89 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccComputeTargetHttpProxy_targetHttpProxyBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeTargetHttpProxyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeTargetHttpProxy_targetHttpProxyBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_target_http_proxy.default", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeTargetHttpProxy_targetHttpProxyBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_target_http_proxy" "default" { + name = "test-proxy-%s" + url_map = "${google_compute_url_map.default.self_link}" +} + +resource "google_compute_url_map" "default" { + name = "url-map-%s" + default_service = "${google_compute_backend_service.default.self_link}" + + host_rule { + hosts = ["mysite.com"] + path_matcher = "allpaths" + } + + path_matcher { + name = "allpaths" + default_service = "${google_compute_backend_service.default.self_link}" + + path_rule { + paths = ["/*"] + service = "${google_compute_backend_service.default.self_link}" + } + } +} + +resource "google_compute_backend_service" "default" { + name = "backend-service-%s" + port_name = "http" + protocol = "HTTP" + timeout_sec = 10 + + health_checks = ["${google_compute_http_health_check.default.self_link}"] +} + +resource "google_compute_http_health_check" "default" { + name = "http-health-check-%s" + request_path = "/" + check_interval_sec = 1 + timeout_sec = 1 +} +`, val, val, val, val, + ) +} diff --git a/google/resource_compute_target_https_proxy_generated_test.go b/google/resource_compute_target_https_proxy_generated_test.go new file mode 100644 index 00000000000..047d2e70341 --- /dev/null +++ b/google/resource_compute_target_https_proxy_generated_test.go @@ -0,0 +1,98 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccComputeTargetHttpsProxy_targetHttpsProxyBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeTargetHttpsProxyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeTargetHttpsProxy_targetHttpsProxyBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_target_https_proxy.default", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeTargetHttpsProxy_targetHttpsProxyBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_target_https_proxy" "default" { + name = "test-proxy-%s" + url_map = "${google_compute_url_map.default.self_link}" + ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] +} + +resource "google_compute_ssl_certificate" "default" { + name = "my-certificate-%s" + private_key = "${file("test-fixtures/ssl_cert/test.key")}" + certificate = "${file("test-fixtures/ssl_cert/test.crt")}" +} + +resource "google_compute_url_map" "default" { + name = "url-map-%s" + description = "a description" + + default_service = "${google_compute_backend_service.default.self_link}" + + host_rule { + hosts = ["mysite.com"] + path_matcher = "allpaths" + } + + path_matcher { + name = "allpaths" + default_service = "${google_compute_backend_service.default.self_link}" + + path_rule { + paths = ["/*"] + service = "${google_compute_backend_service.default.self_link}" + } + } +} + +resource "google_compute_backend_service" "default" { + name = "backend-service-%s" + port_name = "http" + protocol = "HTTP" + timeout_sec = 10 + + health_checks = ["${google_compute_http_health_check.default.self_link}"] +} + +resource "google_compute_http_health_check" "default" { + name = "http-health-check-%s" + request_path = "/" + check_interval_sec = 1 + timeout_sec = 1 +} +`, val, val, val, val, val, + ) +} diff --git a/google/resource_compute_target_ssl_proxy_generated_test.go b/google/resource_compute_target_ssl_proxy_generated_test.go new file mode 100644 index 00000000000..a0ed426065f --- /dev/null +++ b/google/resource_compute_target_ssl_proxy_generated_test.go @@ -0,0 +1,75 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccComputeTargetSslProxy_targetSslProxyBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeTargetSslProxyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeTargetSslProxy_targetSslProxyBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_target_ssl_proxy.default", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeTargetSslProxy_targetSslProxyBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_target_ssl_proxy" "default" { + name = "test-proxy-%s" + backend_service = "${google_compute_backend_service.default.self_link}" + ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] +} + +resource "google_compute_ssl_certificate" "default" { + name = "default-cert-%s" + private_key = "${file("test-fixtures/ssl_cert/test.key")}" + certificate = "${file("test-fixtures/ssl_cert/test.crt")}" +} + +resource "google_compute_backend_service" "default" { + name = "backend-service-%s" + protocol = "SSL" + health_checks = ["${google_compute_health_check.default.self_link}"] +} + +resource "google_compute_health_check" "default" { + name = "health-check-%s" + check_interval_sec = 1 + timeout_sec = 1 + tcp_health_check { + port = "443" + } +} +`, val, val, val, val, + ) +} diff --git a/google/resource_compute_target_tcp_proxy_generated_test.go b/google/resource_compute_target_tcp_proxy_generated_test.go new file mode 100644 index 00000000000..6f671e4f300 --- /dev/null +++ b/google/resource_compute_target_tcp_proxy_generated_test.go @@ -0,0 +1,71 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccComputeTargetTcpProxy_targetTcpProxyBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeTargetTcpProxyDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeTargetTcpProxy_targetTcpProxyBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_target_tcp_proxy.default", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeTargetTcpProxy_targetTcpProxyBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_target_tcp_proxy" "default" { + name = "test-proxy-%s" + backend_service = "${google_compute_backend_service.default.self_link}" +} + +resource "google_compute_backend_service" "default" { + name = "backend-service-%s" + protocol = "TCP" + timeout_sec = 10 + + health_checks = ["${google_compute_health_check.default.self_link}"] +} + +resource "google_compute_health_check" "default" { + name = "health-check-%s" + timeout_sec = 1 + check_interval_sec = 1 + + tcp_health_check { + port = "443" + } +} +`, val, val, val, + ) +} diff --git a/google/resource_compute_vpn_gateway_generated_test.go b/google/resource_compute_vpn_gateway_generated_test.go new file mode 100644 index 00000000000..df26c6739da --- /dev/null +++ b/google/resource_compute_vpn_gateway_generated_test.go @@ -0,0 +1,107 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccComputeVpnGateway_targetVpnGatewayBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeVpnGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeVpnGateway_targetVpnGatewayBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_vpn_gateway.target_gateway", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeVpnGateway_targetVpnGatewayBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_vpn_gateway" "target_gateway" { + name = "vpn1-%s" + network = "${google_compute_network.network1.self_link}" +} + +resource "google_compute_network" "network1" { + name = "network1-%s" +} + +resource "google_compute_address" "vpn_static_ip" { + name = "vpn-static-ip-%s" +} + +resource "google_compute_forwarding_rule" "fr_esp" { + name = "fr-esp-%s" + ip_protocol = "ESP" + ip_address = "${google_compute_address.vpn_static_ip.address}" + target = "${google_compute_vpn_gateway.target_gateway.self_link}" +} + +resource "google_compute_forwarding_rule" "fr_udp500" { + name = "fr-udp500-%s" + ip_protocol = "UDP" + port_range = "500" + ip_address = "${google_compute_address.vpn_static_ip.address}" + target = "${google_compute_vpn_gateway.target_gateway.self_link}" +} + +resource "google_compute_forwarding_rule" "fr_udp4500" { + name = "fr-udp4500-%s" + ip_protocol = "UDP" + port_range = "4500" + ip_address = "${google_compute_address.vpn_static_ip.address}" + target = "${google_compute_vpn_gateway.target_gateway.self_link}" +} + +resource "google_compute_vpn_tunnel" "tunnel1" { + name = "tunnel1-%s" + peer_ip = "15.0.0.120" + shared_secret = "a secret message" + + target_vpn_gateway = "${google_compute_vpn_gateway.target_gateway.self_link}" + + depends_on = [ + "google_compute_forwarding_rule.fr_esp", + "google_compute_forwarding_rule.fr_udp500", + "google_compute_forwarding_rule.fr_udp4500", + ] +} + +resource "google_compute_route" "route1" { + name = "route1-%s" + network = "${google_compute_network.network1.name}" + dest_range = "15.0.0.0/24" + priority = 1000 + + next_hop_vpn_tunnel = "${google_compute_vpn_tunnel.tunnel1.self_link}" +} +`, val, val, val, val, val, val, val, val, + ) +} diff --git a/google/resource_compute_vpn_tunnel_generated_test.go b/google/resource_compute_vpn_tunnel_generated_test.go new file mode 100644 index 00000000000..8d4efd0cb01 --- /dev/null +++ b/google/resource_compute_vpn_tunnel_generated_test.go @@ -0,0 +1,108 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccComputeVpnTunnel_vpnTunnelBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeVpnTunnelDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeVpnTunnel_vpnTunnelBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_vpn_tunnel.tunnel1", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"shared_secret"}, + }, + }, + }) +} + +func testAccComputeVpnTunnel_vpnTunnelBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_vpn_tunnel" "tunnel1" { + name = "tunnel1-%s" + peer_ip = "15.0.0.120" + shared_secret = "a secret message" + + target_vpn_gateway = "${google_compute_vpn_gateway.target_gateway.self_link}" + + depends_on = [ + "google_compute_forwarding_rule.fr_esp", + "google_compute_forwarding_rule.fr_udp500", + "google_compute_forwarding_rule.fr_udp4500", + ] +} + +resource "google_compute_vpn_gateway" "target_gateway" { + name = "vpn1-%s" + network = "${google_compute_network.network1.self_link}" +} + +resource "google_compute_network" "network1" { + name = "network1-%s" +} + +resource "google_compute_address" "vpn_static_ip" { + name = "vpn-static-ip-%s" +} + +resource "google_compute_forwarding_rule" "fr_esp" { + name = "fr-esp-%s" + ip_protocol = "ESP" + ip_address = "${google_compute_address.vpn_static_ip.address}" + target = "${google_compute_vpn_gateway.target_gateway.self_link}" +} + +resource "google_compute_forwarding_rule" "fr_udp500" { + name = "fr-udp500-%s" + ip_protocol = "UDP" + port_range = "500" + ip_address = "${google_compute_address.vpn_static_ip.address}" + target = "${google_compute_vpn_gateway.target_gateway.self_link}" +} + +resource "google_compute_forwarding_rule" "fr_udp4500" { + name = "fr-udp4500-%s" + ip_protocol = "UDP" + port_range = "4500" + ip_address = "${google_compute_address.vpn_static_ip.address}" + target = "${google_compute_vpn_gateway.target_gateway.self_link}" +} + +resource "google_compute_route" "route1" { + name = "route1-%s" + network = "${google_compute_network.network1.name}" + dest_range = "15.0.0.0/24" + priority = 1000 + + next_hop_vpn_tunnel = "${google_compute_vpn_tunnel.tunnel1.self_link}" +} +`, val, val, val, val, val, val, val, val, + ) +} diff --git a/website/docs/r/compute_ssl_certificate.html.markdown b/website/docs/r/compute_ssl_certificate.html.markdown index 7f5694cd28e..c9129b942d4 100644 --- a/website/docs/r/compute_ssl_certificate.html.markdown +++ b/website/docs/r/compute_ssl_certificate.html.markdown @@ -45,20 +45,9 @@ resource "google_compute_ssl_certificate" "default" { create_before_destroy = true } } - +``` +```hcl # You may also want to control name generation explicitly: - -resource "random_id" "certificate" { - byte_length = 4 - prefix = "my-certificate-" - - # For security, do not expose raw certificate values in the output - keepers { - private_key = "${base64sha256(file("path/to/private.key"))}" - certificate = "${base64sha256(file("path/to/certificate.crt"))}" - } -} - resource "google_compute_ssl_certificate" "default" { # The name will contain 8 random hex digits, # e.g. "my-certificate-48ab27cd2a" @@ -70,6 +59,17 @@ resource "google_compute_ssl_certificate" "default" { create_before_destroy = true } } + +resource "random_id" "certificate" { + byte_length = 4 + prefix = "my-certificate-" + + # For security, do not expose raw certificate values in the output + keepers { + private_key = "${base64sha256(file("path/to/private.key"))}" + certificate = "${base64sha256(file("path/to/certificate.crt"))}" + } +} ``` ```hcl // Using with Target HTTPS Proxies @@ -84,7 +84,6 @@ resource "google_compute_ssl_certificate" "default" { resource "google_compute_ssl_certificate" "default" { name_prefix = "my-certificate-" - description = "a description" private_key = "${file("path/to/private.key")}" certificate = "${file("path/to/certificate.crt")}" @@ -93,11 +92,49 @@ resource "google_compute_ssl_certificate" "default" { } } -resource "google_compute_target_https_proxy" "my_proxy" { - name = "public-proxy" - url_map = # ... +resource "google_compute_target_https_proxy" "default" { + name = "test-proxy" + url_map = "${google_compute_url_map.default.self_link}" ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] } + +resource "google_compute_url_map" "default" { + name = "url-map" + description = "a description" + + default_service = "${google_compute_backend_service.default.self_link}" + + host_rule { + hosts = ["mysite.com"] + path_matcher = "allpaths" + } + + path_matcher { + name = "allpaths" + default_service = "${google_compute_backend_service.default.self_link}" + + path_rule { + paths = ["/*"] + service = "${google_compute_backend_service.default.self_link}" + } + } +} + +resource "google_compute_backend_service" "default" { + name = "backend-service" + port_name = "http" + protocol = "HTTP" + timeout_sec = 10 + + health_checks = ["${google_compute_http_health_check.default.self_link}"] +} + +resource "google_compute_http_health_check" "default" { + name = "http-health-check" + request_path = "/" + check_interval_sec = 1 + timeout_sec = 1 +} ``` ## Argument Reference diff --git a/website/docs/r/compute_target_http_proxy.html.markdown b/website/docs/r/compute_target_http_proxy.html.markdown index 7d0a02e9c89..b5ea1d41cdf 100644 --- a/website/docs/r/compute_target_http_proxy.html.markdown +++ b/website/docs/r/compute_target_http_proxy.html.markdown @@ -37,14 +37,11 @@ To get more information about TargetHttpProxy, see: ```hcl resource "google_compute_target_http_proxy" "default" { name = "test-proxy" - description = "a description" url_map = "${google_compute_url_map.default.self_link}" } resource "google_compute_url_map" "default" { name = "url-map" - description = "a description" - default_service = "${google_compute_backend_service.default.self_link}" host_rule { @@ -64,7 +61,7 @@ resource "google_compute_url_map" "default" { } resource "google_compute_backend_service" "default" { - name = "default-backend" + name = "backend-service" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -73,7 +70,7 @@ resource "google_compute_backend_service" "default" { } resource "google_compute_http_health_check" "default" { - name = "test" + name = "http-health-check" request_path = "/" check_interval_sec = 1 timeout_sec = 1 diff --git a/website/docs/r/compute_target_https_proxy.html.markdown b/website/docs/r/compute_target_https_proxy.html.markdown index 222c3b99aa6..55c0657d511 100644 --- a/website/docs/r/compute_target_https_proxy.html.markdown +++ b/website/docs/r/compute_target_https_proxy.html.markdown @@ -37,14 +37,12 @@ To get more information about TargetHttpsProxy, see: ```hcl resource "google_compute_target_https_proxy" "default" { name = "test-proxy" - description = "a description" url_map = "${google_compute_url_map.default.self_link}" ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] } resource "google_compute_ssl_certificate" "default" { name = "my-certificate" - description = "a description" private_key = "${file("path/to/private.key")}" certificate = "${file("path/to/certificate.crt")}" } @@ -72,7 +70,7 @@ resource "google_compute_url_map" "default" { } resource "google_compute_backend_service" "default" { - name = "default-backend" + name = "backend-service" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -81,7 +79,7 @@ resource "google_compute_backend_service" "default" { } resource "google_compute_http_health_check" "default" { - name = "test" + name = "http-health-check" request_path = "/" check_interval_sec = 1 timeout_sec = 1 diff --git a/website/docs/r/compute_target_ssl_proxy.html.markdown b/website/docs/r/compute_target_ssl_proxy.html.markdown index 0518523db31..2dbc2e487be 100644 --- a/website/docs/r/compute_target_ssl_proxy.html.markdown +++ b/website/docs/r/compute_target_ssl_proxy.html.markdown @@ -38,27 +38,27 @@ To get more information about TargetSslProxy, see: ```hcl resource "google_compute_target_ssl_proxy" "default" { - name = "test" - backend_service = "${google_compute_backend_service.default.self_link}" + name = "test-proxy" + backend_service = "${google_compute_backend_service.default.self_link}" ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] } resource "google_compute_ssl_certificate" "default" { - name = "default-cert" - private_key = "${file("path/to/test.key")}" - certificate = "${file("path/to/test.crt")}" + name = "default-cert" + private_key = "${file("path/to/private.key")}" + certificate = "${file("path/to/certificate.crt")}" } resource "google_compute_backend_service" "default" { - name = "default-backend" - protocol = "SSL" + name = "backend-service" + protocol = "SSL" health_checks = ["${google_compute_health_check.default.self_link}"] } resource "google_compute_health_check" "default" { - name = "default-health-check" + name = "health-check" check_interval_sec = 1 - timeout_sec = 1 + timeout_sec = 1 tcp_health_check { port = "443" } diff --git a/website/docs/r/compute_target_tcp_proxy.html.markdown b/website/docs/r/compute_target_tcp_proxy.html.markdown index eb526e58bdf..b7be94c6e73 100644 --- a/website/docs/r/compute_target_tcp_proxy.html.markdown +++ b/website/docs/r/compute_target_tcp_proxy.html.markdown @@ -38,21 +38,20 @@ To get more information about TargetTcpProxy, see: ```hcl resource "google_compute_target_tcp_proxy" "default" { - name = "test" - description = "test" + name = "test-proxy" backend_service = "${google_compute_backend_service.default.self_link}" } resource "google_compute_backend_service" "default" { - name = "default-backend" - protocol = "TCP" - timeout_sec = 10 + name = "backend-service" + protocol = "TCP" + timeout_sec = 10 health_checks = ["${google_compute_health_check.default.self_link}"] } resource "google_compute_health_check" "default" { - name = "default" + name = "health-check" timeout_sec = 1 check_interval_sec = 1 diff --git a/website/docs/r/compute_vpn_gateway.html.markdown b/website/docs/r/compute_vpn_gateway.html.markdown index 23531696a55..ce0ba1b4075 100644 --- a/website/docs/r/compute_vpn_gateway.html.markdown +++ b/website/docs/r/compute_vpn_gateway.html.markdown @@ -32,25 +32,21 @@ To get more information about VpnGateway, see: ## Example Usage ```hcl -resource "google_compute_network" "network1" { - name = "network1" - ipv4_range = "10.120.0.0/16" -} - resource "google_compute_vpn_gateway" "target_gateway" { name = "vpn1" network = "${google_compute_network.network1.self_link}" - region = "${var.region}" +} + +resource "google_compute_network" "network1" { + name = "network1" } resource "google_compute_address" "vpn_static_ip" { name = "vpn-static-ip" - region = "${var.region}" } resource "google_compute_forwarding_rule" "fr_esp" { name = "fr-esp" - region = "${var.region}" ip_protocol = "ESP" ip_address = "${google_compute_address.vpn_static_ip.address}" target = "${google_compute_vpn_gateway.target_gateway.self_link}" @@ -58,7 +54,6 @@ resource "google_compute_forwarding_rule" "fr_esp" { resource "google_compute_forwarding_rule" "fr_udp500" { name = "fr-udp500" - region = "${var.region}" ip_protocol = "UDP" port_range = "500" ip_address = "${google_compute_address.vpn_static_ip.address}" @@ -67,7 +62,6 @@ resource "google_compute_forwarding_rule" "fr_udp500" { resource "google_compute_forwarding_rule" "fr_udp4500" { name = "fr-udp4500" - region = "${var.region}" ip_protocol = "UDP" port_range = "4500" ip_address = "${google_compute_address.vpn_static_ip.address}" @@ -76,7 +70,6 @@ resource "google_compute_forwarding_rule" "fr_udp4500" { resource "google_compute_vpn_tunnel" "tunnel1" { name = "tunnel1" - region = "${var.region}" peer_ip = "15.0.0.120" shared_secret = "a secret message" diff --git a/website/docs/r/compute_vpn_tunnel.html.markdown b/website/docs/r/compute_vpn_tunnel.html.markdown index 1283d5ef77c..773abe02945 100644 --- a/website/docs/r/compute_vpn_tunnel.html.markdown +++ b/website/docs/r/compute_vpn_tunnel.html.markdown @@ -38,26 +38,31 @@ state as plain-text. ## Example Usage ```hcl -resource "google_compute_network" "network1" { - name = "network1" -} +resource "google_compute_vpn_tunnel" "tunnel1" { + name = "tunnel1" + peer_ip = "15.0.0.120" + shared_secret = "a secret message" + + target_vpn_gateway = "${google_compute_vpn_gateway.target_gateway.self_link}" -resource "google_compute_subnetwork" "subnet1" { - name = "subnet1" - network = "${google_compute_network.network1.self_link}" - ip_cidr_range = "10.120.0.0/16" - region = "us-central1" + depends_on = [ + "google_compute_forwarding_rule.fr_esp", + "google_compute_forwarding_rule.fr_udp500", + "google_compute_forwarding_rule.fr_udp4500", + ] } resource "google_compute_vpn_gateway" "target_gateway" { name = "vpn1" network = "${google_compute_network.network1.self_link}" - region = "${google_compute_subnetwork.subnet1.region}" +} + +resource "google_compute_network" "network1" { + name = "network1" } resource "google_compute_address" "vpn_static_ip" { name = "vpn-static-ip" - region = "${google_compute_subnetwork.subnet1.region}" } resource "google_compute_forwarding_rule" "fr_esp" { @@ -70,7 +75,7 @@ resource "google_compute_forwarding_rule" "fr_esp" { resource "google_compute_forwarding_rule" "fr_udp500" { name = "fr-udp500" ip_protocol = "UDP" - port_range = "500-500" + port_range = "500" ip_address = "${google_compute_address.vpn_static_ip.address}" target = "${google_compute_vpn_gateway.target_gateway.self_link}" } @@ -78,28 +83,11 @@ resource "google_compute_forwarding_rule" "fr_udp500" { resource "google_compute_forwarding_rule" "fr_udp4500" { name = "fr-udp4500" ip_protocol = "UDP" - port_range = "4500-4500" + port_range = "4500" ip_address = "${google_compute_address.vpn_static_ip.address}" target = "${google_compute_vpn_gateway.target_gateway.self_link}" } -resource "google_compute_vpn_tunnel" "tunnel1" { - name = "tunnel1" - peer_ip = "15.0.0.120" - shared_secret = "a secret message" - - target_vpn_gateway = "${google_compute_vpn_gateway.target_gateway.self_link}" - - local_traffic_selector = ["${google_compute_subnetwork.subnet1.ip_cidr_range}"] - remote_traffic_selector = ["172.16.0.0/12"] - - depends_on = [ - "google_compute_forwarding_rule.fr_esp", - "google_compute_forwarding_rule.fr_udp500", - "google_compute_forwarding_rule.fr_udp4500", - ] -} - resource "google_compute_route" "route1" { name = "route1" network = "${google_compute_network.network1.name}" From fe8b2207fe5f64f0c071f6bb106a005f991056ad Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 5 Oct 2018 13:05:58 -0700 Subject: [PATCH 03/32] Add an address example with a VM instance (#2141) /cc @rileykarson --- ...resource_compute_address_generated_test.go | 53 +++++++++++++++++++ website/docs/r/compute_address.html.markdown | 29 ++++++++++ 2 files changed, 82 insertions(+) diff --git a/google/resource_compute_address_generated_test.go b/google/resource_compute_address_generated_test.go index 0943e5a3a36..e19f1f3f066 100644 --- a/google/resource_compute_address_generated_test.go +++ b/google/resource_compute_address_generated_test.go @@ -94,3 +94,56 @@ resource "google_compute_address" "internal_with_subnet_and_address" { `, val, val, val, ) } + +func TestAccComputeAddress_instanceWithIpExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeAddressDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeAddress_instanceWithIpExample(acctest.RandString(10)), + }, + { + ResourceName: "google_compute_address.static", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeAddress_instanceWithIpExample(val string) string { + return fmt.Sprintf(` +resource "google_compute_address" "static" { + name = "ipv4-address-%s" +} + +data "google_compute_image" "debian_image" { + family = "debian-9" + project = "debian-cloud" +} + +resource "google_compute_instance" "instance_with_ip" { + name = "vm-instance-%s" + machine_type = "f1-micro" + zone = "us-central1-a" + + boot_disk { + initialize_params{ + image = "${data.google_compute_image.debian_image.self_link}" + } + } + + network_interface { + network = "default" + access_config { + nat_ip = "${google_compute_address.static.address}" + } + } +} +`, val, val, + ) +} diff --git a/website/docs/r/compute_address.html.markdown b/website/docs/r/compute_address.html.markdown index b757cf00ce1..1d6419b2bd2 100644 --- a/website/docs/r/compute_address.html.markdown +++ b/website/docs/r/compute_address.html.markdown @@ -70,6 +70,35 @@ resource "google_compute_address" "internal_with_subnet_and_address" { region = "us-central1" } ``` +```hcl +resource "google_compute_address" "static" { + name = "ipv4-address" +} + +data "google_compute_image" "debian_image" { + family = "debian-9" + project = "debian-cloud" +} + +resource "google_compute_instance" "instance_with_ip" { + name = "vm-instance" + machine_type = "f1-micro" + zone = "us-central1-a" + + boot_disk { + initialize_params{ + image = "${data.google_compute_image.debian_image.self_link}" + } + } + + network_interface { + network = "default" + access_config { + nat_ip = "${google_compute_address.static.address}" + } + } +} +``` ## Argument Reference From d7672b4c4716f7303a5278c7e1669672bc6cb587 Mon Sep 17 00:00:00 2001 From: Paddy Carver Date: Fri, 5 Oct 2018 13:19:06 -0700 Subject: [PATCH 04/32] Add documentation for private_cluster_config. --- .../docs/r/container_cluster.html.markdown | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index f1a054ff866..7a8d9982a7a 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -136,11 +136,12 @@ output "cluster_ca_certificate" { for master authorized networks. Omit the nested `cidr_blocks` attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists). -* `master_ipv4_cidr_block` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) Specifies a private +* `master_ipv4_cidr_block` - (Optional, Deprecated, [Beta](/docs/providers/google/index.html#beta-features)) Specifies a private [RFC1918](https://tools.ietf.org/html/rfc1918) block for the master's VPC. The master range must not overlap with any subnet in your cluster's VPC. The master and your cluster use VPC peering. Must be specified in CIDR notation and must be `/28` subnet. This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + This field is deprecated, use `private_cluster_config.master_ipv4_cidr_block` instead. * `min_master_version` - (Optional) The minimum version of the master. GKE will auto-update the master to new versions, so this does not guarantee the @@ -180,12 +181,18 @@ output "cluster_ca_certificate" { This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. -* `private_cluster` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) If true, a +* `privat_cluster_config` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) A set of options for creating + a private cluster. Structure is documented below. + This property is in beta, and should be used with the terraform-provider-google-beta provider. + See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + +* `private_cluster` - (Optional, Deprecated, [Beta](/docs/providers/google/index.html#beta-features)) If true, a [private cluster](https://cloud.google.com/kubernetes-engine/docs/how-to/private-clusters) will be created, meaning nodes do not get public IP addresses. It is mandatory to specify `master_ipv4_cidr_block` and `ip_allocation_policy` with this option. This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + This field is deprecated, use `private_cluster_config.enable_private_nodes` instead. * `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used. @@ -386,6 +393,23 @@ The `pod_security_policy_config` block supports: * `enabled` (Required) - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. +The `private_cluster_config` block supports: + +* `enable_private_endpoint` (Optional) - Whether the master's internal IP address is used as the cluster endpoint. + +* `enable_private_nodes` (Optional) - Whether nodes have internal IP addresses only. If enabled, all nodes are given only RFC 1918 private + addresses and communicate with the master via private networking. + +* `master_ipv4_cidr_block` (Optional) - The IP range in CIDR notation to use for the hosted master network. This range will be used for + assigning internal IP addresses to the master or set of masters, as well as the ILB VIP. This range must not overlap with any other ranges + in use within the cluster's network. + +In addition, the `private_cluster_config` allows access to the following read-only fields: + +* `private_endpoint` - The internal IP address of this cluster's master endpoint. + +* `public_endpoint` - The external IP address of this cluster's master endpoint. + The `taint` block supports: * `key` (Required) Key for taint. From 1b88724449be3178458bb4741dbc478ebd30d69d Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 5 Oct 2018 15:28:31 -0700 Subject: [PATCH 05/32] Add example tests for Redis, Filestore, ContainerAnalysis (#2131) /cc @rileykarson --- ...e_containeranalysis_note_generated_test.go | 57 ++++++++++ ...ource_filestore_instance_generated_test.go | 65 +++++++++++ .../resource_redis_instance_generated_test.go | 104 ++++++++++++++++++ ...binaryauthorization_attestor.html.markdown | 18 +-- .../binaryauthorization_policy.html.markdown | 32 +++--- .../docs/r/filestore_instance.html.markdown | 27 ++--- website/docs/r/redis_instance.html.markdown | 24 ++-- .../docs/r/resourcemanager_lien.html.markdown | 16 +-- 8 files changed, 281 insertions(+), 62 deletions(-) create mode 100644 google/resource_containeranalysis_note_generated_test.go create mode 100644 google/resource_filestore_instance_generated_test.go create mode 100644 google/resource_redis_instance_generated_test.go diff --git a/google/resource_containeranalysis_note_generated_test.go b/google/resource_containeranalysis_note_generated_test.go new file mode 100644 index 00000000000..dc740356a29 --- /dev/null +++ b/google/resource_containeranalysis_note_generated_test.go @@ -0,0 +1,57 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccContainerAnalysisNote_containerAnalysisNoteBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckContainerAnalysisNoteDestroy, + Steps: []resource.TestStep{ + { + Config: testAccContainerAnalysisNote_containerAnalysisNoteBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_container_analysis_note.note", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccContainerAnalysisNote_containerAnalysisNoteBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_container_analysis_note" "note" { + name = "test-attestor-note-%s" + attestation_authority { + hint { + human_readable_name = "Attestor Note" + } + } +} +`, val, + ) +} diff --git a/google/resource_filestore_instance_generated_test.go b/google/resource_filestore_instance_generated_test.go new file mode 100644 index 00000000000..517d9fd44af --- /dev/null +++ b/google/resource_filestore_instance_generated_test.go @@ -0,0 +1,65 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccFilestoreInstance_filestoreInstanceBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckFilestoreInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccFilestoreInstance_filestoreInstanceBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_filestore_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"zone"}, + }, + }, + }) +} + +func testAccFilestoreInstance_filestoreInstanceBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_filestore_instance" "instance" { + name = "test-instance-%s" + zone = "us-central1-b" + tier = "PREMIUM" + + file_shares { + capacity_gb = 2660 + name = "share1" + } + + networks { + network = "default" + modes = ["MODE_IPV4"] + } +} +`, val, + ) +} diff --git a/google/resource_redis_instance_generated_test.go b/google/resource_redis_instance_generated_test.go new file mode 100644 index 00000000000..1d08da4e0a6 --- /dev/null +++ b/google/resource_redis_instance_generated_test.go @@ -0,0 +1,104 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- + +package google + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccRedisInstance_redisInstanceBasicExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRedisInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccRedisInstance_redisInstanceBasicExample(acctest.RandString(10)), + }, + { + ResourceName: "google_redis_instance.cache", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"region"}, + }, + }, + }) +} + +func testAccRedisInstance_redisInstanceBasicExample(val string) string { + return fmt.Sprintf(` +resource "google_redis_instance" "cache" { + name = "memory-cache-%s" + memory_size_gb = 1 +} +`, val, + ) +} + +func TestAccRedisInstance_redisInstanceFullExample(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRedisInstanceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccRedisInstance_redisInstanceFullExample(acctest.RandString(10)), + }, + { + ResourceName: "google_redis_instance.cache", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"region"}, + }, + }, + }) +} + +func testAccRedisInstance_redisInstanceFullExample(val string) string { + return fmt.Sprintf(` +resource "google_redis_instance" "cache" { + name = "ha-memory-cache-%s" + tier = "STANDARD_HA" + memory_size_gb = 1 + + location_id = "us-central1-a" + alternative_location_id = "us-central1-f" + + authorized_network = "${google_compute_network.auto-network.self_link}" + + redis_version = "REDIS_3_2" + display_name = "Terraform Test Instance" + reserved_ip_range = "192.168.0.0/29" + + labels { + my_key = "my_val" + other_key = "other_val" + } +} + +resource "google_compute_network" "auto-network" { + name = "authorized-network-%s" +} +`, val, val, + ) +} diff --git a/website/docs/r/binaryauthorization_attestor.html.markdown b/website/docs/r/binaryauthorization_attestor.html.markdown index 040ca6fb4ff..1b71efa4530 100644 --- a/website/docs/r/binaryauthorization_attestor.html.markdown +++ b/website/docs/r/binaryauthorization_attestor.html.markdown @@ -35,15 +35,6 @@ To get more information about Attestor, see: ## Example Usage ```hcl -resource "google_container_analysis_note" "note" { - name = "test-attestor-note" - attestation_authority { - hint { - human_readable_name = "Attestor Note" - } - } -} - resource "google_binary_authorization_attestor" "attestor" { name = "test-attestor" attestation_authority_note { @@ -69,6 +60,15 @@ EOF } } } + +resource "google_container_analysis_note" "note" { + name = "test-attestor-note" + attestation_authority { + hint { + human_readable_name = "Attestor Note" + } + } +} ``` ## Argument Reference diff --git a/website/docs/r/binaryauthorization_policy.html.markdown b/website/docs/r/binaryauthorization_policy.html.markdown index 409dfc409ab..392b3b2b1c4 100644 --- a/website/docs/r/binaryauthorization_policy.html.markdown +++ b/website/docs/r/binaryauthorization_policy.html.markdown @@ -35,22 +35,6 @@ To get more information about Policy, see: ## Example Usage ```hcl -resource "google_container_analysis_note" "note" { - name = "test-attestor-note" - attestation_authority { - hint { - human_readable_name = "My attestor" - } - } -} - -resource "google_binary_authorization_attestor" "attestor" { - name = "test-attestor" - attestation_authority_note { - note_reference = "${google_container_analysis_note.note.name}" - } -} - resource "google_binary_authorization_policy" "policy" { admission_whitelist_patterns { name_pattern= "gcr.io/google_containers/*" @@ -68,6 +52,22 @@ resource "google_binary_authorization_policy" "policy" { require_attestations_by = ["${google_binary_authorization_attestor.attestor.name}"] } } + +resource "google_container_analysis_note" "note" { + name = "test-attestor-note" + attestation_authority { + hint { + human_readable_name = "My attestor" + } + } +} + +resource "google_binary_authorization_attestor" "attestor" { + name = "test-attestor" + attestation_authority_note { + note_reference = "${google_container_analysis_note.note.name}" + } +} ``` ## Argument Reference diff --git a/website/docs/r/filestore_instance.html.markdown b/website/docs/r/filestore_instance.html.markdown index dc82fd61a4c..13bd842b4ca 100644 --- a/website/docs/r/filestore_instance.html.markdown +++ b/website/docs/r/filestore_instance.html.markdown @@ -36,21 +36,22 @@ To get more information about Instance, see: ## Example Usage -### Basic Usage ```hcl - resource "google_file_instance" "instance" { - name = "test-instance" - zone = "us-central1-b" - file_shares { - capacity_gb = 2660 - name = "share1" - } - networks { - network = "default" - modes = ["MODE_IPV4"] - } - tier = "PREMIUM" +resource "google_filestore_instance" "instance" { + name = "test-instance" + zone = "us-central1-b" + tier = "PREMIUM" + + file_shares { + capacity_gb = 2660 + name = "share1" } + + networks { + network = "default" + modes = ["MODE_IPV4"] + } +} ``` ## Argument Reference diff --git a/website/docs/r/redis_instance.html.markdown b/website/docs/r/redis_instance.html.markdown index a33cbfaa0a7..bf639dabe93 100644 --- a/website/docs/r/redis_instance.html.markdown +++ b/website/docs/r/redis_instance.html.markdown @@ -32,30 +32,22 @@ To get more information about Instance, see: ## Example Usage -### Basic Usage ```hcl -resource "google_redis_instance" "test" { - name = "%s" +resource "google_redis_instance" "cache" { + name = "memory-cache" memory_size_gb = 1 } ``` - -### Full Usage ```hcl -resource "google_compute_network" "test" { - name = "%s" -} - -resource "google_redis_instance" "test" { - name = "%s" +resource "google_redis_instance" "cache" { + name = "ha-memory-cache" tier = "STANDARD_HA" memory_size_gb = 1 - region = "us-central1" location_id = "us-central1-a" alternative_location_id = "us-central1-f" - - authorized_network = "${google_compute_network.test.self_link}" + + authorized_network = "${google_compute_network.auto-network.self_link}" redis_version = "REDIS_3_2" display_name = "Terraform Test Instance" @@ -66,6 +58,10 @@ resource "google_redis_instance" "test" { other_key = "other_val" } } + +resource "google_compute_network" "auto-network" { + name = "authorized-network" +} ``` ## Argument Reference diff --git a/website/docs/r/resourcemanager_lien.html.markdown b/website/docs/r/resourcemanager_lien.html.markdown index aa7a1f77cb9..667a1aa9643 100644 --- a/website/docs/r/resourcemanager_lien.html.markdown +++ b/website/docs/r/resourcemanager_lien.html.markdown @@ -28,20 +28,16 @@ A Lien represents an encumbrance on the actions that can be performed on a resou ## Example Usage ```hcl -resource "random_id" "r" { - byte_length = 8 -} - -resource "google_project" "project" { - project_id = "project-${random_id.r.hex}" - name = "A very important project!" -} - resource "google_resource_manager_lien" "lien" { parent = "projects/${google_project.project.number}" restrictions = ["resourcemanager.projects.delete"] origin = "machine-readable-explanation" - reason = "This project is very important to me!" + reason = "This project is an important environment" +} + +resource "google_project" "project" { + project_id = "staging-project" + name = "A very important project!" } ``` From 706e6ce16818870dd1683bd89bcb79e36cca65be Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Mon, 8 Oct 2018 11:14:08 -0700 Subject: [PATCH 06/32] Remove beta-features header (#2178) * Remove beta-features header * add version * Fix old type s/privat/private/ --- website/docs/index.html.markdown | 14 +++----------- website/docs/provider_reference.html.markdown | 13 +++++++++++++ .../r/compute_backend_service.html.markdown | 4 ++-- ...ompute_global_forwarding_rule.html.markdown | 5 +++-- ...ompute_instance_group_manager.html.markdown | 6 +++--- ...region_instance_group_manager.html.markdown | 18 +++++++++++++----- .../r/compute_security_policy.html.markdown | 2 -- .../r/compute_subnetwork_iam.html.markdown | 2 -- website/docs/r/container_cluster.html.markdown | 10 +++++----- website/docs/r/sql_database.html.markdown | 4 ++-- .../docs/r/sql_database_instance.html.markdown | 2 +- 11 files changed, 45 insertions(+), 35 deletions(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index e35d341c527..cedc65c1f32 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -8,6 +8,9 @@ description: |- # Google Cloud Platform Provider +-> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) +for more details on how to use `google-beta`. + The Google provider is used to configure your [Google Cloud Platform](https://cloud.google.com/) infrastructure. See the [Getting Started](/docs/providers/google/getting_started.html) page for an introduction to using the provider. @@ -90,14 +93,3 @@ or thumbs up [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull the existing request if one exists. By filing and reacting to requests, we can gauge your interest in yet-to-be-supported GCP features and make sure that we prioritize support for them when they enter Beta. - -### Beta Features -Some resources contain Beta features; Beta GCP Features have no -deprecation policy, and no SLA, but are otherwise considered to be feature-complete -with only minor outstanding issues after their Alpha period. Beta is when GCP -features are publicly announced, and is when they generally become publicly -available. For more information see [the official documentation on GCP launch stages](https://cloud.google.com/terms/launch-stages). - -Terraform resources that support Beta features will always use the Beta APIs to provision -the resource. Importing a resource that supports Beta features will always import those -features, even if the resource was created in a matter that was not explicitly Beta. diff --git a/website/docs/provider_reference.html.markdown b/website/docs/provider_reference.html.markdown index 9520168e275..37c56283d57 100644 --- a/website/docs/provider_reference.html.markdown +++ b/website/docs/provider_reference.html.markdown @@ -7,6 +7,10 @@ description: |- --- # `google` provider reference + +-> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) +for more details on how to use `google-beta`. + The `google` provider block is used to configure default values for your GCP project and location (`zone` and `region`), and add your credentials. @@ -25,6 +29,15 @@ provider "google" { } ``` +```hcl +provider "google-beta" { + credentials = "${file("account.json")}" + project = "my-project-id" + region = "us-central1" + zone = "us-central1-c" +} +``` + ## Configuration Reference The following keys can be used to configure the provider. diff --git a/website/docs/r/compute_backend_service.html.markdown b/website/docs/r/compute_backend_service.html.markdown index 12c2cd1733a..ae0dc10a964 100644 --- a/website/docs/r/compute_backend_service.html.markdown +++ b/website/docs/r/compute_backend_service.html.markdown @@ -84,7 +84,7 @@ The following arguments are supported: * `connection_draining_timeout_sec` - (Optional) Time for which instance will be drained (not accept new connections, but still work to finish started ones). Defaults to `300`. -* `custom_request_headers` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) Headers that the +* `custom_request_headers` - (Optional) Headers that the HTTP/S load balancer should add to proxied requests. See [guide](https://cloud.google.com/compute/docs/load-balancing/http/backend-service#user-defined-request-headers) for details. This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. @@ -102,7 +102,7 @@ but still work to finish started ones). Defaults to `300`. * `protocol` - (Optional) The protocol for incoming requests. Defaults to `HTTP`. -* `security_policy` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) Name or URI of a +* `security_policy` - (Optional) Name or URI of a [security policy](https://cloud.google.com/armor/docs/security-policy-concepts) to add to the backend service. * `session_affinity` - (Optional) How to distribute load. Options are `NONE` (no diff --git a/website/docs/r/compute_global_forwarding_rule.html.markdown b/website/docs/r/compute_global_forwarding_rule.html.markdown index 65b926faaff..91b02755591 100644 --- a/website/docs/r/compute_global_forwarding_rule.html.markdown +++ b/website/docs/r/compute_global_forwarding_rule.html.markdown @@ -105,7 +105,7 @@ The IP Version that will be used by this resource's address. One of `"IPV4"` or - - - -* `labels` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) +* `labels` - (Optional) A set of key/value label pairs to assign to the resource. This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. @@ -117,7 +117,8 @@ exported: * `self_link` - The URI of the created resource. -* `label_fingerprint` - ([Beta](/docs/providers/google/index.html#beta-features)) The current label fingerprint. +* `label_fingerprint` - The current label fingerprint. This property is in beta, and should be used with the terraform-provider-google-beta provider. +See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. ## Import diff --git a/website/docs/r/compute_instance_group_manager.html.markdown b/website/docs/r/compute_instance_group_manager.html.markdown index 47bf2d2f173..e91d028b230 100644 --- a/website/docs/r/compute_instance_group_manager.html.markdown +++ b/website/docs/r/compute_instance_group_manager.html.markdown @@ -123,7 +123,7 @@ The following arguments are supported: * `update_strategy` - (Optional, Default `"REPLACE"`) If the `instance_template` resource is modified, a value of `"NONE"` will prevent any of the managed instances from being restarted by Terraform. A value of `"REPLACE"` will - restart all of the instances at once. `"ROLLING_UPDATE"` is supported as [Beta feature]. + restart all of the instances at once. `"ROLLING_UPDATE"` is supported as a beta feature. A value of `"ROLLING_UPDATE"` requires `rolling_update_policy` block to be set * `target_size` - (Optional) The target number of running instances for this managed @@ -140,12 +140,12 @@ The following arguments are supported: --- -* `auto_healing_policies` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) The autohealing policies for this managed instance +* `auto_healing_policies` - (Optional) The autohealing policies for this managed instance group. You can specify only one value. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/creating-groups-of-managed-instances#monitoring_groups). This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. -* `rolling_update_policy` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/instanceGroupManagers/patch) +* `rolling_update_policy` - (Optional) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/instanceGroupManagers/patch) This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. - - - diff --git a/website/docs/r/compute_region_instance_group_manager.html.markdown b/website/docs/r/compute_region_instance_group_manager.html.markdown index 959ea0392a2..92068921db6 100644 --- a/website/docs/r/compute_region_instance_group_manager.html.markdown +++ b/website/docs/r/compute_region_instance_group_manager.html.markdown @@ -99,6 +99,8 @@ The following arguments are supported: exactly one version must not specify a target size. It means that versions with a target size will respect the setting, and the one without target size will be applied to all remaining Instances (top level target_size - each version target_size). + This property is in beta, and should be used with the terraform-provider-google-beta provider. + See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. * `name` - (Required) The name of the instance group manager. Must be 1-63 characters long and comply with @@ -121,8 +123,8 @@ The following arguments are supported: * `update_strategy` - (Optional, Default `"NONE"`) If the `instance_template` resource is modified, a value of `"NONE"` will prevent any of the managed instances from being restarted by Terraform. A value of `"ROLLING_UPDATE"` - is supported as [Beta feature]. A value of `"ROLLING_UPDATE"` requires - `rolling_update_policy` block to be set + is supported as a beta feature. A value of `"ROLLING_UPDATE"` requires + `rolling_update_policy` block to be set. * `target_size` - (Optional) The target number of running instances for this managed instance group. This value should always be explicitly set unless this resource is attached to @@ -138,12 +140,18 @@ The following arguments are supported: --- -* `auto_healing_policies` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) The autohealing policies for this managed instance +* `auto_healing_policies` - (Optional) The autohealing policies for this managed instance group. You can specify only one value. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/creating-groups-of-managed-instances#monitoring_groups). +This property is in beta, and should be used with the terraform-provider-google-beta provider. +See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. -* `rolling_update_policy` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/regionInstanceGroupManagers/patch) -* `distribution_policy_zones` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) The distribution policy for this managed instance +* `rolling_update_policy` - (Optional) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/regionInstanceGroupManagers/patch) +This property is in beta, and should be used with the terraform-provider-google-beta provider. +See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + + +* `distribution_policy_zones` - (Optional) The distribution policy for this managed instance group. You can specify one or more values. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/distributing-instances-with-regional-instance-groups#selectingzones). - - - diff --git a/website/docs/r/compute_security_policy.html.markdown b/website/docs/r/compute_security_policy.html.markdown index ac2e85e1b06..987fa2ee993 100644 --- a/website/docs/r/compute_security_policy.html.markdown +++ b/website/docs/r/compute_security_policy.html.markdown @@ -12,8 +12,6 @@ A Security Policy defines an IP blacklist or whitelist that protects load balanc see the [official documentation](https://cloud.google.com/armor/docs/configure-security-policies) and the [API](https://cloud.google.com/compute/docs/reference/rest/beta/securityPolicies). -~> **Note:** This entire resource is in [Beta](/docs/providers/google/index.html#beta-features) - ## Example Usage ```hcl diff --git a/website/docs/r/compute_subnetwork_iam.html.markdown b/website/docs/r/compute_subnetwork_iam.html.markdown index 3eee8ec7195..b8ecab6041c 100644 --- a/website/docs/r/compute_subnetwork_iam.html.markdown +++ b/website/docs/r/compute_subnetwork_iam.html.markdown @@ -21,8 +21,6 @@ Three different resources help you manage your IAM policy for GCE subnetwork. Ea ~> **Note:** `google_compute_subnetwork_iam_binding` resources **can be** used in conjunction with `google_compute_subnetwork_iam_member` resources **only if** they do not grant privilege to the same role. -~> **Note:** These entire resources are in [Beta](/docs/providers/google/index.html#beta-features) - ## google\_compute\_subnetwork\_iam\_policy ```hcl diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index 7a8d9982a7a..c6f1cba2afb 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -136,7 +136,7 @@ output "cluster_ca_certificate" { for master authorized networks. Omit the nested `cidr_blocks` attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists). -* `master_ipv4_cidr_block` - (Optional, Deprecated, [Beta](/docs/providers/google/index.html#beta-features)) Specifies a private +* `master_ipv4_cidr_block` - (Optional, Deprecated) Specifies a private [RFC1918](https://tools.ietf.org/html/rfc1918) block for the master's VPC. The master range must not overlap with any subnet in your cluster's VPC. The master and your cluster use VPC peering. Must be specified in CIDR notation and must be `/28` subnet. This property is in beta, and should be used with the terraform-provider-google-beta provider. @@ -175,18 +175,18 @@ output "cluster_ca_certificate" { or set to the same value as `min_master_version` on create. Defaults to the default version set by GKE which is not necessarily the latest version. -* `pod_security_policy_config` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) Configuration for the +* `pod_security_policy_config` - (Optional) Configuration for the [PodSecurityPolicy](https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies) feature. Structure is documented below. This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. -* `privat_cluster_config` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) A set of options for creating +* `private_cluster_config` - (Optional) A set of options for creating a private cluster. Structure is documented below. This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. -* `private_cluster` - (Optional, Deprecated, [Beta](/docs/providers/google/index.html#beta-features)) If true, a +* `private_cluster` - (Optional, Deprecated) If true, a [private cluster](https://cloud.google.com/kubernetes-engine/docs/how-to/private-clusters) will be created, meaning nodes do not get public IP addresses. It is mandatory to specify `master_ipv4_cidr_block` and `ip_allocation_policy` with this option. @@ -372,7 +372,7 @@ The `node_config` block supports: * `tags` - (Optional) The list of instance tags applied to all nodes. Tags are used to identify valid sources or targets for network firewalls. -* `taint` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) List of +* `taint` - (Optional) List of [kubernetes taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) to apply to each node. Structure is documented below. This property is in beta, and should be used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown index d461bfb195a..948c49c761a 100644 --- a/website/docs/r/sql_database.html.markdown +++ b/website/docs/r/sql_database.html.markdown @@ -49,13 +49,13 @@ The following arguments are supported: * `charset` - (Optional) The charset value. See MySQL's [Supported Character Sets and Collations](https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html) and Postgres' [Character Set Support](https://www.postgresql.org/docs/9.6/static/multibyte.html) - for more details and supported values. Postgres databases are in [Beta](/docs/providers/google/index.html#beta-features), + for more details and supported values. Postgres databases are in beta and have limited `charset` support; they only support a value of `UTF8` at creation time. * `collation` - (Optional) The collation value. See MySQL's [Supported Character Sets and Collations](https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html) and Postgres' [Collation Support](https://www.postgresql.org/docs/9.6/static/collation.html) - for more details and supported values. Postgres databases are in [Beta](/docs/providers/google/index.html#beta-features), + for more details and supported values. Postgres databases are in beta and have limited `collation` support; they only support a value of `en_US.UTF8` at creation time. ## Attributes Reference diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown index 0771f91a016..7a2a2a5d9d6 100644 --- a/website/docs/r/sql_database_instance.html.markdown +++ b/website/docs/r/sql_database_instance.html.markdown @@ -129,7 +129,7 @@ The following arguments are supported: use. Can be `MYSQL_5_6`, `MYSQL_5_7` or `POSTGRES_9_6` for second-generation instances, or `MYSQL_5_5` or `MYSQL_5_6` for first-generation instances. See [Second Generation Capabilities](https://cloud.google.com/sql/docs/1st-2nd-gen-differences) - for more information. `POSTGRES_9_6` support is in [Beta](/docs/providers/google/index.html#beta-features). + for more information. `POSTGRES_9_6` support is in beta. * `name` - (Optional, Computed) The name of the instance. If the name is left blank, Terraform will randomly generate one when the instance is first From 52a17333c00c8f32d078fc39b487ed67f8e13e6e Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Mon, 8 Oct 2018 11:37:19 -0700 Subject: [PATCH 07/32] Deprecate restore_policy in code --- google/resource_google_project_iam_policy.go | 1 + 1 file changed, 1 insertion(+) diff --git a/google/resource_google_project_iam_policy.go b/google/resource_google_project_iam_policy.go index 5e7700c4d71..a98e242657e 100644 --- a/google/resource_google_project_iam_policy.go +++ b/google/resource_google_project_iam_policy.go @@ -43,6 +43,7 @@ func resourceGoogleProjectIamPolicy() *schema.Resource { Computed: true, }, "restore_policy": &schema.Schema{ + Deprecated: "This field will be removed alongside the authoritative field. To ignore changes not managed by Terraform, use google_project_iam_binding and google_project_iam_member instead. See https://www.terraform.io/docs/providers/google/r/google_project_iam.html for more information.", Type: schema.TypeString, Computed: true, }, From f7ae034e934d4f634aa5669ded90c34899673af2 Mon Sep 17 00:00:00 2001 From: Paddy Date: Mon, 8 Oct 2018 12:55:52 -0700 Subject: [PATCH 08/32] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45cd21b035f..7b1f17788b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ BACKWARDS INCOMPATIBILITIES: * compute: `google_compute_instance`, `google_compute_instance_from_template` have had the `network_interface.0.access_config.0.assigned_nat_ip` field deprecated. Please use `network_interface.0.access_config.0.nat_ip` instead. * compute: `google_compute_instance_group_manager` and `google_compute_region_instance_group_manager` have had their `version`, `auto_healing_policies`, and `rolling_update_policy` fields deprecated. `google_compute_instance_group_manager` also now accepts `REPLACE` for `update_strategy`, which is an alias for `RESTART`, and is preferred. [GH-2156] * project: `google_project`'s `app_engine` sub-block has been deprecated. Please use the `google_app_engine_app` resource instead. Changing between the two should not force project re-creation. [GH-2147] +* project: `google_project_iam_policy`'s `restore_policy` field is now deprecated [GH-2186] FEATURES: * **New Datasource**: `google_compute_instance` [GH-1906] From 054ec287eb4b58854dce545f163dad67d8f979a9 Mon Sep 17 00:00:00 2001 From: Paddy Carver Date: Mon, 8 Oct 2018 13:13:26 -0700 Subject: [PATCH 09/32] Fix go fmt. --- google/resource_google_project_iam_policy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google/resource_google_project_iam_policy.go b/google/resource_google_project_iam_policy.go index a98e242657e..8cfc8f4ce04 100644 --- a/google/resource_google_project_iam_policy.go +++ b/google/resource_google_project_iam_policy.go @@ -44,8 +44,8 @@ func resourceGoogleProjectIamPolicy() *schema.Resource { }, "restore_policy": &schema.Schema{ Deprecated: "This field will be removed alongside the authoritative field. To ignore changes not managed by Terraform, use google_project_iam_binding and google_project_iam_member instead. See https://www.terraform.io/docs/providers/google/r/google_project_iam.html for more information.", - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, }, "disable_project": &schema.Schema{ Deprecated: "This will be removed with the authoritative field. Use lifecycle.prevent_destroy instead.", From a4b26062b47ea3836066586a0bdde504d0e78a3b Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Mon, 8 Oct 2018 20:14:37 +0000 Subject: [PATCH 10/32] v1.19.0 --- CHANGELOG.md | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b1f17788b4..509ba7fc67c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,35 +1,35 @@ -## 1.19.0 (Unreleased) +## 1.19.0 (October 08, 2018) BACKWARDS INCOMPATIBILITIES: -* all: beta fields have been deprecated in favor of the new `google-beta` provider. See https://terraform.io/docs/providers/google/provider_versions.html for more info. [GH-2152] [GH-2142] -* bigtable: `google_bigtable_instance` deprecated the `cluster_id`, `zone`, `num_nodes`, and `storage_type` fields, creating a `cluster` block containing those fields instead. [GH-2161] -* cloudfunctions: `google_cloudfunctions_function` and `datasource_google_cloudfunctions_function` deprecated `trigger_bucket` and `trigger_topic` in favor of the new `event_trigger` field, and deprecated `retry_on_failure` in favor of the `event_trigger.failure_policy.retry` field. [GH-2158] -* compute: `google_compute_instance`, `google_compute_instance_template`, `google_compute_instance_from_template` have had the `network_interface.address` field deprecated and the `network_interface.network_ip` field undeprecated to better match the API. Terraform configurations should migrate from `network_interface.address` to `network_interface.network_ip`. [GH-2096] +* all: beta fields have been deprecated in favor of the new `google-beta` provider. See https://terraform.io/docs/providers/google/provider_versions.html for more info. ([#2152](https://github.com/terraform-providers/terraform-provider-google/issues/2152)] [[#2142](https://github.com/terraform-providers/terraform-provider-google/issues/2142)) +* bigtable: `google_bigtable_instance` deprecated the `cluster_id`, `zone`, `num_nodes`, and `storage_type` fields, creating a `cluster` block containing those fields instead. ([#2161](https://github.com/terraform-providers/terraform-provider-google/issues/2161)) +* cloudfunctions: `google_cloudfunctions_function` and `datasource_google_cloudfunctions_function` deprecated `trigger_bucket` and `trigger_topic` in favor of the new `event_trigger` field, and deprecated `retry_on_failure` in favor of the `event_trigger.failure_policy.retry` field. ([#2158](https://github.com/terraform-providers/terraform-provider-google/issues/2158)) +* compute: `google_compute_instance`, `google_compute_instance_template`, `google_compute_instance_from_template` have had the `network_interface.address` field deprecated and the `network_interface.network_ip` field undeprecated to better match the API. Terraform configurations should migrate from `network_interface.address` to `network_interface.network_ip`. ([#2096](https://github.com/terraform-providers/terraform-provider-google/issues/2096)) * compute: `google_compute_instance`, `google_compute_instance_from_template` have had the `network_interface.0.access_config.0.assigned_nat_ip` field deprecated. Please use `network_interface.0.access_config.0.nat_ip` instead. -* compute: `google_compute_instance_group_manager` and `google_compute_region_instance_group_manager` have had their `version`, `auto_healing_policies`, and `rolling_update_policy` fields deprecated. `google_compute_instance_group_manager` also now accepts `REPLACE` for `update_strategy`, which is an alias for `RESTART`, and is preferred. [GH-2156] -* project: `google_project`'s `app_engine` sub-block has been deprecated. Please use the `google_app_engine_app` resource instead. Changing between the two should not force project re-creation. [GH-2147] -* project: `google_project_iam_policy`'s `restore_policy` field is now deprecated [GH-2186] +* compute: `google_compute_instance_group_manager` and `google_compute_region_instance_group_manager` have had their `version`, `auto_healing_policies`, and `rolling_update_policy` fields deprecated. `google_compute_instance_group_manager` also now accepts `REPLACE` for `update_strategy`, which is an alias for `RESTART`, and is preferred. ([#2156](https://github.com/terraform-providers/terraform-provider-google/issues/2156)) +* project: `google_project`'s `app_engine` sub-block has been deprecated. Please use the `google_app_engine_app` resource instead. Changing between the two should not force project re-creation. ([#2147](https://github.com/terraform-providers/terraform-provider-google/issues/2147)) +* project: `google_project_iam_policy`'s `restore_policy` field is now deprecated ([#2186](https://github.com/terraform-providers/terraform-provider-google/issues/2186)) FEATURES: -* **New Datasource**: `google_compute_instance` [GH-1906] -* **New Resource**: `google_compute_interconnect_attachment` [GH-1140] -* **New Resource**: `google_filestore_instance` [GH-2088] -* **New Resource**: `google_app_engine_application` [GH-2147] +* **New Datasource**: `google_compute_instance` ([#1906](https://github.com/terraform-providers/terraform-provider-google/issues/1906)) +* **New Resource**: `google_compute_interconnect_attachment` ([#1140](https://github.com/terraform-providers/terraform-provider-google/issues/1140)) +* **New Resource**: `google_filestore_instance` ([#2088](https://github.com/terraform-providers/terraform-provider-google/issues/2088)) +* **New Resource**: `google_app_engine_application` ([#2147](https://github.com/terraform-providers/terraform-provider-google/issues/2147)) ENHANCEMENTS: -* container: Add `enable_tpu` flag to google_container_cluster [GH-1974] -* dns: `google_dns_managed_zone` is now importable [GH-1944] -* dns: `google_dns_managed_zone` is now entirely GA [GH-2154] -* runtimeconfig: `google_runtimeconfig_config` and `google_runtimeconfig_variable` are now importable. [GH-2054] -* services: containeranalysis.googleapis.com can now be enabled [GH-2095] +* container: Add `enable_tpu` flag to google_container_cluster ([#1974](https://github.com/terraform-providers/terraform-provider-google/issues/1974)) +* dns: `google_dns_managed_zone` is now importable ([#1944](https://github.com/terraform-providers/terraform-provider-google/issues/1944)) +* dns: `google_dns_managed_zone` is now entirely GA ([#2154](https://github.com/terraform-providers/terraform-provider-google/issues/2154)) +* runtimeconfig: `google_runtimeconfig_config` and `google_runtimeconfig_variable` are now importable. ([#2054](https://github.com/terraform-providers/terraform-provider-google/issues/2054)) +* services: containeranalysis.googleapis.com can now be enabled ([#2095](https://github.com/terraform-providers/terraform-provider-google/issues/2095)) BUG FIXES: -* compute: fix instance template interaction with regional disk self links [GH-2138] -* compute: fix diff when using image shorthands for instance templates [GH-1995] -* compute: fix error when reading instance templates created from disks and referenced by name instead of self_link [GH-2153] -* container: Make max_pods_per_node ForceNew [GH-2139] -* services: make google_project_service more resilient to projects being deleted [GH-2090] -* sql: retry failed sql calls [GH-2174] +* compute: fix instance template interaction with regional disk self links ([#2138](https://github.com/terraform-providers/terraform-provider-google/issues/2138)) +* compute: fix diff when using image shorthands for instance templates ([#1995](https://github.com/terraform-providers/terraform-provider-google/issues/1995)) +* compute: fix error when reading instance templates created from disks and referenced by name instead of self_link ([#2153](https://github.com/terraform-providers/terraform-provider-google/issues/2153)) +* container: Make max_pods_per_node ForceNew ([#2139](https://github.com/terraform-providers/terraform-provider-google/issues/2139)) +* services: make google_project_service more resilient to projects being deleted ([#2090](https://github.com/terraform-providers/terraform-provider-google/issues/2090)) +* sql: retry failed sql calls ([#2174](https://github.com/terraform-providers/terraform-provider-google/issues/2174)) ## 1.18.0 (September 17, 2018) From 99c8a17a3e882efe60063905f91986fe93ff7ce5 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Mon, 8 Oct 2018 20:21:58 +0000 Subject: [PATCH 11/32] Cleanup after v1.19.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 509ba7fc67c..8592982b843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.0.0 (Unreleased) ## 1.19.0 (October 08, 2018) BACKWARDS INCOMPATIBILITIES: From fb8721083fae072a19fda2dee2c306aa264745ec Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Tue, 9 Oct 2018 08:21:19 -0700 Subject: [PATCH 12/32] Fix handwritten provider_versions links --- ...gle_container_engine_versions.html.markdown | 2 +- website/docs/index.html.markdown | 2 +- website/docs/provider_reference.html.markdown | 2 +- .../r/compute_backend_service.html.markdown | 2 +- ...ompute_global_forwarding_rule.html.markdown | 4 ++-- ...ompute_instance_group_manager.html.markdown | 6 +++--- ...region_instance_group_manager.html.markdown | 6 +++--- .../r/compute_subnetwork_iam.html.markdown | 2 +- website/docs/r/container_cluster.html.markdown | 18 +++++++++--------- .../docs/r/container_node_pool.html.markdown | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/website/docs/d/google_container_engine_versions.html.markdown b/website/docs/d/google_container_engine_versions.html.markdown index ce4d071b7aa..b1b1cc35798 100644 --- a/website/docs/d/google_container_engine_versions.html.markdown +++ b/website/docs/d/google_container_engine_versions.html.markdown @@ -38,7 +38,7 @@ The following arguments are supported: * `region` (optional) - Region to list available cluster versions for. Should match the region the cluster will be deployed in. For regional clusters, this value must be specified and cannot be inferred from provider-level region. One of zone, region, or provider-level zone is required. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `project` (optional) - ID of the project to list available cluster versions for. Should match the project the cluster will be deployed to. Defaults to the project that the provider is authenticated with. diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index cedc65c1f32..708c69f00f8 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -8,7 +8,7 @@ description: |- # Google Cloud Platform Provider --> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) +-> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on how to use `google-beta`. The Google provider is used to configure your [Google Cloud Platform](https://cloud.google.com/) infrastructure. diff --git a/website/docs/provider_reference.html.markdown b/website/docs/provider_reference.html.markdown index 37c56283d57..c4aa8a2dbb9 100644 --- a/website/docs/provider_reference.html.markdown +++ b/website/docs/provider_reference.html.markdown @@ -8,7 +8,7 @@ description: |- # `google` provider reference --> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) +-> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on how to use `google-beta`. The `google` provider block is used to configure default values for your GCP diff --git a/website/docs/r/compute_backend_service.html.markdown b/website/docs/r/compute_backend_service.html.markdown index ae0dc10a964..ee73436bb51 100644 --- a/website/docs/r/compute_backend_service.html.markdown +++ b/website/docs/r/compute_backend_service.html.markdown @@ -87,7 +87,7 @@ but still work to finish started ones). Defaults to `300`. * `custom_request_headers` - (Optional) Headers that the HTTP/S load balancer should add to proxied requests. See [guide](https://cloud.google.com/compute/docs/load-balancing/http/backend-service#user-defined-request-headers) for details. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `description` - (Optional) The textual description for the backend service. diff --git a/website/docs/r/compute_global_forwarding_rule.html.markdown b/website/docs/r/compute_global_forwarding_rule.html.markdown index 91b02755591..d779bdf7ee6 100644 --- a/website/docs/r/compute_global_forwarding_rule.html.markdown +++ b/website/docs/r/compute_global_forwarding_rule.html.markdown @@ -107,7 +107,7 @@ The IP Version that will be used by this resource's address. One of `"IPV4"` or * `labels` - (Optional) A set of key/value label pairs to assign to the resource. This property is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. ## Attributes Reference @@ -118,7 +118,7 @@ exported: * `self_link` - The URI of the created resource. * `label_fingerprint` - The current label fingerprint. This property is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. ## Import diff --git a/website/docs/r/compute_instance_group_manager.html.markdown b/website/docs/r/compute_instance_group_manager.html.markdown index e91d028b230..60ec63e8ba5 100644 --- a/website/docs/r/compute_instance_group_manager.html.markdown +++ b/website/docs/r/compute_instance_group_manager.html.markdown @@ -99,7 +99,7 @@ The following arguments are supported: a target size will respect the setting, and the one without target size will be applied to all remaining Instances (top level target_size - each version target_size). This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `name` - (Required) The name of the instance group manager. Must be 1-63 characters long and comply with @@ -143,11 +143,11 @@ The following arguments are supported: * `auto_healing_policies` - (Optional) The autohealing policies for this managed instance group. You can specify only one value. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/creating-groups-of-managed-instances#monitoring_groups). This property is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `rolling_update_policy` - (Optional) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/instanceGroupManagers/patch) This property is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. - - - The **rolling_update_policy** block supports: diff --git a/website/docs/r/compute_region_instance_group_manager.html.markdown b/website/docs/r/compute_region_instance_group_manager.html.markdown index 92068921db6..8b8eea0bbed 100644 --- a/website/docs/r/compute_region_instance_group_manager.html.markdown +++ b/website/docs/r/compute_region_instance_group_manager.html.markdown @@ -100,7 +100,7 @@ The following arguments are supported: a target size will respect the setting, and the one without target size will be applied to all remaining Instances (top level target_size - each version target_size). This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `name` - (Required) The name of the instance group manager. Must be 1-63 characters long and comply with @@ -143,12 +143,12 @@ The following arguments are supported: * `auto_healing_policies` - (Optional) The autohealing policies for this managed instance group. You can specify only one value. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/creating-groups-of-managed-instances#monitoring_groups). This property is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `rolling_update_policy` - (Optional) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/regionInstanceGroupManagers/patch) This property is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `distribution_policy_zones` - (Optional) The distribution policy for this managed instance diff --git a/website/docs/r/compute_subnetwork_iam.html.markdown b/website/docs/r/compute_subnetwork_iam.html.markdown index b8ecab6041c..7ec15f16d4a 100644 --- a/website/docs/r/compute_subnetwork_iam.html.markdown +++ b/website/docs/r/compute_subnetwork_iam.html.markdown @@ -9,7 +9,7 @@ description: |- # IAM policy for GCE subnetwork ~> **Warning:** These resources are in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta resources. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta resources. Three different resources help you manage your IAM policy for GCE subnetwork. Each of these resources serves a different use case: diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index c6f1cba2afb..1682d891ff6 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -81,7 +81,7 @@ output "cluster_ca_certificate" { In a Regional Cluster, the number of nodes specified in `initial_node_count` is created in three zones of the region (this can be changed by setting `additional_zones`). This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `additional_zones` - (Optional) The list of additional Google Compute Engine locations in which the cluster's nodes should be located. If additional zones are @@ -99,7 +99,7 @@ output "cluster_ca_certificate" { * `enable_binary_authorization` - (Optional) Enable Binary Authorization for this cluster. If enabled, all container images will be validated by Google Binary Authorization. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `enable_kubernetes_alpha` - (Optional) Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded @@ -108,7 +108,7 @@ output "cluster_ca_certificate" { * `enable_tpu` - (Optional) Whether to enable Cloud TPU resources in this cluster. See the [official documentation](https://cloud.google.com/tpu/docs/kubernetes-engine-setup). This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `enable_legacy_abac` - (Optional) Whether the ABAC authorizer is enabled for this cluster. When enabled, identities in the system, including service accounts, nodes, and controllers, @@ -140,7 +140,7 @@ output "cluster_ca_certificate" { [RFC1918](https://tools.ietf.org/html/rfc1918) block for the master's VPC. The master range must not overlap with any subnet in your cluster's VPC. The master and your cluster use VPC peering. Must be specified in CIDR notation and must be `/28` subnet. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. This field is deprecated, use `private_cluster_config.master_ipv4_cidr_block` instead. * `min_master_version` - (Optional) The minimum version of the master. GKE @@ -179,19 +179,19 @@ output "cluster_ca_certificate" { [PodSecurityPolicy](https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies) feature. Structure is documented below. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `private_cluster_config` - (Optional) A set of options for creating a private cluster. Structure is documented below. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `private_cluster` - (Optional, Deprecated) If true, a [private cluster](https://cloud.google.com/kubernetes-engine/docs/how-to/private-clusters) will be created, meaning nodes do not get public IP addresses. It is mandatory to specify `master_ipv4_cidr_block` and `ip_allocation_policy` with this option. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. This field is deprecated, use `private_cluster_config.enable_private_nodes` instead. * `project` - (Optional) The ID of the project in which the resource belongs. If it @@ -375,12 +375,12 @@ The `node_config` block supports: * `taint` - (Optional) List of [kubernetes taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) to apply to each node. Structure is documented below. This property is in beta, and should be - used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) + used with the terraform-provider-google-beta provider. See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `workload_metadata_config` - (Optional) Metadata configuration to expose to workloads on the node pool. Structure is documented below. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. The `guest_accelerator` block supports: diff --git a/website/docs/r/container_node_pool.html.markdown b/website/docs/r/container_node_pool.html.markdown index e9391fb19fb..fa2f63db79f 100644 --- a/website/docs/r/container_node_pool.html.markdown +++ b/website/docs/r/container_node_pool.html.markdown @@ -114,7 +114,7 @@ resource "google_container_node_pool" "regional-np" { * `region` - (Optional) The region in which the cluster resides (for regional clusters). This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `cluster` - (Required) The cluster to create the node pool for. Cluster must be present in `zone` provided for zonal clusters. @@ -135,7 +135,7 @@ Note: You must be provide region for regional clusters and zone for zonal cluste Note that this does not work on node pools which are "route-based" - that is, node pools belonging to clusters that do not have IP Aliasing enabled. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `name` - (Optional) The name of the node pool. If left blank, Terraform will auto-generate a unique name. From 95c57ac681235b2554288cafbfd1536cf45f6ab9 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Tue, 9 Oct 2018 15:26:38 +0000 Subject: [PATCH 13/32] Fix generated provider_versions links --- google/resource_binaryauthorization_attestor.go | 2 +- google/resource_binaryauthorization_policy.go | 2 +- google/resource_compute_address.go | 4 ++-- google/resource_compute_firewall.go | 2 +- google/resource_compute_forwarding_rule.go | 6 +++--- google/resource_compute_global_address.go | 8 ++++---- google/resource_containeranalysis_note.go | 2 +- google/resource_filestore_instance.go | 2 +- website/docs/r/binaryauthorization_attestor.html.markdown | 2 +- website/docs/r/binaryauthorization_policy.html.markdown | 2 +- website/docs/r/compute_address.html.markdown | 4 ++-- website/docs/r/compute_firewall.html.markdown | 2 +- website/docs/r/compute_forwarding_rule.html.markdown | 6 +++--- website/docs/r/compute_global_address.html.markdown | 8 ++++---- website/docs/r/containeranalysis_note.html.markdown | 2 +- website/docs/r/filestore_instance.html.markdown | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/google/resource_binaryauthorization_attestor.go b/google/resource_binaryauthorization_attestor.go index 692de4b9bc5..7a4d02a255a 100644 --- a/google/resource_binaryauthorization_attestor.go +++ b/google/resource_binaryauthorization_attestor.go @@ -35,7 +35,7 @@ func resourceBinaryAuthorizationAttestor() *schema.Resource { }, DeprecationMessage: `This resource is in beta and will be removed from this provider. Use the BinaryAuthorizationAttestor resource in the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta resources.`, Schema: map[string]*schema.Schema{ "attestation_authority_note": { diff --git a/google/resource_binaryauthorization_policy.go b/google/resource_binaryauthorization_policy.go index 98aed7215b0..49a5a2e6f9f 100644 --- a/google/resource_binaryauthorization_policy.go +++ b/google/resource_binaryauthorization_policy.go @@ -53,7 +53,7 @@ func resourceBinaryAuthorizationPolicy() *schema.Resource { }, DeprecationMessage: `This resource is in beta and will be removed from this provider. Use the BinaryAuthorizationPolicy resource in the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta resources.`, Schema: map[string]*schema.Schema{ "default_admission_rule": { diff --git a/google/resource_compute_address.go b/google/resource_compute_address.go index c20035e984b..87808f2b17b 100644 --- a/google/resource_compute_address.go +++ b/google/resource_compute_address.go @@ -72,7 +72,7 @@ func resourceComputeAddress() *schema.Resource { Optional: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, Elem: &schema.Schema{Type: schema.TypeString}, }, "network_tier": { @@ -105,7 +105,7 @@ See https://terraform.io/docs/provider/google/provider_versions.html for more de Computed: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, }, "users": { Type: schema.TypeList, diff --git a/google/resource_compute_firewall.go b/google/resource_compute_firewall.go index 7d238060072..6e621dc5c9a 100644 --- a/google/resource_compute_firewall.go +++ b/google/resource_compute_firewall.go @@ -150,7 +150,7 @@ func resourceComputeFirewall() *schema.Resource { Optional: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, }, "priority": { Type: schema.TypeInt, diff --git a/google/resource_compute_forwarding_rule.go b/google/resource_compute_forwarding_rule.go index 4a98587b72f..29030cbd043 100644 --- a/google/resource_compute_forwarding_rule.go +++ b/google/resource_compute_forwarding_rule.go @@ -85,7 +85,7 @@ func resourceComputeForwardingRule() *schema.Resource { Optional: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, Elem: &schema.Schema{Type: schema.TypeString}, }, "load_balancing_scheme": { @@ -138,7 +138,7 @@ See https://terraform.io/docs/provider/google/provider_versions.html for more de ForceNew: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, ValidateFunc: validateGCPName, }, "subnetwork": { @@ -166,7 +166,7 @@ See https://terraform.io/docs/provider/google/provider_versions.html for more de Computed: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, }, "project": { Type: schema.TypeString, diff --git a/google/resource_compute_global_address.go b/google/resource_compute_global_address.go index 3d7aff66323..e87f7f4ef12 100644 --- a/google/resource_compute_global_address.go +++ b/google/resource_compute_global_address.go @@ -74,7 +74,7 @@ func resourceComputeGlobalAddress() *schema.Resource { Optional: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, Elem: &schema.Schema{Type: schema.TypeString}, }, "network": { @@ -83,7 +83,7 @@ See https://terraform.io/docs/provider/google/provider_versions.html for more de ForceNew: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, DiffSuppressFunc: compareSelfLinkOrResourceName, }, "prefix_length": { @@ -92,7 +92,7 @@ See https://terraform.io/docs/provider/google/provider_versions.html for more de ForceNew: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, }, "purpose": { Type: schema.TypeString, @@ -100,7 +100,7 @@ See https://terraform.io/docs/provider/google/provider_versions.html for more de ForceNew: true, Deprecated: `This field is in beta and will be removed from this provider. Use the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta fields.`, ValidateFunc: validation.StringInSlice([]string{"VPC_PEERING", ""}, false), }, "address": { diff --git a/google/resource_containeranalysis_note.go b/google/resource_containeranalysis_note.go index ee975f8b50a..a8738bcad3c 100644 --- a/google/resource_containeranalysis_note.go +++ b/google/resource_containeranalysis_note.go @@ -35,7 +35,7 @@ func resourceContainerAnalysisNote() *schema.Resource { }, DeprecationMessage: `This resource is in beta and will be removed from this provider. Use the ContainerAnalysisNote resource in the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta resources.`, Schema: map[string]*schema.Schema{ "attestation_authority": { diff --git a/google/resource_filestore_instance.go b/google/resource_filestore_instance.go index d6433982ed0..8ca928a0014 100644 --- a/google/resource_filestore_instance.go +++ b/google/resource_filestore_instance.go @@ -39,7 +39,7 @@ func resourceFilestoreInstance() *schema.Resource { }, DeprecationMessage: `This resource is in beta and will be removed from this provider. Use the FilestoreInstance resource in the terraform-provider-google-beta provider to continue using it. -See https://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`, +See https://terraform.io/docs/providers/google/provider_versions.html for more details on beta resources.`, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(300 * time.Second), diff --git a/website/docs/r/binaryauthorization_attestor.html.markdown b/website/docs/r/binaryauthorization_attestor.html.markdown index 1b71efa4530..1c21dd87738 100644 --- a/website/docs/r/binaryauthorization_attestor.html.markdown +++ b/website/docs/r/binaryauthorization_attestor.html.markdown @@ -24,7 +24,7 @@ description: |- An attestor that attests to container image artifacts. ~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta resources. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta resources. To get more information about Attestor, see: diff --git a/website/docs/r/binaryauthorization_policy.html.markdown b/website/docs/r/binaryauthorization_policy.html.markdown index 392b3b2b1c4..65350d8dc68 100644 --- a/website/docs/r/binaryauthorization_policy.html.markdown +++ b/website/docs/r/binaryauthorization_policy.html.markdown @@ -24,7 +24,7 @@ description: |- A policy for container image binary authorization. ~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta resources. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta resources. To get more information about Policy, see: diff --git a/website/docs/r/compute_address.html.markdown b/website/docs/r/compute_address.html.markdown index 1d6419b2bd2..c0779c30f90 100644 --- a/website/docs/r/compute_address.html.markdown +++ b/website/docs/r/compute_address.html.markdown @@ -150,7 +150,7 @@ The following arguments are supported: * `labels` - (Optional) Labels to apply to this address. A list of key->value pairs. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `region` - (Optional) @@ -174,7 +174,7 @@ In addition to the arguments listed above, the following computed attributes are * `label_fingerprint` - The fingerprint used for optimistic locking of this resource. Used internally during updates. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `self_link` - The URI of the created resource. diff --git a/website/docs/r/compute_firewall.html.markdown b/website/docs/r/compute_firewall.html.markdown index 5588e14783e..67b34ab555c 100644 --- a/website/docs/r/compute_firewall.html.markdown +++ b/website/docs/r/compute_firewall.html.markdown @@ -130,7 +130,7 @@ The following arguments are supported: This field denotes whether to enable logging for a particular firewall rule. If logging is enabled, logs will be exported to Stackdriver. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `priority` - (Optional) diff --git a/website/docs/r/compute_forwarding_rule.html.markdown b/website/docs/r/compute_forwarding_rule.html.markdown index ada776cd3ac..b2db4481789 100644 --- a/website/docs/r/compute_forwarding_rule.html.markdown +++ b/website/docs/r/compute_forwarding_rule.html.markdown @@ -183,7 +183,7 @@ The following arguments are supported: * `labels` - (Optional) Labels to apply to this forwarding rule. A list of key->value pairs. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `network_tier` - (Optional) @@ -203,7 +203,7 @@ The following arguments are supported: must be a dash, lowercase letter, or digit, except the last character, which cannot be a dash. This field is only used for internal load balancing. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `region` - (Optional) @@ -228,7 +228,7 @@ In addition to the arguments listed above, the following computed attributes are * `service_name` - The internal fully qualified service name for this Forwarding Rule. This field is only used for internal load balancing. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `self_link` - The URI of the created resource. diff --git a/website/docs/r/compute_global_address.html.markdown b/website/docs/r/compute_global_address.html.markdown index c092e9d987d..5a096ff0f98 100644 --- a/website/docs/r/compute_global_address.html.markdown +++ b/website/docs/r/compute_global_address.html.markdown @@ -66,7 +66,7 @@ The following arguments are supported: * `labels` - (Optional) Labels to apply to this address. A list of key->value pairs. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `ip_version` - (Optional) @@ -78,7 +78,7 @@ The following arguments are supported: The prefix length of the IP range. If not present, it means the address field is a single IP address. This field is not applicable to addresses with addressType=EXTERNAL. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `address_type` - (Optional) @@ -91,7 +91,7 @@ The following arguments are supported: The purpose of the resource. For global internal addresses it can be * VPC_PEERING - for peer networks This should only be set when using an Internal address. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `network` - (Optional) @@ -99,7 +99,7 @@ The following arguments are supported: must be in RFC1918 space. The network cannot be deleted if there are any reserved IP ranges referring to it. This should only be set when using an Internal address. This property is in beta, and should be used with the terraform-provider-google-beta provider. - See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields. + See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta fields. * `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used. diff --git a/website/docs/r/containeranalysis_note.html.markdown b/website/docs/r/containeranalysis_note.html.markdown index 9e50ffdd1f8..dff7b7eb8dd 100644 --- a/website/docs/r/containeranalysis_note.html.markdown +++ b/website/docs/r/containeranalysis_note.html.markdown @@ -24,7 +24,7 @@ description: |- Provides a detailed description of a Note. ~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta resources. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta resources. To get more information about Note, see: diff --git a/website/docs/r/filestore_instance.html.markdown b/website/docs/r/filestore_instance.html.markdown index 13bd842b4ca..03fb7cc33dd 100644 --- a/website/docs/r/filestore_instance.html.markdown +++ b/website/docs/r/filestore_instance.html.markdown @@ -24,7 +24,7 @@ description: |- A Google Cloud Filestore instance. ~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/provider/google/provider_versions.html) for more details on beta resources. +See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on beta resources. To get more information about Instance, see: From 0c912f8a10a74f3887ea984b127cbf04c89c411a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Portebois?= Date: Tue, 9 Oct 2018 06:24:09 -0400 Subject: [PATCH 14/32] Fix Provider Versions link target Fixes [https://github.com/hashicorp/terraform/issues/19028](#19028) --- website/docs/index.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 708c69f00f8..43b6f1297c7 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -8,7 +8,8 @@ description: |- # Google Cloud Platform Provider --> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) + +-> We recently introduced the `google-beta` provider. See [Provider Versions](https://www.terraform.io/docs/providers/google/provider_versions.html) for more details on how to use `google-beta`. The Google provider is used to configure your [Google Cloud Platform](https://cloud.google.com/) infrastructure. From c011da1dcb59d6349bd76828d4e844c0ccd86e6f Mon Sep 17 00:00:00 2001 From: Pavel Skuratovich Date: Tue, 9 Oct 2018 12:08:43 +0300 Subject: [PATCH 15/32] Update index.html.markdown --- website/docs/index.html.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 43b6f1297c7..708c69f00f8 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -8,8 +8,7 @@ description: |- # Google Cloud Platform Provider - --> We recently introduced the `google-beta` provider. See [Provider Versions](https://www.terraform.io/docs/providers/google/provider_versions.html) +-> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) for more details on how to use `google-beta`. The Google provider is used to configure your [Google Cloud Platform](https://cloud.google.com/) infrastructure. From c4cf0edd3445dd28b135172c03a45aa329efa4a5 Mon Sep 17 00:00:00 2001 From: jmusselwhite Date: Tue, 9 Oct 2018 09:02:16 -0700 Subject: [PATCH 16/32] Adding the missing word 'peer' --- website/docs/r/compute_router_peer.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/compute_router_peer.html.markdown b/website/docs/r/compute_router_peer.html.markdown index a5fd0b03389..882506069e1 100644 --- a/website/docs/r/compute_router_peer.html.markdown +++ b/website/docs/r/compute_router_peer.html.markdown @@ -6,7 +6,7 @@ description: |- Manages a Cloud Router BGP peer. --- -# google\_compute\_router +# google\_compute\_router\_peer Manages a Cloud Router BGP peer. For more information see [the official documentation](https://cloud.google.com/compute/docs/cloudrouter) From 9f74d5f5c7cfab81fa49aba8f1772e98e69ea84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Somfai?= Date: Tue, 9 Oct 2018 18:18:14 +0200 Subject: [PATCH 17/32] typo fix --- .../docs/d/google_container_registry_repository.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/google_container_registry_repository.html.markdown b/website/docs/d/google_container_registry_repository.html.markdown index 3df37767e7f..a695b31b728 100644 --- a/website/docs/d/google_container_registry_repository.html.markdown +++ b/website/docs/d/google_container_registry_repository.html.markdown @@ -23,7 +23,7 @@ output "gcr_location" { ``` ## Argument Reference -* `project`: (Optional) The project ID that this repository is attached to. If not provider, provider project will be used instead. +* `project`: (Optional) The project ID that this repository is attached to. If not provided, provider project will be used instead. * `region`: (Optional) The GCR region to use. As of this writing, one of `asia`, `eu`, and `us`. See [the documentation](https://cloud.google.com/container-registry/docs/pushing-and-pulling) for additional information. ## Attributes Reference From d5ea3bf41377e4e6437062aff9b975540760b01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Somfai?= Date: Tue, 9 Oct 2018 18:33:50 +0200 Subject: [PATCH 18/32] fix a list rendering issue The list item under the "Attribues reference" section is rendered incorrectly. See the screenshot here: https://prnt.sc/l434b0 --- .../docs/d/google_container_registry_repository.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/google_container_registry_repository.html.markdown b/website/docs/d/google_container_registry_repository.html.markdown index 3df37767e7f..60a96fe8d57 100644 --- a/website/docs/d/google_container_registry_repository.html.markdown +++ b/website/docs/d/google_container_registry_repository.html.markdown @@ -28,4 +28,5 @@ output "gcr_location" { ## Attributes Reference In addition to the arguments listed above, this data source exports: + * `repository_url`: The URL at which the repository can be accessed. From f24efcc83f99cb29cc1654228ff1496ec394ce73 Mon Sep 17 00:00:00 2001 From: Paddy Date: Wed, 10 Oct 2018 10:03:13 -0700 Subject: [PATCH 19/32] Update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8592982b843..4bfa6adacaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -## 2.0.0 (Unreleased) +## 1.19.1 (Unreleased) + +BUG FIXES: + +* all: fix deprecation links in resources [GH-2197] [GH-2196] + ## 1.19.0 (October 08, 2018) BACKWARDS INCOMPATIBILITIES: From a0979fe66a8f505c5e57b12a1a153a8bb33fb1f5 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Wed, 10 Oct 2018 10:30:55 -0700 Subject: [PATCH 20/32] don't try to parse the source image if there is none --- google/resource_compute_instance_template.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go index b47f469fddd..854616fd04b 100644 --- a/google/resource_compute_instance_template.go +++ b/google/resource_compute_instance_template.go @@ -689,15 +689,19 @@ func flattenDisks(disks []*computeBeta.AttachedDisk, d *schema.ResourceData, def for _, disk := range disks { diskMap := make(map[string]interface{}) if disk.InitializeParams != nil { - selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage) - if err != nil { - return nil, errwrap.Wrapf("Error expanding source image input to self_link: {{err}}", err) - } - path, err := getRelativePath(selfLink) - if err != nil { - return nil, errwrap.Wrapf("Error getting relative path for source image: {{err}}", err) + if disk.InitializeParams.SourceImage != "" { + selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage) + if err != nil { + return nil, errwrap.Wrapf("Error expanding source image input to self_link: {{err}}", err) + } + path, err := getRelativePath(selfLink) + if err != nil { + return nil, errwrap.Wrapf("Error getting relative path for source image: {{err}}", err) + } + diskMap["source_image"] = path + } else { + diskMap["source_image"] = "" } - diskMap["source_image"] = path diskMap["disk_type"] = disk.InitializeParams.DiskType diskMap["disk_name"] = disk.InitializeParams.DiskName diskMap["disk_size_gb"] = disk.InitializeParams.DiskSizeGb From 8f35c8285f31f89d39571e19cd243bd1ce017108 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Tue, 9 Oct 2018 11:25:24 -0700 Subject: [PATCH 21/32] set app engine to empty if api not enabled --- google/resource_google_project.go | 1 + 1 file changed, 1 insertion(+) diff --git a/google/resource_google_project.go b/google/resource_google_project.go index ed6db66ffa5..553c06b7301 100644 --- a/google/resource_google_project.go +++ b/google/resource_google_project.go @@ -383,6 +383,7 @@ func resourceGoogleProjectRead(d *schema.ResourceData, meta interface{}) error { d.Set("app_engine", []map[string]interface{}{}) } else if isApiNotEnabledError(err) { log.Printf("[WARN] App Engine Admin API not enabled, please enable it to read App Engine info about project %q: %s", pid, err.Error()) + d.Set("app_engine", []map[string]interface{}{}) } else { appBlocks, err := flattenAppEngineApp(app) if err != nil { From 3f40d2547a38126cfee70836714f44bd5b49651b Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Wed, 10 Oct 2018 10:39:09 -0700 Subject: [PATCH 22/32] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bfa6adacaa..646ae83a11b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ BUG FIXES: * all: fix deprecation links in resources [GH-2197] [GH-2196] +* compute: allow instance templates to have disks with no source image set [GH-2218] +* project: fix plan output when app engine api is not enabled [GH-2204] ## 1.19.0 (October 08, 2018) From 5512f8a9617246fbee2d13dcc0dc45a873fb7c15 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Thu, 11 Oct 2018 09:37:31 -0700 Subject: [PATCH 23/32] Guard against nil empty typelists. --- google/resource_cloudfunctions_function.go | 35 +++++++++---------- google/resource_compute_backend_service.go | 22 ++++++------ google/resource_compute_security_policy.go | 6 ++-- google/resource_container_cluster.go | 15 +++++--- google/resource_google_organization_policy.go | 6 ++-- google/resource_pubsub_subscription.go | 2 +- google/resource_sql_database_instance.go | 12 +++---- 7 files changed, 50 insertions(+), 48 deletions(-) diff --git a/google/resource_cloudfunctions_function.go b/google/resource_cloudfunctions_function.go index d0a44f888f9..41c877664a3 100644 --- a/google/resource_cloudfunctions_function.go +++ b/google/resource_cloudfunctions_function.go @@ -586,28 +586,25 @@ func resourceCloudFunctionsDestroy(d *schema.ResourceData, meta interface{}) err } func expandEventTrigger(configured []interface{}, project string) *cloudfunctions.EventTrigger { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } - if data, ok := configured[0].(map[string]interface{}); ok { - eventType := data["event_type"].(string) - shape := "" - switch { - case strings.HasPrefix(eventType, "providers/cloud.storage/eventTypes/"): - shape = "projects/%s/buckets/%s" - case strings.HasPrefix(eventType, "providers/cloud.pubsub/eventTypes/"): - shape = "projects/%s/topics/%s" - } - - return &cloudfunctions.EventTrigger{ - EventType: eventType, - Resource: fmt.Sprintf(shape, project, data["resource"].(string)), - FailurePolicy: expandFailurePolicy(data["failure_policy"].([]interface{})), - } + data := configured[0].(map[string]interface{}) + eventType := data["event_type"].(string) + shape := "" + switch { + case strings.HasPrefix(eventType, "providers/cloud.storage/eventTypes/"): + shape = "projects/%s/buckets/%s" + case strings.HasPrefix(eventType, "providers/cloud.pubsub/eventTypes/"): + shape = "projects/%s/topics/%s" } - return nil + return &cloudfunctions.EventTrigger{ + EventType: eventType, + Resource: fmt.Sprintf(shape, project, data["resource"].(string)), + FailurePolicy: expandFailurePolicy(data["failure_policy"].([]interface{})), + } } func flattenEventTrigger(eventTrigger *cloudfunctions.EventTrigger) []map[string]interface{} { @@ -626,11 +623,11 @@ func flattenEventTrigger(eventTrigger *cloudfunctions.EventTrigger) []map[string } func expandFailurePolicy(configured []interface{}) *cloudfunctions.FailurePolicy { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return &cloudfunctions.FailurePolicy{} } - if data, ok := configured[0].(map[string]interface{}); ok && data["retry"].(bool) { + if data := configured[0].(map[string]interface{}); data["retry"].(bool) { return &cloudfunctions.FailurePolicy{ Retry: &cloudfunctions.Retry{}, } diff --git a/google/resource_compute_backend_service.go b/google/resource_compute_backend_service.go index 319f7e3cb48..fd747ed57e5 100644 --- a/google/resource_compute_backend_service.go +++ b/google/resource_compute_backend_service.go @@ -399,19 +399,17 @@ func resourceComputeBackendServiceDelete(d *schema.ResourceData, meta interface{ } func expandIap(configured []interface{}) *computeBeta.BackendServiceIAP { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } - if data, ok := configured[0].(map[string]interface{}); ok { - return &computeBeta.BackendServiceIAP{ - Enabled: true, - Oauth2ClientId: data["oauth2_client_id"].(string), - Oauth2ClientSecret: data["oauth2_client_secret"].(string), - ForceSendFields: []string{"Enabled", "Oauth2ClientId", "Oauth2ClientSecret"}, - } - } - return nil + data := configured[0].(map[string]interface{}) + return &computeBeta.BackendServiceIAP{ + Enabled: true, + Oauth2ClientId: data["oauth2_client_id"].(string), + Oauth2ClientSecret: data["oauth2_client_secret"].(string), + ForceSendFields: []string{"Enabled", "Oauth2ClientId", "Oauth2ClientSecret"}, + } } func flattenIap(iap *computeBeta.BackendServiceIAP) []map[string]interface{} { @@ -591,11 +589,11 @@ func expandBackendService(d *schema.ResourceData) (*computeBeta.BackendService, } func expandCdnPolicy(configured []interface{}) *computeBeta.BackendServiceCdnPolicy { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } - data := configured[0].(map[string]interface{}) + data := configured[0].(map[string]interface{}) ckp := data["cache_key_policy"].([]interface{}) if len(ckp) == 0 { return nil diff --git a/google/resource_compute_security_policy.go b/google/resource_compute_security_policy.go index 89777a3b994..ff7318df125 100644 --- a/google/resource_compute_security_policy.go +++ b/google/resource_compute_security_policy.go @@ -317,9 +317,10 @@ func expandSecurityPolicyRule(raw interface{}) *compute.SecurityPolicyRule { } func expandSecurityPolicyMatch(configured []interface{}) *compute.SecurityPolicyRuleMatcher { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } + data := configured[0].(map[string]interface{}) return &compute.SecurityPolicyRuleMatcher{ VersionedExpr: data["versioned_expr"].(string), @@ -328,9 +329,10 @@ func expandSecurityPolicyMatch(configured []interface{}) *compute.SecurityPolicy } func expandSecurityPolicyMatchConfig(configured []interface{}) *compute.SecurityPolicyRuleMatcherConfig { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } + data := configured[0].(map[string]interface{}) return &compute.SecurityPolicyRuleMatcherConfig{ SrcIpRanges: convertStringArr(data["src_ip_ranges"].(*schema.Set).List()), diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go index f249cc20c28..e686f9e656d 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -1363,9 +1363,10 @@ func getInstanceGroupUrlsFromManagerUrls(config *Config, igmUrls []string) ([]st func expandClusterAddonsConfig(configured interface{}) *containerBeta.AddonsConfig { l := configured.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } + config := l[0].(map[string]interface{}) ac := &containerBeta.AddonsConfig{} @@ -1406,9 +1407,10 @@ func expandClusterAddonsConfig(configured interface{}) *containerBeta.AddonsConf func expandIPAllocationPolicy(configured interface{}) *containerBeta.IPAllocationPolicy { l := configured.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } + config := l[0].(map[string]interface{}) return &containerBeta.IPAllocationPolicy{ @@ -1427,9 +1429,10 @@ func expandIPAllocationPolicy(configured interface{}) *containerBeta.IPAllocatio func expandMaintenancePolicy(configured interface{}) *containerBeta.MaintenancePolicy { l := configured.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } + maintenancePolicy := l[0].(map[string]interface{}) dailyMaintenanceWindow := maintenancePolicy["daily_maintenance_window"].([]interface{})[0].(map[string]interface{}) startTime := dailyMaintenanceWindow["start_time"].(string) @@ -1444,9 +1447,10 @@ func expandMaintenancePolicy(configured interface{}) *containerBeta.MaintenanceP func expandMasterAuth(configured interface{}) *containerBeta.MasterAuth { l := configured.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } + masterAuth := l[0].(map[string]interface{}) result := &containerBeta.MasterAuth{ Username: masterAuth["username"].(string), @@ -1507,9 +1511,10 @@ func expandNetworkPolicy(configured interface{}) *containerBeta.NetworkPolicy { func expandPodSecurityPolicyConfig(configured interface{}) *containerBeta.PodSecurityPolicyConfig { l := configured.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil } + config := l[0].(map[string]interface{}) return &containerBeta.PodSecurityPolicyConfig{ Enabled: config["enabled"].(bool), diff --git a/google/resource_google_organization_policy.go b/google/resource_google_organization_policy.go index 71c9cba383a..6e85947e44c 100644 --- a/google/resource_google_organization_policy.go +++ b/google/resource_google_organization_policy.go @@ -263,7 +263,7 @@ func flattenRestoreOrganizationPolicy(restore_policy *cloudresourcemanager.Resto } func expandBooleanOrganizationPolicy(configured []interface{}) *cloudresourcemanager.BooleanPolicy { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } @@ -274,7 +274,7 @@ func expandBooleanOrganizationPolicy(configured []interface{}) *cloudresourceman } func expandRestoreOrganizationPolicy(configured []interface{}) (*cloudresourcemanager.RestoreDefault, error) { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil, nil } @@ -321,7 +321,7 @@ func flattenListOrganizationPolicy(policy *cloudresourcemanager.ListPolicy) []ma } func expandListOrganizationPolicy(configured []interface{}) (*cloudresourcemanager.ListPolicy, error) { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil, nil } diff --git a/google/resource_pubsub_subscription.go b/google/resource_pubsub_subscription.go index cce8f1976ca..f4731a3f5e8 100644 --- a/google/resource_pubsub_subscription.go +++ b/google/resource_pubsub_subscription.go @@ -214,7 +214,7 @@ func flattenPubsubSubscriptionPushConfig(pushConfig *pubsub.PushConfig) []map[st } func expandPubsubSubscriptionPushConfig(configured []interface{}) *pubsub.PushConfig { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { // An empty `pushConfig` indicates that the Pub/Sub system should stop pushing messages // from the given subscription and allow messages to be pulled and acknowledged. return &pubsub.PushConfig{} diff --git a/google/resource_sql_database_instance.go b/google/resource_sql_database_instance.go index 80474dc73f8..1b425743f3e 100644 --- a/google/resource_sql_database_instance.go +++ b/google/resource_sql_database_instance.go @@ -522,7 +522,7 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{}) } func expandSqlDatabaseInstanceSettings(configured []interface{}, secondGen bool) *sqladmin.Settings { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } @@ -556,7 +556,7 @@ func expandSqlDatabaseInstanceSettings(configured []interface{}, secondGen bool) } func expandReplicaConfiguration(configured []interface{}) *sqladmin.ReplicaConfiguration { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } @@ -582,7 +582,7 @@ func expandReplicaConfiguration(configured []interface{}) *sqladmin.ReplicaConfi } func expandMaintenanceWindow(configured []interface{}) *sqladmin.MaintenanceWindow { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } @@ -595,7 +595,7 @@ func expandMaintenanceWindow(configured []interface{}) *sqladmin.MaintenanceWind } func expandLocationPreference(configured []interface{}) *sqladmin.LocationPreference { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } @@ -607,7 +607,7 @@ func expandLocationPreference(configured []interface{}) *sqladmin.LocationPrefer } func expandIpConfiguration(configured []interface{}) *sqladmin.IpConfiguration { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } @@ -654,7 +654,7 @@ func expandDatabaseFlags(configured []interface{}) []*sqladmin.DatabaseFlags { } func expandBackupConfiguration(configured []interface{}) *sqladmin.BackupConfiguration { - if len(configured) == 0 { + if len(configured) == 0 || configured[0] == nil { return nil } From 66c10d2ce1799778e88069357ab8b70a3089e619 Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 11 Oct 2018 12:57:31 -0700 Subject: [PATCH 24/32] Fix empty TypeList expands in generated resources (#2233) /cc @rileykarson --- google/resource_binaryauthorization_attestor.go | 2 +- google/resource_binaryauthorization_policy.go | 2 +- google/resource_compute_autoscaler.go | 6 +++--- google/resource_compute_disk.go | 4 ++-- google/resource_compute_health_check.go | 8 ++++---- google/resource_compute_region_autoscaler.go | 6 +++--- google/resource_compute_region_disk.go | 4 ++-- google/resource_compute_router.go | 2 +- google/resource_containeranalysis_note.go | 4 ++-- google/resource_monitoring_alert_policy.go | 8 ++++---- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/google/resource_binaryauthorization_attestor.go b/google/resource_binaryauthorization_attestor.go index 7a4d02a255a..2948b3b90a1 100644 --- a/google/resource_binaryauthorization_attestor.go +++ b/google/resource_binaryauthorization_attestor.go @@ -317,7 +317,7 @@ func expandBinaryAuthorizationAttestorDescription(v interface{}, d *schema.Resou func expandBinaryAuthorizationAttestorAttestationAuthorityNote(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_binaryauthorization_policy.go b/google/resource_binaryauthorization_policy.go index 49a5a2e6f9f..fcac616f9a7 100644 --- a/google/resource_binaryauthorization_policy.go +++ b/google/resource_binaryauthorization_policy.go @@ -503,7 +503,7 @@ func expandBinaryAuthorizationPolicyClusterAdmissionRulesEnforcementMode(v inter func expandBinaryAuthorizationPolicyDefaultAdmissionRule(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_compute_autoscaler.go b/google/resource_compute_autoscaler.go index 43f0672a748..dac6dddbadd 100644 --- a/google/resource_compute_autoscaler.go +++ b/google/resource_compute_autoscaler.go @@ -538,7 +538,7 @@ func expandComputeAutoscalerDescription(v interface{}, d *schema.ResourceData, c func expandComputeAutoscalerAutoscalingPolicy(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -604,7 +604,7 @@ func expandComputeAutoscalerAutoscalingPolicyCooldownPeriod(v interface{}, d *sc func expandComputeAutoscalerAutoscalingPolicyCpuUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -675,7 +675,7 @@ func expandComputeAutoscalerAutoscalingPolicyMetricType(v interface{}, d *schema func expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_compute_disk.go b/google/resource_compute_disk.go index 7871b98714f..63613836cc4 100644 --- a/google/resource_compute_disk.go +++ b/google/resource_compute_disk.go @@ -1040,7 +1040,7 @@ func expandComputeDiskZone(v interface{}, d *schema.ResourceData, config *Config func expandComputeDiskSourceImageEncryptionKey(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -1101,7 +1101,7 @@ func expandComputeDiskSnapshot(v interface{}, d *schema.ResourceData, config *Co func expandComputeDiskSourceSnapshotEncryptionKey(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_compute_health_check.go b/google/resource_compute_health_check.go index bce9037afd5..ff62218f365 100644 --- a/google/resource_compute_health_check.go +++ b/google/resource_compute_health_check.go @@ -774,7 +774,7 @@ func expandComputeHealthCheckUnhealthyThreshold(v interface{}, d *schema.Resourc func expandComputeHealthCheckHttpHealthCheck(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -830,7 +830,7 @@ func expandComputeHealthCheckHttpHealthCheckProxyHeader(v interface{}, d *schema func expandComputeHealthCheckHttpsHealthCheck(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -886,7 +886,7 @@ func expandComputeHealthCheckHttpsHealthCheckProxyHeader(v interface{}, d *schem func expandComputeHealthCheckTcpHealthCheck(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -942,7 +942,7 @@ func expandComputeHealthCheckTcpHealthCheckProxyHeader(v interface{}, d *schema. func expandComputeHealthCheckSslHealthCheck(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_compute_region_autoscaler.go b/google/resource_compute_region_autoscaler.go index 93a14c7fbb0..4be06005daf 100644 --- a/google/resource_compute_region_autoscaler.go +++ b/google/resource_compute_region_autoscaler.go @@ -534,7 +534,7 @@ func expandComputeRegionAutoscalerDescription(v interface{}, d *schema.ResourceD func expandComputeRegionAutoscalerAutoscalingPolicy(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -600,7 +600,7 @@ func expandComputeRegionAutoscalerAutoscalingPolicyCooldownPeriod(v interface{}, func expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -671,7 +671,7 @@ func expandComputeRegionAutoscalerAutoscalingPolicyMetricType(v interface{}, d * func expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_compute_region_disk.go b/google/resource_compute_region_disk.go index 2944e12f7cc..d05f7bddacf 100644 --- a/google/resource_compute_region_disk.go +++ b/google/resource_compute_region_disk.go @@ -733,7 +733,7 @@ func expandComputeRegionDiskRegion(v interface{}, d *schema.ResourceData, config func expandComputeRegionDiskDiskEncryptionKey(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -775,7 +775,7 @@ func expandComputeRegionDiskSnapshot(v interface{}, d *schema.ResourceData, conf func expandComputeRegionDiskSourceSnapshotEncryptionKey(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_compute_router.go b/google/resource_compute_router.go index f043388e419..b00dd5cf6d6 100644 --- a/google/resource_compute_router.go +++ b/google/resource_compute_router.go @@ -491,7 +491,7 @@ func expandComputeRouterNetwork(v interface{}, d *schema.ResourceData, config *C func expandComputeRouterBgp(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_containeranalysis_note.go b/google/resource_containeranalysis_note.go index a8738bcad3c..1ca490d35c5 100644 --- a/google/resource_containeranalysis_note.go +++ b/google/resource_containeranalysis_note.go @@ -257,7 +257,7 @@ func expandContainerAnalysisNoteName(v interface{}, d *schema.ResourceData, conf func expandContainerAnalysisNoteAttestationAuthority(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -276,7 +276,7 @@ func expandContainerAnalysisNoteAttestationAuthority(v interface{}, d *schema.Re func expandContainerAnalysisNoteAttestationAuthorityHint(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_monitoring_alert_policy.go b/google/resource_monitoring_alert_policy.go index cc28792baee..c0d2c60965f 100644 --- a/google/resource_monitoring_alert_policy.go +++ b/google/resource_monitoring_alert_policy.go @@ -849,7 +849,7 @@ func expandMonitoringAlertPolicyConditions(v interface{}, d *schema.ResourceData func expandMonitoringAlertPolicyConditionsConditionAbsent(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -948,7 +948,7 @@ func expandMonitoringAlertPolicyConditionsConditionAbsentAggregationsCrossSeries func expandMonitoringAlertPolicyConditionsConditionAbsentTrigger(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -994,7 +994,7 @@ func expandMonitoringAlertPolicyConditionsName(v interface{}, d *schema.Resource func expandMonitoringAlertPolicyConditionsConditionThreshold(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] @@ -1137,7 +1137,7 @@ func expandMonitoringAlertPolicyConditionsConditionThresholdComparison(v interfa func expandMonitoringAlertPolicyConditionsConditionThresholdTrigger(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] From 42dd317f1077b14aca89f64b719c2b54a1fc9f0f Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Thu, 11 Oct 2018 16:11:05 -0700 Subject: [PATCH 25/32] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 646ae83a11b..77f3b353c43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ BUG FIXES: * all: fix deprecation links in resources [GH-2197] [GH-2196] +* all: fix panics caused by including empty blocks with lists [GH-2229] [GH-2233] [GH-2239] * compute: allow instance templates to have disks with no source image set [GH-2218] * project: fix plan output when app engine api is not enabled [GH-2204] From a1581695f2de23c606de6fcf5e4b72d86f6c26dd Mon Sep 17 00:00:00 2001 From: Paddy Date: Thu, 11 Oct 2018 23:23:52 -0700 Subject: [PATCH 26/32] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 646ae83a11b..6c33df34d78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,15 @@ BUG FIXES: * all: fix deprecation links in resources [GH-2197] [GH-2196] +* cloudfunctions: fix panic when creating or updating triggers [GH-2229] * compute: allow instance templates to have disks with no source image set [GH-2218] +* compute: fix panic when creating or updating backend services [GH-2229] +* compute: fix panic when creating or updating security policies [GH-2229] +* container: fix panic when creating or updating clusters [GH-2229] +* organization: fix panic when creating or updating organization policy [GH-2229] * project: fix plan output when app engine api is not enabled [GH-2204] +* pubsub: fix panic when creating or updating subscription [GH-2229] +* sql: fix panic when creating or updating instance [GH-2229] ## 1.19.0 (October 08, 2018) From 8d2735ae6da31c5221287afbfb089030cc18b50e Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 12 Oct 2018 18:39:37 +0000 Subject: [PATCH 27/32] v1.19.1 --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f3b353c43..e3434020c73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ -## 1.19.1 (Unreleased) +## 1.19.1 (October 12, 2018) BUG FIXES: -* all: fix deprecation links in resources [GH-2197] [GH-2196] -* all: fix panics caused by including empty blocks with lists [GH-2229] [GH-2233] [GH-2239] -* compute: allow instance templates to have disks with no source image set [GH-2218] -* project: fix plan output when app engine api is not enabled [GH-2204] +* all: fix deprecation links in resources ([#2197](https://github.com/terraform-providers/terraform-provider-google/issues/2197)] [[#2196](https://github.com/terraform-providers/terraform-provider-google/issues/2196)) +* all: fix panics caused by including empty blocks with lists ([#2229](https://github.com/terraform-providers/terraform-provider-google/issues/2229)] [[#2233](https://github.com/terraform-providers/terraform-provider-google/issues/2233)] [[#2239](https://github.com/terraform-providers/terraform-provider-google/issues/2239)) +* compute: allow instance templates to have disks with no source image set ([#2218](https://github.com/terraform-providers/terraform-provider-google/issues/2218)) +* project: fix plan output when app engine api is not enabled ([#2204](https://github.com/terraform-providers/terraform-provider-google/issues/2204)) ## 1.19.0 (October 08, 2018) From e64502a0b5e22a40a6bce850a064480f2e0694da Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Fri, 12 Oct 2018 18:45:52 +0000 Subject: [PATCH 28/32] Cleanup after v1.19.1 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3434020c73..365df74819e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 1.19.2 (Unreleased) ## 1.19.1 (October 12, 2018) BUG FIXES: From ddd9e01d980ad7a7b851ee1cc045b12ff05370f2 Mon Sep 17 00:00:00 2001 From: Thomas Poindessous Date: Wed, 17 Oct 2018 21:35:49 +0000 Subject: [PATCH 29/32] Create a link to storage_bucket_acl documentation (#2275) Create a link to storage_bucket_acl ressource documentation page. It's easier than scrolling and scrolling or copy text and search it on the page. Thank you ! --- website/docs/r/storage_bucket.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/storage_bucket.html.markdown b/website/docs/r/storage_bucket.html.markdown index 29b46fdfba1..548a38d9ce1 100644 --- a/website/docs/r/storage_bucket.html.markdown +++ b/website/docs/r/storage_bucket.html.markdown @@ -10,7 +10,7 @@ description: |- Creates a new bucket in Google cloud storage service (GCS). Once a bucket has been created, its location can't be changed. -[ACLs](https://cloud.google.com/storage/docs/access-control/lists) can be applied using the `google_storage_bucket_acl` resource. +[ACLs](https://cloud.google.com/storage/docs/access-control/lists) can be applied using the [`google_storage_bucket_acl` resource](/docs/providers/google/r/storage_bucket_acl.html). For more information see [the official documentation](https://cloud.google.com/storage/docs/overview) and From 1fd3d8c2b91c7651f58ee0cc8ce0795a3c00a624 Mon Sep 17 00:00:00 2001 From: Nic West Date: Tue, 23 Oct 2018 19:27:52 +0100 Subject: [PATCH 30/32] fix a typo --- website/docs/r/app_engine_application.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/app_engine_application.html.markdown b/website/docs/r/app_engine_application.html.markdown index e1ce7c33542..dd5f1b3d24a 100755 --- a/website/docs/r/app_engine_application.html.markdown +++ b/website/docs/r/app_engine_application.html.markdown @@ -26,7 +26,7 @@ resource "google_project" "my_project" { resource "google_app_engine_application" "app" { project = "${google_project.my_project.project_id}" - location_id = "us-central' + location_id = "us-central" } ``` From 8a62911016a743e329206d325146b10cc4036a4c Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Thu, 8 Nov 2018 16:30:51 -0800 Subject: [PATCH 31/32] Merge OiCS links into TPG Master (#2433) --- ...binaryauthorization_attestor.html.markdown | 3 ++- .../binaryauthorization_policy.html.markdown | 3 ++- website/docs/r/compute_address.html.markdown | 24 ++++++++++++++++++- .../docs/r/compute_autoscaler.html.markdown | 8 ++++++- .../r/compute_backend_bucket.html.markdown | 8 ++++++- website/docs/r/compute_disk.html.markdown | 8 ++++++- website/docs/r/compute_firewall.html.markdown | 8 ++++++- .../r/compute_forwarding_rule.html.markdown | 8 ++++++- .../r/compute_global_address.html.markdown | 8 ++++++- .../docs/r/compute_health_check.html.markdown | 8 ++++++- .../r/compute_http_health_check.html.markdown | 8 ++++++- .../compute_https_health_check.html.markdown | 8 ++++++- .../r/compute_region_autoscaler.html.markdown | 8 ++++++- .../docs/r/compute_region_disk.html.markdown | 8 ++++++- website/docs/r/compute_route.html.markdown | 8 ++++++- website/docs/r/compute_router.html.markdown | 8 ++++++- .../r/compute_ssl_certificate.html.markdown | 24 ++++++++++++++++++- .../docs/r/compute_ssl_policy.html.markdown | 8 ++++++- .../docs/r/compute_subnetwork.html.markdown | 8 ++++++- .../r/compute_target_http_proxy.html.markdown | 8 ++++++- .../compute_target_https_proxy.html.markdown | 8 ++++++- .../r/compute_target_ssl_proxy.html.markdown | 8 ++++++- .../r/compute_target_tcp_proxy.html.markdown | 8 ++++++- .../docs/r/compute_vpn_gateway.html.markdown | 8 ++++++- .../docs/r/compute_vpn_tunnel.html.markdown | 8 ++++++- .../r/containeranalysis_note.html.markdown | 8 ++++++- .../docs/r/filestore_instance.html.markdown | 8 ++++++- website/docs/r/redis_instance.html.markdown | 16 ++++++++++++- .../docs/r/resourcemanager_lien.html.markdown | 3 ++- 29 files changed, 228 insertions(+), 29 deletions(-) diff --git a/website/docs/r/binaryauthorization_attestor.html.markdown b/website/docs/r/binaryauthorization_attestor.html.markdown index 1c21dd87738..6af5322f336 100644 --- a/website/docs/r/binaryauthorization_attestor.html.markdown +++ b/website/docs/r/binaryauthorization_attestor.html.markdown @@ -32,7 +32,8 @@ To get more information about Attestor, see: * How-to Guides * [Official Documentation](https://cloud.google.com/binary-authorization/) -## Example Usage +## Example Usage - Binary Authorization Attestor Basic + ```hcl resource "google_binary_authorization_attestor" "attestor" { diff --git a/website/docs/r/binaryauthorization_policy.html.markdown b/website/docs/r/binaryauthorization_policy.html.markdown index 65350d8dc68..0a64b0b084c 100644 --- a/website/docs/r/binaryauthorization_policy.html.markdown +++ b/website/docs/r/binaryauthorization_policy.html.markdown @@ -32,7 +32,8 @@ To get more information about Policy, see: * How-to Guides * [Official Documentation](https://cloud.google.com/binary-authorization/) -## Example Usage +## Example Usage - Binary Authorization Policy Basic + ```hcl resource "google_binary_authorization_policy" "policy" { diff --git a/website/docs/r/compute_address.html.markdown b/website/docs/r/compute_address.html.markdown index c0779c30f90..a8b6fc2a52a 100644 --- a/website/docs/r/compute_address.html.markdown +++ b/website/docs/r/compute_address.html.markdown @@ -43,13 +43,27 @@ To get more information about Address, see: * [Reserving a Static External IP Address](https://cloud.google.com/compute/docs/instances-and-network) * [Reserving a Static Internal IP Address](https://cloud.google.com/compute/docs/ip-addresses/reserve-static-internal-ip-address) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Address Basic + ```hcl resource "google_compute_address" "ip_address" { name = "my-address" } ``` +
    + + Open in Cloud Shell + +
    +## Example Usage - Address With Subnetwork + + ```hcl resource "google_compute_network" "default" { name = "my-network" @@ -70,6 +84,14 @@ resource "google_compute_address" "internal_with_subnet_and_address" { region = "us-central1" } ``` +
    + + Open in Cloud Shell + +
    +## Example Usage - Instance With Ip + + ```hcl resource "google_compute_address" "static" { name = "ipv4-address" diff --git a/website/docs/r/compute_autoscaler.html.markdown b/website/docs/r/compute_autoscaler.html.markdown index e287880cf60..0a835a9958f 100644 --- a/website/docs/r/compute_autoscaler.html.markdown +++ b/website/docs/r/compute_autoscaler.html.markdown @@ -34,7 +34,13 @@ To get more information about Autoscaler, see: * How-to Guides * [Autoscaling Groups of Instances](https://cloud.google.com/compute/docs/autoscaler/) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Autoscaler Basic + ```hcl resource "google_compute_autoscaler" "foobar" { diff --git a/website/docs/r/compute_backend_bucket.html.markdown b/website/docs/r/compute_backend_bucket.html.markdown index 97387cccd00..7af594d40a8 100644 --- a/website/docs/r/compute_backend_bucket.html.markdown +++ b/website/docs/r/compute_backend_bucket.html.markdown @@ -37,7 +37,13 @@ To get more information about BackendBucket, see: * How-to Guides * [Using a Cloud Storage bucket as a load balancer backend](https://cloud.google.com/compute/docs/load-balancing/http/backend-bucket) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Backend Bucket Basic + ```hcl resource "google_compute_backend_bucket" "image_backend" { diff --git a/website/docs/r/compute_disk.html.markdown b/website/docs/r/compute_disk.html.markdown index 3f68ccacb6e..649ef011255 100644 --- a/website/docs/r/compute_disk.html.markdown +++ b/website/docs/r/compute_disk.html.markdown @@ -49,7 +49,13 @@ To get more information about Disk, see: state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html). -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Disk Basic + ```hcl resource "google_compute_disk" "default" { diff --git a/website/docs/r/compute_firewall.html.markdown b/website/docs/r/compute_firewall.html.markdown index 67b34ab555c..d3b83a9ee98 100644 --- a/website/docs/r/compute_firewall.html.markdown +++ b/website/docs/r/compute_firewall.html.markdown @@ -42,7 +42,13 @@ To get more information about Firewall, see: * How-to Guides * [Official Documentation](https://cloud.google.com/vpc/docs/firewalls) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Firewall Basic + ```hcl resource "google_compute_firewall" "default" { diff --git a/website/docs/r/compute_forwarding_rule.html.markdown b/website/docs/r/compute_forwarding_rule.html.markdown index b2db4481789..00c908c62d2 100644 --- a/website/docs/r/compute_forwarding_rule.html.markdown +++ b/website/docs/r/compute_forwarding_rule.html.markdown @@ -32,7 +32,13 @@ To get more information about ForwardingRule, see: * How-to Guides * [Official Documentation](https://cloud.google.com/compute/docs/load-balancing/network/forwarding-rules) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Forwarding Rule Basic + ```hcl resource "google_compute_forwarding_rule" "default" { diff --git a/website/docs/r/compute_global_address.html.markdown b/website/docs/r/compute_global_address.html.markdown index 5a096ff0f98..da9fe39f145 100644 --- a/website/docs/r/compute_global_address.html.markdown +++ b/website/docs/r/compute_global_address.html.markdown @@ -31,7 +31,13 @@ To get more information about GlobalAddress, see: * How-to Guides * [Reserving a Static External IP Address](https://cloud.google.com/compute/docs/ip-addresses/reserve-static-external-ip-address) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Global Address Basic + ```hcl resource "google_compute_global_address" "default" { diff --git a/website/docs/r/compute_health_check.html.markdown b/website/docs/r/compute_health_check.html.markdown index 3145ee8d315..7278dc46897 100644 --- a/website/docs/r/compute_health_check.html.markdown +++ b/website/docs/r/compute_health_check.html.markdown @@ -40,7 +40,13 @@ To get more information about HealthCheck, see: * How-to Guides * [Official Documentation](https://cloud.google.com/load-balancing/docs/health-checks) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Health Check Basic + ```hcl resource "google_compute_health_check" "internal-health-check" { diff --git a/website/docs/r/compute_http_health_check.html.markdown b/website/docs/r/compute_http_health_check.html.markdown index 61aa739601d..3f586f0fa5f 100644 --- a/website/docs/r/compute_http_health_check.html.markdown +++ b/website/docs/r/compute_http_health_check.html.markdown @@ -38,7 +38,13 @@ To get more information about HttpHealthCheck, see: * How-to Guides * [Adding Health Checks](https://cloud.google.com/compute/docs/load-balancing/health-checks#legacy_health_checks) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Http Health Check Basic + ```hcl resource "google_compute_http_health_check" "default" { diff --git a/website/docs/r/compute_https_health_check.html.markdown b/website/docs/r/compute_https_health_check.html.markdown index 17b2797f23e..9901d4c66a9 100644 --- a/website/docs/r/compute_https_health_check.html.markdown +++ b/website/docs/r/compute_https_health_check.html.markdown @@ -38,7 +38,13 @@ To get more information about HttpsHealthCheck, see: * How-to Guides * [Adding Health Checks](https://cloud.google.com/compute/docs/load-balancing/health-checks#legacy_health_checks) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Https Health Check Basic + ```hcl resource "google_compute_https_health_check" "default" { diff --git a/website/docs/r/compute_region_autoscaler.html.markdown b/website/docs/r/compute_region_autoscaler.html.markdown index 6288c0bc371..1aae2c6fa17 100644 --- a/website/docs/r/compute_region_autoscaler.html.markdown +++ b/website/docs/r/compute_region_autoscaler.html.markdown @@ -34,7 +34,13 @@ To get more information about RegionAutoscaler, see: * How-to Guides * [Autoscaling Groups of Instances](https://cloud.google.com/compute/docs/autoscaler/) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Region Autoscaler Basic + ```hcl resource "google_compute_region_autoscaler" "foobar" { diff --git a/website/docs/r/compute_region_disk.html.markdown b/website/docs/r/compute_region_disk.html.markdown index 2316a27ce8c..7be51631f5d 100644 --- a/website/docs/r/compute_region_disk.html.markdown +++ b/website/docs/r/compute_region_disk.html.markdown @@ -49,7 +49,13 @@ To get more information about RegionDisk, see: state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html). -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Region Disk Basic + ```hcl resource "google_compute_region_disk" "regiondisk" { diff --git a/website/docs/r/compute_route.html.markdown b/website/docs/r/compute_route.html.markdown index 018f6569344..79df921e60c 100644 --- a/website/docs/r/compute_route.html.markdown +++ b/website/docs/r/compute_route.html.markdown @@ -50,7 +50,13 @@ To get more information about Route, see: * How-to Guides * [Using Routes](https://cloud.google.com/vpc/docs/using-routes) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Route Basic + ```hcl resource "google_compute_route" "default" { diff --git a/website/docs/r/compute_router.html.markdown b/website/docs/r/compute_router.html.markdown index a22d0676be1..b93defe5510 100644 --- a/website/docs/r/compute_router.html.markdown +++ b/website/docs/r/compute_router.html.markdown @@ -30,7 +30,13 @@ To get more information about Router, see: * How-to Guides * [Google Cloud Router](https://cloud.google.com/router/docs/) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Router Basic + ```hcl resource "google_compute_router" "foobar" { diff --git a/website/docs/r/compute_ssl_certificate.html.markdown b/website/docs/r/compute_ssl_certificate.html.markdown index c9129b942d4..cb5f8466da8 100644 --- a/website/docs/r/compute_ssl_certificate.html.markdown +++ b/website/docs/r/compute_ssl_certificate.html.markdown @@ -32,7 +32,13 @@ To get more information about SslCertificate, see: * How-to Guides * [Official Documentation](https://cloud.google.com/load-balancing/docs/ssl-certificates) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Ssl Certificate Basic + ```hcl resource "google_compute_ssl_certificate" "default" { @@ -46,6 +52,14 @@ resource "google_compute_ssl_certificate" "default" { } } ``` +
    + + Open in Cloud Shell + +
    +## Example Usage - Ssl Certificate Random Provider + + ```hcl # You may also want to control name generation explicitly: resource "google_compute_ssl_certificate" "default" { @@ -71,6 +85,14 @@ resource "random_id" "certificate" { } } ``` +
    + + Open in Cloud Shell + +
    +## Example Usage - Ssl Certificate Target Https Proxies + + ```hcl // Using with Target HTTPS Proxies // diff --git a/website/docs/r/compute_ssl_policy.html.markdown b/website/docs/r/compute_ssl_policy.html.markdown index c623ee57579..036c3d1fec2 100644 --- a/website/docs/r/compute_ssl_policy.html.markdown +++ b/website/docs/r/compute_ssl_policy.html.markdown @@ -31,7 +31,13 @@ To get more information about SslPolicy, see: * How-to Guides * [Using SSL Policies](https://cloud.google.com/compute/docs/load-balancing/ssl-policies) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Ssl Policy Basic + ```hcl resource "google_compute_ssl_policy" "prod-ssl-policy" { diff --git a/website/docs/r/compute_subnetwork.html.markdown b/website/docs/r/compute_subnetwork.html.markdown index 095ff5a18cf..c9becf3b085 100644 --- a/website/docs/r/compute_subnetwork.html.markdown +++ b/website/docs/r/compute_subnetwork.html.markdown @@ -53,7 +53,13 @@ To get more information about Subnetwork, see: * [Private Google Access](https://cloud.google.com/vpc/docs/configure-private-google-access) * [Cloud Networking](https://cloud.google.com/vpc/docs/using-vpc) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Subnetwork Basic + ```hcl resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" { diff --git a/website/docs/r/compute_target_http_proxy.html.markdown b/website/docs/r/compute_target_http_proxy.html.markdown index b5ea1d41cdf..5715cb878e3 100644 --- a/website/docs/r/compute_target_http_proxy.html.markdown +++ b/website/docs/r/compute_target_http_proxy.html.markdown @@ -32,7 +32,13 @@ To get more information about TargetHttpProxy, see: * How-to Guides * [Official Documentation](https://cloud.google.com/compute/docs/load-balancing/http/target-proxies) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Target Http Proxy Basic + ```hcl resource "google_compute_target_http_proxy" "default" { diff --git a/website/docs/r/compute_target_https_proxy.html.markdown b/website/docs/r/compute_target_https_proxy.html.markdown index 55c0657d511..0148648e18d 100644 --- a/website/docs/r/compute_target_https_proxy.html.markdown +++ b/website/docs/r/compute_target_https_proxy.html.markdown @@ -32,7 +32,13 @@ To get more information about TargetHttpsProxy, see: * How-to Guides * [Official Documentation](https://cloud.google.com/compute/docs/load-balancing/http/target-proxies) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Target Https Proxy Basic + ```hcl resource "google_compute_target_https_proxy" "default" { diff --git a/website/docs/r/compute_target_ssl_proxy.html.markdown b/website/docs/r/compute_target_ssl_proxy.html.markdown index 2dbc2e487be..8c1d9ce49fc 100644 --- a/website/docs/r/compute_target_ssl_proxy.html.markdown +++ b/website/docs/r/compute_target_ssl_proxy.html.markdown @@ -34,7 +34,13 @@ To get more information about TargetSslProxy, see: * How-to Guides * [Setting Up SSL proxy for Google Cloud Load Balancing](https://cloud.google.com/compute/docs/load-balancing/tcp-ssl/) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Target Ssl Proxy Basic + ```hcl resource "google_compute_target_ssl_proxy" "default" { diff --git a/website/docs/r/compute_target_tcp_proxy.html.markdown b/website/docs/r/compute_target_tcp_proxy.html.markdown index b7be94c6e73..89059e86b0c 100644 --- a/website/docs/r/compute_target_tcp_proxy.html.markdown +++ b/website/docs/r/compute_target_tcp_proxy.html.markdown @@ -34,7 +34,13 @@ To get more information about TargetTcpProxy, see: * How-to Guides * [Setting Up TCP proxy for Google Cloud Load Balancing](https://cloud.google.com/compute/docs/load-balancing/tcp-ssl/tcp-proxy) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Target Tcp Proxy Basic + ```hcl resource "google_compute_target_tcp_proxy" "default" { diff --git a/website/docs/r/compute_vpn_gateway.html.markdown b/website/docs/r/compute_vpn_gateway.html.markdown index ce0ba1b4075..2bd4b01d23c 100644 --- a/website/docs/r/compute_vpn_gateway.html.markdown +++ b/website/docs/r/compute_vpn_gateway.html.markdown @@ -29,7 +29,13 @@ To get more information about VpnGateway, see: * [API documentation](https://cloud.google.com/compute/docs/reference/rest/v1/targetVpnGateways) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Target Vpn Gateway Basic + ```hcl resource "google_compute_vpn_gateway" "target_gateway" { diff --git a/website/docs/r/compute_vpn_tunnel.html.markdown b/website/docs/r/compute_vpn_tunnel.html.markdown index 773abe02945..05df2a91209 100644 --- a/website/docs/r/compute_vpn_tunnel.html.markdown +++ b/website/docs/r/compute_vpn_tunnel.html.markdown @@ -35,7 +35,13 @@ To get more information about VpnTunnel, see: state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html). -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Vpn Tunnel Basic + ```hcl resource "google_compute_vpn_tunnel" "tunnel1" { diff --git a/website/docs/r/containeranalysis_note.html.markdown b/website/docs/r/containeranalysis_note.html.markdown index dff7b7eb8dd..bffafbb1895 100644 --- a/website/docs/r/containeranalysis_note.html.markdown +++ b/website/docs/r/containeranalysis_note.html.markdown @@ -32,7 +32,13 @@ To get more information about Note, see: * How-to Guides * [Official Documentation](https://cloud.google.com/container-analysis/) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Container Analysis Note Basic + ```hcl resource "google_container_analysis_note" "note" { diff --git a/website/docs/r/filestore_instance.html.markdown b/website/docs/r/filestore_instance.html.markdown index 03fb7cc33dd..80f83a9a6dd 100644 --- a/website/docs/r/filestore_instance.html.markdown +++ b/website/docs/r/filestore_instance.html.markdown @@ -34,7 +34,13 @@ To get more information about Instance, see: * [Use with Kubernetes](https://cloud.google.com/filestore/docs/accessing-fileshares) * [Copying Data In/Out](https://cloud.google.com/filestore/docs/copying-data) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Filestore Instance Basic + ```hcl resource "google_filestore_instance" "instance" { diff --git a/website/docs/r/redis_instance.html.markdown b/website/docs/r/redis_instance.html.markdown index bf639dabe93..5485ff6973e 100644 --- a/website/docs/r/redis_instance.html.markdown +++ b/website/docs/r/redis_instance.html.markdown @@ -30,7 +30,13 @@ To get more information about Instance, see: * How-to Guides * [Official Documentation](https://cloud.google.com/memorystore/docs/redis/) -## Example Usage +
    + + Open in Cloud Shell + +
    +## Example Usage - Redis Instance Basic + ```hcl resource "google_redis_instance" "cache" { @@ -38,6 +44,14 @@ resource "google_redis_instance" "cache" { memory_size_gb = 1 } ``` +
    + + Open in Cloud Shell + +
    +## Example Usage - Redis Instance Full + + ```hcl resource "google_redis_instance" "cache" { name = "ha-memory-cache" diff --git a/website/docs/r/resourcemanager_lien.html.markdown b/website/docs/r/resourcemanager_lien.html.markdown index 667a1aa9643..02599a31a9f 100644 --- a/website/docs/r/resourcemanager_lien.html.markdown +++ b/website/docs/r/resourcemanager_lien.html.markdown @@ -25,7 +25,8 @@ A Lien represents an encumbrance on the actions that can be performed on a resou -## Example Usage +## Example Usage - Resource Manager Lien + ```hcl resource "google_resource_manager_lien" "lien" { From 0c13b20d59a44500ca173d1e95399a1d1d216240 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Fri, 9 Nov 2018 12:14:29 -0800 Subject: [PATCH 32/32] Fix changelog, including missed message. --- CHANGELOG.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f43933f4eee..b99da438aa2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,21 @@ -## 1.19.2 (Unreleased) -## 1.19.1 (October 12, 2018) +## 1.19.1 (Unreleased) BUG FIXES: - * all: fix deprecation links in resources ([#2197](https://github.com/terraform-providers/terraform-provider-google/issues/2197)] [[#2196](https://github.com/terraform-providers/terraform-provider-google/issues/2196)) * all: fix panics caused by including empty blocks with lists ([#2229](https://github.com/terraform-providers/terraform-provider-google/issues/2229)] [[#2233](https://github.com/terraform-providers/terraform-provider-google/issues/2233)] [[#2239](https://github.com/terraform-providers/terraform-provider-google/issues/2239)) * compute: allow instance templates to have disks with no source image set ([#2218](https://github.com/terraform-providers/terraform-provider-google/issues/2218)) * project: fix plan output when app engine api is not enabled ([#2204](https://github.com/terraform-providers/terraform-provider-google/issues/2204)) -## 1.19.0 (October 08, 2018) +## 1.19.0 (October 05, 2018) BACKWARDS INCOMPATIBILITIES: -* all: beta fields have been deprecated in favor of the new `google-beta` provider. See https://terraform.io/docs/providers/google/provider_versions.html for more info. ([#2152](https://github.com/terraform-providers/terraform-provider-google/issues/2152)] [[#2142](https://github.com/terraform-providers/terraform-provider-google/issues/2142)) -* bigtable: `google_bigtable_instance` deprecated the `cluster_id`, `zone`, `num_nodes`, and `storage_type` fields, creating a `cluster` block containing those fields instead. ([#2161](https://github.com/terraform-providers/terraform-provider-google/issues/2161)) -* cloudfunctions: `google_cloudfunctions_function` and `datasource_google_cloudfunctions_function` deprecated `trigger_bucket` and `trigger_topic` in favor of the new `event_trigger` field, and deprecated `retry_on_failure` in favor of the `event_trigger.failure_policy.retry` field. ([#2158](https://github.com/terraform-providers/terraform-provider-google/issues/2158)) -* compute: `google_compute_instance`, `google_compute_instance_template`, `google_compute_instance_from_template` have had the `network_interface.address` field deprecated and the `network_interface.network_ip` field undeprecated to better match the API. Terraform configurations should migrate from `network_interface.address` to `network_interface.network_ip`. ([#2096](https://github.com/terraform-providers/terraform-provider-google/issues/2096)) +* bigtable: `google_bigtable_instance` deprecated the `cluster_id`, `zone`, `num_nodes`, and `storage_type` fields, creating a `cluster` block containing those fields instead. (#2161)[https://github.com/terraform-providers/terraform-provider-google/pull/2161] +* cloudfunctions: `google_cloudfunctions_function` and `datasource_google_cloudfunctions_function` deprecated `trigger_bucket` and `trigger_topic` in favor of the new `event_trigger` field, and deprecated `retry_on_failure` in favor of the `event_trigger.failure_policy.retry` field. (#2158)[https://github.com/terraform-providers/terraform-provider-google/pull/2158] +* compute: `google_compute_instance`, `google_compute_instance_template`, `google_compute_instance_from_template` have had the `network_interface.address` field deprecated and the `network_interface.network_ip` field undeprecated to better match the API. Terraform configurations should migrate from `network_interface.address` to `network_interface.network_ip`. (#2096)[https://github.com/terraform-providers/terraform-provider-google/pull/2096] * compute: `google_compute_instance`, `google_compute_instance_from_template` have had the `network_interface.0.access_config.0.assigned_nat_ip` field deprecated. Please use `network_interface.0.access_config.0.nat_ip` instead. * compute: `google_compute_instance_group_manager` and `google_compute_region_instance_group_manager` have had their `instance_template` field removed. Use `versions.instance_template` instead. ([#1](https://github.com/terraform-providers/terraform-provider-google/issues/1)) * container: `google_container_cluster`'s `private_cluster` field is now deprecated in favor of `private_cluster_config`. ([#3](https://github.com/terraform-providers/terraform-provider-google/issues/3)) -* project: `google_project`'s `app_engine` sub-block has been deprecated. Please use the `google_app_engine_app` resource instead. Changing between the two should not force project re-creation. ([#2147](https://github.com/terraform-providers/terraform-provider-google/issues/2147)) +* project: `google_project`'s `app_engine` sub-block has been deprecated. Please use the `google_app_engine_app` resource instead. Changing between the two should not force project re-creation. (#2147)[https://github.com/terraform-providers/terraform-provider-google/pull/2147] * project: `google_project_iam_policy`'s `restore_policy` field is now deprecated ([#2186](https://github.com/terraform-providers/terraform-provider-google/issues/2186)) FEATURES: