@@ -20,10 +20,10 @@ class SecretProperties(object):
20
20
"""A secret's id and attributes."""
21
21
22
22
def __init__ (self , attributes , vault_id , ** kwargs ):
23
- # type: (_models.SecretAttributes, str, **Any) -> None
23
+ # type: (Optional[ _models.SecretAttributes], Optional[ str] , **Any) -> None
24
24
self ._attributes = attributes
25
25
self ._id = vault_id
26
- self ._vault_id = KeyVaultSecretIdentifier (vault_id )
26
+ self ._vault_id = KeyVaultSecretIdentifier (vault_id ) if vault_id else None
27
27
self ._content_type = kwargs .get ("content_type" , None )
28
28
self ._key_id = kwargs .get ("key_id" , None )
29
29
self ._managed = kwargs .get ("managed" , None )
@@ -60,82 +60,82 @@ def _from_secret_item(cls, secret_item):
60
60
61
61
@property
62
62
def content_type (self ):
63
- # type: () -> str
63
+ # type: () -> Optional[ str]
64
64
"""An arbitrary string indicating the type of the secret
65
65
66
- :rtype: str
66
+ :rtype: str or None
67
67
"""
68
68
return self ._content_type
69
69
70
70
@property
71
71
def id (self ):
72
- # type: () -> str
72
+ # type: () -> Optional[ str]
73
73
"""The secret's id
74
74
75
- :rtype: str
75
+ :rtype: str or None
76
76
"""
77
77
return self ._id
78
78
79
79
@property
80
80
def key_id (self ):
81
- # type: () -> str
81
+ # type: () -> Optional[ str]
82
82
"""If this secret backs a certificate, this property is the identifier of the corresponding key.
83
83
84
- :rtype: str
84
+ :rtype: str or None
85
85
"""
86
86
return self ._key_id
87
87
88
88
@property
89
89
def enabled (self ):
90
- # type: () -> bool
90
+ # type: () -> Optional[ bool]
91
91
"""Whether the secret is enabled for use
92
92
93
- :rtype: bool
93
+ :rtype: bool or None
94
94
"""
95
- return self ._attributes .enabled
95
+ return self ._attributes .enabled if self . _attributes else None
96
96
97
97
@property
98
98
def not_before (self ):
99
- # type: () -> datetime
99
+ # type: () -> Optional[ datetime]
100
100
"""The time before which the secret can not be used, in UTC
101
101
102
- :rtype: ~datetime.datetime
102
+ :rtype: ~datetime.datetime or None
103
103
"""
104
- return self ._attributes .not_before
104
+ return self ._attributes .not_before if self . _attributes else None
105
105
106
106
@property
107
107
def expires_on (self ):
108
- # type: () -> datetime
108
+ # type: () -> Optional[ datetime]
109
109
"""When the secret expires, in UTC
110
110
111
- :rtype: ~datetime.datetime
111
+ :rtype: ~datetime.datetime or None
112
112
"""
113
- return self ._attributes .expires
113
+ return self ._attributes .expires if self . _attributes else None
114
114
115
115
@property
116
116
def created_on (self ):
117
- # type: () -> datetime
117
+ # type: () -> Optional[ datetime]
118
118
"""When the secret was created, in UTC
119
119
120
- :rtype: ~datetime.datetime
120
+ :rtype: ~datetime.datetime or None
121
121
"""
122
- return self ._attributes .created
122
+ return self ._attributes .created if self . _attributes else None
123
123
124
124
@property
125
125
def updated_on (self ):
126
- # type: () -> datetime
126
+ # type: () -> Optional[ datetime]
127
127
"""When the secret was last updated, in UTC
128
128
129
- :rtype: ~datetime.datetime
129
+ :rtype: ~datetime.datetime or None
130
130
"""
131
- return self ._attributes .updated
131
+ return self ._attributes .updated if self . _attributes else None
132
132
133
133
@property
134
134
def recoverable_days (self ):
135
135
# type: () -> Optional[int]
136
136
"""The number of days the key is retained before being deleted from a soft-delete enabled Key Vault.
137
137
138
- :rtype: int
138
+ :rtype: int or None
139
139
"""
140
140
# recoverable_days was added in 7.1-preview
141
141
if self ._attributes and hasattr (self ._attributes , "recoverable_days" ):
@@ -144,54 +144,55 @@ def recoverable_days(self):
144
144
145
145
@property
146
146
def recovery_level (self ):
147
- # type: () -> str
147
+ # type: () -> Optional[ str]
148
148
"""The vault's deletion recovery level for secrets
149
149
150
- :rtype: str
150
+ :rtype: str or None
151
151
"""
152
- return self ._attributes .recovery_level
152
+ return self ._attributes .recovery_level if self . _attributes else None
153
153
154
154
@property
155
155
def vault_url (self ):
156
- # type: () -> str
156
+ # type: () -> Optional[ str]
157
157
"""URL of the vault containing the secret
158
158
159
- :rtype: str
159
+ :rtype: str or None
160
160
"""
161
- return self ._vault_id .vault_url
161
+ return self ._vault_id .vault_url if self . _vault_id else None
162
162
163
163
@property
164
164
def name (self ):
165
- # type: () -> str
165
+ # type: () -> Optional[ str]
166
166
"""The secret's name
167
167
168
- :rtype: str
168
+ :rtype: str or None
169
169
"""
170
- return self ._vault_id .name
170
+ return self ._vault_id .name if self . _vault_id else None
171
171
172
172
@property
173
173
def version (self ):
174
- # type: () -> str
174
+ # type: () -> Optional[ str]
175
175
"""The secret's version
176
176
177
- :rtype: str
177
+ :rtype: str or None
178
178
"""
179
- return self ._vault_id .version
179
+ return self ._vault_id .version if self . _vault_id else None
180
180
181
181
@property
182
182
def tags (self ):
183
- # type: () -> Dict[str, str]
183
+ # type: () -> Optional[ Dict[str, str] ]
184
184
"""Application specific metadata in the form of key-value pairs
185
185
186
- :rtype: dict"""
186
+ :rtype: dict or None
187
+ """
187
188
return self ._tags
188
189
189
190
190
191
class KeyVaultSecret (object ):
191
192
"""All of a secret's properties, and its value."""
192
193
193
194
def __init__ (self , properties , value ):
194
- # type: (SecretProperties, str) -> None
195
+ # type: (SecretProperties, Optional[ str] ) -> None
195
196
self ._properties = properties
196
197
self ._value = value
197
198
@@ -210,19 +211,19 @@ def _from_secret_bundle(cls, secret_bundle):
210
211
211
212
@property
212
213
def name (self ):
213
- # type: () -> str
214
+ # type: () -> Optional[ str]
214
215
"""The secret's name
215
216
216
- :rtype: str
217
+ :rtype: str or None
217
218
"""
218
219
return self ._properties .name
219
220
220
221
@property
221
222
def id (self ):
222
- # type: () -> str
223
+ # type: () -> Optional[ str]
223
224
"""The secret's id
224
225
225
- :rtype: str
226
+ :rtype: str or None
226
227
"""
227
228
return self ._properties .id
228
229
@@ -237,10 +238,10 @@ def properties(self):
237
238
238
239
@property
239
240
def value (self ):
240
- # type: () -> str
241
+ # type: () -> Optional[ str]
241
242
"""The secret's value
242
243
243
- :rtype: str
244
+ :rtype: str or None
244
245
"""
245
246
return self ._value
246
247
@@ -329,19 +330,19 @@ def _from_deleted_secret_item(cls, deleted_secret_item):
329
330
330
331
@property
331
332
def name (self ):
332
- # type: () -> str
333
+ # type: () -> Optional[ str]
333
334
"""The secret's name
334
335
335
- :rtype: str
336
+ :rtype: str or None
336
337
"""
337
338
return self ._properties .name
338
339
339
340
@property
340
341
def id (self ):
341
- # type: () -> str
342
+ # type: () -> Optional[ str]
342
343
"""The secret's id
343
344
344
- :rtype: str
345
+ :rtype: str or None
345
346
"""
346
347
return self ._properties .id
347
348
@@ -356,27 +357,27 @@ def properties(self):
356
357
357
358
@property
358
359
def deleted_date (self ):
359
- # type: () -> datetime
360
+ # type: () -> Optional[ datetime]
360
361
"""When the secret was deleted, in UTC
361
362
362
- :rtype: ~datetime.datetime
363
+ :rtype: ~datetime.datetime or None
363
364
"""
364
365
return self ._deleted_date
365
366
366
367
@property
367
368
def recovery_id (self ):
368
- # type: () -> str
369
+ # type: () -> Optional[ str]
369
370
"""An identifier used to recover the deleted secret. Returns ``None`` if soft-delete is disabled.
370
371
371
- :rtype: str
372
+ :rtype: str or None
372
373
"""
373
374
return self ._recovery_id
374
375
375
376
@property
376
377
def scheduled_purge_date (self ):
377
- # type: () -> datetime
378
+ # type: () -> Optional[ datetime]
378
379
"""When the secret is scheduled to be purged, in UTC. Returns ``None`` if soft-delete is disabled.
379
380
380
- :rtype: ~datetime.datetime
381
+ :rtype: ~datetime.datetime or None
381
382
"""
382
383
return self ._scheduled_purge_date
0 commit comments