Skip to content

Commit 61e11ba

Browse files
committed
use new write_only structure
1 parent 921b946 commit 61e11ba

File tree

2 files changed

+3
-35
lines changed

2 files changed

+3
-35
lines changed

mmv1/api/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ func (r Resource) HasPostCreateComputedFields() bool {
13921392
// Functions used to create slices of resource properties that could not otherwise be called from within generating templates.
13931393
func (r Resource) ReadProperties() []*Type {
13941394
return google.Reject(r.GettableProperties(), func(p *Type) bool {
1395-
return p.IgnoreRead || p.WriteOnly
1395+
return p.IgnoreRead
13961396
})
13971397
}
13981398

mmv1/products/compute/SslCertificate.yaml

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,8 @@ properties:
8888
The certificate chain must be no greater than 5 certs long.
8989
The chain must include at least one intermediate cert.
9090
immutable: true
91-
at_least_one_of:
92-
- 'certificate'
93-
- 'certificateWo'
94-
sensitive: true
95-
- name: 'certificateWo'
96-
type: String
97-
description: 'The write-only certificate in PEM format.'
98-
required_with:
99-
- 'certificateWoVersion'
100-
at_least_one_of:
101-
- 'certificate'
102-
- 'certificateWo'
10391
write_only: true
104-
- name: 'certificateWoVersion'
105-
type: String
106-
description: 'The write-only version of the certificate.'
107-
immutable: true
108-
ignore_read: true
92+
sensitive: true
10993
- name: 'creationTimestamp'
11094
type: Time
11195
description: 'Creation timestamp in RFC3339 text format.'
@@ -141,25 +125,9 @@ properties:
141125
- name: 'privateKey'
142126
type: String
143127
description: 'The private key in PEM format.'
144-
at_least_one_of:
145-
- 'privateKey'
146-
- 'privateKeyWo'
128+
write_only: true
147129
immutable: true
148130
ignore_read: true
149131
sensitive: true
150132
diff_suppress_func: 'sha256DiffSuppress'
151133
custom_flatten: 'templates/terraform/custom_flatten/sha256.tmpl'
152-
- name: 'privateKeyWo'
153-
type: String
154-
description: 'The write-only private key in PEM format.'
155-
required_with:
156-
- 'privateKeyWoVersion'
157-
at_least_one_of:
158-
- 'privateKey'
159-
- 'privateKeyWo'
160-
write_only: true
161-
- name: 'privateKeyWoVersion'
162-
type: String
163-
description: 'The write-only version of the private key.'
164-
immutable: true
165-
ignore_read: true

0 commit comments

Comments
 (0)