Skip to content

Commit fddf223

Browse files
yoshi-automationcallmehiphop
yoshi-automation
authored and
callmehiphop
committed
feat: add plural and singular resource descriptor (#56)
1 parent 396976c commit fddf223

File tree

4 files changed

+153
-7
lines changed

4 files changed

+153
-7
lines changed

‎packages/google-cloud-phishingprotection/protos/protos.d.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2019 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
import * as Long from "long";
116
import * as $protobuf from "protobufjs";
217
/** Namespace google. */
318
export namespace google {
@@ -605,6 +620,12 @@ export namespace google {
605620

606621
/** ResourceDescriptor history */
607622
history?: (google.api.ResourceDescriptor.History|null);
623+
624+
/** ResourceDescriptor plural */
625+
plural?: (string|null);
626+
627+
/** ResourceDescriptor singular */
628+
singular?: (string|null);
608629
}
609630

610631
/** Represents a ResourceDescriptor. */
@@ -628,6 +649,12 @@ export namespace google {
628649
/** ResourceDescriptor history. */
629650
public history: google.api.ResourceDescriptor.History;
630651

652+
/** ResourceDescriptor plural. */
653+
public plural: string;
654+
655+
/** ResourceDescriptor singular. */
656+
public singular: string;
657+
631658
/**
632659
* Creates a new ResourceDescriptor instance using the specified properties.
633660
* @param [properties] Properties to set
@@ -2364,6 +2391,9 @@ export namespace google {
23642391

23652392
/** FileOptions uninterpretedOption */
23662393
uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null);
2394+
2395+
/** FileOptions .google.api.resourceDefinition */
2396+
".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null);
23672397
}
23682398

23692399
/** Represents a FileOptions. */

‎packages/google-cloud-phishingprotection/protos/protos.js

Lines changed: 103 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Copyright 2019 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
216
(function(global, factory) { /* global define, require, module */
317

@@ -1444,6 +1458,8 @@
14441458
* @property {Array.<string>|null} [pattern] ResourceDescriptor pattern
14451459
* @property {string|null} [nameField] ResourceDescriptor nameField
14461460
* @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history
1461+
* @property {string|null} [plural] ResourceDescriptor plural
1462+
* @property {string|null} [singular] ResourceDescriptor singular
14471463
*/
14481464

14491465
/**
@@ -1494,6 +1510,22 @@
14941510
*/
14951511
ResourceDescriptor.prototype.history = 0;
14961512

1513+
/**
1514+
* ResourceDescriptor plural.
1515+
* @member {string} plural
1516+
* @memberof google.api.ResourceDescriptor
1517+
* @instance
1518+
*/
1519+
ResourceDescriptor.prototype.plural = "";
1520+
1521+
/**
1522+
* ResourceDescriptor singular.
1523+
* @member {string} singular
1524+
* @memberof google.api.ResourceDescriptor
1525+
* @instance
1526+
*/
1527+
ResourceDescriptor.prototype.singular = "";
1528+
14971529
/**
14981530
* Creates a new ResourceDescriptor instance using the specified properties.
14991531
* @function create
@@ -1527,6 +1559,10 @@
15271559
writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField);
15281560
if (message.history != null && message.hasOwnProperty("history"))
15291561
writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history);
1562+
if (message.plural != null && message.hasOwnProperty("plural"))
1563+
writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural);
1564+
if (message.singular != null && message.hasOwnProperty("singular"))
1565+
writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular);
15301566
return writer;
15311567
};
15321568

@@ -1575,6 +1611,12 @@
15751611
case 4:
15761612
message.history = reader.int32();
15771613
break;
1614+
case 5:
1615+
message.plural = reader.string();
1616+
break;
1617+
case 6:
1618+
message.singular = reader.string();
1619+
break;
15781620
default:
15791621
reader.skipType(tag & 7);
15801622
break;
@@ -1632,6 +1674,12 @@
16321674
case 2:
16331675
break;
16341676
}
1677+
if (message.plural != null && message.hasOwnProperty("plural"))
1678+
if (!$util.isString(message.plural))
1679+
return "plural: string expected";
1680+
if (message.singular != null && message.hasOwnProperty("singular"))
1681+
if (!$util.isString(message.singular))
1682+
return "singular: string expected";
16351683
return null;
16361684
};
16371685

@@ -1672,6 +1720,10 @@
16721720
message.history = 2;
16731721
break;
16741722
}
1723+
if (object.plural != null)
1724+
message.plural = String(object.plural);
1725+
if (object.singular != null)
1726+
message.singular = String(object.singular);
16751727
return message;
16761728
};
16771729

@@ -1694,6 +1746,8 @@
16941746
object.type = "";
16951747
object.nameField = "";
16961748
object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0;
1749+
object.plural = "";
1750+
object.singular = "";
16971751
}
16981752
if (message.type != null && message.hasOwnProperty("type"))
16991753
object.type = message.type;
@@ -1706,6 +1760,10 @@
17061760
object.nameField = message.nameField;
17071761
if (message.history != null && message.hasOwnProperty("history"))
17081762
object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history;
1763+
if (message.plural != null && message.hasOwnProperty("plural"))
1764+
object.plural = message.plural;
1765+
if (message.singular != null && message.hasOwnProperty("singular"))
1766+
object.singular = message.singular;
17091767
return object;
17101768
};
17111769

@@ -6120,6 +6178,7 @@
61206178
* @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace
61216179
* @property {string|null} [rubyPackage] FileOptions rubyPackage
61226180
* @property {Array.<google.protobuf.IUninterpretedOption>|null} [uninterpretedOption] FileOptions uninterpretedOption
6181+
* @property {Array.<google.api.IResourceDescriptor>|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition
61236182
*/
61246183

61256184
/**
@@ -6132,6 +6191,7 @@
61326191
*/
61336192
function FileOptions(properties) {
61346193
this.uninterpretedOption = [];
6194+
this[".google.api.resourceDefinition"] = [];
61356195
if (properties)
61366196
for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
61376197
if (properties[keys[i]] != null)
@@ -6306,6 +6366,14 @@
63066366
*/
63076367
FileOptions.prototype.uninterpretedOption = $util.emptyArray;
63086368

6369+
/**
6370+
* FileOptions .google.api.resourceDefinition.
6371+
* @member {Array.<google.api.IResourceDescriptor>} .google.api.resourceDefinition
6372+
* @memberof google.protobuf.FileOptions
6373+
* @instance
6374+
*/
6375+
FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray;
6376+
63096377
/**
63106378
* Creates a new FileOptions instance using the specified properties.
63116379
* @function create
@@ -6373,6 +6441,9 @@
63736441
if (message.uninterpretedOption != null && message.uninterpretedOption.length)
63746442
for (var i = 0; i < message.uninterpretedOption.length; ++i)
63756443
$root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim();
6444+
if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length)
6445+
for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i)
6446+
$root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim();
63766447
return writer;
63776448
};
63786449

@@ -6472,6 +6543,11 @@
64726543
message.uninterpretedOption = [];
64736544
message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32()));
64746545
break;
6546+
case 1053:
6547+
if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length))
6548+
message[".google.api.resourceDefinition"] = [];
6549+
message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32()));
6550+
break;
64756551
default:
64766552
reader.skipType(tag & 7);
64776553
break;
@@ -6582,6 +6658,15 @@
65826658
return "uninterpretedOption." + error;
65836659
}
65846660
}
6661+
if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) {
6662+
if (!Array.isArray(message[".google.api.resourceDefinition"]))
6663+
return ".google.api.resourceDefinition: array expected";
6664+
for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) {
6665+
var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]);
6666+
if (error)
6667+
return ".google.api.resourceDefinition." + error;
6668+
}
6669+
}
65856670
return null;
65866671
};
65876672

@@ -6659,6 +6744,16 @@
66596744
message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]);
66606745
}
66616746
}
6747+
if (object[".google.api.resourceDefinition"]) {
6748+
if (!Array.isArray(object[".google.api.resourceDefinition"]))
6749+
throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected");
6750+
message[".google.api.resourceDefinition"] = [];
6751+
for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) {
6752+
if (typeof object[".google.api.resourceDefinition"][i] !== "object")
6753+
throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected");
6754+
message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]);
6755+
}
6756+
}
66626757
return message;
66636758
};
66646759

@@ -6675,8 +6770,10 @@
66756770
if (!options)
66766771
options = {};
66776772
var object = {};
6678-
if (options.arrays || options.defaults)
6773+
if (options.arrays || options.defaults) {
66796774
object.uninterpretedOption = [];
6775+
object[".google.api.resourceDefinition"] = [];
6776+
}
66806777
if (options.defaults) {
66816778
object.javaPackage = "";
66826779
object.javaOuterClassname = "";
@@ -6744,6 +6841,11 @@
67446841
for (var j = 0; j < message.uninterpretedOption.length; ++j)
67456842
object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options);
67466843
}
6844+
if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) {
6845+
object[".google.api.resourceDefinition"] = [];
6846+
for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j)
6847+
object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options);
6848+
}
67476849
return object;
67486850
};
67496851

‎packages/google-cloud-phishingprotection/protos/protos.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,12 @@
196196
"id": 1055,
197197
"extend": "google.protobuf.FieldOptions"
198198
},
199+
"resourceDefinition": {
200+
"rule": "repeated",
201+
"type": "google.api.ResourceDescriptor",
202+
"id": 1053,
203+
"extend": "google.protobuf.FileOptions"
204+
},
199205
"resource": {
200206
"type": "google.api.ResourceDescriptor",
201207
"id": 1053,
@@ -219,6 +225,14 @@
219225
"history": {
220226
"type": "History",
221227
"id": 4
228+
},
229+
"plural": {
230+
"type": "string",
231+
"id": 5
232+
},
233+
"singular": {
234+
"type": "string",
235+
"id": 6
222236
}
223237
},
224238
"nested": {

‎packages/google-cloud-phishingprotection/synth.metadata

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"updateTime": "2019-10-01T11:25:34.736885Z",
2+
"updateTime": "2019-11-19T12:23:08.771698Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.37.1",
8-
"dockerImage": "googleapis/artman@sha256:6068f67900a3f0bdece596b97bda8fc70406ca0e137a941f4c81d3217c994a80"
7+
"version": "0.42.1",
8+
"dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "ce3c574d1266026cebea3a893247790bd68191c2",
16-
"internalRef": "272147209"
15+
"sha": "d8dd7fe8d5304f7bd1c52207703d7f27d5328c5a",
16+
"internalRef": "281088257"
1717
}
1818
},
1919
{
2020
"template": {
2121
"name": "node_library",
2222
"origin": "synthtool.gcp",
23-
"version": "2019.5.2"
23+
"version": "2019.10.17"
2424
}
2525
}
2626
],

0 commit comments

Comments
 (0)