Skip to content

Commit

Permalink
compute: Allow setting both ssl_certificates and certificate_map (#6770
Browse files Browse the repository at this point in the history
…) (#12950)

Signed-off-by: Modular Magician <magic-modules@google.com>

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Nov 4, 2022
1 parent 4f3c912 commit d2a3e31
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/6770.txt
@@ -0,0 +1,3 @@
```release-note:bug
compute: made `target_https_proxy` possible to set `ssl_certificates` and `certificate_map` at the same time
```
2 changes: 0 additions & 2 deletions google/resource_compute_target_https_proxy.go
Expand Up @@ -66,7 +66,6 @@ to the BackendService.`,
Description: `A reference to the CertificateMap resource uri that identifies a certificate map
associated with the given target proxy. This field can only be set for global target proxies.
Accepted format is '//certificatemanager.googleapis.com/projects/{project}/locations/{location}/certificateMaps/{resourceName}'.`,
ExactlyOneOf: []string{"ssl_certificates", "certificate_map"},
},
"description": {
Type: schema.TypeString,
Expand Down Expand Up @@ -103,7 +102,6 @@ certificate must be specified.`,
Type: schema.TypeString,
DiffSuppressFunc: compareSelfLinkOrResourceName,
},
ExactlyOneOf: []string{"ssl_certificates", "certificate_map"},
},
"ssl_policy": {
Type: schema.TypeString,
Expand Down

0 comments on commit d2a3e31

Please sign in to comment.