Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote Managed SSL to GA + Doc fixes #4247

Merged
merged 13 commits into from
Dec 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions products/cloudscheduler/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ objects:
HTTP request body.
A request body is allowed only if the HTTP method is POST or PUT.
It will result in invalid argument error to set a body on a job with an incompatible HttpMethod.

A base64-encoded string.
required: false
input: true
- !ruby/object:Api::Type::KeyValuePairs
Expand Down Expand Up @@ -311,6 +313,8 @@ objects:
HTTP request body.
A request body is allowed only if the HTTP method is POST, PUT, or PATCH.
It is an error to set body on a job with an incompatible HttpMethod.

A base64-encoded string.
required: false
- !ruby/object:Api::Type::KeyValuePairs
name: headers
Expand Down
2 changes: 2 additions & 0 deletions products/compute/ansible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
exclude: true
VpnGateway: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
ManagedSslCertificate: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
files: !ruby/object:Provider::Config::Files
resource:
<%= lines(indent(compile('provider/ansible/resource~compile.yaml'), 4)) -%>
1 change: 0 additions & 1 deletion products/compute/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13241,7 +13241,6 @@ objects:
# GCP resource as the preceding certificate object.
name: 'ManagedSslCertificate'
kind: 'compute#sslCertificate'
min_version: beta
base_url: projects/{{project}}/global/sslCertificates
collection_url_key: 'items'
references: !ruby/object:Api::Resource::ReferenceLinks
Expand Down
3 changes: 1 addition & 2 deletions products/compute/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2167,10 +2167,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
http_health_check_name: "http-health-check"
- !ruby/object:Provider::Terraform::Examples
name: "managed_ssl_certificate_recreation"
primary_resource_id: "default"
primary_resource_id: "cert"
# Random provider
skip_vcr: true
min_version: beta
description: |
{{description}}
For a resource where you provide the key, see the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
resource "google_compute_managed_ssl_certificate" "default" {
provider = google-beta

name = "<%= ctx[:vars]['cert_name'] %>"

managed {
Expand All @@ -9,16 +7,12 @@ resource "google_compute_managed_ssl_certificate" "default" {
}

resource "google_compute_target_https_proxy" "default" {
provider = google-beta

name = "<%= ctx[:vars]['proxy_name'] %>"
url_map = google_compute_url_map.default.id
ssl_certificates = [google_compute_managed_ssl_certificate.default.id]
}

resource "google_compute_url_map" "default" {
provider = google-beta

name = "<%= ctx[:vars]['url_map_name'] %>"
description = "a description"

Expand All @@ -41,8 +35,6 @@ resource "google_compute_url_map" "default" {
}

resource "google_compute_backend_service" "default" {
provider = google-beta

name = "<%= ctx[:vars]['backend_service_name'] %>"
port_name = "http"
protocol = "HTTP"
Expand All @@ -52,40 +44,27 @@ resource "google_compute_backend_service" "default" {
}

resource "google_compute_http_health_check" "default" {
provider = google-beta

name = "<%= ctx[:vars]['http_health_check_name'] %>"
request_path = "/"
check_interval_sec = 1
timeout_sec = 1
}

resource "google_dns_managed_zone" "zone" {
provider = google-beta

name = "<%= ctx[:vars]['dns_zone_name'] %>"
dns_name = "sslcert.tf-test.club."
}

resource "google_compute_global_forwarding_rule" "default" {
provider = google-beta

name = "<%= ctx[:vars]['forwarding_rule_name'] %>"
target = google_compute_target_https_proxy.default.id
port_range = 443
}

resource "google_dns_record_set" "set" {
provider = google-beta

name = "sslcert.tf-test.club."
type = "A"
ttl = 3600
managed_zone = google_dns_managed_zone.zone.name
rrdatas = [google_compute_global_forwarding_rule.default.ip_address]
}

provider "google-beta" {
region = "us-central1"
zone = "us-central1-a"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// recreate the ssl certificate and update the target https proxy correctly

resource "google_compute_target_https_proxy" "default" {
provider = google-beta
name = "test-proxy"
url_map = google_compute_url_map.default.id
ssl_certificates = [google_compute_managed_ssl_certificate.cert.id]
Expand All @@ -22,7 +21,6 @@ resource "random_id" "certificate" {
}

resource "google_compute_managed_ssl_certificate" "cert" {
provider = google-beta
name = random_id.certificate.hex

lifecycle {
Expand All @@ -35,7 +33,6 @@ resource "google_compute_managed_ssl_certificate" "cert" {
}

resource "google_compute_url_map" "default" {
provider = google-beta
name = "url-map"
description = "a description"
default_service = google_compute_backend_service.default.id
Expand All @@ -54,7 +51,6 @@ resource "google_compute_url_map" "default" {
}

resource "google_compute_backend_service" "default" {
provider = google-beta
name = "backend-service"
port_name = "http"
protocol = "HTTP"
Expand All @@ -63,7 +59,6 @@ resource "google_compute_backend_service" "default" {
}

resource "google_compute_http_health_check" "default" {
provider = google-beta
name = "http-health-check"
request_path = "/"
check_interval_sec = 1
Expand Down
1 change: 1 addition & 0 deletions templates/terraform/examples/scheduler_job_http.tf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ resource "google_cloud_scheduler_job" "job" {
http_target {
http_method = "POST"
uri = "https://example.com/ping"
body = base64encode("{"foo":"bar"}")
}
}
2 changes: 1 addition & 1 deletion third_party/terraform/utils/common_diff_suppress.go.erb
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ func locationDiffSuppressHelper(a, b string) bool {
strings.Replace(a, "/locations/", "/zones/", 1) == b
}

<% unless version == 'ga' -%>
// For managed SSL certs, if new is an absolute FQDN (trailing '.') but old isn't, treat them as equals.
func absoluteDomainSuppress(k, old, new string, _ *schema.ResourceData) bool {
if strings.HasPrefix(k, "managed.0.domains.") {
Expand All @@ -145,6 +144,7 @@ func absoluteDomainSuppress(k, old, new string, _ *schema.ResourceData) bool {
return old == new
}

<% unless version == 'ga' -%>
func timestampDiffSuppress(format string) schema.SchemaDiffSuppressFunc {
return func(_, old, new string, _ *schema.ResourceData) bool {
oldT, err := time.Parse(format, old)
Expand Down