Skip to content

Commit bb4d7cf

Browse files
yoshi-automationyoshi-automation
authored
fix: set resource type for database parameter of Backup (#174)
PiperOrigin-RevId: 306557455 Source-Author: Google APIs <noreply@google.com> Source-Date: Tue Apr 14 18:46:18 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: ab5d07c2883026eec395d73ff59a17f4ad0153db Source-Link: googleapis/googleapis@ab5d07c
1 parent 6657436 commit bb4d7cf

File tree

6 files changed

+69
-67
lines changed

6 files changed

+69
-67
lines changed

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -459,12 +459,12 @@ public void testIamPermissionsExceptionTest() throws Exception {
459459
@Test
460460
@SuppressWarnings("all")
461461
public void createBackupTest() throws Exception {
462-
String database = "database1789464955";
462+
DatabaseName database = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
463463
BackupName name = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
464464
long sizeBytes = 1796325715L;
465465
Backup expectedResponse =
466466
Backup.newBuilder()
467-
.setDatabase(database)
467+
.setDatabase(database.toString())
468468
.setName(name.toString())
469469
.setSizeBytes(sizeBytes)
470470
.build();
@@ -519,12 +519,12 @@ public void createBackupExceptionTest() throws Exception {
519519
@Test
520520
@SuppressWarnings("all")
521521
public void getBackupTest() {
522-
String database = "database1789464955";
522+
DatabaseName database = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
523523
BackupName name2 = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
524524
long sizeBytes = 1796325715L;
525525
Backup expectedResponse =
526526
Backup.newBuilder()
527-
.setDatabase(database)
527+
.setDatabase(database.toString())
528528
.setName(name2.toString())
529529
.setSizeBytes(sizeBytes)
530530
.build();
@@ -565,12 +565,12 @@ public void getBackupExceptionTest() throws Exception {
565565
@Test
566566
@SuppressWarnings("all")
567567
public void updateBackupTest() {
568-
String database = "database1789464955";
568+
DatabaseName database = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
569569
BackupName name = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
570570
long sizeBytes = 1796325715L;
571571
Backup expectedResponse =
572572
Backup.newBuilder()
573-
.setDatabase(database)
573+
.setDatabase(database.toString())
574574
.setName(name.toString())
575575
.setSizeBytes(sizeBytes)
576576
.build();

‎proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ private State(int value) {
345345
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
346346
* </pre>
347347
*
348-
* <code>string database = 2;</code>
348+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
349349
*
350350
* @return The database.
351351
*/
@@ -371,7 +371,7 @@ public java.lang.String getDatabase() {
371371
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
372372
* </pre>
373373
*
374-
* <code>string database = 2;</code>
374+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
375375
*
376376
* @return The bytes for database.
377377
*/
@@ -1178,7 +1178,7 @@ public Builder mergeFrom(
11781178
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
11791179
* </pre>
11801180
*
1181-
* <code>string database = 2;</code>
1181+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
11821182
*
11831183
* @return The database.
11841184
*/
@@ -1204,7 +1204,7 @@ public java.lang.String getDatabase() {
12041204
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
12051205
* </pre>
12061206
*
1207-
* <code>string database = 2;</code>
1207+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
12081208
*
12091209
* @return The bytes for database.
12101210
*/
@@ -1230,7 +1230,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
12301230
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
12311231
* </pre>
12321232
*
1233-
* <code>string database = 2;</code>
1233+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
12341234
*
12351235
* @param value The database to set.
12361236
* @return This builder for chaining.
@@ -1255,7 +1255,7 @@ public Builder setDatabase(java.lang.String value) {
12551255
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
12561256
* </pre>
12571257
*
1258-
* <code>string database = 2;</code>
1258+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
12591259
*
12601260
* @return This builder for chaining.
12611261
*/
@@ -1276,7 +1276,7 @@ public Builder clearDatabase() {
12761276
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
12771277
* </pre>
12781278
*
1279-
* <code>string database = 2;</code>
1279+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
12801280
*
12811281
* @param value The bytes for database to set.
12821282
* @return This builder for chaining.

‎proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupOrBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface BackupOrBuilder
3434
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
3535
* </pre>
3636
*
37-
* <code>string database = 2;</code>
37+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
3838
*
3939
* @return The database.
4040
*/
@@ -50,7 +50,7 @@ public interface BackupOrBuilder
5050
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
5151
* </pre>
5252
*
53-
* <code>string database = 2;</code>
53+
* <code>string database = 2 [(.google.api.resource_reference) = { ... }</code>
5454
*
5555
* @return The bytes for database.
5656
*/

‎proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupProto.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -88,54 +88,54 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
8888
+ "d_mask.proto\032\037google/protobuf/timestamp."
8989
+ "proto\032-google/spanner/admin/database/v1/"
9090
+ "common.proto\032\034google/api/annotations.pro"
91-
+ "to\"\247\003\n\006Backup\022\020\n\010database\030\002 \001(\t\022/\n\013expir"
92-
+ "e_time\030\003 \001(\0132\032.google.protobuf.Timestamp"
93-
+ "\022\014\n\004name\030\001 \001(\t\0224\n\013create_time\030\004 \001(\0132\032.go"
94-
+ "ogle.protobuf.TimestampB\003\340A\003\022\027\n\nsize_byt"
95-
+ "es\030\005 \001(\003B\003\340A\003\022B\n\005state\030\006 \001(\0162..google.sp"
96-
+ "anner.admin.database.v1.Backup.StateB\003\340A"
97-
+ "\003\022\"\n\025referencing_databases\030\007 \003(\tB\003\340A\003\"7\n"
98-
+ "\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATIN"
99-
+ "G\020\001\022\t\n\005READY\020\002:\\\352AY\n\035spanner.googleapis."
100-
+ "com/Backup\0228projects/{project}/instances"
101-
+ "/{instance}/backups/{backup}\"\245\001\n\023CreateB"
102-
+ "ackupRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037sp"
103-
+ "anner.googleapis.com/Instance\022\026\n\tbackup_"
104-
+ "id\030\002 \001(\tB\003\340A\002\022=\n\006backup\030\003 \001(\0132(.google.s"
105-
+ "panner.admin.database.v1.BackupB\003\340A\002\"\256\001\n"
106-
+ "\024CreateBackupMetadata\022\014\n\004name\030\001 \001(\t\022\020\n\010d"
107-
+ "atabase\030\002 \001(\t\022E\n\010progress\030\003 \001(\01323.google"
108-
+ ".spanner.admin.database.v1.OperationProg"
109-
+ "ress\022/\n\013cancel_time\030\004 \001(\0132\032.google.proto"
110-
+ "buf.Timestamp\"\212\001\n\023UpdateBackupRequest\022=\n"
111-
+ "\006backup\030\001 \001(\0132(.google.spanner.admin.dat"
112-
+ "abase.v1.BackupB\003\340A\002\0224\n\013update_mask\030\002 \001("
113-
+ "\0132\032.google.protobuf.FieldMaskB\003\340A\002\"G\n\020Ge"
114-
+ "tBackupRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035sp"
115-
+ "anner.googleapis.com/Backup\"J\n\023DeleteBac"
116-
+ "kupRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035spanne"
117-
+ "r.googleapis.com/Backup\"\204\001\n\022ListBackupsR"
118-
+ "equest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037spanner."
119-
+ "googleapis.com/Instance\022\016\n\006filter\030\002 \001(\t\022"
120-
+ "\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"i"
121-
+ "\n\023ListBackupsResponse\0229\n\007backups\030\001 \003(\0132("
122-
+ ".google.spanner.admin.database.v1.Backup"
123-
+ "\022\027\n\017next_page_token\030\002 \001(\t\"\215\001\n\033ListBackup"
124-
+ "OperationsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A"
125-
+ "!\n\037spanner.googleapis.com/Instance\022\016\n\006fi"
126-
+ "lter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_to"
127-
+ "ken\030\004 \001(\t\"j\n\034ListBackupOperationsRespons"
128-
+ "e\0221\n\noperations\030\001 \003(\0132\035.google.longrunni"
129-
+ "ng.Operation\022\027\n\017next_page_token\030\002 \001(\t\"f\n"
130-
+ "\nBackupInfo\022\016\n\006backup\030\001 \001(\t\022/\n\013create_ti"
131-
+ "me\030\002 \001(\0132\032.google.protobuf.Timestamp\022\027\n\017"
132-
+ "source_database\030\003 \001(\tB\321\001\n$com.google.spa"
133-
+ "nner.admin.database.v1B\013BackupProtoP\001ZHg"
134-
+ "oogle.golang.org/genproto/googleapis/spa"
135-
+ "nner/admin/database/v1;database\252\002&Google"
136-
+ ".Cloud.Spanner.Admin.Database.V1\312\002&Googl"
137-
+ "e\\Cloud\\Spanner\\Admin\\Database\\V1b\006proto"
138-
+ "3"
91+
+ "to\"\315\003\n\006Backup\0226\n\010database\030\002 \001(\tB$\372A!\n\037sp"
92+
+ "anner.googleapis.com/Database\022/\n\013expire_"
93+
+ "time\030\003 \001(\0132\032.google.protobuf.Timestamp\022\014"
94+
+ "\n\004name\030\001 \001(\t\0224\n\013create_time\030\004 \001(\0132\032.goog"
95+
+ "le.protobuf.TimestampB\003\340A\003\022\027\n\nsize_bytes"
96+
+ "\030\005 \001(\003B\003\340A\003\022B\n\005state\030\006 \001(\0162..google.span"
97+
+ "ner.admin.database.v1.Backup.StateB\003\340A\003\022"
98+
+ "\"\n\025referencing_databases\030\007 \003(\tB\003\340A\003\"7\n\005S"
99+
+ "tate\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATING\020"
100+
+ "\001\022\t\n\005READY\020\002:\\\352AY\n\035spanner.googleapis.co"
101+
+ "m/Backup\0228projects/{project}/instances/{"
102+
+ "instance}/backups/{backup}\"\245\001\n\023CreateBac"
103+
+ "kupRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037span"
104+
+ "ner.googleapis.com/Instance\022\026\n\tbackup_id"
105+
+ "\030\002 \001(\tB\003\340A\002\022=\n\006backup\030\003 \001(\0132(.google.spa"
106+
+ "nner.admin.database.v1.BackupB\003\340A\002\"\256\001\n\024C"
107+
+ "reateBackupMetadata\022\014\n\004name\030\001 \001(\t\022\020\n\010dat"
108+
+ "abase\030\002 \001(\t\022E\n\010progress\030\003 \001(\01323.google.s"
109+
+ "panner.admin.database.v1.OperationProgre"
110+
+ "ss\022/\n\013cancel_time\030\004 \001(\0132\032.google.protobu"
111+
+ "f.Timestamp\"\212\001\n\023UpdateBackupRequest\022=\n\006b"
112+
+ "ackup\030\001 \001(\0132(.google.spanner.admin.datab"
113+
+ "ase.v1.BackupB\003\340A\002\0224\n\013update_mask\030\002 \001(\0132"
114+
+ "\032.google.protobuf.FieldMaskB\003\340A\002\"G\n\020GetB"
115+
+ "ackupRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035span"
116+
+ "ner.googleapis.com/Backup\"J\n\023DeleteBacku"
117+
+ "pRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035spanner."
118+
+ "googleapis.com/Backup\"\204\001\n\022ListBackupsReq"
119+
+ "uest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.go"
120+
+ "ogleapis.com/Instance\022\016\n\006filter\030\002 \001(\t\022\021\n"
121+
+ "\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"i\n\023"
122+
+ "ListBackupsResponse\0229\n\007backups\030\001 \003(\0132(.g"
123+
+ "oogle.spanner.admin.database.v1.Backup\022\027"
124+
+ "\n\017next_page_token\030\002 \001(\t\"\215\001\n\033ListBackupOp"
125+
+ "erationsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n"
126+
+ "\037spanner.googleapis.com/Instance\022\016\n\006filt"
127+
+ "er\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_toke"
128+
+ "n\030\004 \001(\t\"j\n\034ListBackupOperationsResponse\022"
129+
+ "1\n\noperations\030\001 \003(\0132\035.google.longrunning"
130+
+ ".Operation\022\027\n\017next_page_token\030\002 \001(\t\"f\n\nB"
131+
+ "ackupInfo\022\016\n\006backup\030\001 \001(\t\022/\n\013create_time"
132+
+ "\030\002 \001(\0132\032.google.protobuf.Timestamp\022\027\n\017so"
133+
+ "urce_database\030\003 \001(\tB\321\001\n$com.google.spann"
134+
+ "er.admin.database.v1B\013BackupProtoP\001ZHgoo"
135+
+ "gle.golang.org/genproto/googleapis/spann"
136+
+ "er/admin/database/v1;database\252\002&Google.C"
137+
+ "loud.Spanner.Admin.Database.V1\312\002&Google\\"
138+
+ "Cloud\\Spanner\\Admin\\Database\\V1b\006proto3"
139139
};
140140
descriptor =
141141
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

‎proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup.proto‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ message Backup {
5656
// created. This needs to be in the same instance as the backup.
5757
// Values are of the form
5858
// `projects/<project>/instances/<instance>/databases/<database>`.
59-
string database = 2;
59+
string database = 2 [(google.api.resource_reference) = {
60+
type: "spanner.googleapis.com/Database"
61+
}];
6062

6163
// Required for the [CreateBackup][google.spanner.admin.database.v1.DatabaseAdmin.CreateBackup]
6264
// operation. The expiration time of the backup, with microseconds

‎synth.metadata‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-spanner.git",
7-
"sha": "9e5a1cdaacf71147b67681861f063c3276705f44"
7+
"sha": "5806b0e1c7c5bfe7891283ae515b114b3ef814d9"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "ee4ea76504aa60c2bff9b7c11269c155d8c21e0d",
15-
"internalRef": "305619145"
14+
"sha": "ab5d07c2883026eec395d73ff59a17f4ad0153db",
15+
"internalRef": "306557455"
1616
}
1717
},
1818
{

0 commit comments

Comments
 (0)