Skip to content

Commit 799d954

Browse files
modular-magicianEdward Sun
and
Edward Sun
authored
make pemCertificate sensitive (#7114) (#13505)
* make pemCertificate sensitive * make pemPrivateKey sensitive * remove sensitive on selfManaged.pemCertificate and selfManaged Co-authored-by: Edward Sun <[email protected]> Signed-off-by: Modular Magician <[email protected]> Signed-off-by: Modular Magician <[email protected]> Co-authored-by: Edward Sun <[email protected]>
1 parent 2ec420e commit 799d954

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.changelog/7114.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
certificatemanager: removed incorrect indication that the `self_managed` field in `google_certificate_manager_certificate` was treated as sensitive, and marked `self_managed.pem_private_key` as sensitive
3+
```

google/resource_certificate_manager_certificate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ Leaf certificate comes first, followed by intermediate ones if any.`,
206206
Type: schema.TypeString,
207207
Optional: true,
208208
Description: `The private key of the leaf certificate in PEM-encoded form.`,
209+
Sensitive: true,
209210
ExactlyOneOf: []string{"self_managed.0.private_key_pem", "self_managed.0.pem_private_key"},
210211
},
211212
"private_key_pem": {
@@ -218,7 +219,6 @@ Leaf certificate comes first, followed by intermediate ones if any.`,
218219
},
219220
},
220221
},
221-
Sensitive: true,
222222
ExactlyOneOf: []string{"self_managed", "managed"},
223223
},
224224
"project": {

website/docs/r/certificate_manager_certificate.html.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Certificate represents a HTTP-reachable backend for a Certificate.
2424

2525

2626

27-
~> **Warning:** All arguments including `self_managed`, `self_managed.certificate_pem`, and `self_managed.private_key_pem` will be stored in the raw
27+
~> **Warning:** All arguments including `self_managed.certificate_pem`, `self_managed.private_key_pem`, and `self_managed.pem_private_key` will be stored in the raw
2828
state as plain-text. [Read more about sensitive data in state](https://www.terraform.io/language/state/sensitive-data).
2929

3030
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
@@ -84,7 +84,6 @@ The following arguments are supported:
8484
Certificate data for a SelfManaged Certificate.
8585
SelfManaged Certificates are uploaded by the user. Updating such
8686
certificates before they expire remains the user's responsibility.
87-
**Note**: This property is sensitive and will not be displayed in the plan.
8887
Structure is [documented below](#nested_self_managed).
8988

9089
* `managed` -
@@ -119,6 +118,7 @@ The following arguments are supported:
119118
* `pem_private_key` -
120119
(Optional)
121120
The private key of the leaf certificate in PEM-encoded form.
121+
**Note**: This property is sensitive and will not be displayed in the plan.
122122

123123
<a name="nested_managed"></a>The `managed` block supports:
124124

0 commit comments

Comments
 (0)