flow.rb in google-cloud-dialogflow-cx-v3-0.20.0

- old
+ new

@@ -136,11 +136,14 @@
           #     *   They are inherited by every page's [transition
           #     route groups][Page.transition_route_groups]. Transition route groups
           #     defined in the page have higher priority than those defined in the flow.
           #
           #     Format:`projects/<Project ID>/locations/<Location ID>/agents/<Agent
-          #     ID>/flows/<Flow ID>/transitionRouteGroups/<TransitionRouteGroup ID>`.
+          #     ID>/flows/<Flow ID>/transitionRouteGroups/<TransitionRouteGroup ID>`
+          #     or `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+          #     ID>/transitionRouteGroups/<TransitionRouteGroup ID>` for agent-level
+          #     groups.
           # @!attribute [rw] nlu_settings
           #   @return [::Google::Cloud::Dialogflow::CX::V3::NluSettings]
           #     NLU related settings of the flow.
           class Flow
             include ::Google::Protobuf::MessageExts
@@ -383,10 +386,14 @@
           #   @return [::String]
           #     Uncompressed raw byte content for flow.
           # @!attribute [rw] import_option
           #   @return [::Google::Cloud::Dialogflow::CX::V3::ImportFlowRequest::ImportOption]
           #     Flow import mode. If not specified, `KEEP` is assumed.
+          # @!attribute [rw] flow_import_strategy
+          #   @return [::Google::Cloud::Dialogflow::CX::V3::FlowImportStrategy]
+          #     Optional. Specifies the import strategy used when resolving resource
+          #     conflicts.
           class ImportFlowRequest
             include ::Google::Protobuf::MessageExts
             extend ::Google::Protobuf::MessageExts::ClassMethods
 
             # Import option.
@@ -402,9 +409,22 @@
               # Fallback to default settings if some settings are not supported in the
               # agent to import into. E.g. Standard NLU will be used if custom NLU is
               # not available.
               FALLBACK = 2
             end
+          end
+
+          # The flow import strategy used for resource conflict resolution associated
+          # with an {::Google::Cloud::Dialogflow::CX::V3::ImportFlowRequest ImportFlowRequest}.
+          # @!attribute [rw] global_import_strategy
+          #   @return [::Google::Cloud::Dialogflow::CX::V3::ImportStrategy]
+          #     Optional. Import strategy for resource conflict resolution, applied
+          #     globally throughout the flow. It will be applied for all display name
+          #     conflicts in the imported content. If not specified, 'CREATE_NEW' is
+          #     assumed.
+          class FlowImportStrategy
+            include ::Google::Protobuf::MessageExts
+            extend ::Google::Protobuf::MessageExts::ClassMethods
           end
 
           # The response message for
           # {::Google::Cloud::Dialogflow::CX::V3::Flows::Client#import_flow Flows.ImportFlow}.
           # @!attribute [rw] flow