@google-cloud/dlp 3.2.0 → 3.4.0

package/build/protos/protos.js

@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@
                         };
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#inspectContent}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|inspectContent}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef InspectContentCallback
                          * @type {function}
@@ -132,7 +132,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#redactImage}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|redactImage}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef RedactImageCallback
                          * @type {function}
@@ -165,7 +165,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#deidentifyContent}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|deidentifyContent}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef DeidentifyContentCallback
                          * @type {function}
@@ -198,7 +198,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#reidentifyContent}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|reidentifyContent}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ReidentifyContentCallback
                          * @type {function}
@@ -231,7 +231,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#listInfoTypes}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|listInfoTypes}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ListInfoTypesCallback
                          * @type {function}
@@ -264,7 +264,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#createInspectTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|createInspectTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef CreateInspectTemplateCallback
                          * @type {function}
@@ -297,7 +297,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#updateInspectTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|updateInspectTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef UpdateInspectTemplateCallback
                          * @type {function}
@@ -330,7 +330,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#getInspectTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|getInspectTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef GetInspectTemplateCallback
                          * @type {function}
@@ -363,7 +363,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#listInspectTemplates}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|listInspectTemplates}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ListInspectTemplatesCallback
                          * @type {function}
@@ -396,7 +396,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#deleteInspectTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|deleteInspectTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef DeleteInspectTemplateCallback
                          * @type {function}
@@ -429,7 +429,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#createDeidentifyTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|createDeidentifyTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef CreateDeidentifyTemplateCallback
                          * @type {function}
@@ -462,7 +462,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#updateDeidentifyTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|updateDeidentifyTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef UpdateDeidentifyTemplateCallback
                          * @type {function}
@@ -495,7 +495,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#getDeidentifyTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|getDeidentifyTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef GetDeidentifyTemplateCallback
                          * @type {function}
@@ -528,7 +528,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#listDeidentifyTemplates}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|listDeidentifyTemplates}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ListDeidentifyTemplatesCallback
                          * @type {function}
@@ -561,7 +561,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#deleteDeidentifyTemplate}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|deleteDeidentifyTemplate}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef DeleteDeidentifyTemplateCallback
                          * @type {function}
@@ -594,7 +594,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#createJobTrigger}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|createJobTrigger}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef CreateJobTriggerCallback
                          * @type {function}
@@ -627,7 +627,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#updateJobTrigger}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|updateJobTrigger}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef UpdateJobTriggerCallback
                          * @type {function}
@@ -660,7 +660,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#hybridInspectJobTrigger}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|hybridInspectJobTrigger}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef HybridInspectJobTriggerCallback
                          * @type {function}
@@ -693,7 +693,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#getJobTrigger}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|getJobTrigger}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef GetJobTriggerCallback
                          * @type {function}
@@ -726,7 +726,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#listJobTriggers}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|listJobTriggers}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ListJobTriggersCallback
                          * @type {function}
@@ -759,7 +759,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#deleteJobTrigger}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|deleteJobTrigger}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef DeleteJobTriggerCallback
                          * @type {function}
@@ -792,7 +792,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#activateJobTrigger}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|activateJobTrigger}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ActivateJobTriggerCallback
                          * @type {function}
@@ -825,7 +825,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#createDlpJob}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|createDlpJob}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef CreateDlpJobCallback
                          * @type {function}
@@ -858,7 +858,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#listDlpJobs}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|listDlpJobs}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ListDlpJobsCallback
                          * @type {function}
@@ -891,7 +891,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#getDlpJob}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|getDlpJob}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef GetDlpJobCallback
                          * @type {function}
@@ -924,7 +924,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#deleteDlpJob}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|deleteDlpJob}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef DeleteDlpJobCallback
                          * @type {function}
@@ -957,7 +957,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#cancelDlpJob}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|cancelDlpJob}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef CancelDlpJobCallback
                          * @type {function}
@@ -990,7 +990,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#createStoredInfoType}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|createStoredInfoType}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef CreateStoredInfoTypeCallback
                          * @type {function}
@@ -1023,7 +1023,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#updateStoredInfoType}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|updateStoredInfoType}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef UpdateStoredInfoTypeCallback
                          * @type {function}
@@ -1056,7 +1056,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#getStoredInfoType}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|getStoredInfoType}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef GetStoredInfoTypeCallback
                          * @type {function}
@@ -1089,7 +1089,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#listStoredInfoTypes}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|listStoredInfoTypes}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef ListStoredInfoTypesCallback
                          * @type {function}
@@ -1122,7 +1122,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#deleteStoredInfoType}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|deleteStoredInfoType}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef DeleteStoredInfoTypeCallback
                          * @type {function}
@@ -1155,7 +1155,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#hybridInspectDlpJob}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|hybridInspectDlpJob}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef HybridInspectDlpJobCallback
                          * @type {function}
@@ -1188,7 +1188,7 @@
                          */
     
                         /**
-                         * Callback as used by {@link google.privacy.dlp.v2.DlpService#finishDlpJob}.
+                         * Callback as used by {@link google.privacy.dlp.v2.DlpService|finishDlpJob}.
                          * @memberof google.privacy.dlp.v2.DlpService
                          * @typedef FinishDlpJobCallback
                          * @type {function}
@@ -3368,6 +3368,8 @@
                                 case 5:
                                 case 7:
                                 case 8:
+                                case 9:
+                                case 10:
                                 case 11:
                                 case 12:
                                 case 13:
@@ -3428,6 +3430,14 @@
                             case 8:
                                 message.type = 8;
                                 break;
+                            case "POWERPOINT_DOCUMENT":
+                            case 9:
+                                message.type = 9;
+                                break;
+                            case "EXCEL_DOCUMENT":
+                            case 10:
+                                message.type = 10;
+                                break;
                             case "AVRO":
                             case 11:
                                 message.type = 11;
@@ -3503,6 +3513,8 @@
                          * @property {number} TEXT_UTF8=5 TEXT_UTF8 value
                          * @property {number} WORD_DOCUMENT=7 WORD_DOCUMENT value
                          * @property {number} PDF=8 PDF value
+                         * @property {number} POWERPOINT_DOCUMENT=9 POWERPOINT_DOCUMENT value
+                         * @property {number} EXCEL_DOCUMENT=10 EXCEL_DOCUMENT value
                          * @property {number} AVRO=11 AVRO value
                          * @property {number} CSV=12 CSV value
                          * @property {number} TSV=13 TSV value
@@ -3518,6 +3530,8 @@
                             values[valuesById[5] = "TEXT_UTF8"] = 5;
                             values[valuesById[7] = "WORD_DOCUMENT"] = 7;
                             values[valuesById[8] = "PDF"] = 8;
+                            values[valuesById[9] = "POWERPOINT_DOCUMENT"] = 9;
+                            values[valuesById[10] = "EXCEL_DOCUMENT"] = 10;
                             values[valuesById[11] = "AVRO"] = 11;
                             values[valuesById[12] = "CSV"] = 12;
                             values[valuesById[13] = "TSV"] = 13;
@@ -4509,6 +4523,7 @@
                          * @property {Object.<string,string>|null} [labels] Finding labels
                          * @property {google.protobuf.ITimestamp|null} [jobCreateTime] Finding jobCreateTime
                          * @property {string|null} [jobName] Finding jobName
+                         * @property {string|null} [findingId] Finding findingId
                          */
     
                         /**
@@ -4623,6 +4638,14 @@
                          */
                         Finding.prototype.jobName = "";
     
+                        /**
+                         * Finding findingId.
+                         * @member {string} findingId
+                         * @memberof google.privacy.dlp.v2.Finding
+                         * @instance
+                         */
+                        Finding.prototype.findingId = "";
+    
                         /**
                          * Creates a new Finding instance using the specified properties.
                          * @function create
@@ -4672,6 +4695,8 @@
                                 writer.uint32(/* id 13, wireType 2 =*/106).string(message.jobName);
                             if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                                 writer.uint32(/* id 14, wireType 2 =*/114).string(message.name);
+                            if (message.findingId != null && Object.hasOwnProperty.call(message, "findingId"))
+                                writer.uint32(/* id 15, wireType 2 =*/122).string(message.findingId);
                             return writer;
                         };
     
@@ -4761,6 +4786,9 @@
                                 case 13:
                                     message.jobName = reader.string();
                                     break;
+                                case 15:
+                                    message.findingId = reader.string();
+                                    break;
                                 default:
                                     reader.skipType(tag & 7);
                                     break;
@@ -4856,6 +4884,9 @@
                             if (message.jobName != null && message.hasOwnProperty("jobName"))
                                 if (!$util.isString(message.jobName))
                                     return "jobName: string expected";
+                            if (message.findingId != null && message.hasOwnProperty("findingId"))
+                                if (!$util.isString(message.findingId))
+                                    return "findingId: string expected";
                             return null;
                         };
     
@@ -4939,6 +4970,8 @@
                             }
                             if (object.jobName != null)
                                 message.jobName = String(object.jobName);
+                            if (object.findingId != null)
+                                message.findingId = String(object.findingId);
                             return message;
                         };
     
@@ -4969,6 +5002,7 @@
                                 object.jobCreateTime = null;
                                 object.jobName = "";
                                 object.name = "";
+                                object.findingId = "";
                             }
                             if (message.quote != null && message.hasOwnProperty("quote"))
                                 object.quote = message.quote;
@@ -4998,6 +5032,8 @@
                                 object.jobName = message.jobName;
                             if (message.name != null && message.hasOwnProperty("name"))
                                 object.name = message.name;
+                            if (message.findingId != null && message.hasOwnProperty("findingId"))
+                                object.findingId = message.findingId;
                             return object;
                         };
     
@@ -23391,6 +23427,7 @@
                          * @property {google.privacy.dlp.v2.ICryptoHashConfig|null} [cryptoHashConfig] PrimitiveTransformation cryptoHashConfig
                          * @property {google.privacy.dlp.v2.IDateShiftConfig|null} [dateShiftConfig] PrimitiveTransformation dateShiftConfig
                          * @property {google.privacy.dlp.v2.ICryptoDeterministicConfig|null} [cryptoDeterministicConfig] PrimitiveTransformation cryptoDeterministicConfig
+                         * @property {google.privacy.dlp.v2.IReplaceDictionaryConfig|null} [replaceDictionaryConfig] PrimitiveTransformation replaceDictionaryConfig
                          */
     
                         /**
@@ -23496,17 +23533,25 @@
                          */
                         PrimitiveTransformation.prototype.cryptoDeterministicConfig = null;
     
+                        /**
+                         * PrimitiveTransformation replaceDictionaryConfig.
+                         * @member {google.privacy.dlp.v2.IReplaceDictionaryConfig|null|undefined} replaceDictionaryConfig
+                         * @memberof google.privacy.dlp.v2.PrimitiveTransformation
+                         * @instance
+                         */
+                        PrimitiveTransformation.prototype.replaceDictionaryConfig = null;
+    
                         // OneOf field names bound to virtual getters and setters
                         var $oneOfFields;
     
                         /**
                          * PrimitiveTransformation transformation.
-                         * @member {"replaceConfig"|"redactConfig"|"characterMaskConfig"|"cryptoReplaceFfxFpeConfig"|"fixedSizeBucketingConfig"|"bucketingConfig"|"replaceWithInfoTypeConfig"|"timePartConfig"|"cryptoHashConfig"|"dateShiftConfig"|"cryptoDeterministicConfig"|undefined} transformation
+                         * @member {"replaceConfig"|"redactConfig"|"characterMaskConfig"|"cryptoReplaceFfxFpeConfig"|"fixedSizeBucketingConfig"|"bucketingConfig"|"replaceWithInfoTypeConfig"|"timePartConfig"|"cryptoHashConfig"|"dateShiftConfig"|"cryptoDeterministicConfig"|"replaceDictionaryConfig"|undefined} transformation
                          * @memberof google.privacy.dlp.v2.PrimitiveTransformation
                          * @instance
                          */
                         Object.defineProperty(PrimitiveTransformation.prototype, "transformation", {
-                            get: $util.oneOfGetter($oneOfFields = ["replaceConfig", "redactConfig", "characterMaskConfig", "cryptoReplaceFfxFpeConfig", "fixedSizeBucketingConfig", "bucketingConfig", "replaceWithInfoTypeConfig", "timePartConfig", "cryptoHashConfig", "dateShiftConfig", "cryptoDeterministicConfig"]),
+                            get: $util.oneOfGetter($oneOfFields = ["replaceConfig", "redactConfig", "characterMaskConfig", "cryptoReplaceFfxFpeConfig", "fixedSizeBucketingConfig", "bucketingConfig", "replaceWithInfoTypeConfig", "timePartConfig", "cryptoHashConfig", "dateShiftConfig", "cryptoDeterministicConfig", "replaceDictionaryConfig"]),
                             set: $util.oneOfSetter($oneOfFields)
                         });
     
@@ -23556,6 +23601,8 @@
                                 $root.google.privacy.dlp.v2.DateShiftConfig.encode(message.dateShiftConfig, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim();
                             if (message.cryptoDeterministicConfig != null && Object.hasOwnProperty.call(message, "cryptoDeterministicConfig"))
                                 $root.google.privacy.dlp.v2.CryptoDeterministicConfig.encode(message.cryptoDeterministicConfig, writer.uint32(/* id 12, wireType 2 =*/98).fork()).ldelim();
+                            if (message.replaceDictionaryConfig != null && Object.hasOwnProperty.call(message, "replaceDictionaryConfig"))
+                                $root.google.privacy.dlp.v2.ReplaceDictionaryConfig.encode(message.replaceDictionaryConfig, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim();
                             return writer;
                         };
     
@@ -23623,6 +23670,9 @@
                                 case 12:
                                     message.cryptoDeterministicConfig = $root.google.privacy.dlp.v2.CryptoDeterministicConfig.decode(reader, reader.uint32());
                                     break;
+                                case 13:
+                                    message.replaceDictionaryConfig = $root.google.privacy.dlp.v2.ReplaceDictionaryConfig.decode(reader, reader.uint32());
+                                    break;
                                 default:
                                     reader.skipType(tag & 7);
                                     break;
@@ -23767,6 +23817,16 @@
                                         return "cryptoDeterministicConfig." + error;
                                 }
                             }
+                            if (message.replaceDictionaryConfig != null && message.hasOwnProperty("replaceDictionaryConfig")) {
+                                if (properties.transformation === 1)
+                                    return "transformation: multiple values";
+                                properties.transformation = 1;
+                                {
+                                    var error = $root.google.privacy.dlp.v2.ReplaceDictionaryConfig.verify(message.replaceDictionaryConfig);
+                                    if (error)
+                                        return "replaceDictionaryConfig." + error;
+                                }
+                            }
                             return null;
                         };
     
@@ -23837,6 +23897,11 @@
                                     throw TypeError(".google.privacy.dlp.v2.PrimitiveTransformation.cryptoDeterministicConfig: object expected");
                                 message.cryptoDeterministicConfig = $root.google.privacy.dlp.v2.CryptoDeterministicConfig.fromObject(object.cryptoDeterministicConfig);
                             }
+                            if (object.replaceDictionaryConfig != null) {
+                                if (typeof object.replaceDictionaryConfig !== "object")
+                                    throw TypeError(".google.privacy.dlp.v2.PrimitiveTransformation.replaceDictionaryConfig: object expected");
+                                message.replaceDictionaryConfig = $root.google.privacy.dlp.v2.ReplaceDictionaryConfig.fromObject(object.replaceDictionaryConfig);
+                            }
                             return message;
                         };
     
@@ -23908,6 +23973,11 @@
                                 if (options.oneofs)
                                     object.transformation = "cryptoDeterministicConfig";
                             }
+                            if (message.replaceDictionaryConfig != null && message.hasOwnProperty("replaceDictionaryConfig")) {
+                                object.replaceDictionaryConfig = $root.google.privacy.dlp.v2.ReplaceDictionaryConfig.toObject(message.replaceDictionaryConfig, options);
+                                if (options.oneofs)
+                                    object.transformation = "replaceDictionaryConfig";
+                            }
                             return object;
                         };
     
@@ -24805,6 +24875,217 @@
                         return ReplaceValueConfig;
                     })();
     
+                    v2.ReplaceDictionaryConfig = (function() {
+    
+                        /**
+                         * Properties of a ReplaceDictionaryConfig.
+                         * @memberof google.privacy.dlp.v2
+                         * @interface IReplaceDictionaryConfig
+                         * @property {google.privacy.dlp.v2.CustomInfoType.Dictionary.IWordList|null} [wordList] ReplaceDictionaryConfig wordList
+                         */
+    
+                        /**
+                         * Constructs a new ReplaceDictionaryConfig.
+                         * @memberof google.privacy.dlp.v2
+                         * @classdesc Represents a ReplaceDictionaryConfig.
+                         * @implements IReplaceDictionaryConfig
+                         * @constructor
+                         * @param {google.privacy.dlp.v2.IReplaceDictionaryConfig=} [properties] Properties to set
+                         */
+                        function ReplaceDictionaryConfig(properties) {
+                            if (properties)
+                                for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                                    if (properties[keys[i]] != null)
+                                        this[keys[i]] = properties[keys[i]];
+                        }
+    
+                        /**
+                         * ReplaceDictionaryConfig wordList.
+                         * @member {google.privacy.dlp.v2.CustomInfoType.Dictionary.IWordList|null|undefined} wordList
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @instance
+                         */
+                        ReplaceDictionaryConfig.prototype.wordList = null;
+    
+                        // OneOf field names bound to virtual getters and setters
+                        var $oneOfFields;
+    
+                        /**
+                         * ReplaceDictionaryConfig type.
+                         * @member {"wordList"|undefined} type
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @instance
+                         */
+                        Object.defineProperty(ReplaceDictionaryConfig.prototype, "type", {
+                            get: $util.oneOfGetter($oneOfFields = ["wordList"]),
+                            set: $util.oneOfSetter($oneOfFields)
+                        });
+    
+                        /**
+                         * Creates a new ReplaceDictionaryConfig instance using the specified properties.
+                         * @function create
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {google.privacy.dlp.v2.IReplaceDictionaryConfig=} [properties] Properties to set
+                         * @returns {google.privacy.dlp.v2.ReplaceDictionaryConfig} ReplaceDictionaryConfig instance
+                         */
+                        ReplaceDictionaryConfig.create = function create(properties) {
+                            return new ReplaceDictionaryConfig(properties);
+                        };
+    
+                        /**
+                         * Encodes the specified ReplaceDictionaryConfig message. Does not implicitly {@link google.privacy.dlp.v2.ReplaceDictionaryConfig.verify|verify} messages.
+                         * @function encode
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {google.privacy.dlp.v2.IReplaceDictionaryConfig} message ReplaceDictionaryConfig message or plain object to encode
+                         * @param {$protobuf.Writer} [writer] Writer to encode to
+                         * @returns {$protobuf.Writer} Writer
+                         */
+                        ReplaceDictionaryConfig.encode = function encode(message, writer) {
+                            if (!writer)
+                                writer = $Writer.create();
+                            if (message.wordList != null && Object.hasOwnProperty.call(message, "wordList"))
+                                $root.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList.encode(message.wordList, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
+                            return writer;
+                        };
+    
+                        /**
+                         * Encodes the specified ReplaceDictionaryConfig message, length delimited. Does not implicitly {@link google.privacy.dlp.v2.ReplaceDictionaryConfig.verify|verify} messages.
+                         * @function encodeDelimited
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {google.privacy.dlp.v2.IReplaceDictionaryConfig} message ReplaceDictionaryConfig message or plain object to encode
+                         * @param {$protobuf.Writer} [writer] Writer to encode to
+                         * @returns {$protobuf.Writer} Writer
+                         */
+                        ReplaceDictionaryConfig.encodeDelimited = function encodeDelimited(message, writer) {
+                            return this.encode(message, writer).ldelim();
+                        };
+    
+                        /**
+                         * Decodes a ReplaceDictionaryConfig message from the specified reader or buffer.
+                         * @function decode
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+                         * @param {number} [length] Message length if known beforehand
+                         * @returns {google.privacy.dlp.v2.ReplaceDictionaryConfig} ReplaceDictionaryConfig
+                         * @throws {Error} If the payload is not a reader or valid buffer
+                         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+                         */
+                        ReplaceDictionaryConfig.decode = function decode(reader, length) {
+                            if (!(reader instanceof $Reader))
+                                reader = $Reader.create(reader);
+                            var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.privacy.dlp.v2.ReplaceDictionaryConfig();
+                            while (reader.pos < end) {
+                                var tag = reader.uint32();
+                                switch (tag >>> 3) {
+                                case 1:
+                                    message.wordList = $root.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList.decode(reader, reader.uint32());
+                                    break;
+                                default:
+                                    reader.skipType(tag & 7);
+                                    break;
+                                }
+                            }
+                            return message;
+                        };
+    
+                        /**
+                         * Decodes a ReplaceDictionaryConfig message from the specified reader or buffer, length delimited.
+                         * @function decodeDelimited
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+                         * @returns {google.privacy.dlp.v2.ReplaceDictionaryConfig} ReplaceDictionaryConfig
+                         * @throws {Error} If the payload is not a reader or valid buffer
+                         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+                         */
+                        ReplaceDictionaryConfig.decodeDelimited = function decodeDelimited(reader) {
+                            if (!(reader instanceof $Reader))
+                                reader = new $Reader(reader);
+                            return this.decode(reader, reader.uint32());
+                        };
+    
+                        /**
+                         * Verifies a ReplaceDictionaryConfig message.
+                         * @function verify
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {Object.<string,*>} message Plain object to verify
+                         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+                         */
+                        ReplaceDictionaryConfig.verify = function verify(message) {
+                            if (typeof message !== "object" || message === null)
+                                return "object expected";
+                            var properties = {};
+                            if (message.wordList != null && message.hasOwnProperty("wordList")) {
+                                properties.type = 1;
+                                {
+                                    var error = $root.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList.verify(message.wordList);
+                                    if (error)
+                                        return "wordList." + error;
+                                }
+                            }
+                            return null;
+                        };
+    
+                        /**
+                         * Creates a ReplaceDictionaryConfig message from a plain object. Also converts values to their respective internal types.
+                         * @function fromObject
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {Object.<string,*>} object Plain object
+                         * @returns {google.privacy.dlp.v2.ReplaceDictionaryConfig} ReplaceDictionaryConfig
+                         */
+                        ReplaceDictionaryConfig.fromObject = function fromObject(object) {
+                            if (object instanceof $root.google.privacy.dlp.v2.ReplaceDictionaryConfig)
+                                return object;
+                            var message = new $root.google.privacy.dlp.v2.ReplaceDictionaryConfig();
+                            if (object.wordList != null) {
+                                if (typeof object.wordList !== "object")
+                                    throw TypeError(".google.privacy.dlp.v2.ReplaceDictionaryConfig.wordList: object expected");
+                                message.wordList = $root.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList.fromObject(object.wordList);
+                            }
+                            return message;
+                        };
+    
+                        /**
+                         * Creates a plain object from a ReplaceDictionaryConfig message. Also converts values to other types if specified.
+                         * @function toObject
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @static
+                         * @param {google.privacy.dlp.v2.ReplaceDictionaryConfig} message ReplaceDictionaryConfig
+                         * @param {$protobuf.IConversionOptions} [options] Conversion options
+                         * @returns {Object.<string,*>} Plain object
+                         */
+                        ReplaceDictionaryConfig.toObject = function toObject(message, options) {
+                            if (!options)
+                                options = {};
+                            var object = {};
+                            if (message.wordList != null && message.hasOwnProperty("wordList")) {
+                                object.wordList = $root.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList.toObject(message.wordList, options);
+                                if (options.oneofs)
+                                    object.type = "wordList";
+                            }
+                            return object;
+                        };
+    
+                        /**
+                         * Converts this ReplaceDictionaryConfig to JSON.
+                         * @function toJSON
+                         * @memberof google.privacy.dlp.v2.ReplaceDictionaryConfig
+                         * @instance
+                         * @returns {Object.<string,*>} JSON object
+                         */
+                        ReplaceDictionaryConfig.prototype.toJSON = function toJSON() {
+                            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+                        };
+    
+                        return ReplaceDictionaryConfig;
+                    })();
+    
                     v2.ReplaceWithInfoTypeConfig = (function() {
     
                         /**
@@ -30734,6 +31015,22 @@
                             return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
                         };
     
+                        /**
+                         * TransformationResultCode enum.
+                         * @name google.privacy.dlp.v2.TransformationSummary.TransformationResultCode
+                         * @enum {number}
+                         * @property {number} TRANSFORMATION_RESULT_CODE_UNSPECIFIED=0 TRANSFORMATION_RESULT_CODE_UNSPECIFIED value
+                         * @property {number} SUCCESS=1 SUCCESS value
+                         * @property {number} ERROR=2 ERROR value
+                         */
+                        TransformationSummary.TransformationResultCode = (function() {
+                            var valuesById = {}, values = Object.create(valuesById);
+                            values[valuesById[0] = "TRANSFORMATION_RESULT_CODE_UNSPECIFIED"] = 0;
+                            values[valuesById[1] = "SUCCESS"] = 1;
+                            values[valuesById[2] = "ERROR"] = 2;
+                            return values;
+                        })();
+    
                         TransformationSummary.SummaryResult = (function() {
     
                             /**
@@ -30998,22 +31295,6 @@
                             return SummaryResult;
                         })();
     
-                        /**
-                         * TransformationResultCode enum.
-                         * @name google.privacy.dlp.v2.TransformationSummary.TransformationResultCode
-                         * @enum {number}
-                         * @property {number} TRANSFORMATION_RESULT_CODE_UNSPECIFIED=0 TRANSFORMATION_RESULT_CODE_UNSPECIFIED value
-                         * @property {number} SUCCESS=1 SUCCESS value
-                         * @property {number} ERROR=2 ERROR value
-                         */
-                        TransformationSummary.TransformationResultCode = (function() {
-                            var valuesById = {}, values = Object.create(valuesById);
-                            values[valuesById[0] = "TRANSFORMATION_RESULT_CODE_UNSPECIFIED"] = 0;
-                            values[valuesById[1] = "SUCCESS"] = 1;
-                            values[valuesById[2] = "ERROR"] = 2;
-                            return values;
-                        })();
-    
                         return TransformationSummary;
                     })();
     
@@ -36987,6 +37268,7 @@
                          * @property {number|null} [pageSize] ListJobTriggersRequest pageSize
                          * @property {string|null} [orderBy] ListJobTriggersRequest orderBy
                          * @property {string|null} [filter] ListJobTriggersRequest filter
+                         * @property {google.privacy.dlp.v2.DlpJobType|null} [type] ListJobTriggersRequest type
                          * @property {string|null} [locationId] ListJobTriggersRequest locationId
                          */
     
@@ -37045,6 +37327,14 @@
                          */
                         ListJobTriggersRequest.prototype.filter = "";
     
+                        /**
+                         * ListJobTriggersRequest type.
+                         * @member {google.privacy.dlp.v2.DlpJobType} type
+                         * @memberof google.privacy.dlp.v2.ListJobTriggersRequest
+                         * @instance
+                         */
+                        ListJobTriggersRequest.prototype.type = 0;
+    
                         /**
                          * ListJobTriggersRequest locationId.
                          * @member {string} locationId
@@ -37087,6 +37377,8 @@
                                 writer.uint32(/* id 4, wireType 2 =*/34).string(message.orderBy);
                             if (message.filter != null && Object.hasOwnProperty.call(message, "filter"))
                                 writer.uint32(/* id 5, wireType 2 =*/42).string(message.filter);
+                            if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                                writer.uint32(/* id 6, wireType 0 =*/48).int32(message.type);
                             if (message.locationId != null && Object.hasOwnProperty.call(message, "locationId"))
                                 writer.uint32(/* id 7, wireType 2 =*/58).string(message.locationId);
                             return writer;
@@ -37138,6 +37430,9 @@
                                 case 5:
                                     message.filter = reader.string();
                                     break;
+                                case 6:
+                                    message.type = reader.int32();
+                                    break;
                                 case 7:
                                     message.locationId = reader.string();
                                     break;
@@ -37191,6 +37486,15 @@
                             if (message.filter != null && message.hasOwnProperty("filter"))
                                 if (!$util.isString(message.filter))
                                     return "filter: string expected";
+                            if (message.type != null && message.hasOwnProperty("type"))
+                                switch (message.type) {
+                                default:
+                                    return "type: enum value expected";
+                                case 0:
+                                case 1:
+                                case 2:
+                                    break;
+                                }
                             if (message.locationId != null && message.hasOwnProperty("locationId"))
                                 if (!$util.isString(message.locationId))
                                     return "locationId: string expected";
@@ -37219,6 +37523,20 @@
                                 message.orderBy = String(object.orderBy);
                             if (object.filter != null)
                                 message.filter = String(object.filter);
+                            switch (object.type) {
+                            case "DLP_JOB_TYPE_UNSPECIFIED":
+                            case 0:
+                                message.type = 0;
+                                break;
+                            case "INSPECT_JOB":
+                            case 1:
+                                message.type = 1;
+                                break;
+                            case "RISK_ANALYSIS_JOB":
+                            case 2:
+                                message.type = 2;
+                                break;
+                            }
                             if (object.locationId != null)
                                 message.locationId = String(object.locationId);
                             return message;
@@ -37243,6 +37561,7 @@
                                 object.pageSize = 0;
                                 object.orderBy = "";
                                 object.filter = "";
+                                object.type = options.enums === String ? "DLP_JOB_TYPE_UNSPECIFIED" : 0;
                                 object.locationId = "";
                             }
                             if (message.parent != null && message.hasOwnProperty("parent"))
@@ -37255,6 +37574,8 @@
                                 object.orderBy = message.orderBy;
                             if (message.filter != null && message.hasOwnProperty("filter"))
                                 object.filter = message.filter;
+                            if (message.type != null && message.hasOwnProperty("type"))
+                                object.type = options.enums === String ? $root.google.privacy.dlp.v2.DlpJobType[message.type] : message.type;
                             if (message.locationId != null && message.hasOwnProperty("locationId"))
                                 object.locationId = message.locationId;
                             return object;
@@ -45502,6 +45823,7 @@
                          * @memberof google.privacy.dlp.v2
                          * @interface IInfoType
                          * @property {string|null} [name] InfoType name
+                         * @property {string|null} [version] InfoType version
                          */
     
                         /**
@@ -45527,6 +45849,14 @@
                          */
                         InfoType.prototype.name = "";
     
+                        /**
+                         * InfoType version.
+                         * @member {string} version
+                         * @memberof google.privacy.dlp.v2.InfoType
+                         * @instance
+                         */
+                        InfoType.prototype.version = "";
+    
                         /**
                          * Creates a new InfoType instance using the specified properties.
                          * @function create
@@ -45553,6 +45883,8 @@
                                 writer = $Writer.create();
                             if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                                 writer.uint32(/* id 1, wireType 2 =*/10).string(message.name);
+                            if (message.version != null && Object.hasOwnProperty.call(message, "version"))
+                                writer.uint32(/* id 2, wireType 2 =*/18).string(message.version);
                             return writer;
                         };
     
@@ -45590,6 +45922,9 @@
                                 case 1:
                                     message.name = reader.string();
                                     break;
+                                case 2:
+                                    message.version = reader.string();
+                                    break;
                                 default:
                                     reader.skipType(tag & 7);
                                     break;
@@ -45628,6 +45963,9 @@
                             if (message.name != null && message.hasOwnProperty("name"))
                                 if (!$util.isString(message.name))
                                     return "name: string expected";
+                            if (message.version != null && message.hasOwnProperty("version"))
+                                if (!$util.isString(message.version))
+                                    return "version: string expected";
                             return null;
                         };
     
@@ -45645,6 +45983,8 @@
                             var message = new $root.google.privacy.dlp.v2.InfoType();
                             if (object.name != null)
                                 message.name = String(object.name);
+                            if (object.version != null)
+                                message.version = String(object.version);
                             return message;
                         };
     
@@ -45661,10 +46001,14 @@
                             if (!options)
                                 options = {};
                             var object = {};
-                            if (options.defaults)
+                            if (options.defaults) {
                                 object.name = "";
+                                object.version = "";
+                            }
                             if (message.name != null && message.hasOwnProperty("name"))
                                 object.name = message.name;
+                            if (message.version != null && message.hasOwnProperty("version"))
+                                object.version = message.version;
                             return object;
                         };
     
@@ -45682,6 +46026,28 @@
                         return InfoType;
                     })();
     
+                    /**
+                     * Likelihood enum.
+                     * @name google.privacy.dlp.v2.Likelihood
+                     * @enum {number}
+                     * @property {number} LIKELIHOOD_UNSPECIFIED=0 LIKELIHOOD_UNSPECIFIED value
+                     * @property {number} VERY_UNLIKELY=1 VERY_UNLIKELY value
+                     * @property {number} UNLIKELY=2 UNLIKELY value
+                     * @property {number} POSSIBLE=3 POSSIBLE value
+                     * @property {number} LIKELY=4 LIKELY value
+                     * @property {number} VERY_LIKELY=5 VERY_LIKELY value
+                     */
+                    v2.Likelihood = (function() {
+                        var valuesById = {}, values = Object.create(valuesById);
+                        values[valuesById[0] = "LIKELIHOOD_UNSPECIFIED"] = 0;
+                        values[valuesById[1] = "VERY_UNLIKELY"] = 1;
+                        values[valuesById[2] = "UNLIKELY"] = 2;
+                        values[valuesById[3] = "POSSIBLE"] = 3;
+                        values[valuesById[4] = "LIKELY"] = 4;
+                        values[valuesById[5] = "VERY_LIKELY"] = 5;
+                        return values;
+                    })();
+    
                     v2.StoredType = (function() {
     
                         /**
@@ -45897,28 +46263,6 @@
                         return StoredType;
                     })();
     
-                    /**
-                     * Likelihood enum.
-                     * @name google.privacy.dlp.v2.Likelihood
-                     * @enum {number}
-                     * @property {number} LIKELIHOOD_UNSPECIFIED=0 LIKELIHOOD_UNSPECIFIED value
-                     * @property {number} VERY_UNLIKELY=1 VERY_UNLIKELY value
-                     * @property {number} UNLIKELY=2 UNLIKELY value
-                     * @property {number} POSSIBLE=3 POSSIBLE value
-                     * @property {number} LIKELY=4 LIKELY value
-                     * @property {number} VERY_LIKELY=5 VERY_LIKELY value
-                     */
-                    v2.Likelihood = (function() {
-                        var valuesById = {}, values = Object.create(valuesById);
-                        values[valuesById[0] = "LIKELIHOOD_UNSPECIFIED"] = 0;
-                        values[valuesById[1] = "VERY_UNLIKELY"] = 1;
-                        values[valuesById[2] = "UNLIKELY"] = 2;
-                        values[valuesById[3] = "POSSIBLE"] = 3;
-                        values[valuesById[4] = "LIKELY"] = 4;
-                        values[valuesById[5] = "VERY_LIKELY"] = 5;
-                        return values;
-                    })();
-    
                     v2.CustomInfoType = (function() {
     
                         /**
@@ -48989,6 +49333,38 @@
                         return DatastoreOptions;
                     })();
     
+                    /**
+                     * FileType enum.
+                     * @name google.privacy.dlp.v2.FileType
+                     * @enum {number}
+                     * @property {number} FILE_TYPE_UNSPECIFIED=0 FILE_TYPE_UNSPECIFIED value
+                     * @property {number} BINARY_FILE=1 BINARY_FILE value
+                     * @property {number} TEXT_FILE=2 TEXT_FILE value
+                     * @property {number} IMAGE=3 IMAGE value
+                     * @property {number} WORD=5 WORD value
+                     * @property {number} PDF=6 PDF value
+                     * @property {number} AVRO=7 AVRO value
+                     * @property {number} CSV=8 CSV value
+                     * @property {number} TSV=9 TSV value
+                     * @property {number} POWERPOINT=11 POWERPOINT value
+                     * @property {number} EXCEL=12 EXCEL value
+                     */
+                    v2.FileType = (function() {
+                        var valuesById = {}, values = Object.create(valuesById);
+                        values[valuesById[0] = "FILE_TYPE_UNSPECIFIED"] = 0;
+                        values[valuesById[1] = "BINARY_FILE"] = 1;
+                        values[valuesById[2] = "TEXT_FILE"] = 2;
+                        values[valuesById[3] = "IMAGE"] = 3;
+                        values[valuesById[5] = "WORD"] = 5;
+                        values[valuesById[6] = "PDF"] = 6;
+                        values[valuesById[7] = "AVRO"] = 7;
+                        values[valuesById[8] = "CSV"] = 8;
+                        values[valuesById[9] = "TSV"] = 9;
+                        values[valuesById[11] = "POWERPOINT"] = 11;
+                        values[valuesById[12] = "EXCEL"] = 12;
+                        return values;
+                    })();
+    
                     v2.CloudStorageRegexFileSet = (function() {
     
                         /**
@@ -49493,6 +49869,8 @@
                                     case 7:
                                     case 8:
                                     case 9:
+                                    case 11:
+                                    case 12:
                                         break;
                                     }
                             }
@@ -49582,6 +49960,14 @@
                                     case 9:
                                         message.fileTypes[i] = 9;
                                         break;
+                                    case "POWERPOINT":
+                                    case 11:
+                                        message.fileTypes[i] = 11;
+                                        break;
+                                    case "EXCEL":
+                                    case 12:
+                                        message.fileTypes[i] = 12;
+                                        break;
                                     }
                             }
                             switch (object.sampleMethod) {
@@ -50281,6 +50667,7 @@
                          * @property {number|null} [rowsLimitPercent] BigQueryOptions rowsLimitPercent
                          * @property {google.privacy.dlp.v2.BigQueryOptions.SampleMethod|null} [sampleMethod] BigQueryOptions sampleMethod
                          * @property {Array.<google.privacy.dlp.v2.IFieldId>|null} [excludedFields] BigQueryOptions excludedFields
+                         * @property {Array.<google.privacy.dlp.v2.IFieldId>|null} [includedFields] BigQueryOptions includedFields
                          */
     
                         /**
@@ -50294,6 +50681,7 @@
                         function BigQueryOptions(properties) {
                             this.identifyingFields = [];
                             this.excludedFields = [];
+                            this.includedFields = [];
                             if (properties)
                                 for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                                     if (properties[keys[i]] != null)
@@ -50348,6 +50736,14 @@
                          */
                         BigQueryOptions.prototype.excludedFields = $util.emptyArray;
     
+                        /**
+                         * BigQueryOptions includedFields.
+                         * @member {Array.<google.privacy.dlp.v2.IFieldId>} includedFields
+                         * @memberof google.privacy.dlp.v2.BigQueryOptions
+                         * @instance
+                         */
+                        BigQueryOptions.prototype.includedFields = $util.emptyArray;
+    
                         /**
                          * Creates a new BigQueryOptions instance using the specified properties.
                          * @function create
@@ -50386,6 +50782,9 @@
                                     $root.google.privacy.dlp.v2.FieldId.encode(message.excludedFields[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim();
                             if (message.rowsLimitPercent != null && Object.hasOwnProperty.call(message, "rowsLimitPercent"))
                                 writer.uint32(/* id 6, wireType 0 =*/48).int32(message.rowsLimitPercent);
+                            if (message.includedFields != null && message.includedFields.length)
+                                for (var i = 0; i < message.includedFields.length; ++i)
+                                    $root.google.privacy.dlp.v2.FieldId.encode(message.includedFields[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim();
                             return writer;
                         };
     
@@ -50442,6 +50841,11 @@
                                         message.excludedFields = [];
                                     message.excludedFields.push($root.google.privacy.dlp.v2.FieldId.decode(reader, reader.uint32()));
                                     break;
+                                case 7:
+                                    if (!(message.includedFields && message.includedFields.length))
+                                        message.includedFields = [];
+                                    message.includedFields.push($root.google.privacy.dlp.v2.FieldId.decode(reader, reader.uint32()));
+                                    break;
                                 default:
                                     reader.skipType(tag & 7);
                                     break;
@@ -50515,6 +50919,15 @@
                                         return "excludedFields." + error;
                                 }
                             }
+                            if (message.includedFields != null && message.hasOwnProperty("includedFields")) {
+                                if (!Array.isArray(message.includedFields))
+                                    return "includedFields: array expected";
+                                for (var i = 0; i < message.includedFields.length; ++i) {
+                                    var error = $root.google.privacy.dlp.v2.FieldId.verify(message.includedFields[i]);
+                                    if (error)
+                                        return "includedFields." + error;
+                                }
+                            }
                             return null;
                         };
     
@@ -50580,6 +50993,16 @@
                                     message.excludedFields[i] = $root.google.privacy.dlp.v2.FieldId.fromObject(object.excludedFields[i]);
                                 }
                             }
+                            if (object.includedFields) {
+                                if (!Array.isArray(object.includedFields))
+                                    throw TypeError(".google.privacy.dlp.v2.BigQueryOptions.includedFields: array expected");
+                                message.includedFields = [];
+                                for (var i = 0; i < object.includedFields.length; ++i) {
+                                    if (typeof object.includedFields[i] !== "object")
+                                        throw TypeError(".google.privacy.dlp.v2.BigQueryOptions.includedFields: object expected");
+                                    message.includedFields[i] = $root.google.privacy.dlp.v2.FieldId.fromObject(object.includedFields[i]);
+                                }
+                            }
                             return message;
                         };
     
@@ -50599,6 +51022,7 @@
                             if (options.arrays || options.defaults) {
                                 object.identifyingFields = [];
                                 object.excludedFields = [];
+                                object.includedFields = [];
                             }
                             if (options.defaults) {
                                 object.tableReference = null;
@@ -50631,6 +51055,11 @@
                             }
                             if (message.rowsLimitPercent != null && message.hasOwnProperty("rowsLimitPercent"))
                                 object.rowsLimitPercent = message.rowsLimitPercent;
+                            if (message.includedFields && message.includedFields.length) {
+                                object.includedFields = [];
+                                for (var j = 0; j < message.includedFields.length; ++j)
+                                    object.includedFields[j] = $root.google.privacy.dlp.v2.FieldId.toObject(message.includedFields[j], options);
+                            }
                             return object;
                         };
     
@@ -51274,34 +51703,6 @@
                         return StorageConfig;
                     })();
     
-                    /**
-                     * FileType enum.
-                     * @name google.privacy.dlp.v2.FileType
-                     * @enum {number}
-                     * @property {number} FILE_TYPE_UNSPECIFIED=0 FILE_TYPE_UNSPECIFIED value
-                     * @property {number} BINARY_FILE=1 BINARY_FILE value
-                     * @property {number} TEXT_FILE=2 TEXT_FILE value
-                     * @property {number} IMAGE=3 IMAGE value
-                     * @property {number} WORD=5 WORD value
-                     * @property {number} PDF=6 PDF value
-                     * @property {number} AVRO=7 AVRO value
-                     * @property {number} CSV=8 CSV value
-                     * @property {number} TSV=9 TSV value
-                     */
-                    v2.FileType = (function() {
-                        var valuesById = {}, values = Object.create(valuesById);
-                        values[valuesById[0] = "FILE_TYPE_UNSPECIFIED"] = 0;
-                        values[valuesById[1] = "BINARY_FILE"] = 1;
-                        values[valuesById[2] = "TEXT_FILE"] = 2;
-                        values[valuesById[3] = "IMAGE"] = 3;
-                        values[valuesById[5] = "WORD"] = 5;
-                        values[valuesById[6] = "PDF"] = 6;
-                        values[valuesById[7] = "AVRO"] = 7;
-                        values[valuesById[8] = "CSV"] = 8;
-                        values[valuesById[9] = "TSV"] = 9;
-                        return values;
-                    })();
-    
                     v2.HybridOptions = (function() {
     
                         /**
@@ -53691,56 +54092,26 @@
              */
             var api = {};
     
-            /**
-             * FieldBehavior enum.
-             * @name google.api.FieldBehavior
-             * @enum {number}
-             * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value
-             * @property {number} OPTIONAL=1 OPTIONAL value
-             * @property {number} REQUIRED=2 REQUIRED value
-             * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value
-             * @property {number} INPUT_ONLY=4 INPUT_ONLY value
-             * @property {number} IMMUTABLE=5 IMMUTABLE value
-             * @property {number} UNORDERED_LIST=6 UNORDERED_LIST value
-             */
-            api.FieldBehavior = (function() {
-                var valuesById = {}, values = Object.create(valuesById);
-                values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0;
-                values[valuesById[1] = "OPTIONAL"] = 1;
-                values[valuesById[2] = "REQUIRED"] = 2;
-                values[valuesById[3] = "OUTPUT_ONLY"] = 3;
-                values[valuesById[4] = "INPUT_ONLY"] = 4;
-                values[valuesById[5] = "IMMUTABLE"] = 5;
-                values[valuesById[6] = "UNORDERED_LIST"] = 6;
-                return values;
-            })();
-    
-            api.ResourceDescriptor = (function() {
+            api.Http = (function() {
     
                 /**
-                 * Properties of a ResourceDescriptor.
+                 * Properties of a Http.
                  * @memberof google.api
-                 * @interface IResourceDescriptor
-                 * @property {string|null} [type] ResourceDescriptor type
-                 * @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
-                 * @property {Array.<google.api.ResourceDescriptor.Style>|null} [style] ResourceDescriptor style
+                 * @interface IHttp
+                 * @property {Array.<google.api.IHttpRule>|null} [rules] Http rules
+                 * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion
                  */
     
                 /**
-                 * Constructs a new ResourceDescriptor.
+                 * Constructs a new Http.
                  * @memberof google.api
-                 * @classdesc Represents a ResourceDescriptor.
-                 * @implements IResourceDescriptor
+                 * @classdesc Represents a Http.
+                 * @implements IHttp
                  * @constructor
-                 * @param {google.api.IResourceDescriptor=} [properties] Properties to set
+                 * @param {google.api.IHttp=} [properties] Properties to set
                  */
-                function ResourceDescriptor(properties) {
-                    this.pattern = [];
-                    this.style = [];
+                function Http(properties) {
+                    this.rules = [];
                     if (properties)
                         for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                             if (properties[keys[i]] != null)
@@ -53748,167 +54119,91 @@
                 }
     
                 /**
-                 * ResourceDescriptor type.
-                 * @member {string} type
-                 * @memberof google.api.ResourceDescriptor
-                 * @instance
-                 */
-                ResourceDescriptor.prototype.type = "";
-    
-                /**
-                 * ResourceDescriptor pattern.
-                 * @member {Array.<string>} pattern
-                 * @memberof google.api.ResourceDescriptor
-                 * @instance
-                 */
-                ResourceDescriptor.prototype.pattern = $util.emptyArray;
-    
-                /**
-                 * ResourceDescriptor nameField.
-                 * @member {string} nameField
-                 * @memberof google.api.ResourceDescriptor
-                 * @instance
-                 */
-                ResourceDescriptor.prototype.nameField = "";
-    
-                /**
-                 * ResourceDescriptor history.
-                 * @member {google.api.ResourceDescriptor.History} history
-                 * @memberof google.api.ResourceDescriptor
-                 * @instance
-                 */
-                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
+                 * Http rules.
+                 * @member {Array.<google.api.IHttpRule>} rules
+                 * @memberof google.api.Http
                  * @instance
                  */
-                ResourceDescriptor.prototype.singular = "";
+                Http.prototype.rules = $util.emptyArray;
     
                 /**
-                 * ResourceDescriptor style.
-                 * @member {Array.<google.api.ResourceDescriptor.Style>} style
-                 * @memberof google.api.ResourceDescriptor
+                 * Http fullyDecodeReservedExpansion.
+                 * @member {boolean} fullyDecodeReservedExpansion
+                 * @memberof google.api.Http
                  * @instance
                  */
-                ResourceDescriptor.prototype.style = $util.emptyArray;
+                Http.prototype.fullyDecodeReservedExpansion = false;
     
                 /**
-                 * Creates a new ResourceDescriptor instance using the specified properties.
+                 * Creates a new Http instance using the specified properties.
                  * @function create
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
-                 * @param {google.api.IResourceDescriptor=} [properties] Properties to set
-                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance
+                 * @param {google.api.IHttp=} [properties] Properties to set
+                 * @returns {google.api.Http} Http instance
                  */
-                ResourceDescriptor.create = function create(properties) {
-                    return new ResourceDescriptor(properties);
+                Http.create = function create(properties) {
+                    return new Http(properties);
                 };
     
                 /**
-                 * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages.
+                 * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages.
                  * @function encode
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
-                 * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode
+                 * @param {google.api.IHttp} message Http message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                ResourceDescriptor.encode = function encode(message, writer) {
+                Http.encode = function encode(message, writer) {
                     if (!writer)
                         writer = $Writer.create();
-                    if (message.type != null && Object.hasOwnProperty.call(message, "type"))
-                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.type);
-                    if (message.pattern != null && message.pattern.length)
-                        for (var i = 0; i < message.pattern.length; ++i)
-                            writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]);
-                    if (message.nameField != null && Object.hasOwnProperty.call(message, "nameField"))
-                        writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField);
-                    if (message.history != null && Object.hasOwnProperty.call(message, "history"))
-                        writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history);
-                    if (message.plural != null && Object.hasOwnProperty.call(message, "plural"))
-                        writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural);
-                    if (message.singular != null && Object.hasOwnProperty.call(message, "singular"))
-                        writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular);
-                    if (message.style != null && message.style.length) {
-                        writer.uint32(/* id 10, wireType 2 =*/82).fork();
-                        for (var i = 0; i < message.style.length; ++i)
-                            writer.int32(message.style[i]);
-                        writer.ldelim();
-                    }
+                    if (message.rules != null && message.rules.length)
+                        for (var i = 0; i < message.rules.length; ++i)
+                            $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
+                    if (message.fullyDecodeReservedExpansion != null && Object.hasOwnProperty.call(message, "fullyDecodeReservedExpansion"))
+                        writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion);
                     return writer;
                 };
     
                 /**
-                 * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages.
+                 * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages.
                  * @function encodeDelimited
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
-                 * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode
+                 * @param {google.api.IHttp} message Http message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) {
+                Http.encodeDelimited = function encodeDelimited(message, writer) {
                     return this.encode(message, writer).ldelim();
                 };
     
                 /**
-                 * Decodes a ResourceDescriptor message from the specified reader or buffer.
+                 * Decodes a Http message from the specified reader or buffer.
                  * @function decode
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
                  * @param {number} [length] Message length if known beforehand
-                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor
+                 * @returns {google.api.Http} Http
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                ResourceDescriptor.decode = function decode(reader, length) {
+                Http.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor();
+                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http();
                     while (reader.pos < end) {
                         var tag = reader.uint32();
                         switch (tag >>> 3) {
                         case 1:
-                            message.type = reader.string();
+                            if (!(message.rules && message.rules.length))
+                                message.rules = [];
+                            message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32()));
                             break;
                         case 2:
-                            if (!(message.pattern && message.pattern.length))
-                                message.pattern = [];
-                            message.pattern.push(reader.string());
-                            break;
-                        case 3:
-                            message.nameField = reader.string();
-                            break;
-                        case 4:
-                            message.history = reader.int32();
-                            break;
-                        case 5:
-                            message.plural = reader.string();
-                            break;
-                        case 6:
-                            message.singular = reader.string();
-                            break;
-                        case 10:
-                            if (!(message.style && message.style.length))
-                                message.style = [];
-                            if ((tag & 7) === 2) {
-                                var end2 = reader.uint32() + reader.pos;
-                                while (reader.pos < end2)
-                                    message.style.push(reader.int32());
-                            } else
-                                message.style.push(reader.int32());
+                            message.fullyDecodeReservedExpansion = reader.bool();
                             break;
                         default:
                             reader.skipType(tag & 7);
@@ -53919,246 +54214,143 @@
                 };
     
                 /**
-                 * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited.
+                 * Decodes a Http message from the specified reader or buffer, length delimited.
                  * @function decodeDelimited
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor
+                 * @returns {google.api.Http} Http
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) {
+                Http.decodeDelimited = function decodeDelimited(reader) {
                     if (!(reader instanceof $Reader))
                         reader = new $Reader(reader);
                     return this.decode(reader, reader.uint32());
                 };
     
                 /**
-                 * Verifies a ResourceDescriptor message.
+                 * Verifies a Http message.
                  * @function verify
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
                  * @param {Object.<string,*>} message Plain object to verify
                  * @returns {string|null} `null` if valid, otherwise the reason why it is not
                  */
-                ResourceDescriptor.verify = function verify(message) {
+                Http.verify = function verify(message) {
                     if (typeof message !== "object" || message === null)
                         return "object expected";
-                    if (message.type != null && message.hasOwnProperty("type"))
-                        if (!$util.isString(message.type))
-                            return "type: string expected";
-                    if (message.pattern != null && message.hasOwnProperty("pattern")) {
-                        if (!Array.isArray(message.pattern))
-                            return "pattern: array expected";
-                        for (var i = 0; i < message.pattern.length; ++i)
-                            if (!$util.isString(message.pattern[i]))
-                                return "pattern: string[] expected";
-                    }
-                    if (message.nameField != null && message.hasOwnProperty("nameField"))
-                        if (!$util.isString(message.nameField))
-                            return "nameField: string expected";
-                    if (message.history != null && message.hasOwnProperty("history"))
-                        switch (message.history) {
-                        default:
-                            return "history: enum value expected";
-                        case 0:
-                        case 1:
-                        case 2:
-                            break;
+                    if (message.rules != null && message.hasOwnProperty("rules")) {
+                        if (!Array.isArray(message.rules))
+                            return "rules: array expected";
+                        for (var i = 0; i < message.rules.length; ++i) {
+                            var error = $root.google.api.HttpRule.verify(message.rules[i]);
+                            if (error)
+                                return "rules." + error;
                         }
-                    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";
-                    if (message.style != null && message.hasOwnProperty("style")) {
-                        if (!Array.isArray(message.style))
-                            return "style: array expected";
-                        for (var i = 0; i < message.style.length; ++i)
-                            switch (message.style[i]) {
-                            default:
-                                return "style: enum value[] expected";
-                            case 0:
-                            case 1:
-                                break;
-                            }
                     }
+                    if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion"))
+                        if (typeof message.fullyDecodeReservedExpansion !== "boolean")
+                            return "fullyDecodeReservedExpansion: boolean expected";
                     return null;
                 };
     
                 /**
-                 * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types.
+                 * Creates a Http message from a plain object. Also converts values to their respective internal types.
                  * @function fromObject
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
                  * @param {Object.<string,*>} object Plain object
-                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor
+                 * @returns {google.api.Http} Http
                  */
-                ResourceDescriptor.fromObject = function fromObject(object) {
-                    if (object instanceof $root.google.api.ResourceDescriptor)
+                Http.fromObject = function fromObject(object) {
+                    if (object instanceof $root.google.api.Http)
                         return object;
-                    var message = new $root.google.api.ResourceDescriptor();
-                    if (object.type != null)
-                        message.type = String(object.type);
-                    if (object.pattern) {
-                        if (!Array.isArray(object.pattern))
-                            throw TypeError(".google.api.ResourceDescriptor.pattern: array expected");
-                        message.pattern = [];
-                        for (var i = 0; i < object.pattern.length; ++i)
-                            message.pattern[i] = String(object.pattern[i]);
-                    }
-                    if (object.nameField != null)
-                        message.nameField = String(object.nameField);
-                    switch (object.history) {
-                    case "HISTORY_UNSPECIFIED":
-                    case 0:
-                        message.history = 0;
-                        break;
-                    case "ORIGINALLY_SINGLE_PATTERN":
-                    case 1:
-                        message.history = 1;
-                        break;
-                    case "FUTURE_MULTI_PATTERN":
-                    case 2:
-                        message.history = 2;
-                        break;
-                    }
-                    if (object.plural != null)
-                        message.plural = String(object.plural);
-                    if (object.singular != null)
-                        message.singular = String(object.singular);
-                    if (object.style) {
-                        if (!Array.isArray(object.style))
-                            throw TypeError(".google.api.ResourceDescriptor.style: array expected");
-                        message.style = [];
-                        for (var i = 0; i < object.style.length; ++i)
-                            switch (object.style[i]) {
-                            default:
-                            case "STYLE_UNSPECIFIED":
-                            case 0:
-                                message.style[i] = 0;
-                                break;
-                            case "DECLARATIVE_FRIENDLY":
-                            case 1:
-                                message.style[i] = 1;
-                                break;
-                            }
+                    var message = new $root.google.api.Http();
+                    if (object.rules) {
+                        if (!Array.isArray(object.rules))
+                            throw TypeError(".google.api.Http.rules: array expected");
+                        message.rules = [];
+                        for (var i = 0; i < object.rules.length; ++i) {
+                            if (typeof object.rules[i] !== "object")
+                                throw TypeError(".google.api.Http.rules: object expected");
+                            message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]);
+                        }
                     }
+                    if (object.fullyDecodeReservedExpansion != null)
+                        message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion);
                     return message;
                 };
     
                 /**
-                 * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified.
+                 * Creates a plain object from a Http message. Also converts values to other types if specified.
                  * @function toObject
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @static
-                 * @param {google.api.ResourceDescriptor} message ResourceDescriptor
+                 * @param {google.api.Http} message Http
                  * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
-                ResourceDescriptor.toObject = function toObject(message, options) {
+                Http.toObject = function toObject(message, options) {
                     if (!options)
                         options = {};
                     var object = {};
-                    if (options.arrays || options.defaults) {
-                        object.pattern = [];
-                        object.style = [];
-                    }
-                    if (options.defaults) {
-                        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;
-                    if (message.pattern && message.pattern.length) {
-                        object.pattern = [];
-                        for (var j = 0; j < message.pattern.length; ++j)
-                            object.pattern[j] = message.pattern[j];
-                    }
-                    if (message.nameField != null && message.hasOwnProperty("nameField"))
-                        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;
-                    if (message.style && message.style.length) {
-                        object.style = [];
-                        for (var j = 0; j < message.style.length; ++j)
-                            object.style[j] = options.enums === String ? $root.google.api.ResourceDescriptor.Style[message.style[j]] : message.style[j];
+                    if (options.arrays || options.defaults)
+                        object.rules = [];
+                    if (options.defaults)
+                        object.fullyDecodeReservedExpansion = false;
+                    if (message.rules && message.rules.length) {
+                        object.rules = [];
+                        for (var j = 0; j < message.rules.length; ++j)
+                            object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options);
                     }
+                    if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion"))
+                        object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion;
                     return object;
                 };
     
                 /**
-                 * Converts this ResourceDescriptor to JSON.
+                 * Converts this Http to JSON.
                  * @function toJSON
-                 * @memberof google.api.ResourceDescriptor
+                 * @memberof google.api.Http
                  * @instance
                  * @returns {Object.<string,*>} JSON object
                  */
-                ResourceDescriptor.prototype.toJSON = function toJSON() {
+                Http.prototype.toJSON = function toJSON() {
                     return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
                 };
     
-                /**
-                 * History enum.
-                 * @name google.api.ResourceDescriptor.History
-                 * @enum {number}
-                 * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value
-                 * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value
-                 * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value
-                 */
-                ResourceDescriptor.History = (function() {
-                    var valuesById = {}, values = Object.create(valuesById);
-                    values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0;
-                    values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1;
-                    values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2;
-                    return values;
-                })();
-    
-                /**
-                 * Style enum.
-                 * @name google.api.ResourceDescriptor.Style
-                 * @enum {number}
-                 * @property {number} STYLE_UNSPECIFIED=0 STYLE_UNSPECIFIED value
-                 * @property {number} DECLARATIVE_FRIENDLY=1 DECLARATIVE_FRIENDLY value
-                 */
-                ResourceDescriptor.Style = (function() {
-                    var valuesById = {}, values = Object.create(valuesById);
-                    values[valuesById[0] = "STYLE_UNSPECIFIED"] = 0;
-                    values[valuesById[1] = "DECLARATIVE_FRIENDLY"] = 1;
-                    return values;
-                })();
-    
-                return ResourceDescriptor;
+                return Http;
             })();
     
-            api.ResourceReference = (function() {
+            api.HttpRule = (function() {
     
                 /**
-                 * Properties of a ResourceReference.
+                 * Properties of a HttpRule.
                  * @memberof google.api
-                 * @interface IResourceReference
-                 * @property {string|null} [type] ResourceReference type
-                 * @property {string|null} [childType] ResourceReference childType
+                 * @interface IHttpRule
+                 * @property {string|null} [selector] HttpRule selector
+                 * @property {string|null} [get] HttpRule get
+                 * @property {string|null} [put] HttpRule put
+                 * @property {string|null} [post] HttpRule post
+                 * @property {string|null} ["delete"] HttpRule delete
+                 * @property {string|null} [patch] HttpRule patch
+                 * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom
+                 * @property {string|null} [body] HttpRule body
+                 * @property {string|null} [responseBody] HttpRule responseBody
+                 * @property {Array.<google.api.IHttpRule>|null} [additionalBindings] HttpRule additionalBindings
                  */
     
                 /**
-                 * Constructs a new ResourceReference.
+                 * Constructs a new HttpRule.
                  * @memberof google.api
-                 * @classdesc Represents a ResourceReference.
-                 * @implements IResourceReference
+                 * @classdesc Represents a HttpRule.
+                 * @implements IHttpRule
                  * @constructor
-                 * @param {google.api.IResourceReference=} [properties] Properties to set
+                 * @param {google.api.IHttpRule=} [properties] Properties to set
                  */
-                function ResourceReference(properties) {
+                function HttpRule(properties) {
+                    this.additionalBindings = [];
                     if (properties)
                         for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                             if (properties[keys[i]] != null)
@@ -54166,88 +54358,209 @@
                 }
     
                 /**
-                 * ResourceReference type.
-                 * @member {string} type
-                 * @memberof google.api.ResourceReference
+                 * HttpRule selector.
+                 * @member {string} selector
+                 * @memberof google.api.HttpRule
                  * @instance
                  */
-                ResourceReference.prototype.type = "";
+                HttpRule.prototype.selector = "";
     
                 /**
-                 * ResourceReference childType.
-                 * @member {string} childType
-                 * @memberof google.api.ResourceReference
+                 * HttpRule get.
+                 * @member {string|null|undefined} get
+                 * @memberof google.api.HttpRule
                  * @instance
                  */
-                ResourceReference.prototype.childType = "";
+                HttpRule.prototype.get = null;
     
                 /**
-                 * Creates a new ResourceReference instance using the specified properties.
+                 * HttpRule put.
+                 * @member {string|null|undefined} put
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype.put = null;
+    
+                /**
+                 * HttpRule post.
+                 * @member {string|null|undefined} post
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype.post = null;
+    
+                /**
+                 * HttpRule delete.
+                 * @member {string|null|undefined} delete
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype["delete"] = null;
+    
+                /**
+                 * HttpRule patch.
+                 * @member {string|null|undefined} patch
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype.patch = null;
+    
+                /**
+                 * HttpRule custom.
+                 * @member {google.api.ICustomHttpPattern|null|undefined} custom
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype.custom = null;
+    
+                /**
+                 * HttpRule body.
+                 * @member {string} body
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype.body = "";
+    
+                /**
+                 * HttpRule responseBody.
+                 * @member {string} responseBody
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype.responseBody = "";
+    
+                /**
+                 * HttpRule additionalBindings.
+                 * @member {Array.<google.api.IHttpRule>} additionalBindings
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                HttpRule.prototype.additionalBindings = $util.emptyArray;
+    
+                // OneOf field names bound to virtual getters and setters
+                var $oneOfFields;
+    
+                /**
+                 * HttpRule pattern.
+                 * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern
+                 * @memberof google.api.HttpRule
+                 * @instance
+                 */
+                Object.defineProperty(HttpRule.prototype, "pattern", {
+                    get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]),
+                    set: $util.oneOfSetter($oneOfFields)
+                });
+    
+                /**
+                 * Creates a new HttpRule instance using the specified properties.
                  * @function create
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
-                 * @param {google.api.IResourceReference=} [properties] Properties to set
-                 * @returns {google.api.ResourceReference} ResourceReference instance
+                 * @param {google.api.IHttpRule=} [properties] Properties to set
+                 * @returns {google.api.HttpRule} HttpRule instance
                  */
-                ResourceReference.create = function create(properties) {
-                    return new ResourceReference(properties);
+                HttpRule.create = function create(properties) {
+                    return new HttpRule(properties);
                 };
     
                 /**
-                 * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages.
+                 * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages.
                  * @function encode
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
-                 * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode
+                 * @param {google.api.IHttpRule} message HttpRule message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                ResourceReference.encode = function encode(message, writer) {
+                HttpRule.encode = function encode(message, writer) {
                     if (!writer)
                         writer = $Writer.create();
-                    if (message.type != null && Object.hasOwnProperty.call(message, "type"))
-                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.type);
-                    if (message.childType != null && Object.hasOwnProperty.call(message, "childType"))
-                        writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType);
+                    if (message.selector != null && Object.hasOwnProperty.call(message, "selector"))
+                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector);
+                    if (message.get != null && Object.hasOwnProperty.call(message, "get"))
+                        writer.uint32(/* id 2, wireType 2 =*/18).string(message.get);
+                    if (message.put != null && Object.hasOwnProperty.call(message, "put"))
+                        writer.uint32(/* id 3, wireType 2 =*/26).string(message.put);
+                    if (message.post != null && Object.hasOwnProperty.call(message, "post"))
+                        writer.uint32(/* id 4, wireType 2 =*/34).string(message.post);
+                    if (message["delete"] != null && Object.hasOwnProperty.call(message, "delete"))
+                        writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]);
+                    if (message.patch != null && Object.hasOwnProperty.call(message, "patch"))
+                        writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch);
+                    if (message.body != null && Object.hasOwnProperty.call(message, "body"))
+                        writer.uint32(/* id 7, wireType 2 =*/58).string(message.body);
+                    if (message.custom != null && Object.hasOwnProperty.call(message, "custom"))
+                        $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim();
+                    if (message.additionalBindings != null && message.additionalBindings.length)
+                        for (var i = 0; i < message.additionalBindings.length; ++i)
+                            $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim();
+                    if (message.responseBody != null && Object.hasOwnProperty.call(message, "responseBody"))
+                        writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody);
                     return writer;
                 };
     
                 /**
-                 * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages.
+                 * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages.
                  * @function encodeDelimited
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
-                 * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode
+                 * @param {google.api.IHttpRule} message HttpRule message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                ResourceReference.encodeDelimited = function encodeDelimited(message, writer) {
+                HttpRule.encodeDelimited = function encodeDelimited(message, writer) {
                     return this.encode(message, writer).ldelim();
                 };
     
                 /**
-                 * Decodes a ResourceReference message from the specified reader or buffer.
+                 * Decodes a HttpRule message from the specified reader or buffer.
                  * @function decode
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
                  * @param {number} [length] Message length if known beforehand
-                 * @returns {google.api.ResourceReference} ResourceReference
+                 * @returns {google.api.HttpRule} HttpRule
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                ResourceReference.decode = function decode(reader, length) {
+                HttpRule.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference();
+                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule();
                     while (reader.pos < end) {
                         var tag = reader.uint32();
                         switch (tag >>> 3) {
                         case 1:
-                            message.type = reader.string();
+                            message.selector = reader.string();
                             break;
                         case 2:
-                            message.childType = reader.string();
+                            message.get = reader.string();
+                            break;
+                        case 3:
+                            message.put = reader.string();
+                            break;
+                        case 4:
+                            message.post = reader.string();
+                            break;
+                        case 5:
+                            message["delete"] = reader.string();
+                            break;
+                        case 6:
+                            message.patch = reader.string();
+                            break;
+                        case 8:
+                            message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32());
+                            break;
+                        case 7:
+                            message.body = reader.string();
+                            break;
+                        case 12:
+                            message.responseBody = reader.string();
+                            break;
+                        case 11:
+                            if (!(message.additionalBindings && message.additionalBindings.length))
+                                message.additionalBindings = [];
+                            message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32()));
                             break;
                         default:
                             reader.skipType(tag & 7);
@@ -54258,118 +54571,240 @@
                 };
     
                 /**
-                 * Decodes a ResourceReference message from the specified reader or buffer, length delimited.
+                 * Decodes a HttpRule message from the specified reader or buffer, length delimited.
                  * @function decodeDelimited
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @returns {google.api.ResourceReference} ResourceReference
+                 * @returns {google.api.HttpRule} HttpRule
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                ResourceReference.decodeDelimited = function decodeDelimited(reader) {
+                HttpRule.decodeDelimited = function decodeDelimited(reader) {
                     if (!(reader instanceof $Reader))
                         reader = new $Reader(reader);
                     return this.decode(reader, reader.uint32());
                 };
     
                 /**
-                 * Verifies a ResourceReference message.
+                 * Verifies a HttpRule message.
                  * @function verify
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
                  * @param {Object.<string,*>} message Plain object to verify
                  * @returns {string|null} `null` if valid, otherwise the reason why it is not
                  */
-                ResourceReference.verify = function verify(message) {
+                HttpRule.verify = function verify(message) {
                     if (typeof message !== "object" || message === null)
                         return "object expected";
-                    if (message.type != null && message.hasOwnProperty("type"))
-                        if (!$util.isString(message.type))
-                            return "type: string expected";
-                    if (message.childType != null && message.hasOwnProperty("childType"))
-                        if (!$util.isString(message.childType))
-                            return "childType: string expected";
+                    var properties = {};
+                    if (message.selector != null && message.hasOwnProperty("selector"))
+                        if (!$util.isString(message.selector))
+                            return "selector: string expected";
+                    if (message.get != null && message.hasOwnProperty("get")) {
+                        properties.pattern = 1;
+                        if (!$util.isString(message.get))
+                            return "get: string expected";
+                    }
+                    if (message.put != null && message.hasOwnProperty("put")) {
+                        if (properties.pattern === 1)
+                            return "pattern: multiple values";
+                        properties.pattern = 1;
+                        if (!$util.isString(message.put))
+                            return "put: string expected";
+                    }
+                    if (message.post != null && message.hasOwnProperty("post")) {
+                        if (properties.pattern === 1)
+                            return "pattern: multiple values";
+                        properties.pattern = 1;
+                        if (!$util.isString(message.post))
+                            return "post: string expected";
+                    }
+                    if (message["delete"] != null && message.hasOwnProperty("delete")) {
+                        if (properties.pattern === 1)
+                            return "pattern: multiple values";
+                        properties.pattern = 1;
+                        if (!$util.isString(message["delete"]))
+                            return "delete: string expected";
+                    }
+                    if (message.patch != null && message.hasOwnProperty("patch")) {
+                        if (properties.pattern === 1)
+                            return "pattern: multiple values";
+                        properties.pattern = 1;
+                        if (!$util.isString(message.patch))
+                            return "patch: string expected";
+                    }
+                    if (message.custom != null && message.hasOwnProperty("custom")) {
+                        if (properties.pattern === 1)
+                            return "pattern: multiple values";
+                        properties.pattern = 1;
+                        {
+                            var error = $root.google.api.CustomHttpPattern.verify(message.custom);
+                            if (error)
+                                return "custom." + error;
+                        }
+                    }
+                    if (message.body != null && message.hasOwnProperty("body"))
+                        if (!$util.isString(message.body))
+                            return "body: string expected";
+                    if (message.responseBody != null && message.hasOwnProperty("responseBody"))
+                        if (!$util.isString(message.responseBody))
+                            return "responseBody: string expected";
+                    if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) {
+                        if (!Array.isArray(message.additionalBindings))
+                            return "additionalBindings: array expected";
+                        for (var i = 0; i < message.additionalBindings.length; ++i) {
+                            var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]);
+                            if (error)
+                                return "additionalBindings." + error;
+                        }
+                    }
                     return null;
                 };
     
                 /**
-                 * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types.
+                 * Creates a HttpRule message from a plain object. Also converts values to their respective internal types.
                  * @function fromObject
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
                  * @param {Object.<string,*>} object Plain object
-                 * @returns {google.api.ResourceReference} ResourceReference
+                 * @returns {google.api.HttpRule} HttpRule
                  */
-                ResourceReference.fromObject = function fromObject(object) {
-                    if (object instanceof $root.google.api.ResourceReference)
+                HttpRule.fromObject = function fromObject(object) {
+                    if (object instanceof $root.google.api.HttpRule)
                         return object;
-                    var message = new $root.google.api.ResourceReference();
-                    if (object.type != null)
-                        message.type = String(object.type);
-                    if (object.childType != null)
-                        message.childType = String(object.childType);
+                    var message = new $root.google.api.HttpRule();
+                    if (object.selector != null)
+                        message.selector = String(object.selector);
+                    if (object.get != null)
+                        message.get = String(object.get);
+                    if (object.put != null)
+                        message.put = String(object.put);
+                    if (object.post != null)
+                        message.post = String(object.post);
+                    if (object["delete"] != null)
+                        message["delete"] = String(object["delete"]);
+                    if (object.patch != null)
+                        message.patch = String(object.patch);
+                    if (object.custom != null) {
+                        if (typeof object.custom !== "object")
+                            throw TypeError(".google.api.HttpRule.custom: object expected");
+                        message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom);
+                    }
+                    if (object.body != null)
+                        message.body = String(object.body);
+                    if (object.responseBody != null)
+                        message.responseBody = String(object.responseBody);
+                    if (object.additionalBindings) {
+                        if (!Array.isArray(object.additionalBindings))
+                            throw TypeError(".google.api.HttpRule.additionalBindings: array expected");
+                        message.additionalBindings = [];
+                        for (var i = 0; i < object.additionalBindings.length; ++i) {
+                            if (typeof object.additionalBindings[i] !== "object")
+                                throw TypeError(".google.api.HttpRule.additionalBindings: object expected");
+                            message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]);
+                        }
+                    }
                     return message;
                 };
     
                 /**
-                 * Creates a plain object from a ResourceReference message. Also converts values to other types if specified.
+                 * Creates a plain object from a HttpRule message. Also converts values to other types if specified.
                  * @function toObject
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @static
-                 * @param {google.api.ResourceReference} message ResourceReference
+                 * @param {google.api.HttpRule} message HttpRule
                  * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
-                ResourceReference.toObject = function toObject(message, options) {
+                HttpRule.toObject = function toObject(message, options) {
                     if (!options)
                         options = {};
                     var object = {};
+                    if (options.arrays || options.defaults)
+                        object.additionalBindings = [];
                     if (options.defaults) {
-                        object.type = "";
-                        object.childType = "";
+                        object.selector = "";
+                        object.body = "";
+                        object.responseBody = "";
                     }
-                    if (message.type != null && message.hasOwnProperty("type"))
-                        object.type = message.type;
-                    if (message.childType != null && message.hasOwnProperty("childType"))
-                        object.childType = message.childType;
+                    if (message.selector != null && message.hasOwnProperty("selector"))
+                        object.selector = message.selector;
+                    if (message.get != null && message.hasOwnProperty("get")) {
+                        object.get = message.get;
+                        if (options.oneofs)
+                            object.pattern = "get";
+                    }
+                    if (message.put != null && message.hasOwnProperty("put")) {
+                        object.put = message.put;
+                        if (options.oneofs)
+                            object.pattern = "put";
+                    }
+                    if (message.post != null && message.hasOwnProperty("post")) {
+                        object.post = message.post;
+                        if (options.oneofs)
+                            object.pattern = "post";
+                    }
+                    if (message["delete"] != null && message.hasOwnProperty("delete")) {
+                        object["delete"] = message["delete"];
+                        if (options.oneofs)
+                            object.pattern = "delete";
+                    }
+                    if (message.patch != null && message.hasOwnProperty("patch")) {
+                        object.patch = message.patch;
+                        if (options.oneofs)
+                            object.pattern = "patch";
+                    }
+                    if (message.body != null && message.hasOwnProperty("body"))
+                        object.body = message.body;
+                    if (message.custom != null && message.hasOwnProperty("custom")) {
+                        object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options);
+                        if (options.oneofs)
+                            object.pattern = "custom";
+                    }
+                    if (message.additionalBindings && message.additionalBindings.length) {
+                        object.additionalBindings = [];
+                        for (var j = 0; j < message.additionalBindings.length; ++j)
+                            object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options);
+                    }
+                    if (message.responseBody != null && message.hasOwnProperty("responseBody"))
+                        object.responseBody = message.responseBody;
                     return object;
                 };
     
                 /**
-                 * Converts this ResourceReference to JSON.
+                 * Converts this HttpRule to JSON.
                  * @function toJSON
-                 * @memberof google.api.ResourceReference
+                 * @memberof google.api.HttpRule
                  * @instance
                  * @returns {Object.<string,*>} JSON object
                  */
-                ResourceReference.prototype.toJSON = function toJSON() {
+                HttpRule.prototype.toJSON = function toJSON() {
                     return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
                 };
     
-                return ResourceReference;
+                return HttpRule;
             })();
     
-            api.Http = (function() {
+            api.CustomHttpPattern = (function() {
     
                 /**
-                 * Properties of a Http.
+                 * Properties of a CustomHttpPattern.
                  * @memberof google.api
-                 * @interface IHttp
-                 * @property {Array.<google.api.IHttpRule>|null} [rules] Http rules
-                 * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion
+                 * @interface ICustomHttpPattern
+                 * @property {string|null} [kind] CustomHttpPattern kind
+                 * @property {string|null} [path] CustomHttpPattern path
                  */
     
                 /**
-                 * Constructs a new Http.
+                 * Constructs a new CustomHttpPattern.
                  * @memberof google.api
-                 * @classdesc Represents a Http.
-                 * @implements IHttp
+                 * @classdesc Represents a CustomHttpPattern.
+                 * @implements ICustomHttpPattern
                  * @constructor
-                 * @param {google.api.IHttp=} [properties] Properties to set
+                 * @param {google.api.ICustomHttpPattern=} [properties] Properties to set
                  */
-                function Http(properties) {
-                    this.rules = [];
+                function CustomHttpPattern(properties) {
                     if (properties)
                         for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                             if (properties[keys[i]] != null)
@@ -54377,91 +54812,88 @@
                 }
     
                 /**
-                 * Http rules.
-                 * @member {Array.<google.api.IHttpRule>} rules
-                 * @memberof google.api.Http
+                 * CustomHttpPattern kind.
+                 * @member {string} kind
+                 * @memberof google.api.CustomHttpPattern
                  * @instance
                  */
-                Http.prototype.rules = $util.emptyArray;
+                CustomHttpPattern.prototype.kind = "";
     
                 /**
-                 * Http fullyDecodeReservedExpansion.
-                 * @member {boolean} fullyDecodeReservedExpansion
-                 * @memberof google.api.Http
+                 * CustomHttpPattern path.
+                 * @member {string} path
+                 * @memberof google.api.CustomHttpPattern
                  * @instance
                  */
-                Http.prototype.fullyDecodeReservedExpansion = false;
+                CustomHttpPattern.prototype.path = "";
     
                 /**
-                 * Creates a new Http instance using the specified properties.
+                 * Creates a new CustomHttpPattern instance using the specified properties.
                  * @function create
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
-                 * @param {google.api.IHttp=} [properties] Properties to set
-                 * @returns {google.api.Http} Http instance
+                 * @param {google.api.ICustomHttpPattern=} [properties] Properties to set
+                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance
                  */
-                Http.create = function create(properties) {
-                    return new Http(properties);
+                CustomHttpPattern.create = function create(properties) {
+                    return new CustomHttpPattern(properties);
                 };
     
                 /**
-                 * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages.
+                 * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages.
                  * @function encode
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
-                 * @param {google.api.IHttp} message Http message or plain object to encode
+                 * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                Http.encode = function encode(message, writer) {
+                CustomHttpPattern.encode = function encode(message, writer) {
                     if (!writer)
                         writer = $Writer.create();
-                    if (message.rules != null && message.rules.length)
-                        for (var i = 0; i < message.rules.length; ++i)
-                            $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
-                    if (message.fullyDecodeReservedExpansion != null && Object.hasOwnProperty.call(message, "fullyDecodeReservedExpansion"))
-                        writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion);
+                    if (message.kind != null && Object.hasOwnProperty.call(message, "kind"))
+                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind);
+                    if (message.path != null && Object.hasOwnProperty.call(message, "path"))
+                        writer.uint32(/* id 2, wireType 2 =*/18).string(message.path);
                     return writer;
                 };
     
                 /**
-                 * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages.
+                 * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages.
                  * @function encodeDelimited
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
-                 * @param {google.api.IHttp} message Http message or plain object to encode
+                 * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                Http.encodeDelimited = function encodeDelimited(message, writer) {
+                CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) {
                     return this.encode(message, writer).ldelim();
                 };
     
                 /**
-                 * Decodes a Http message from the specified reader or buffer.
+                 * Decodes a CustomHttpPattern message from the specified reader or buffer.
                  * @function decode
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
                  * @param {number} [length] Message length if known beforehand
-                 * @returns {google.api.Http} Http
+                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                Http.decode = function decode(reader, length) {
+                CustomHttpPattern.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http();
+                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern();
                     while (reader.pos < end) {
                         var tag = reader.uint32();
                         switch (tag >>> 3) {
                         case 1:
-                            if (!(message.rules && message.rules.length))
-                                message.rules = [];
-                            message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32()));
+                            message.kind = reader.string();
                             break;
                         case 2:
-                            message.fullyDecodeReservedExpansion = reader.bool();
+                            message.path = reader.string();
                             break;
                         default:
                             reader.skipType(tag & 7);
@@ -54472,143 +54904,150 @@
                 };
     
                 /**
-                 * Decodes a Http message from the specified reader or buffer, length delimited.
+                 * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited.
                  * @function decodeDelimited
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @returns {google.api.Http} Http
+                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                Http.decodeDelimited = function decodeDelimited(reader) {
+                CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) {
                     if (!(reader instanceof $Reader))
                         reader = new $Reader(reader);
                     return this.decode(reader, reader.uint32());
                 };
     
                 /**
-                 * Verifies a Http message.
+                 * Verifies a CustomHttpPattern message.
                  * @function verify
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
                  * @param {Object.<string,*>} message Plain object to verify
                  * @returns {string|null} `null` if valid, otherwise the reason why it is not
                  */
-                Http.verify = function verify(message) {
+                CustomHttpPattern.verify = function verify(message) {
                     if (typeof message !== "object" || message === null)
                         return "object expected";
-                    if (message.rules != null && message.hasOwnProperty("rules")) {
-                        if (!Array.isArray(message.rules))
-                            return "rules: array expected";
-                        for (var i = 0; i < message.rules.length; ++i) {
-                            var error = $root.google.api.HttpRule.verify(message.rules[i]);
-                            if (error)
-                                return "rules." + error;
-                        }
-                    }
-                    if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion"))
-                        if (typeof message.fullyDecodeReservedExpansion !== "boolean")
-                            return "fullyDecodeReservedExpansion: boolean expected";
+                    if (message.kind != null && message.hasOwnProperty("kind"))
+                        if (!$util.isString(message.kind))
+                            return "kind: string expected";
+                    if (message.path != null && message.hasOwnProperty("path"))
+                        if (!$util.isString(message.path))
+                            return "path: string expected";
                     return null;
                 };
     
                 /**
-                 * Creates a Http message from a plain object. Also converts values to their respective internal types.
+                 * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types.
                  * @function fromObject
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
                  * @param {Object.<string,*>} object Plain object
-                 * @returns {google.api.Http} Http
+                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern
                  */
-                Http.fromObject = function fromObject(object) {
-                    if (object instanceof $root.google.api.Http)
+                CustomHttpPattern.fromObject = function fromObject(object) {
+                    if (object instanceof $root.google.api.CustomHttpPattern)
                         return object;
-                    var message = new $root.google.api.Http();
-                    if (object.rules) {
-                        if (!Array.isArray(object.rules))
-                            throw TypeError(".google.api.Http.rules: array expected");
-                        message.rules = [];
-                        for (var i = 0; i < object.rules.length; ++i) {
-                            if (typeof object.rules[i] !== "object")
-                                throw TypeError(".google.api.Http.rules: object expected");
-                            message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]);
-                        }
-                    }
-                    if (object.fullyDecodeReservedExpansion != null)
-                        message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion);
+                    var message = new $root.google.api.CustomHttpPattern();
+                    if (object.kind != null)
+                        message.kind = String(object.kind);
+                    if (object.path != null)
+                        message.path = String(object.path);
                     return message;
                 };
     
                 /**
-                 * Creates a plain object from a Http message. Also converts values to other types if specified.
+                 * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified.
                  * @function toObject
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @static
-                 * @param {google.api.Http} message Http
+                 * @param {google.api.CustomHttpPattern} message CustomHttpPattern
                  * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
-                Http.toObject = function toObject(message, options) {
+                CustomHttpPattern.toObject = function toObject(message, options) {
                     if (!options)
                         options = {};
                     var object = {};
-                    if (options.arrays || options.defaults)
-                        object.rules = [];
-                    if (options.defaults)
-                        object.fullyDecodeReservedExpansion = false;
-                    if (message.rules && message.rules.length) {
-                        object.rules = [];
-                        for (var j = 0; j < message.rules.length; ++j)
-                            object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options);
+                    if (options.defaults) {
+                        object.kind = "";
+                        object.path = "";
                     }
-                    if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion"))
-                        object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion;
+                    if (message.kind != null && message.hasOwnProperty("kind"))
+                        object.kind = message.kind;
+                    if (message.path != null && message.hasOwnProperty("path"))
+                        object.path = message.path;
                     return object;
                 };
     
                 /**
-                 * Converts this Http to JSON.
+                 * Converts this CustomHttpPattern to JSON.
                  * @function toJSON
-                 * @memberof google.api.Http
+                 * @memberof google.api.CustomHttpPattern
                  * @instance
                  * @returns {Object.<string,*>} JSON object
                  */
-                Http.prototype.toJSON = function toJSON() {
+                CustomHttpPattern.prototype.toJSON = function toJSON() {
                     return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
                 };
     
-                return Http;
+                return CustomHttpPattern;
             })();
     
-            api.HttpRule = (function() {
+            /**
+             * FieldBehavior enum.
+             * @name google.api.FieldBehavior
+             * @enum {number}
+             * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value
+             * @property {number} OPTIONAL=1 OPTIONAL value
+             * @property {number} REQUIRED=2 REQUIRED value
+             * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value
+             * @property {number} INPUT_ONLY=4 INPUT_ONLY value
+             * @property {number} IMMUTABLE=5 IMMUTABLE value
+             * @property {number} UNORDERED_LIST=6 UNORDERED_LIST value
+             * @property {number} NON_EMPTY_DEFAULT=7 NON_EMPTY_DEFAULT value
+             */
+            api.FieldBehavior = (function() {
+                var valuesById = {}, values = Object.create(valuesById);
+                values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0;
+                values[valuesById[1] = "OPTIONAL"] = 1;
+                values[valuesById[2] = "REQUIRED"] = 2;
+                values[valuesById[3] = "OUTPUT_ONLY"] = 3;
+                values[valuesById[4] = "INPUT_ONLY"] = 4;
+                values[valuesById[5] = "IMMUTABLE"] = 5;
+                values[valuesById[6] = "UNORDERED_LIST"] = 6;
+                values[valuesById[7] = "NON_EMPTY_DEFAULT"] = 7;
+                return values;
+            })();
+    
+            api.ResourceDescriptor = (function() {
     
                 /**
-                 * Properties of a HttpRule.
+                 * Properties of a ResourceDescriptor.
                  * @memberof google.api
-                 * @interface IHttpRule
-                 * @property {string|null} [selector] HttpRule selector
-                 * @property {string|null} [get] HttpRule get
-                 * @property {string|null} [put] HttpRule put
-                 * @property {string|null} [post] HttpRule post
-                 * @property {string|null} ["delete"] HttpRule delete
-                 * @property {string|null} [patch] HttpRule patch
-                 * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom
-                 * @property {string|null} [body] HttpRule body
-                 * @property {string|null} [responseBody] HttpRule responseBody
-                 * @property {Array.<google.api.IHttpRule>|null} [additionalBindings] HttpRule additionalBindings
+                 * @interface IResourceDescriptor
+                 * @property {string|null} [type] ResourceDescriptor type
+                 * @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
+                 * @property {Array.<google.api.ResourceDescriptor.Style>|null} [style] ResourceDescriptor style
                  */
     
                 /**
-                 * Constructs a new HttpRule.
+                 * Constructs a new ResourceDescriptor.
                  * @memberof google.api
-                 * @classdesc Represents a HttpRule.
-                 * @implements IHttpRule
+                 * @classdesc Represents a ResourceDescriptor.
+                 * @implements IResourceDescriptor
                  * @constructor
-                 * @param {google.api.IHttpRule=} [properties] Properties to set
+                 * @param {google.api.IResourceDescriptor=} [properties] Properties to set
                  */
-                function HttpRule(properties) {
-                    this.additionalBindings = [];
+                function ResourceDescriptor(properties) {
+                    this.pattern = [];
+                    this.style = [];
                     if (properties)
                         for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                             if (properties[keys[i]] != null)
@@ -54616,209 +55055,167 @@
                 }
     
                 /**
-                 * HttpRule selector.
-                 * @member {string} selector
-                 * @memberof google.api.HttpRule
-                 * @instance
-                 */
-                HttpRule.prototype.selector = "";
-    
-                /**
-                 * HttpRule get.
-                 * @member {string|null|undefined} get
-                 * @memberof google.api.HttpRule
-                 * @instance
-                 */
-                HttpRule.prototype.get = null;
-    
-                /**
-                 * HttpRule put.
-                 * @member {string|null|undefined} put
-                 * @memberof google.api.HttpRule
-                 * @instance
-                 */
-                HttpRule.prototype.put = null;
-    
-                /**
-                 * HttpRule post.
-                 * @member {string|null|undefined} post
-                 * @memberof google.api.HttpRule
-                 * @instance
-                 */
-                HttpRule.prototype.post = null;
-    
-                /**
-                 * HttpRule delete.
-                 * @member {string|null|undefined} delete
-                 * @memberof google.api.HttpRule
+                 * ResourceDescriptor type.
+                 * @member {string} type
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  */
-                HttpRule.prototype["delete"] = null;
+                ResourceDescriptor.prototype.type = "";
     
                 /**
-                 * HttpRule patch.
-                 * @member {string|null|undefined} patch
-                 * @memberof google.api.HttpRule
+                 * ResourceDescriptor pattern.
+                 * @member {Array.<string>} pattern
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  */
-                HttpRule.prototype.patch = null;
+                ResourceDescriptor.prototype.pattern = $util.emptyArray;
     
                 /**
-                 * HttpRule custom.
-                 * @member {google.api.ICustomHttpPattern|null|undefined} custom
-                 * @memberof google.api.HttpRule
+                 * ResourceDescriptor nameField.
+                 * @member {string} nameField
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  */
-                HttpRule.prototype.custom = null;
+                ResourceDescriptor.prototype.nameField = "";
     
                 /**
-                 * HttpRule body.
-                 * @member {string} body
-                 * @memberof google.api.HttpRule
+                 * ResourceDescriptor history.
+                 * @member {google.api.ResourceDescriptor.History} history
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  */
-                HttpRule.prototype.body = "";
+                ResourceDescriptor.prototype.history = 0;
     
                 /**
-                 * HttpRule responseBody.
-                 * @member {string} responseBody
-                 * @memberof google.api.HttpRule
+                 * ResourceDescriptor plural.
+                 * @member {string} plural
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  */
-                HttpRule.prototype.responseBody = "";
+                ResourceDescriptor.prototype.plural = "";
     
                 /**
-                 * HttpRule additionalBindings.
-                 * @member {Array.<google.api.IHttpRule>} additionalBindings
-                 * @memberof google.api.HttpRule
+                 * ResourceDescriptor singular.
+                 * @member {string} singular
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  */
-                HttpRule.prototype.additionalBindings = $util.emptyArray;
-    
-                // OneOf field names bound to virtual getters and setters
-                var $oneOfFields;
+                ResourceDescriptor.prototype.singular = "";
     
                 /**
-                 * HttpRule pattern.
-                 * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern
-                 * @memberof google.api.HttpRule
+                 * ResourceDescriptor style.
+                 * @member {Array.<google.api.ResourceDescriptor.Style>} style
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  */
-                Object.defineProperty(HttpRule.prototype, "pattern", {
-                    get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]),
-                    set: $util.oneOfSetter($oneOfFields)
-                });
+                ResourceDescriptor.prototype.style = $util.emptyArray;
     
                 /**
-                 * Creates a new HttpRule instance using the specified properties.
+                 * Creates a new ResourceDescriptor instance using the specified properties.
                  * @function create
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
-                 * @param {google.api.IHttpRule=} [properties] Properties to set
-                 * @returns {google.api.HttpRule} HttpRule instance
+                 * @param {google.api.IResourceDescriptor=} [properties] Properties to set
+                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance
                  */
-                HttpRule.create = function create(properties) {
-                    return new HttpRule(properties);
+                ResourceDescriptor.create = function create(properties) {
+                    return new ResourceDescriptor(properties);
                 };
     
                 /**
-                 * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages.
+                 * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages.
                  * @function encode
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
-                 * @param {google.api.IHttpRule} message HttpRule message or plain object to encode
+                 * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                HttpRule.encode = function encode(message, writer) {
+                ResourceDescriptor.encode = function encode(message, writer) {
                     if (!writer)
                         writer = $Writer.create();
-                    if (message.selector != null && Object.hasOwnProperty.call(message, "selector"))
-                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector);
-                    if (message.get != null && Object.hasOwnProperty.call(message, "get"))
-                        writer.uint32(/* id 2, wireType 2 =*/18).string(message.get);
-                    if (message.put != null && Object.hasOwnProperty.call(message, "put"))
-                        writer.uint32(/* id 3, wireType 2 =*/26).string(message.put);
-                    if (message.post != null && Object.hasOwnProperty.call(message, "post"))
-                        writer.uint32(/* id 4, wireType 2 =*/34).string(message.post);
-                    if (message["delete"] != null && Object.hasOwnProperty.call(message, "delete"))
-                        writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]);
-                    if (message.patch != null && Object.hasOwnProperty.call(message, "patch"))
-                        writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch);
-                    if (message.body != null && Object.hasOwnProperty.call(message, "body"))
-                        writer.uint32(/* id 7, wireType 2 =*/58).string(message.body);
-                    if (message.custom != null && Object.hasOwnProperty.call(message, "custom"))
-                        $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim();
-                    if (message.additionalBindings != null && message.additionalBindings.length)
-                        for (var i = 0; i < message.additionalBindings.length; ++i)
-                            $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim();
-                    if (message.responseBody != null && Object.hasOwnProperty.call(message, "responseBody"))
-                        writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody);
+                    if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.type);
+                    if (message.pattern != null && message.pattern.length)
+                        for (var i = 0; i < message.pattern.length; ++i)
+                            writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]);
+                    if (message.nameField != null && Object.hasOwnProperty.call(message, "nameField"))
+                        writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField);
+                    if (message.history != null && Object.hasOwnProperty.call(message, "history"))
+                        writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history);
+                    if (message.plural != null && Object.hasOwnProperty.call(message, "plural"))
+                        writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural);
+                    if (message.singular != null && Object.hasOwnProperty.call(message, "singular"))
+                        writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular);
+                    if (message.style != null && message.style.length) {
+                        writer.uint32(/* id 10, wireType 2 =*/82).fork();
+                        for (var i = 0; i < message.style.length; ++i)
+                            writer.int32(message.style[i]);
+                        writer.ldelim();
+                    }
                     return writer;
                 };
     
                 /**
-                 * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages.
+                 * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages.
                  * @function encodeDelimited
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
-                 * @param {google.api.IHttpRule} message HttpRule message or plain object to encode
+                 * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                HttpRule.encodeDelimited = function encodeDelimited(message, writer) {
+                ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) {
                     return this.encode(message, writer).ldelim();
                 };
     
                 /**
-                 * Decodes a HttpRule message from the specified reader or buffer.
+                 * Decodes a ResourceDescriptor message from the specified reader or buffer.
                  * @function decode
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
                  * @param {number} [length] Message length if known beforehand
-                 * @returns {google.api.HttpRule} HttpRule
+                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                HttpRule.decode = function decode(reader, length) {
+                ResourceDescriptor.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule();
+                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor();
                     while (reader.pos < end) {
                         var tag = reader.uint32();
                         switch (tag >>> 3) {
                         case 1:
-                            message.selector = reader.string();
+                            message.type = reader.string();
                             break;
                         case 2:
-                            message.get = reader.string();
+                            if (!(message.pattern && message.pattern.length))
+                                message.pattern = [];
+                            message.pattern.push(reader.string());
                             break;
                         case 3:
-                            message.put = reader.string();
+                            message.nameField = reader.string();
                             break;
                         case 4:
-                            message.post = reader.string();
+                            message.history = reader.int32();
                             break;
                         case 5:
-                            message["delete"] = reader.string();
+                            message.plural = reader.string();
                             break;
                         case 6:
-                            message.patch = reader.string();
-                            break;
-                        case 8:
-                            message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32());
-                            break;
-                        case 7:
-                            message.body = reader.string();
-                            break;
-                        case 12:
-                            message.responseBody = reader.string();
+                            message.singular = reader.string();
                             break;
-                        case 11:
-                            if (!(message.additionalBindings && message.additionalBindings.length))
-                                message.additionalBindings = [];
-                            message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32()));
+                        case 10:
+                            if (!(message.style && message.style.length))
+                                message.style = [];
+                            if ((tag & 7) === 2) {
+                                var end2 = reader.uint32() + reader.pos;
+                                while (reader.pos < end2)
+                                    message.style.push(reader.int32());
+                            } else
+                                message.style.push(reader.int32());
                             break;
                         default:
                             reader.skipType(tag & 7);
@@ -54829,240 +55226,246 @@
                 };
     
                 /**
-                 * Decodes a HttpRule message from the specified reader or buffer, length delimited.
+                 * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited.
                  * @function decodeDelimited
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @returns {google.api.HttpRule} HttpRule
+                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                HttpRule.decodeDelimited = function decodeDelimited(reader) {
+                ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) {
                     if (!(reader instanceof $Reader))
                         reader = new $Reader(reader);
                     return this.decode(reader, reader.uint32());
                 };
     
                 /**
-                 * Verifies a HttpRule message.
+                 * Verifies a ResourceDescriptor message.
                  * @function verify
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
                  * @param {Object.<string,*>} message Plain object to verify
                  * @returns {string|null} `null` if valid, otherwise the reason why it is not
                  */
-                HttpRule.verify = function verify(message) {
+                ResourceDescriptor.verify = function verify(message) {
                     if (typeof message !== "object" || message === null)
                         return "object expected";
-                    var properties = {};
-                    if (message.selector != null && message.hasOwnProperty("selector"))
-                        if (!$util.isString(message.selector))
-                            return "selector: string expected";
-                    if (message.get != null && message.hasOwnProperty("get")) {
-                        properties.pattern = 1;
-                        if (!$util.isString(message.get))
-                            return "get: string expected";
-                    }
-                    if (message.put != null && message.hasOwnProperty("put")) {
-                        if (properties.pattern === 1)
-                            return "pattern: multiple values";
-                        properties.pattern = 1;
-                        if (!$util.isString(message.put))
-                            return "put: string expected";
-                    }
-                    if (message.post != null && message.hasOwnProperty("post")) {
-                        if (properties.pattern === 1)
-                            return "pattern: multiple values";
-                        properties.pattern = 1;
-                        if (!$util.isString(message.post))
-                            return "post: string expected";
-                    }
-                    if (message["delete"] != null && message.hasOwnProperty("delete")) {
-                        if (properties.pattern === 1)
-                            return "pattern: multiple values";
-                        properties.pattern = 1;
-                        if (!$util.isString(message["delete"]))
-                            return "delete: string expected";
-                    }
-                    if (message.patch != null && message.hasOwnProperty("patch")) {
-                        if (properties.pattern === 1)
-                            return "pattern: multiple values";
-                        properties.pattern = 1;
-                        if (!$util.isString(message.patch))
-                            return "patch: string expected";
-                    }
-                    if (message.custom != null && message.hasOwnProperty("custom")) {
-                        if (properties.pattern === 1)
-                            return "pattern: multiple values";
-                        properties.pattern = 1;
-                        {
-                            var error = $root.google.api.CustomHttpPattern.verify(message.custom);
-                            if (error)
-                                return "custom." + error;
-                        }
+                    if (message.type != null && message.hasOwnProperty("type"))
+                        if (!$util.isString(message.type))
+                            return "type: string expected";
+                    if (message.pattern != null && message.hasOwnProperty("pattern")) {
+                        if (!Array.isArray(message.pattern))
+                            return "pattern: array expected";
+                        for (var i = 0; i < message.pattern.length; ++i)
+                            if (!$util.isString(message.pattern[i]))
+                                return "pattern: string[] expected";
                     }
-                    if (message.body != null && message.hasOwnProperty("body"))
-                        if (!$util.isString(message.body))
-                            return "body: string expected";
-                    if (message.responseBody != null && message.hasOwnProperty("responseBody"))
-                        if (!$util.isString(message.responseBody))
-                            return "responseBody: string expected";
-                    if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) {
-                        if (!Array.isArray(message.additionalBindings))
-                            return "additionalBindings: array expected";
-                        for (var i = 0; i < message.additionalBindings.length; ++i) {
-                            var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]);
-                            if (error)
-                                return "additionalBindings." + error;
+                    if (message.nameField != null && message.hasOwnProperty("nameField"))
+                        if (!$util.isString(message.nameField))
+                            return "nameField: string expected";
+                    if (message.history != null && message.hasOwnProperty("history"))
+                        switch (message.history) {
+                        default:
+                            return "history: enum value expected";
+                        case 0:
+                        case 1:
+                        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";
+                    if (message.style != null && message.hasOwnProperty("style")) {
+                        if (!Array.isArray(message.style))
+                            return "style: array expected";
+                        for (var i = 0; i < message.style.length; ++i)
+                            switch (message.style[i]) {
+                            default:
+                                return "style: enum value[] expected";
+                            case 0:
+                            case 1:
+                                break;
+                            }
                     }
                     return null;
                 };
     
                 /**
-                 * Creates a HttpRule message from a plain object. Also converts values to their respective internal types.
+                 * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types.
                  * @function fromObject
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
                  * @param {Object.<string,*>} object Plain object
-                 * @returns {google.api.HttpRule} HttpRule
+                 * @returns {google.api.ResourceDescriptor} ResourceDescriptor
                  */
-                HttpRule.fromObject = function fromObject(object) {
-                    if (object instanceof $root.google.api.HttpRule)
+                ResourceDescriptor.fromObject = function fromObject(object) {
+                    if (object instanceof $root.google.api.ResourceDescriptor)
                         return object;
-                    var message = new $root.google.api.HttpRule();
-                    if (object.selector != null)
-                        message.selector = String(object.selector);
-                    if (object.get != null)
-                        message.get = String(object.get);
-                    if (object.put != null)
-                        message.put = String(object.put);
-                    if (object.post != null)
-                        message.post = String(object.post);
-                    if (object["delete"] != null)
-                        message["delete"] = String(object["delete"]);
-                    if (object.patch != null)
-                        message.patch = String(object.patch);
-                    if (object.custom != null) {
-                        if (typeof object.custom !== "object")
-                            throw TypeError(".google.api.HttpRule.custom: object expected");
-                        message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom);
+                    var message = new $root.google.api.ResourceDescriptor();
+                    if (object.type != null)
+                        message.type = String(object.type);
+                    if (object.pattern) {
+                        if (!Array.isArray(object.pattern))
+                            throw TypeError(".google.api.ResourceDescriptor.pattern: array expected");
+                        message.pattern = [];
+                        for (var i = 0; i < object.pattern.length; ++i)
+                            message.pattern[i] = String(object.pattern[i]);
                     }
-                    if (object.body != null)
-                        message.body = String(object.body);
-                    if (object.responseBody != null)
-                        message.responseBody = String(object.responseBody);
-                    if (object.additionalBindings) {
-                        if (!Array.isArray(object.additionalBindings))
-                            throw TypeError(".google.api.HttpRule.additionalBindings: array expected");
-                        message.additionalBindings = [];
-                        for (var i = 0; i < object.additionalBindings.length; ++i) {
-                            if (typeof object.additionalBindings[i] !== "object")
-                                throw TypeError(".google.api.HttpRule.additionalBindings: object expected");
-                            message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]);
-                        }
+                    if (object.nameField != null)
+                        message.nameField = String(object.nameField);
+                    switch (object.history) {
+                    case "HISTORY_UNSPECIFIED":
+                    case 0:
+                        message.history = 0;
+                        break;
+                    case "ORIGINALLY_SINGLE_PATTERN":
+                    case 1:
+                        message.history = 1;
+                        break;
+                    case "FUTURE_MULTI_PATTERN":
+                    case 2:
+                        message.history = 2;
+                        break;
+                    }
+                    if (object.plural != null)
+                        message.plural = String(object.plural);
+                    if (object.singular != null)
+                        message.singular = String(object.singular);
+                    if (object.style) {
+                        if (!Array.isArray(object.style))
+                            throw TypeError(".google.api.ResourceDescriptor.style: array expected");
+                        message.style = [];
+                        for (var i = 0; i < object.style.length; ++i)
+                            switch (object.style[i]) {
+                            default:
+                            case "STYLE_UNSPECIFIED":
+                            case 0:
+                                message.style[i] = 0;
+                                break;
+                            case "DECLARATIVE_FRIENDLY":
+                            case 1:
+                                message.style[i] = 1;
+                                break;
+                            }
                     }
                     return message;
                 };
     
                 /**
-                 * Creates a plain object from a HttpRule message. Also converts values to other types if specified.
+                 * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified.
                  * @function toObject
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @static
-                 * @param {google.api.HttpRule} message HttpRule
+                 * @param {google.api.ResourceDescriptor} message ResourceDescriptor
                  * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
-                HttpRule.toObject = function toObject(message, options) {
+                ResourceDescriptor.toObject = function toObject(message, options) {
                     if (!options)
                         options = {};
                     var object = {};
-                    if (options.arrays || options.defaults)
-                        object.additionalBindings = [];
-                    if (options.defaults) {
-                        object.selector = "";
-                        object.body = "";
-                        object.responseBody = "";
-                    }
-                    if (message.selector != null && message.hasOwnProperty("selector"))
-                        object.selector = message.selector;
-                    if (message.get != null && message.hasOwnProperty("get")) {
-                        object.get = message.get;
-                        if (options.oneofs)
-                            object.pattern = "get";
-                    }
-                    if (message.put != null && message.hasOwnProperty("put")) {
-                        object.put = message.put;
-                        if (options.oneofs)
-                            object.pattern = "put";
-                    }
-                    if (message.post != null && message.hasOwnProperty("post")) {
-                        object.post = message.post;
-                        if (options.oneofs)
-                            object.pattern = "post";
-                    }
-                    if (message["delete"] != null && message.hasOwnProperty("delete")) {
-                        object["delete"] = message["delete"];
-                        if (options.oneofs)
-                            object.pattern = "delete";
+                    if (options.arrays || options.defaults) {
+                        object.pattern = [];
+                        object.style = [];
                     }
-                    if (message.patch != null && message.hasOwnProperty("patch")) {
-                        object.patch = message.patch;
-                        if (options.oneofs)
-                            object.pattern = "patch";
+                    if (options.defaults) {
+                        object.type = "";
+                        object.nameField = "";
+                        object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0;
+                        object.plural = "";
+                        object.singular = "";
                     }
-                    if (message.body != null && message.hasOwnProperty("body"))
-                        object.body = message.body;
-                    if (message.custom != null && message.hasOwnProperty("custom")) {
-                        object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options);
-                        if (options.oneofs)
-                            object.pattern = "custom";
+                    if (message.type != null && message.hasOwnProperty("type"))
+                        object.type = message.type;
+                    if (message.pattern && message.pattern.length) {
+                        object.pattern = [];
+                        for (var j = 0; j < message.pattern.length; ++j)
+                            object.pattern[j] = message.pattern[j];
                     }
-                    if (message.additionalBindings && message.additionalBindings.length) {
-                        object.additionalBindings = [];
-                        for (var j = 0; j < message.additionalBindings.length; ++j)
-                            object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options);
+                    if (message.nameField != null && message.hasOwnProperty("nameField"))
+                        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;
+                    if (message.style && message.style.length) {
+                        object.style = [];
+                        for (var j = 0; j < message.style.length; ++j)
+                            object.style[j] = options.enums === String ? $root.google.api.ResourceDescriptor.Style[message.style[j]] : message.style[j];
                     }
-                    if (message.responseBody != null && message.hasOwnProperty("responseBody"))
-                        object.responseBody = message.responseBody;
                     return object;
                 };
     
                 /**
-                 * Converts this HttpRule to JSON.
+                 * Converts this ResourceDescriptor to JSON.
                  * @function toJSON
-                 * @memberof google.api.HttpRule
+                 * @memberof google.api.ResourceDescriptor
                  * @instance
                  * @returns {Object.<string,*>} JSON object
                  */
-                HttpRule.prototype.toJSON = function toJSON() {
+                ResourceDescriptor.prototype.toJSON = function toJSON() {
                     return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
                 };
     
-                return HttpRule;
+                /**
+                 * History enum.
+                 * @name google.api.ResourceDescriptor.History
+                 * @enum {number}
+                 * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value
+                 * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value
+                 * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value
+                 */
+                ResourceDescriptor.History = (function() {
+                    var valuesById = {}, values = Object.create(valuesById);
+                    values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0;
+                    values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1;
+                    values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2;
+                    return values;
+                })();
+    
+                /**
+                 * Style enum.
+                 * @name google.api.ResourceDescriptor.Style
+                 * @enum {number}
+                 * @property {number} STYLE_UNSPECIFIED=0 STYLE_UNSPECIFIED value
+                 * @property {number} DECLARATIVE_FRIENDLY=1 DECLARATIVE_FRIENDLY value
+                 */
+                ResourceDescriptor.Style = (function() {
+                    var valuesById = {}, values = Object.create(valuesById);
+                    values[valuesById[0] = "STYLE_UNSPECIFIED"] = 0;
+                    values[valuesById[1] = "DECLARATIVE_FRIENDLY"] = 1;
+                    return values;
+                })();
+    
+                return ResourceDescriptor;
             })();
     
-            api.CustomHttpPattern = (function() {
+            api.ResourceReference = (function() {
     
                 /**
-                 * Properties of a CustomHttpPattern.
+                 * Properties of a ResourceReference.
                  * @memberof google.api
-                 * @interface ICustomHttpPattern
-                 * @property {string|null} [kind] CustomHttpPattern kind
-                 * @property {string|null} [path] CustomHttpPattern path
+                 * @interface IResourceReference
+                 * @property {string|null} [type] ResourceReference type
+                 * @property {string|null} [childType] ResourceReference childType
                  */
     
                 /**
-                 * Constructs a new CustomHttpPattern.
+                 * Constructs a new ResourceReference.
                  * @memberof google.api
-                 * @classdesc Represents a CustomHttpPattern.
-                 * @implements ICustomHttpPattern
+                 * @classdesc Represents a ResourceReference.
+                 * @implements IResourceReference
                  * @constructor
-                 * @param {google.api.ICustomHttpPattern=} [properties] Properties to set
+                 * @param {google.api.IResourceReference=} [properties] Properties to set
                  */
-                function CustomHttpPattern(properties) {
+                function ResourceReference(properties) {
                     if (properties)
                         for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                             if (properties[keys[i]] != null)
@@ -55070,88 +55473,88 @@
                 }
     
                 /**
-                 * CustomHttpPattern kind.
-                 * @member {string} kind
-                 * @memberof google.api.CustomHttpPattern
+                 * ResourceReference type.
+                 * @member {string} type
+                 * @memberof google.api.ResourceReference
                  * @instance
                  */
-                CustomHttpPattern.prototype.kind = "";
+                ResourceReference.prototype.type = "";
     
                 /**
-                 * CustomHttpPattern path.
-                 * @member {string} path
-                 * @memberof google.api.CustomHttpPattern
+                 * ResourceReference childType.
+                 * @member {string} childType
+                 * @memberof google.api.ResourceReference
                  * @instance
                  */
-                CustomHttpPattern.prototype.path = "";
+                ResourceReference.prototype.childType = "";
     
                 /**
-                 * Creates a new CustomHttpPattern instance using the specified properties.
+                 * Creates a new ResourceReference instance using the specified properties.
                  * @function create
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
-                 * @param {google.api.ICustomHttpPattern=} [properties] Properties to set
-                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance
+                 * @param {google.api.IResourceReference=} [properties] Properties to set
+                 * @returns {google.api.ResourceReference} ResourceReference instance
                  */
-                CustomHttpPattern.create = function create(properties) {
-                    return new CustomHttpPattern(properties);
+                ResourceReference.create = function create(properties) {
+                    return new ResourceReference(properties);
                 };
     
                 /**
-                 * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages.
+                 * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages.
                  * @function encode
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
-                 * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode
+                 * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                CustomHttpPattern.encode = function encode(message, writer) {
+                ResourceReference.encode = function encode(message, writer) {
                     if (!writer)
                         writer = $Writer.create();
-                    if (message.kind != null && Object.hasOwnProperty.call(message, "kind"))
-                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind);
-                    if (message.path != null && Object.hasOwnProperty.call(message, "path"))
-                        writer.uint32(/* id 2, wireType 2 =*/18).string(message.path);
+                    if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.type);
+                    if (message.childType != null && Object.hasOwnProperty.call(message, "childType"))
+                        writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType);
                     return writer;
                 };
     
                 /**
-                 * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages.
+                 * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages.
                  * @function encodeDelimited
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
-                 * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode
+                 * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode
                  * @param {$protobuf.Writer} [writer] Writer to encode to
                  * @returns {$protobuf.Writer} Writer
                  */
-                CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) {
+                ResourceReference.encodeDelimited = function encodeDelimited(message, writer) {
                     return this.encode(message, writer).ldelim();
                 };
     
                 /**
-                 * Decodes a CustomHttpPattern message from the specified reader or buffer.
+                 * Decodes a ResourceReference message from the specified reader or buffer.
                  * @function decode
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
                  * @param {number} [length] Message length if known beforehand
-                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern
+                 * @returns {google.api.ResourceReference} ResourceReference
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                CustomHttpPattern.decode = function decode(reader, length) {
+                ResourceReference.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern();
+                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference();
                     while (reader.pos < end) {
                         var tag = reader.uint32();
                         switch (tag >>> 3) {
                         case 1:
-                            message.kind = reader.string();
+                            message.type = reader.string();
                             break;
                         case 2:
-                            message.path = reader.string();
+                            message.childType = reader.string();
                             break;
                         default:
                             reader.skipType(tag & 7);
@@ -55162,96 +55565,96 @@
                 };
     
                 /**
-                 * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited.
+                 * Decodes a ResourceReference message from the specified reader or buffer, length delimited.
                  * @function decodeDelimited
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
                  * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern
+                 * @returns {google.api.ResourceReference} ResourceReference
                  * @throws {Error} If the payload is not a reader or valid buffer
                  * @throws {$protobuf.util.ProtocolError} If required fields are missing
                  */
-                CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) {
+                ResourceReference.decodeDelimited = function decodeDelimited(reader) {
                     if (!(reader instanceof $Reader))
                         reader = new $Reader(reader);
                     return this.decode(reader, reader.uint32());
                 };
     
                 /**
-                 * Verifies a CustomHttpPattern message.
+                 * Verifies a ResourceReference message.
                  * @function verify
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
                  * @param {Object.<string,*>} message Plain object to verify
                  * @returns {string|null} `null` if valid, otherwise the reason why it is not
                  */
-                CustomHttpPattern.verify = function verify(message) {
+                ResourceReference.verify = function verify(message) {
                     if (typeof message !== "object" || message === null)
                         return "object expected";
-                    if (message.kind != null && message.hasOwnProperty("kind"))
-                        if (!$util.isString(message.kind))
-                            return "kind: string expected";
-                    if (message.path != null && message.hasOwnProperty("path"))
-                        if (!$util.isString(message.path))
-                            return "path: string expected";
+                    if (message.type != null && message.hasOwnProperty("type"))
+                        if (!$util.isString(message.type))
+                            return "type: string expected";
+                    if (message.childType != null && message.hasOwnProperty("childType"))
+                        if (!$util.isString(message.childType))
+                            return "childType: string expected";
                     return null;
                 };
     
                 /**
-                 * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types.
+                 * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types.
                  * @function fromObject
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
                  * @param {Object.<string,*>} object Plain object
-                 * @returns {google.api.CustomHttpPattern} CustomHttpPattern
+                 * @returns {google.api.ResourceReference} ResourceReference
                  */
-                CustomHttpPattern.fromObject = function fromObject(object) {
-                    if (object instanceof $root.google.api.CustomHttpPattern)
+                ResourceReference.fromObject = function fromObject(object) {
+                    if (object instanceof $root.google.api.ResourceReference)
                         return object;
-                    var message = new $root.google.api.CustomHttpPattern();
-                    if (object.kind != null)
-                        message.kind = String(object.kind);
-                    if (object.path != null)
-                        message.path = String(object.path);
+                    var message = new $root.google.api.ResourceReference();
+                    if (object.type != null)
+                        message.type = String(object.type);
+                    if (object.childType != null)
+                        message.childType = String(object.childType);
                     return message;
                 };
     
                 /**
-                 * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified.
+                 * Creates a plain object from a ResourceReference message. Also converts values to other types if specified.
                  * @function toObject
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @static
-                 * @param {google.api.CustomHttpPattern} message CustomHttpPattern
+                 * @param {google.api.ResourceReference} message ResourceReference
                  * @param {$protobuf.IConversionOptions} [options] Conversion options
                  * @returns {Object.<string,*>} Plain object
                  */
-                CustomHttpPattern.toObject = function toObject(message, options) {
+                ResourceReference.toObject = function toObject(message, options) {
                     if (!options)
                         options = {};
                     var object = {};
                     if (options.defaults) {
-                        object.kind = "";
-                        object.path = "";
+                        object.type = "";
+                        object.childType = "";
                     }
-                    if (message.kind != null && message.hasOwnProperty("kind"))
-                        object.kind = message.kind;
-                    if (message.path != null && message.hasOwnProperty("path"))
-                        object.path = message.path;
+                    if (message.type != null && message.hasOwnProperty("type"))
+                        object.type = message.type;
+                    if (message.childType != null && message.hasOwnProperty("childType"))
+                        object.childType = message.childType;
                     return object;
                 };
     
                 /**
-                 * Converts this CustomHttpPattern to JSON.
+                 * Converts this ResourceReference to JSON.
                  * @function toJSON
-                 * @memberof google.api.CustomHttpPattern
+                 * @memberof google.api.ResourceReference
                  * @instance
                  * @returns {Object.<string,*>} JSON object
                  */
-                CustomHttpPattern.prototype.toJSON = function toJSON() {
+                ResourceReference.prototype.toJSON = function toJSON() {
                     return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
                 };
     
-                return CustomHttpPattern;
+                return ResourceReference;
             })();
     
             return api;
@@ -60784,6 +61187,7 @@
                             case 4:
                             case 5:
                             case 6:
+                            case 7:
                                 break;
                             }
                     }
@@ -60888,6 +61292,10 @@
                             case 6:
                                 message[".google.api.fieldBehavior"][i] = 6;
                                 break;
+                            case "NON_EMPTY_DEFAULT":
+                            case 7:
+                                message[".google.api.fieldBehavior"][i] = 7;
+                                break;
                             }
                     }
                     if (object[".google.api.resourceReference"] != null) {
@@ -61975,8 +62383,8 @@
                  * @property {boolean|null} [deprecated] MethodOptions deprecated
                  * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel
                  * @property {Array.<google.protobuf.IUninterpretedOption>|null} [uninterpretedOption] MethodOptions uninterpretedOption
-                 * @property {Array.<string>|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature
                  * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http
+                 * @property {Array.<string>|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature
                  */
     
                 /**
@@ -62021,20 +62429,20 @@
                 MethodOptions.prototype.uninterpretedOption = $util.emptyArray;
     
                 /**
-                 * MethodOptions .google.api.methodSignature.
-                 * @member {Array.<string>} .google.api.methodSignature
+                 * MethodOptions .google.api.http.
+                 * @member {google.api.IHttpRule|null|undefined} .google.api.http
                  * @memberof google.protobuf.MethodOptions
                  * @instance
                  */
-                MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray;
+                MethodOptions.prototype[".google.api.http"] = null;
     
                 /**
-                 * MethodOptions .google.api.http.
-                 * @member {google.api.IHttpRule|null|undefined} .google.api.http
+                 * MethodOptions .google.api.methodSignature.
+                 * @member {Array.<string>} .google.api.methodSignature
                  * @memberof google.protobuf.MethodOptions
                  * @instance
                  */
-                MethodOptions.prototype[".google.api.http"] = null;
+                MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray;
     
                 /**
                  * Creates a new MethodOptions instance using the specified properties.
@@ -62117,14 +62525,14 @@
                                 message.uninterpretedOption = [];
                             message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32()));
                             break;
+                        case 72295728:
+                            message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32());
+                            break;
                         case 1051:
                             if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length))
                                 message[".google.api.methodSignature"] = [];
                             message[".google.api.methodSignature"].push(reader.string());
                             break;
-                        case 72295728:
-                            message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32());
-                            break;
                         default:
                             reader.skipType(tag & 7);
                             break;
@@ -62181,6 +62589,11 @@
                                 return "uninterpretedOption." + error;
                         }
                     }
+                    if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) {
+                        var error = $root.google.api.HttpRule.verify(message[".google.api.http"]);
+                        if (error)
+                            return ".google.api.http." + error;
+                    }
                     if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) {
                         if (!Array.isArray(message[".google.api.methodSignature"]))
                             return ".google.api.methodSignature: array expected";
@@ -62188,11 +62601,6 @@
                             if (!$util.isString(message[".google.api.methodSignature"][i]))
                                 return ".google.api.methodSignature: string[] expected";
                     }
-                    if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) {
-                        var error = $root.google.api.HttpRule.verify(message[".google.api.http"]);
-                        if (error)
-                            return ".google.api.http." + error;
-                    }
                     return null;
                 };
     
@@ -62234,6 +62642,11 @@
                             message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]);
                         }
                     }
+                    if (object[".google.api.http"] != null) {
+                        if (typeof object[".google.api.http"] !== "object")
+                            throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected");
+                        message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]);
+                    }
                     if (object[".google.api.methodSignature"]) {
                         if (!Array.isArray(object[".google.api.methodSignature"]))
                             throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected");
@@ -62241,11 +62654,6 @@
                         for (var i = 0; i < object[".google.api.methodSignature"].length; ++i)
                             message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]);
                     }
-                    if (object[".google.api.http"] != null) {
-                        if (typeof object[".google.api.http"] !== "object")
-                            throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected");
-                        message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]);
-                    }
                     return message;
                 };