Skip to content

Commit 2779896

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: add Database.SourceInfo and Database.source_info (information about database provenance, specifically for restored databases) (#2176)
- [ ] Regenerate this pull request now. feat: add Database.CmekConfig and Database.cmek_config (information about CMEK enablement) feat: allow specifying an encryption_config when restoring a database feat: add Database.delete_time (the time a database was deleted, if it ever was) feat: add Database.previous_id (if a database was deleted, what ID it was using beforehand) docs: fix assorted capitalization issues with the word "ID" docs: clarify restore details PiperOrigin-RevId: 671737474 Source-Link: https://togithub.com/googleapis/googleapis/commit/070b0fd6acdfe19674f2d1e058659a30e5298988 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/9921c6823793498b29e253f4ef41d12336125e54 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTkyMWM2ODIzNzkzNDk4YjI5ZTI1M2Y0ZWY0MWQxMjMzNjEyNWU1NCJ9 BEGIN_NESTED_COMMIT docs: Clarify maximum retention of backups (max 14 weeks) docs: Remove note about backups running at a specific time docs: Standardize on the capitalization of "ID" PiperOrigin-RevId: 668987834 Source-Link: https://togithub.com/googleapis/googleapis/commit/296afd14291cc14dc4bc5408479ba62bf11ed7c0 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/f4db04004c64d52f87a9926e70185957713e8b5b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjRkYjA0MDA0YzY0ZDUyZjg3YTk5MjZlNzAxODU5NTc3MTNlOGI1YiJ9 END_NESTED_COMMIT
1 parent 1339dc2 commit 2779896

21 files changed

+2796
-140
lines changed

‎dev/protos/admin_v1.json‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"options": {
3+
"syntax": "proto3"
4+
},
25
"nested": {
36
"google": {
47
"nested": {
@@ -145,6 +148,13 @@
145148
"(google.api.field_behavior)": "OUTPUT_ONLY"
146149
}
147150
},
151+
"deleteTime": {
152+
"type": "google.protobuf.Timestamp",
153+
"id": 7,
154+
"options": {
155+
"(google.api.field_behavior)": "OUTPUT_ONLY"
156+
}
157+
},
148158
"locationId": {
149159
"type": "string",
150160
"id": 9
@@ -190,6 +200,27 @@
190200
"type": "DeleteProtectionState",
191201
"id": 22
192202
},
203+
"cmekConfig": {
204+
"type": "CmekConfig",
205+
"id": 23,
206+
"options": {
207+
"(google.api.field_behavior)": "OPTIONAL"
208+
}
209+
},
210+
"previousId": {
211+
"type": "string",
212+
"id": 25,
213+
"options": {
214+
"(google.api.field_behavior)": "OUTPUT_ONLY"
215+
}
216+
},
217+
"sourceInfo": {
218+
"type": "SourceInfo",
219+
"id": 26,
220+
"options": {
221+
"(google.api.field_behavior)": "OUTPUT_ONLY"
222+
}
223+
},
193224
"etag": {
194225
"type": "string",
195226
"id": 99
@@ -231,6 +262,104 @@
231262
"DELETE_PROTECTION_DISABLED": 1,
232263
"DELETE_PROTECTION_ENABLED": 2
233264
}
265+
},
266+
"CmekConfig": {
267+
"fields": {
268+
"kmsKeyName": {
269+
"type": "string",
270+
"id": 1,
271+
"options": {
272+
"(google.api.field_behavior)": "REQUIRED"
273+
}
274+
},
275+
"activeKeyVersion": {
276+
"rule": "repeated",
277+
"type": "string",
278+
"id": 2,
279+
"options": {
280+
"(google.api.field_behavior)": "OUTPUT_ONLY"
281+
}
282+
}
283+
}
284+
},
285+
"SourceInfo": {
286+
"oneofs": {
287+
"source": {
288+
"oneof": [
289+
"backup"
290+
]
291+
}
292+
},
293+
"fields": {
294+
"backup": {
295+
"type": "BackupSource",
296+
"id": 1
297+
},
298+
"operation": {
299+
"type": "string",
300+
"id": 3,
301+
"options": {
302+
"(google.api.resource_reference).type": "firestore.googleapis.com/Operation"
303+
}
304+
}
305+
},
306+
"nested": {
307+
"BackupSource": {
308+
"fields": {
309+
"backup": {
310+
"type": "string",
311+
"id": 1,
312+
"options": {
313+
"(google.api.resource_reference).type": "firestore.googleapis.com/Backup"
314+
}
315+
}
316+
}
317+
}
318+
}
319+
},
320+
"EncryptionConfig": {
321+
"oneofs": {
322+
"encryptionType": {
323+
"oneof": [
324+
"googleDefaultEncryption",
325+
"useSourceEncryption",
326+
"customerManagedEncryption"
327+
]
328+
}
329+
},
330+
"fields": {
331+
"googleDefaultEncryption": {
332+
"type": "GoogleDefaultEncryptionOptions",
333+
"id": 1
334+
},
335+
"useSourceEncryption": {
336+
"type": "SourceEncryptionOptions",
337+
"id": 2
338+
},
339+
"customerManagedEncryption": {
340+
"type": "CustomerManagedEncryptionOptions",
341+
"id": 3
342+
}
343+
},
344+
"nested": {
345+
"GoogleDefaultEncryptionOptions": {
346+
"fields": {}
347+
},
348+
"SourceEncryptionOptions": {
349+
"fields": {}
350+
},
351+
"CustomerManagedEncryptionOptions": {
352+
"fields": {
353+
"kmsKeyName": {
354+
"type": "string",
355+
"id": 1,
356+
"options": {
357+
"(google.api.field_behavior)": "REQUIRED"
358+
}
359+
}
360+
}
361+
}
362+
}
234363
}
235364
}
236365
},
@@ -1445,6 +1574,13 @@
14451574
"(google.api.field_behavior)": "REQUIRED",
14461575
"(google.api.resource_reference).type": "firestore.googleapis.com/Backup"
14471576
}
1577+
},
1578+
"encryptionConfig": {
1579+
"type": "Database.EncryptionConfig",
1580+
"id": 9,
1581+
"options": {
1582+
"(google.api.field_behavior)": "OPTIONAL"
1583+
}
14481584
}
14491585
}
14501586
},
@@ -2176,6 +2312,20 @@
21762312
"common": {
21772313
"type": "CommonLanguageSettings",
21782314
"id": 1
2315+
},
2316+
"experimentalFeatures": {
2317+
"type": "ExperimentalFeatures",
2318+
"id": 2
2319+
}
2320+
},
2321+
"nested": {
2322+
"ExperimentalFeatures": {
2323+
"fields": {
2324+
"restAsyncIoEnabled": {
2325+
"type": "bool",
2326+
"id": 1
2327+
}
2328+
}
21792329
}
21802330
}
21812331
},

0 commit comments

Comments
 (0)