Skip to content

Commit 2188ff0

Browse files
yoshi-automationJustinBeckwith
yoshi-automation
authored and
JustinBeckwith
committed
feat: adds plural and singular resource descriptor (#471)
1 parent b46ebf2 commit 2188ff0

4 files changed

Lines changed: 123 additions & 6 deletions

File tree

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27844,6 +27844,12 @@ export namespace google {
2784427844

2784527845
/** ResourceDescriptor history */
2784627846
history?: (google.api.ResourceDescriptor.History|null);
27847+
27848+
/** ResourceDescriptor plural */
27849+
plural?: (string|null);
27850+
27851+
/** ResourceDescriptor singular */
27852+
singular?: (string|null);
2784727853
}
2784827854

2784927855
/** Represents a ResourceDescriptor. */
@@ -27867,6 +27873,12 @@ export namespace google {
2786727873
/** ResourceDescriptor history. */
2786827874
public history: google.api.ResourceDescriptor.History;
2786927875

27876+
/** ResourceDescriptor plural. */
27877+
public plural: string;
27878+
27879+
/** ResourceDescriptor singular. */
27880+
public singular: string;
27881+
2787027882
/**
2787127883
* Creates a new ResourceDescriptor instance using the specified properties.
2787227884
* @param [properties] Properties to set
@@ -29603,6 +29615,9 @@ export namespace google {
2960329615

2960429616
/** FileOptions uninterpretedOption */
2960529617
uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null);
29618+
29619+
/** FileOptions .google.api.resourceDefinition */
29620+
".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null);
2960629621
}
2960729622

2960829623
/** Represents a FileOptions. */

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

Lines changed: 89 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66955,6 +66955,8 @@
6695566955
* @property {Array.<string>|null} [pattern] ResourceDescriptor pattern
6695666956
* @property {string|null} [nameField] ResourceDescriptor nameField
6695766957
* @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history
66958+
* @property {string|null} [plural] ResourceDescriptor plural
66959+
* @property {string|null} [singular] ResourceDescriptor singular
6695866960
*/
6695966961

6696066962
/**
@@ -67005,6 +67007,22 @@
6700567007
*/
6700667008
ResourceDescriptor.prototype.history = 0;
6700767009

67010+
/**
67011+
* ResourceDescriptor plural.
67012+
* @member {string} plural
67013+
* @memberof google.api.ResourceDescriptor
67014+
* @instance
67015+
*/
67016+
ResourceDescriptor.prototype.plural = "";
67017+
67018+
/**
67019+
* ResourceDescriptor singular.
67020+
* @member {string} singular
67021+
* @memberof google.api.ResourceDescriptor
67022+
* @instance
67023+
*/
67024+
ResourceDescriptor.prototype.singular = "";
67025+
6700867026
/**
6700967027
* Creates a new ResourceDescriptor instance using the specified properties.
6701067028
* @function create
@@ -67038,6 +67056,10 @@
6703867056
writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField);
6703967057
if (message.history != null && message.hasOwnProperty("history"))
6704067058
writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history);
67059+
if (message.plural != null && message.hasOwnProperty("plural"))
67060+
writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural);
67061+
if (message.singular != null && message.hasOwnProperty("singular"))
67062+
writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular);
6704167063
return writer;
6704267064
};
6704367065

@@ -67086,6 +67108,12 @@
6708667108
case 4:
6708767109
message.history = reader.int32();
6708867110
break;
67111+
case 5:
67112+
message.plural = reader.string();
67113+
break;
67114+
case 6:
67115+
message.singular = reader.string();
67116+
break;
6708967117
default:
6709067118
reader.skipType(tag & 7);
6709167119
break;
@@ -67143,6 +67171,12 @@
6714367171
case 2:
6714467172
break;
6714567173
}
67174+
if (message.plural != null && message.hasOwnProperty("plural"))
67175+
if (!$util.isString(message.plural))
67176+
return "plural: string expected";
67177+
if (message.singular != null && message.hasOwnProperty("singular"))
67178+
if (!$util.isString(message.singular))
67179+
return "singular: string expected";
6714667180
return null;
6714767181
};
6714867182

@@ -67183,6 +67217,10 @@
6718367217
message.history = 2;
6718467218
break;
6718567219
}
67220+
if (object.plural != null)
67221+
message.plural = String(object.plural);
67222+
if (object.singular != null)
67223+
message.singular = String(object.singular);
6718667224
return message;
6718767225
};
6718867226

@@ -67205,6 +67243,8 @@
6720567243
object.type = "";
6720667244
object.nameField = "";
6720767245
object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0;
67246+
object.plural = "";
67247+
object.singular = "";
6720867248
}
6720967249
if (message.type != null && message.hasOwnProperty("type"))
6721067250
object.type = message.type;
@@ -67217,6 +67257,10 @@
6721767257
object.nameField = message.nameField;
6721867258
if (message.history != null && message.hasOwnProperty("history"))
6721967259
object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history;
67260+
if (message.plural != null && message.hasOwnProperty("plural"))
67261+
object.plural = message.plural;
67262+
if (message.singular != null && message.hasOwnProperty("singular"))
67263+
object.singular = message.singular;
6722067264
return object;
6722167265
};
6722267266

@@ -71631,6 +71675,7 @@
7163171675
* @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace
7163271676
* @property {string|null} [rubyPackage] FileOptions rubyPackage
7163371677
* @property {Array.<google.protobuf.IUninterpretedOption>|null} [uninterpretedOption] FileOptions uninterpretedOption
71678+
* @property {Array.<google.api.IResourceDescriptor>|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition
7163471679
*/
7163571680

7163671681
/**
@@ -71643,6 +71688,7 @@
7164371688
*/
7164471689
function FileOptions(properties) {
7164571690
this.uninterpretedOption = [];
71691+
this[".google.api.resourceDefinition"] = [];
7164671692
if (properties)
7164771693
for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
7164871694
if (properties[keys[i]] != null)
@@ -71817,6 +71863,14 @@
7181771863
*/
7181871864
FileOptions.prototype.uninterpretedOption = $util.emptyArray;
7181971865

71866+
/**
71867+
* FileOptions .google.api.resourceDefinition.
71868+
* @member {Array.<google.api.IResourceDescriptor>} .google.api.resourceDefinition
71869+
* @memberof google.protobuf.FileOptions
71870+
* @instance
71871+
*/
71872+
FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray;
71873+
7182071874
/**
7182171875
* Creates a new FileOptions instance using the specified properties.
7182271876
* @function create
@@ -71884,6 +71938,9 @@
7188471938
if (message.uninterpretedOption != null && message.uninterpretedOption.length)
7188571939
for (var i = 0; i < message.uninterpretedOption.length; ++i)
7188671940
$root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim();
71941+
if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length)
71942+
for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i)
71943+
$root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim();
7188771944
return writer;
7188871945
};
7188971946

@@ -71983,6 +72040,11 @@
7198372040
message.uninterpretedOption = [];
7198472041
message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32()));
7198572042
break;
72043+
case 1053:
72044+
if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length))
72045+
message[".google.api.resourceDefinition"] = [];
72046+
message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32()));
72047+
break;
7198672048
default:
7198772049
reader.skipType(tag & 7);
7198872050
break;
@@ -72093,6 +72155,15 @@
7209372155
return "uninterpretedOption." + error;
7209472156
}
7209572157
}
72158+
if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) {
72159+
if (!Array.isArray(message[".google.api.resourceDefinition"]))
72160+
return ".google.api.resourceDefinition: array expected";
72161+
for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) {
72162+
var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]);
72163+
if (error)
72164+
return ".google.api.resourceDefinition." + error;
72165+
}
72166+
}
7209672167
return null;
7209772168
};
7209872169

@@ -72170,6 +72241,16 @@
7217072241
message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]);
7217172242
}
7217272243
}
72244+
if (object[".google.api.resourceDefinition"]) {
72245+
if (!Array.isArray(object[".google.api.resourceDefinition"]))
72246+
throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected");
72247+
message[".google.api.resourceDefinition"] = [];
72248+
for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) {
72249+
if (typeof object[".google.api.resourceDefinition"][i] !== "object")
72250+
throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected");
72251+
message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]);
72252+
}
72253+
}
7217372254
return message;
7217472255
};
7217572256

@@ -72186,8 +72267,10 @@
7218672267
if (!options)
7218772268
options = {};
7218872269
var object = {};
72189-
if (options.arrays || options.defaults)
72270+
if (options.arrays || options.defaults) {
7219072271
object.uninterpretedOption = [];
72272+
object[".google.api.resourceDefinition"] = [];
72273+
}
7219172274
if (options.defaults) {
7219272275
object.javaPackage = "";
7219372276
object.javaOuterClassname = "";
@@ -72255,6 +72338,11 @@
7225572338
for (var j = 0; j < message.uninterpretedOption.length; ++j)
7225672339
object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options);
7225772340
}
72341+
if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) {
72342+
object[".google.api.resourceDefinition"] = [];
72343+
for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j)
72344+
object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options);
72345+
}
7225872346
return object;
7225972347
};
7226072348

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6511,6 +6511,12 @@
65116511
"id": 1055,
65126512
"extend": "google.protobuf.FieldOptions"
65136513
},
6514+
"resourceDefinition": {
6515+
"rule": "repeated",
6516+
"type": "google.api.ResourceDescriptor",
6517+
"id": 1053,
6518+
"extend": "google.protobuf.FileOptions"
6519+
},
65146520
"resource": {
65156521
"type": "google.api.ResourceDescriptor",
65166522
"id": 1053,
@@ -6534,6 +6540,14 @@
65346540
"history": {
65356541
"type": "History",
65366542
"id": 4
6543+
},
6544+
"plural": {
6545+
"type": "string",
6546+
"id": 5
6547+
},
6548+
"singular": {
6549+
"type": "string",
6550+
"id": 6
65376551
}
65386552
},
65396553
"nested": {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"updateTime": "2019-11-15T12:12:42.241170Z",
2+
"updateTime": "2019-11-19T12:15:56.120048Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.41.1",
8-
"dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e"
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": "f6808ff4e8b966cd571e99279d4a2780ed97dff2",
16-
"internalRef": "280581337"
15+
"sha": "d8dd7fe8d5304f7bd1c52207703d7f27d5328c5a",
16+
"internalRef": "281088257"
1717
}
1818
},
1919
{

0 commit comments

Comments
 (0)