Skip to content

Commit

Permalink
feat: add plural and singular resource descriptor (googleapis#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yoshi-automation @callmehiphop
yoshi-automation authored and callmehiphop committed Nov 22, 2019
1 parent 97d7180 commit a67ffa7
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 6 deletions.
30 changes: 30 additions & 0 deletions protos/protos.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
// Copyright 2019 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

import * as Long from "long";
import * as $protobuf from "protobufjs";
/** Namespace google. */
export namespace google {
Expand Down Expand Up @@ -1083,6 +1098,12 @@ export namespace google {

/** ResourceDescriptor history */
history?: (google.api.ResourceDescriptor.History|null);

/** ResourceDescriptor plural */
plural?: (string|null);

/** ResourceDescriptor singular */
singular?: (string|null);
}

/** Represents a ResourceDescriptor. */
Expand All @@ -1106,6 +1127,12 @@ export namespace google {
/** ResourceDescriptor history. */
public history: google.api.ResourceDescriptor.History;

/** ResourceDescriptor plural. */
public plural: string;

/** ResourceDescriptor singular. */
public singular: string;

/**
* Creates a new ResourceDescriptor instance using the specified properties.
* @param [properties] Properties to set
Expand Down Expand Up @@ -2842,6 +2869,9 @@ export namespace google {

/** FileOptions uninterpretedOption */
uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null);

/** FileOptions .google.api.resourceDefinition */
".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null);
}

/** Represents a FileOptions. */
Expand Down
104 changes: 103 additions & 1 deletion protos/protos.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
// Copyright 2019 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
(function(global, factory) { /* global define, require, module */

Expand Down Expand Up @@ -2647,6 +2661,8 @@
* @property {Array.<string>|null} [pattern] ResourceDescriptor pattern
* @property {string|null} [nameField] ResourceDescriptor nameField
* @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history
* @property {string|null} [plural] ResourceDescriptor plural
* @property {string|null} [singular] ResourceDescriptor singular
*/

/**
Expand Down Expand Up @@ -2697,6 +2713,22 @@
*/
ResourceDescriptor.prototype.history = 0;

/**
* ResourceDescriptor plural.
* @member {string} plural
* @memberof google.api.ResourceDescriptor
* @instance
*/
ResourceDescriptor.prototype.plural = "";

/**
* ResourceDescriptor singular.
* @member {string} singular
* @memberof google.api.ResourceDescriptor
* @instance
*/
ResourceDescriptor.prototype.singular = "";

/**
* Creates a new ResourceDescriptor instance using the specified properties.
* @function create
Expand Down Expand Up @@ -2730,6 +2762,10 @@
writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField);
if (message.history != null && message.hasOwnProperty("history"))
writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history);
if (message.plural != null && message.hasOwnProperty("plural"))
writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural);
if (message.singular != null && message.hasOwnProperty("singular"))
writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular);
return writer;
};

Expand Down Expand Up @@ -2778,6 +2814,12 @@
case 4:
message.history = reader.int32();
break;
case 5:
message.plural = reader.string();
break;
case 6:
message.singular = reader.string();
break;
default:
reader.skipType(tag & 7);
break;
Expand Down Expand Up @@ -2835,6 +2877,12 @@
case 2:
break;
}
if (message.plural != null && message.hasOwnProperty("plural"))
if (!$util.isString(message.plural))
return "plural: string expected";
if (message.singular != null && message.hasOwnProperty("singular"))
if (!$util.isString(message.singular))
return "singular: string expected";
return null;
};

Expand Down Expand Up @@ -2875,6 +2923,10 @@
message.history = 2;
break;
}
if (object.plural != null)
message.plural = String(object.plural);
if (object.singular != null)
message.singular = String(object.singular);
return message;
};

Expand All @@ -2897,6 +2949,8 @@
object.type = "";
object.nameField = "";
object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0;
object.plural = "";
object.singular = "";
}
if (message.type != null && message.hasOwnProperty("type"))
object.type = message.type;
Expand All @@ -2909,6 +2963,10 @@
object.nameField = message.nameField;
if (message.history != null && message.hasOwnProperty("history"))
object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history;
if (message.plural != null && message.hasOwnProperty("plural"))
object.plural = message.plural;
if (message.singular != null && message.hasOwnProperty("singular"))
object.singular = message.singular;
return object;
};

Expand Down Expand Up @@ -7323,6 +7381,7 @@
* @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace
* @property {string|null} [rubyPackage] FileOptions rubyPackage
* @property {Array.<google.protobuf.IUninterpretedOption>|null} [uninterpretedOption] FileOptions uninterpretedOption
* @property {Array.<google.api.IResourceDescriptor>|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition
*/

/**
Expand All @@ -7335,6 +7394,7 @@
*/
function FileOptions(properties) {
this.uninterpretedOption = [];
this[".google.api.resourceDefinition"] = [];
if (properties)
for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
if (properties[keys[i]] != null)
Expand Down Expand Up @@ -7509,6 +7569,14 @@
*/
FileOptions.prototype.uninterpretedOption = $util.emptyArray;

/**
* FileOptions .google.api.resourceDefinition.
* @member {Array.<google.api.IResourceDescriptor>} .google.api.resourceDefinition
* @memberof google.protobuf.FileOptions
* @instance
*/
FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray;

/**
* Creates a new FileOptions instance using the specified properties.
* @function create
Expand Down Expand Up @@ -7576,6 +7644,9 @@
if (message.uninterpretedOption != null && message.uninterpretedOption.length)
for (var i = 0; i < message.uninterpretedOption.length; ++i)
$root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim();
if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length)
for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i)
$root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim();
return writer;
};

Expand Down Expand Up @@ -7675,6 +7746,11 @@
message.uninterpretedOption = [];
message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32()));
break;
case 1053:
if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length))
message[".google.api.resourceDefinition"] = [];
message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32()));
break;
default:
reader.skipType(tag & 7);
break;
Expand Down Expand Up @@ -7785,6 +7861,15 @@
return "uninterpretedOption." + error;
}
}
if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) {
if (!Array.isArray(message[".google.api.resourceDefinition"]))
return ".google.api.resourceDefinition: array expected";
for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) {
var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]);
if (error)
return ".google.api.resourceDefinition." + error;
}
}
return null;
};

Expand Down Expand Up @@ -7862,6 +7947,16 @@
message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]);
}
}
if (object[".google.api.resourceDefinition"]) {
if (!Array.isArray(object[".google.api.resourceDefinition"]))
throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected");
message[".google.api.resourceDefinition"] = [];
for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) {
if (typeof object[".google.api.resourceDefinition"][i] !== "object")
throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected");
message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]);
}
}
return message;
};

Expand All @@ -7878,8 +7973,10 @@
if (!options)
options = {};
var object = {};
if (options.arrays || options.defaults)
if (options.arrays || options.defaults) {
object.uninterpretedOption = [];
object[".google.api.resourceDefinition"] = [];
}
if (options.defaults) {
object.javaPackage = "";
object.javaOuterClassname = "";
Expand Down Expand Up @@ -7947,6 +8044,11 @@
for (var j = 0; j < message.uninterpretedOption.length; ++j)
object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options);
}
if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) {
object[".google.api.resourceDefinition"] = [];
for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j)
object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options);
}
return object;
};

Expand Down
14 changes: 14 additions & 0 deletions protos/protos.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,12 @@
"id": 1055,
"extend": "google.protobuf.FieldOptions"
},
"resourceDefinition": {
"rule": "repeated",
"type": "google.api.ResourceDescriptor",
"id": 1053,
"extend": "google.protobuf.FileOptions"
},
"resource": {
"type": "google.api.ResourceDescriptor",
"id": 1053,
Expand All @@ -364,6 +370,14 @@
"history": {
"type": "History",
"id": 4
},
"plural": {
"type": "string",
"id": 5
},
"singular": {
"type": "string",
"id": 6
}
},
"nested": {
Expand Down
10 changes: 5 additions & 5 deletions synth.metadata
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"updateTime": "2019-11-14T03:52:09.794198Z",
"updateTime": "2019-11-19T12:24:42.593913Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "0.41.1",
"dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e"
"version": "0.42.1",
"dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "218164b3deba1075979c9dca5f71461379e42dd1",
"internalRef": "280279014"
"sha": "d8dd7fe8d5304f7bd1c52207703d7f27d5328c5a",
"internalRef": "281088257"
}
},
{
Expand Down

0 comments on commit a67ffa7

Please sign in to comment.