feat(v2beta1): add Location parent to Environment resource (#243)

This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/58020715-0b4b-44c4-95c1-cbec2e342b42/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 320004023 Source-Link: googleapis/googleapis@4139410
googleapis · Jul 8, 2020 · e80418c · e80418c
1 parent 21a2cb6
commit e80418c
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 64 deletions.
diff --git a/...loud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClient.java b/...loud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClient.java
@@ -169,8 +169,9 @@ public EnvironmentsStub getStub() {
    * }
    * </code></pre>
    *
-   * @param parent Required. The agent to list all environments from. Format: `projects/&lt;Project
-   *     ID&gt;/agent`.
+   * @param parent Required. The agent to list all environments from. Format: -
+   *     `projects/&lt;Project Number / ID&gt;/agent` - `projects/&lt;Project Number /
+   *     ID&gt;/locations/&lt;Location ID&gt;/agent
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListEnvironmentsPagedResponse listEnvironments(ProjectAgentName parent) {
@@ -196,8 +197,9 @@ public final ListEnvironmentsPagedResponse listEnvironments(ProjectAgentName par
    * }
    * </code></pre>
    *
-   * @param parent Required. The agent to list all environments from. Format: `projects/&lt;Project
-   *     ID&gt;/agent`.
+   * @param parent Required. The agent to list all environments from. Format: -
+   *     `projects/&lt;Project Number / ID&gt;/agent` - `projects/&lt;Project Number /
+   *     ID&gt;/locations/&lt;Location ID&gt;/agent
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListEnvironmentsPagedResponse listEnvironments(String parent) {

diff --git a/...oud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Environment.java b/...oud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Environment.java
@@ -340,8 +340,10 @@ private State(int value) {
    *
    * <pre>
    * Output only. The unique identifier of this agent environment.
-   * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-   * For Environment ID, "-" is reserved for 'draft' environment.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent/environments/&lt;Environment ID&gt;`
    * </pre>
    *
    * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -365,8 +367,10 @@ public java.lang.String getName() {
    *
    * <pre>
    * Output only. The unique identifier of this agent environment.
-   * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-   * For Environment ID, "-" is reserved for 'draft' environment.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent/environments/&lt;Environment ID&gt;`
    * </pre>
    *
    * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -984,8 +988,10 @@ public Builder mergeFrom(
      *
      * <pre>
      * Output only. The unique identifier of this agent environment.
-     * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-     * For Environment ID, "-" is reserved for 'draft' environment.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent/environments/&lt;Environment ID&gt;`
      * </pre>
      *
      * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1008,8 +1014,10 @@ public java.lang.String getName() {
      *
      * <pre>
      * Output only. The unique identifier of this agent environment.
-     * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-     * For Environment ID, "-" is reserved for 'draft' environment.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent/environments/&lt;Environment ID&gt;`
      * </pre>
      *
      * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1032,8 +1040,10 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * <pre>
      * Output only. The unique identifier of this agent environment.
-     * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-     * For Environment ID, "-" is reserved for 'draft' environment.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent/environments/&lt;Environment ID&gt;`
      * </pre>
      *
      * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1055,8 +1065,10 @@ public Builder setName(java.lang.String value) {
      *
      * <pre>
      * Output only. The unique identifier of this agent environment.
-     * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-     * For Environment ID, "-" is reserved for 'draft' environment.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent/environments/&lt;Environment ID&gt;`
      * </pre>
      *
      * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1074,8 +1086,10 @@ public Builder clearName() {
      *
      * <pre>
      * Output only. The unique identifier of this agent environment.
-     * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-     * For Environment ID, "-" is reserved for 'draft' environment.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent/environments/&lt;Environment ID&gt;`
      * </pre>
      *
      * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>

diff --git a/...gflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentOrBuilder.java b/...gflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentOrBuilder.java
@@ -28,8 +28,10 @@ public interface EnvironmentOrBuilder
    *
    * <pre>
    * Output only. The unique identifier of this agent environment.
-   * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-   * For Environment ID, "-" is reserved for 'draft' environment.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent/environments/&lt;Environment ID&gt;`
    * </pre>
    *
    * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -42,8 +44,10 @@ public interface EnvironmentOrBuilder
    *
    * <pre>
    * Output only. The unique identifier of this agent environment.
-   * Format: `projects/&lt;Project ID&gt;/agent/environments/&lt;Environment ID&gt;`.
-   * For Environment ID, "-" is reserved for 'draft' environment.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent/environments/&lt;Environment ID&gt;`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent/environments/&lt;Environment ID&gt;`
    * </pre>
    *
    * <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>

diff --git a/...ialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentProto.java b/...ialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentProto.java
@@ -56,38 +56,40 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "v2beta1/audio_config.proto\032\033google/proto"
           + "buf/empty.proto\032 google/protobuf/field_m"
           + "ask.proto\032\037google/protobuf/timestamp.pro"
-          + "to\032\027google/api/client.proto\"\374\002\n\013Environm"
+          + "to\032\027google/api/client.proto\"\310\003\n\013Environm"
           + "ent\022\021\n\004name\030\001 \001(\tB\003\340A\003\022\030\n\013description\030\002 "
           + "\001(\tB\003\340A\001\022\032\n\ragent_version\030\003 \001(\tB\003\340A\001\022F\n\005"
           + "state\030\004 \001(\01622.google.cloud.dialogflow.v2"
           + "beta1.Environment.StateB\003\340A\003\0224\n\013update_t"
           + "ime\030\005 \001(\0132\032.google.protobuf.TimestampB\003\340"
           + "A\003\"E\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007ST"
-          + "OPPED\020\001\022\013\n\007LOADING\020\002\022\013\n\007RUNNING\020\003:_\352A\\\n%"
-          + "dialogflow.googleapis.com/Environment\0223p"
-          + "rojects/{project}/agent/environments/{en"
-          + "vironment}\"\211\001\n\027ListEnvironmentsRequest\022="
-          + "\n\006parent\030\001 \001(\tB-\340A\002\372A\'\022%dialogflow.googl"
-          + "eapis.com/Environment\022\026\n\tpage_size\030\002 \001(\005"
-          + "B\003\340A\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"w\n\030ListEn"
-          + "vironmentsResponse\022B\n\014environments\030\001 \003(\013"
-          + "2,.google.cloud.dialogflow.v2beta1.Envir"
-          + "onment\022\027\n\017next_page_token\030\002 \001(\t2\212\003\n\014Envi"
-          + "ronments\022\377\001\n\020ListEnvironments\0228.google.c"
-          + "loud.dialogflow.v2beta1.ListEnvironments"
-          + "Request\0329.google.cloud.dialogflow.v2beta"
-          + "1.ListEnvironmentsResponse\"v\202\323\344\223\002p\022//v2b"
-          + "eta1/{parent=projects/*/agent}/environme"
-          + "ntsZ=\022;/v2beta1/{parent=projects/*/locat"
-          + "ions/*/agent}/environments\032x\312A\031dialogflo"
-          + "w.googleapis.com\322AYhttps://www.googleapi"
-          + "s.com/auth/cloud-platform,https://www.go"
-          + "ogleapis.com/auth/dialogflowB\256\001\n#com.goo"
-          + "gle.cloud.dialogflow.v2beta1B\020Environmen"
-          + "tProtoP\001ZIgoogle.golang.org/genproto/goo"
-          + "gleapis/cloud/dialogflow/v2beta1;dialogf"
-          + "low\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dialogflow.V2"
-          + "beta1b\006proto3"
+          + "OPPED\020\001\022\013\n\007LOADING\020\002\022\013\n\007RUNNING\020\003:\252\001\352A\246\001"
+          + "\n%dialogflow.googleapis.com/Environment\022"
+          + "3projects/{project}/agent/environments/{"
+          + "environment}\022Hprojects/{project}/locatio"
+          + "ns/{location}/agent/environments/{enviro"
+          + "nment}\"\211\001\n\027ListEnvironmentsRequest\022=\n\006pa"
+          + "rent\030\001 \001(\tB-\340A\002\372A\'\022%dialogflow.googleapi"
+          + "s.com/Environment\022\026\n\tpage_size\030\002 \001(\005B\003\340A"
+          + "\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"w\n\030ListEnviro"
+          + "nmentsResponse\022B\n\014environments\030\001 \003(\0132,.g"
+          + "oogle.cloud.dialogflow.v2beta1.Environme"
+          + "nt\022\027\n\017next_page_token\030\002 \001(\t2\212\003\n\014Environm"
+          + "ents\022\377\001\n\020ListEnvironments\0228.google.cloud"
+          + ".dialogflow.v2beta1.ListEnvironmentsRequ"
+          + "est\0329.google.cloud.dialogflow.v2beta1.Li"
+          + "stEnvironmentsResponse\"v\202\323\344\223\002p\022//v2beta1"
+          + "/{parent=projects/*/agent}/environmentsZ"
+          + "=\022;/v2beta1/{parent=projects/*/locations"
+          + "/*/agent}/environments\032x\312A\031dialogflow.go"
+          + "ogleapis.com\322AYhttps://www.googleapis.co"
+          + "m/auth/cloud-platform,https://www.google"
+          + "apis.com/auth/dialogflowB\256\001\n#com.google."
+          + "cloud.dialogflow.v2beta1B\020EnvironmentPro"
+          + "toP\001ZIgoogle.golang.org/genproto/googlea"
+          + "pis/cloud/dialogflow/v2beta1;dialogflow\370"
+          + "\001\001\242\002\002DF\252\002\037Google.Cloud.Dialogflow.V2beta"
+          + "1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

diff --git a/...ow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequest.java b/...ow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequest.java
@@ -131,7 +131,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * Required. The agent to list all environments from.
-   * Format: `projects/&lt;Project ID&gt;/agent`.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent
    * </pre>
    *
    * <code>
@@ -157,7 +160,10 @@ public java.lang.String getParent() {
    *
    * <pre>
    * Required. The agent to list all environments from.
-   * Format: `projects/&lt;Project ID&gt;/agent`.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent
    * </pre>
    *
    * <code>
@@ -603,7 +609,10 @@ public Builder mergeFrom(
      *
      * <pre>
      * Required. The agent to list all environments from.
-     * Format: `projects/&lt;Project ID&gt;/agent`.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent
      * </pre>
      *
      * <code>
@@ -628,7 +637,10 @@ public java.lang.String getParent() {
      *
      * <pre>
      * Required. The agent to list all environments from.
-     * Format: `projects/&lt;Project ID&gt;/agent`.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent
      * </pre>
      *
      * <code>
@@ -653,7 +665,10 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      * <pre>
      * Required. The agent to list all environments from.
-     * Format: `projects/&lt;Project ID&gt;/agent`.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent
      * </pre>
      *
      * <code>
@@ -677,7 +692,10 @@ public Builder setParent(java.lang.String value) {
      *
      * <pre>
      * Required. The agent to list all environments from.
-     * Format: `projects/&lt;Project ID&gt;/agent`.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent
      * </pre>
      *
      * <code>
@@ -697,7 +715,10 @@ public Builder clearParent() {
      *
      * <pre>
      * Required. The agent to list all environments from.
-     * Format: `projects/&lt;Project ID&gt;/agent`.
+     * Format:
+     * - `projects/&lt;Project Number / ID&gt;/agent`
+     * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+     * ID&gt;/agent
      * </pre>
      *
      * <code>

diff --git a/...1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequestOrBuilder.java b/...1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEnvironmentsRequestOrBuilder.java
@@ -28,7 +28,10 @@ public interface ListEnvironmentsRequestOrBuilder
    *
    * <pre>
    * Required. The agent to list all environments from.
-   * Format: `projects/&lt;Project ID&gt;/agent`.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent
    * </pre>
    *
    * <code>
@@ -43,7 +46,10 @@ public interface ListEnvironmentsRequestOrBuilder
    *
    * <pre>
    * Required. The agent to list all environments from.
-   * Format: `projects/&lt;Project ID&gt;/agent`.
+   * Format:
+   * - `projects/&lt;Project Number / ID&gt;/agent`
+   * - `projects/&lt;Project Number / ID&gt;/locations/&lt;Location
+   * ID&gt;/agent
    * </pre>
    *
    * <code>

diff --git a/...cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto b/...cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto
@@ -56,6 +56,7 @@ message Environment {
   option (google.api.resource) = {
     type: "dialogflow.googleapis.com/Environment"
     pattern: "projects/{project}/agent/environments/{environment}"
+    pattern: "projects/{project}/locations/{location}/agent/environments/{environment}"
   };
 
   // Represents an environment state. When an environment is pointed to a new
@@ -78,8 +79,10 @@ message Environment {
   }
 
   // Output only. The unique identifier of this agent environment.
-  // Format: `projects/<Project ID>/agent/environments/<Environment ID>`.
-  // For Environment ID, "-" is reserved for 'draft' environment.
+  // Format:
+  // - `projects/<Project Number / ID>/agent/environments/<Environment ID>`
+  // - `projects/<Project Number / ID>/locations/<Location
+  // ID>/agent/environments/<Environment ID>`
   string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Optional. The developer-provided description for this environment.
@@ -102,7 +105,10 @@ message Environment {
 // The request message for [Environments.ListEnvironments][google.cloud.dialogflow.v2beta1.Environments.ListEnvironments].
 message ListEnvironmentsRequest {
   // Required. The agent to list all environments from.
-  // Format: `projects/<Project ID>/agent`.
+  // Format:
+  // - `projects/<Project Number / ID>/agent`
+  // - `projects/<Project Number / ID>/locations/<Location
+  // ID>/agent
   string parent = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {

diff --git a/synth.metadata b/synth.metadata
@@ -11,16 +11,16 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "dc3682a7075d3028f00de866446fd0543ebc6079",
-        "internalRef": "318303567"
+        "sha": "4139410a6b2a3ce9df083c3d97f98498cefbfd78",
+        "internalRef": "320004023"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "dc3682a7075d3028f00de866446fd0543ebc6079",
-        "internalRef": "318303567"
+        "sha": "4139410a6b2a3ce9df083c3d97f98498cefbfd78",
+        "internalRef": "320004023"
       }
     },
     {