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 #7914

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
3 changes: 3 additions & 0 deletions .changelog/4247.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
compute: promoted `google_compute_managed_ssl_certificate` to GA
```
8 changes: 8 additions & 0 deletions google/common_diff_suppress.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,11 @@ func locationDiffSuppressHelper(a, b string) bool {
return strings.Replace(a, "/locations/", "/regions/", 1) == b ||
strings.Replace(a, "/locations/", "/zones/", 1) == b
}

// 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.") {
return old == strings.TrimRight(new, ".")
}
return old == new
}
5 changes: 3 additions & 2 deletions google/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -669,9 +669,9 @@ func Provider() *schema.Provider {
return provider
}

// Generated resources: 169
// Generated resources: 170
// Generated IAM resources: 72
// Total generated resources: 241
// Total generated resources: 242
func ResourceMap() map[string]*schema.Resource {
resourceMap, _ := ResourceMapWithErrors()
return resourceMap
Expand Down Expand Up @@ -784,6 +784,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_compute_router_peer": resourceComputeRouterBgpPeer(),
"google_compute_snapshot": resourceComputeSnapshot(),
"google_compute_ssl_certificate": resourceComputeSslCertificate(),
"google_compute_managed_ssl_certificate": resourceComputeManagedSslCertificate(),
"google_compute_region_ssl_certificate": resourceComputeRegionSslCertificate(),
"google_compute_reservation": resourceComputeReservation(),
"google_compute_ssl_policy": resourceComputeSslPolicy(),
Expand Down
8 changes: 6 additions & 2 deletions google/resource_cloud_scheduler_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ By default, the job is sent to the version which is the default version when the
ForceNew: true,
Description: `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.`,
It will result in invalid argument error to set a body on a job with an incompatible HttpMethod.

A base64-encoded string.`,
},
"headers": {
Type: schema.TypeMap,
Expand Down Expand Up @@ -246,7 +248,9 @@ send a request to the targeted url`,
ForceNew: true,
Description: `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.`,
It is an error to set body on a job with an incompatible HttpMethod.

A base64-encoded string.`,
},
"headers": {
Type: schema.TypeMap,
Expand Down
1 change: 1 addition & 0 deletions google/resource_cloud_scheduler_job_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ resource "google_cloud_scheduler_job" "job" {
http_target {
http_method = "POST"
uri = "https://example.com/ping"
body = base64encode("{"foo":"bar"}")
}
}
`, context)
Expand Down
Loading