google-cloud-dialogflow-v2 0.30.0 → 0.32.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (79) hide show
  1. checksums.yaml +4 -4
  2. data/AUTHENTICATION.md +72 -101
  3. data/lib/google/cloud/dialogflow/v2/agents/client.rb +33 -8
  4. data/lib/google/cloud/dialogflow/v2/agents/operations.rb +28 -6
  5. data/lib/google/cloud/dialogflow/v2/agents/rest/client.rb +35 -7
  6. data/lib/google/cloud/dialogflow/v2/agents/rest/operations.rb +33 -8
  7. data/lib/google/cloud/dialogflow/v2/agents/rest/service_stub.rb +14 -2
  8. data/lib/google/cloud/dialogflow/v2/answer_records/client.rb +32 -8
  9. data/lib/google/cloud/dialogflow/v2/answer_records/rest/client.rb +34 -7
  10. data/lib/google/cloud/dialogflow/v2/answer_records/rest/service_stub.rb +14 -2
  11. data/lib/google/cloud/dialogflow/v2/contexts/client.rb +32 -8
  12. data/lib/google/cloud/dialogflow/v2/contexts/rest/client.rb +34 -7
  13. data/lib/google/cloud/dialogflow/v2/contexts/rest/service_stub.rb +14 -2
  14. data/lib/google/cloud/dialogflow/v2/conversation_datasets/client.rb +33 -8
  15. data/lib/google/cloud/dialogflow/v2/conversation_datasets/operations.rb +28 -6
  16. data/lib/google/cloud/dialogflow/v2/conversation_datasets/rest/client.rb +35 -7
  17. data/lib/google/cloud/dialogflow/v2/conversation_datasets/rest/operations.rb +33 -8
  18. data/lib/google/cloud/dialogflow/v2/conversation_datasets/rest/service_stub.rb +14 -2
  19. data/lib/google/cloud/dialogflow/v2/conversation_models/client.rb +33 -8
  20. data/lib/google/cloud/dialogflow/v2/conversation_models/operations.rb +28 -6
  21. data/lib/google/cloud/dialogflow/v2/conversation_models/rest/client.rb +35 -7
  22. data/lib/google/cloud/dialogflow/v2/conversation_models/rest/operations.rb +33 -8
  23. data/lib/google/cloud/dialogflow/v2/conversation_models/rest/service_stub.rb +14 -2
  24. data/lib/google/cloud/dialogflow/v2/conversation_pb.rb +1 -1
  25. data/lib/google/cloud/dialogflow/v2/conversation_profile_pb.rb +3 -1
  26. data/lib/google/cloud/dialogflow/v2/conversation_profiles/client.rb +33 -8
  27. data/lib/google/cloud/dialogflow/v2/conversation_profiles/operations.rb +28 -6
  28. data/lib/google/cloud/dialogflow/v2/conversation_profiles/rest/client.rb +35 -7
  29. data/lib/google/cloud/dialogflow/v2/conversation_profiles/rest/operations.rb +33 -8
  30. data/lib/google/cloud/dialogflow/v2/conversation_profiles/rest/service_stub.rb +14 -2
  31. data/lib/google/cloud/dialogflow/v2/conversations/client.rb +32 -8
  32. data/lib/google/cloud/dialogflow/v2/conversations/rest/client.rb +34 -7
  33. data/lib/google/cloud/dialogflow/v2/conversations/rest/service_stub.rb +14 -2
  34. data/lib/google/cloud/dialogflow/v2/documents/client.rb +33 -8
  35. data/lib/google/cloud/dialogflow/v2/documents/operations.rb +28 -6
  36. data/lib/google/cloud/dialogflow/v2/documents/rest/client.rb +35 -7
  37. data/lib/google/cloud/dialogflow/v2/documents/rest/operations.rb +33 -8
  38. data/lib/google/cloud/dialogflow/v2/documents/rest/service_stub.rb +14 -2
  39. data/lib/google/cloud/dialogflow/v2/entity_types/client.rb +33 -8
  40. data/lib/google/cloud/dialogflow/v2/entity_types/operations.rb +28 -6
  41. data/lib/google/cloud/dialogflow/v2/entity_types/rest/client.rb +35 -7
  42. data/lib/google/cloud/dialogflow/v2/entity_types/rest/operations.rb +33 -8
  43. data/lib/google/cloud/dialogflow/v2/entity_types/rest/service_stub.rb +14 -2
  44. data/lib/google/cloud/dialogflow/v2/environments/client.rb +32 -8
  45. data/lib/google/cloud/dialogflow/v2/environments/rest/client.rb +34 -7
  46. data/lib/google/cloud/dialogflow/v2/environments/rest/service_stub.rb +14 -2
  47. data/lib/google/cloud/dialogflow/v2/fulfillments/client.rb +32 -8
  48. data/lib/google/cloud/dialogflow/v2/fulfillments/rest/client.rb +34 -7
  49. data/lib/google/cloud/dialogflow/v2/fulfillments/rest/service_stub.rb +14 -2
  50. data/lib/google/cloud/dialogflow/v2/intents/client.rb +33 -8
  51. data/lib/google/cloud/dialogflow/v2/intents/operations.rb +28 -6
  52. data/lib/google/cloud/dialogflow/v2/intents/rest/client.rb +35 -7
  53. data/lib/google/cloud/dialogflow/v2/intents/rest/operations.rb +33 -8
  54. data/lib/google/cloud/dialogflow/v2/intents/rest/service_stub.rb +14 -2
  55. data/lib/google/cloud/dialogflow/v2/knowledge_bases/client.rb +32 -8
  56. data/lib/google/cloud/dialogflow/v2/knowledge_bases/rest/client.rb +34 -7
  57. data/lib/google/cloud/dialogflow/v2/knowledge_bases/rest/service_stub.rb +14 -2
  58. data/lib/google/cloud/dialogflow/v2/participants/client.rb +32 -8
  59. data/lib/google/cloud/dialogflow/v2/participants/rest/client.rb +34 -7
  60. data/lib/google/cloud/dialogflow/v2/participants/rest/service_stub.rb +14 -2
  61. data/lib/google/cloud/dialogflow/v2/session_entity_types/client.rb +32 -8
  62. data/lib/google/cloud/dialogflow/v2/session_entity_types/rest/client.rb +34 -7
  63. data/lib/google/cloud/dialogflow/v2/session_entity_types/rest/service_stub.rb +14 -2
  64. data/lib/google/cloud/dialogflow/v2/sessions/client.rb +32 -8
  65. data/lib/google/cloud/dialogflow/v2/sessions/rest/client.rb +34 -7
  66. data/lib/google/cloud/dialogflow/v2/sessions/rest/service_stub.rb +14 -2
  67. data/lib/google/cloud/dialogflow/v2/version.rb +1 -1
  68. data/lib/google/cloud/dialogflow/v2/versions/client.rb +32 -8
  69. data/lib/google/cloud/dialogflow/v2/versions/rest/client.rb +34 -7
  70. data/lib/google/cloud/dialogflow/v2/versions/rest/service_stub.rb +14 -2
  71. data/proto_docs/google/api/client.rb +14 -0
  72. data/proto_docs/google/cloud/dialogflow/v2/agent.rb +1 -0
  73. data/proto_docs/google/cloud/dialogflow/v2/answer_record.rb +1 -0
  74. data/proto_docs/google/cloud/dialogflow/v2/audio_config.rb +22 -20
  75. data/proto_docs/google/cloud/dialogflow/v2/conversation.rb +7 -1
  76. data/proto_docs/google/cloud/dialogflow/v2/conversation_profile.rb +62 -3
  77. data/proto_docs/google/cloud/dialogflow/v2/fulfillment.rb +1 -0
  78. data/proto_docs/google/cloud/dialogflow/v2/session.rb +1 -0
  79. metadata +7 -7
@@ -26,6 +26,9 @@ module Google
26
26
  module ConversationDatasets
27
27
  # Service that implements Longrunning Operations API.
28
28
  class Operations
29
+ # @private
30
+ DEFAULT_ENDPOINT_TEMPLATE = "dialogflow.$UNIVERSE_DOMAIN$"
31
+
29
32
  # @private
30
33
  attr_reader :operations_stub
31
34
 
@@ -60,6 +63,15 @@ module Google
60
63
  @config
61
64
  end
62
65
 
66
+ ##
67
+ # The effective universe domain
68
+ #
69
+ # @return [String]
70
+ #
71
+ def universe_domain
72
+ @operations_stub.universe_domain
73
+ end
74
+
63
75
  ##
64
76
  # Create a new Operations client object.
65
77
  #
@@ -90,8 +102,10 @@ module Google
90
102
 
91
103
  @operations_stub = ::Gapic::ServiceStub.new(
92
104
  ::Google::Longrunning::Operations::Stub,
93
- credentials: credentials,
94
- endpoint: @config.endpoint,
105
+ credentials: credentials,
106
+ endpoint: @config.endpoint,
107
+ endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
108
+ universe_domain: @config.universe_domain,
95
109
  channel_args: @config.channel_args,
96
110
  interceptors: @config.interceptors,
97
111
  channel_pool_config: @config.channel_pool
@@ -613,9 +627,9 @@ module Google
613
627
  # end
614
628
  #
615
629
  # @!attribute [rw] endpoint
616
- # The hostname or hostname:port of the service endpoint.
617
- # Defaults to `"dialogflow.googleapis.com"`.
618
- # @return [::String]
630
+ # A custom service endpoint, as a hostname or hostname:port. The default is
631
+ # nil, indicating to use the default endpoint in the current universe domain.
632
+ # @return [::String,nil]
619
633
  # @!attribute [rw] credentials
620
634
  # Credentials to send with calls. You may provide any of the following types:
621
635
  # * (`String`) The path to a service account key file in JSON format
@@ -661,13 +675,20 @@ module Google
661
675
  # @!attribute [rw] quota_project
662
676
  # A separate project against which to charge quota.
663
677
  # @return [::String]
678
+ # @!attribute [rw] universe_domain
679
+ # The universe domain within which to make requests. This determines the
680
+ # default endpoint URL. The default value of nil uses the environment
681
+ # universe (usually the default "googleapis.com" universe).
682
+ # @return [::String,nil]
664
683
  #
665
684
  class Configuration
666
685
  extend ::Gapic::Config
667
686
 
687
+ # @private
688
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
668
689
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
669
690
 
670
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
691
+ config_attr :endpoint, nil, ::String, nil
671
692
  config_attr :credentials, nil do |value|
672
693
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
673
694
  allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
@@ -682,6 +703,7 @@ module Google
682
703
  config_attr :metadata, nil, ::Hash, nil
683
704
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
684
705
  config_attr :quota_project, nil, ::String, nil
706
+ config_attr :universe_domain, nil, ::String, nil
685
707
 
686
708
  # @private
687
709
  def initialize parent_config = nil
@@ -36,6 +36,9 @@ module Google
36
36
  # customizable metadata that can be used for model training.
37
37
  #
38
38
  class Client
39
+ # @private
40
+ DEFAULT_ENDPOINT_TEMPLATE = "dialogflow.$UNIVERSE_DOMAIN$"
41
+
39
42
  include Paths
40
43
 
41
44
  # @private
@@ -101,6 +104,15 @@ module Google
101
104
  @config
102
105
  end
103
106
 
107
+ ##
108
+ # The effective universe domain
109
+ #
110
+ # @return [String]
111
+ #
112
+ def universe_domain
113
+ @conversation_datasets_stub.universe_domain
114
+ end
115
+
104
116
  ##
105
117
  # Create a new ConversationDatasets REST client object.
106
118
  #
@@ -128,8 +140,9 @@ module Google
128
140
  credentials = @config.credentials
129
141
  # Use self-signed JWT if the endpoint is unchanged from default,
130
142
  # but only if the default endpoint does not have a region prefix.
131
- enable_self_signed_jwt = @config.endpoint == Configuration::DEFAULT_ENDPOINT &&
132
- !@config.endpoint.split(".").first.include?("-")
143
+ enable_self_signed_jwt = @config.endpoint.nil? ||
144
+ (@config.endpoint == Configuration::DEFAULT_ENDPOINT &&
145
+ !@config.endpoint.split(".").first.include?("-"))
133
146
  credentials ||= Credentials.default scope: @config.scope,
134
147
  enable_self_signed_jwt: enable_self_signed_jwt
135
148
  if credentials.is_a?(::String) || credentials.is_a?(::Hash)
@@ -143,16 +156,23 @@ module Google
143
156
  config.credentials = credentials
144
157
  config.quota_project = @quota_project_id
145
158
  config.endpoint = @config.endpoint
159
+ config.universe_domain = @config.universe_domain
146
160
  end
147
161
 
148
162
  @location_client = Google::Cloud::Location::Locations::Rest::Client.new do |config|
149
163
  config.credentials = credentials
150
164
  config.quota_project = @quota_project_id
151
165
  config.endpoint = @config.endpoint
166
+ config.universe_domain = @config.universe_domain
152
167
  config.bindings_override = @config.bindings_override
153
168
  end
154
169
 
155
- @conversation_datasets_stub = ::Google::Cloud::Dialogflow::V2::ConversationDatasets::Rest::ServiceStub.new endpoint: @config.endpoint, credentials: credentials
170
+ @conversation_datasets_stub = ::Google::Cloud::Dialogflow::V2::ConversationDatasets::Rest::ServiceStub.new(
171
+ endpoint: @config.endpoint,
172
+ endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
173
+ universe_domain: @config.universe_domain,
174
+ credentials: credentials
175
+ )
156
176
  end
157
177
 
158
178
  ##
@@ -667,9 +687,9 @@ module Google
667
687
  # end
668
688
  #
669
689
  # @!attribute [rw] endpoint
670
- # The hostname or hostname:port of the service endpoint.
671
- # Defaults to `"dialogflow.googleapis.com"`.
672
- # @return [::String]
690
+ # A custom service endpoint, as a hostname or hostname:port. The default is
691
+ # nil, indicating to use the default endpoint in the current universe domain.
692
+ # @return [::String,nil]
673
693
  # @!attribute [rw] credentials
674
694
  # Credentials to send with calls. You may provide any of the following types:
675
695
  # * (`String`) The path to a service account key file in JSON format
@@ -706,13 +726,20 @@ module Google
706
726
  # @!attribute [rw] quota_project
707
727
  # A separate project against which to charge quota.
708
728
  # @return [::String]
729
+ # @!attribute [rw] universe_domain
730
+ # The universe domain within which to make requests. This determines the
731
+ # default endpoint URL. The default value of nil uses the environment
732
+ # universe (usually the default "googleapis.com" universe).
733
+ # @return [::String,nil]
709
734
  #
710
735
  class Configuration
711
736
  extend ::Gapic::Config
712
737
 
738
+ # @private
739
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
713
740
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
714
741
 
715
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
742
+ config_attr :endpoint, nil, ::String, nil
716
743
  config_attr :credentials, nil do |value|
717
744
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
718
745
  allowed.any? { |klass| klass === value }
@@ -724,6 +751,7 @@ module Google
724
751
  config_attr :metadata, nil, ::Hash, nil
725
752
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
726
753
  config_attr :quota_project, nil, ::String, nil
754
+ config_attr :universe_domain, nil, ::String, nil
727
755
 
728
756
  # @private
729
757
  # Overrides for http bindings for the RPCs of this service
@@ -26,6 +26,9 @@ module Google
26
26
  module Rest
27
27
  # Service that implements Longrunning Operations API.
28
28
  class Operations
29
+ # @private
30
+ DEFAULT_ENDPOINT_TEMPLATE = "dialogflow.$UNIVERSE_DOMAIN$"
31
+
29
32
  # @private
30
33
  attr_reader :operations_stub
31
34
 
@@ -60,6 +63,15 @@ module Google
60
63
  @config
61
64
  end
62
65
 
66
+ ##
67
+ # The effective universe domain
68
+ #
69
+ # @return [String]
70
+ #
71
+ def universe_domain
72
+ @operations_stub.universe_domain
73
+ end
74
+
63
75
  ##
64
76
  # Create a new Operations client object.
65
77
  #
@@ -84,8 +96,10 @@ module Google
84
96
  @quota_project_id ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
85
97
 
86
98
  @operations_stub = OperationsServiceStub.new(
87
- endpoint: @config.endpoint,
88
- credentials: credentials
99
+ endpoint: @config.endpoint,
100
+ endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
101
+ universe_domain: @config.universe_domain,
102
+ credentials: credentials
89
103
  )
90
104
 
91
105
  # Used by an LRO wrapper for some methods of this service
@@ -478,9 +492,9 @@ module Google
478
492
  # end
479
493
  #
480
494
  # @!attribute [rw] endpoint
481
- # The hostname or hostname:port of the service endpoint.
482
- # Defaults to `"dialogflow.googleapis.com"`.
483
- # @return [::String]
495
+ # A custom service endpoint, as a hostname or hostname:port. The default is
496
+ # nil, indicating to use the default endpoint in the current universe domain.
497
+ # @return [::String,nil]
484
498
  # @!attribute [rw] credentials
485
499
  # Credentials to send with calls. You may provide any of the following types:
486
500
  # * (`String`) The path to a service account key file in JSON format
@@ -517,13 +531,20 @@ module Google
517
531
  # @!attribute [rw] quota_project
518
532
  # A separate project against which to charge quota.
519
533
  # @return [::String]
534
+ # @!attribute [rw] universe_domain
535
+ # The universe domain within which to make requests. This determines the
536
+ # default endpoint URL. The default value of nil uses the environment
537
+ # universe (usually the default "googleapis.com" universe).
538
+ # @return [::String,nil]
520
539
  #
521
540
  class Configuration
522
541
  extend ::Gapic::Config
523
542
 
543
+ # @private
544
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
524
545
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
525
546
 
526
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
547
+ config_attr :endpoint, nil, ::String, nil
527
548
  config_attr :credentials, nil do |value|
528
549
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
529
550
  allowed.any? { |klass| klass === value }
@@ -535,6 +556,7 @@ module Google
535
556
  config_attr :metadata, nil, ::Hash, nil
536
557
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
537
558
  config_attr :quota_project, nil, ::String, nil
559
+ config_attr :universe_domain, nil, ::String, nil
538
560
 
539
561
  # @private
540
562
  def initialize parent_config = nil
@@ -617,12 +639,15 @@ module Google
617
639
  # Service stub contains baseline method implementations
618
640
  # including transcoding, making the REST call, and deserialing the response.
619
641
  class OperationsServiceStub
620
- def initialize endpoint:, credentials:
642
+ def initialize endpoint:, endpoint_template:, universe_domain:, credentials:
621
643
  # These require statements are intentionally placed here to initialize
622
644
  # the REST modules only when it's required.
623
645
  require "gapic/rest"
624
646
 
625
- @client_stub = ::Gapic::Rest::ClientStub.new endpoint: endpoint, credentials: credentials
647
+ @client_stub = ::Gapic::Rest::ClientStub.new endpoint: endpoint,
648
+ endpoint_template: endpoint_template,
649
+ universe_domain: universe_domain,
650
+ credentials: credentials
626
651
  end
627
652
 
628
653
  ##
@@ -30,16 +30,28 @@ module Google
30
30
  # including transcoding, making the REST call, and deserialing the response.
31
31
  #
32
32
  class ServiceStub
33
- def initialize endpoint:, credentials:
33
+ def initialize endpoint:, endpoint_template:, universe_domain:, credentials:
34
34
  # These require statements are intentionally placed here to initialize
35
35
  # the REST modules only when it's required.
36
36
  require "gapic/rest"
37
37
 
38
- @client_stub = ::Gapic::Rest::ClientStub.new endpoint: endpoint, credentials: credentials,
38
+ @client_stub = ::Gapic::Rest::ClientStub.new endpoint: endpoint,
39
+ endpoint_template: endpoint_template,
40
+ universe_domain: universe_domain,
41
+ credentials: credentials,
39
42
  numeric_enums: true,
40
43
  raise_faraday_errors: false
41
44
  end
42
45
 
46
+ ##
47
+ # The effective universe domain
48
+ #
49
+ # @return [String]
50
+ #
51
+ def universe_domain
52
+ @client_stub.universe_domain
53
+ end
54
+
43
55
  ##
44
56
  # Baseline implementation for the create_conversation_dataset REST call
45
57
  #
@@ -31,6 +31,9 @@ module Google
31
31
  # Manages a collection of models for human agent assistant.
32
32
  #
33
33
  class Client
34
+ # @private
35
+ DEFAULT_ENDPOINT_TEMPLATE = "dialogflow.$UNIVERSE_DOMAIN$"
36
+
34
37
  include Paths
35
38
 
36
39
  # @private
@@ -96,6 +99,15 @@ module Google
96
99
  @config
97
100
  end
98
101
 
102
+ ##
103
+ # The effective universe domain
104
+ #
105
+ # @return [String]
106
+ #
107
+ def universe_domain
108
+ @conversation_models_stub.universe_domain
109
+ end
110
+
99
111
  ##
100
112
  # Create a new ConversationModels client object.
101
113
  #
@@ -129,8 +141,9 @@ module Google
129
141
  credentials = @config.credentials
130
142
  # Use self-signed JWT if the endpoint is unchanged from default,
131
143
  # but only if the default endpoint does not have a region prefix.
132
- enable_self_signed_jwt = @config.endpoint == Configuration::DEFAULT_ENDPOINT &&
133
- !@config.endpoint.split(".").first.include?("-")
144
+ enable_self_signed_jwt = @config.endpoint.nil? ||
145
+ (@config.endpoint == Configuration::DEFAULT_ENDPOINT &&
146
+ !@config.endpoint.split(".").first.include?("-"))
134
147
  credentials ||= Credentials.default scope: @config.scope,
135
148
  enable_self_signed_jwt: enable_self_signed_jwt
136
149
  if credentials.is_a?(::String) || credentials.is_a?(::Hash)
@@ -143,18 +156,22 @@ module Google
143
156
  config.credentials = credentials
144
157
  config.quota_project = @quota_project_id
145
158
  config.endpoint = @config.endpoint
159
+ config.universe_domain = @config.universe_domain
146
160
  end
147
161
 
148
162
  @location_client = Google::Cloud::Location::Locations::Client.new do |config|
149
163
  config.credentials = credentials
150
164
  config.quota_project = @quota_project_id
151
165
  config.endpoint = @config.endpoint
166
+ config.universe_domain = @config.universe_domain
152
167
  end
153
168
 
154
169
  @conversation_models_stub = ::Gapic::ServiceStub.new(
155
170
  ::Google::Cloud::Dialogflow::V2::ConversationModels::Stub,
156
- credentials: credentials,
157
- endpoint: @config.endpoint,
171
+ credentials: credentials,
172
+ endpoint: @config.endpoint,
173
+ endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
174
+ universe_domain: @config.universe_domain,
158
175
  channel_args: @config.channel_args,
159
176
  interceptors: @config.interceptors,
160
177
  channel_pool_config: @config.channel_pool
@@ -1089,9 +1106,9 @@ module Google
1089
1106
  # end
1090
1107
  #
1091
1108
  # @!attribute [rw] endpoint
1092
- # The hostname or hostname:port of the service endpoint.
1093
- # Defaults to `"dialogflow.googleapis.com"`.
1094
- # @return [::String]
1109
+ # A custom service endpoint, as a hostname or hostname:port. The default is
1110
+ # nil, indicating to use the default endpoint in the current universe domain.
1111
+ # @return [::String,nil]
1095
1112
  # @!attribute [rw] credentials
1096
1113
  # Credentials to send with calls. You may provide any of the following types:
1097
1114
  # * (`String`) The path to a service account key file in JSON format
@@ -1137,13 +1154,20 @@ module Google
1137
1154
  # @!attribute [rw] quota_project
1138
1155
  # A separate project against which to charge quota.
1139
1156
  # @return [::String]
1157
+ # @!attribute [rw] universe_domain
1158
+ # The universe domain within which to make requests. This determines the
1159
+ # default endpoint URL. The default value of nil uses the environment
1160
+ # universe (usually the default "googleapis.com" universe).
1161
+ # @return [::String,nil]
1140
1162
  #
1141
1163
  class Configuration
1142
1164
  extend ::Gapic::Config
1143
1165
 
1166
+ # @private
1167
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
1144
1168
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
1145
1169
 
1146
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
1170
+ config_attr :endpoint, nil, ::String, nil
1147
1171
  config_attr :credentials, nil do |value|
1148
1172
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
1149
1173
  allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
@@ -1158,6 +1182,7 @@ module Google
1158
1182
  config_attr :metadata, nil, ::Hash, nil
1159
1183
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
1160
1184
  config_attr :quota_project, nil, ::String, nil
1185
+ config_attr :universe_domain, nil, ::String, nil
1161
1186
 
1162
1187
  # @private
1163
1188
  def initialize parent_config = nil
@@ -26,6 +26,9 @@ module Google
26
26
  module ConversationModels
27
27
  # Service that implements Longrunning Operations API.
28
28
  class Operations
29
+ # @private
30
+ DEFAULT_ENDPOINT_TEMPLATE = "dialogflow.$UNIVERSE_DOMAIN$"
31
+
29
32
  # @private
30
33
  attr_reader :operations_stub
31
34
 
@@ -60,6 +63,15 @@ module Google
60
63
  @config
61
64
  end
62
65
 
66
+ ##
67
+ # The effective universe domain
68
+ #
69
+ # @return [String]
70
+ #
71
+ def universe_domain
72
+ @operations_stub.universe_domain
73
+ end
74
+
63
75
  ##
64
76
  # Create a new Operations client object.
65
77
  #
@@ -90,8 +102,10 @@ module Google
90
102
 
91
103
  @operations_stub = ::Gapic::ServiceStub.new(
92
104
  ::Google::Longrunning::Operations::Stub,
93
- credentials: credentials,
94
- endpoint: @config.endpoint,
105
+ credentials: credentials,
106
+ endpoint: @config.endpoint,
107
+ endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
108
+ universe_domain: @config.universe_domain,
95
109
  channel_args: @config.channel_args,
96
110
  interceptors: @config.interceptors,
97
111
  channel_pool_config: @config.channel_pool
@@ -613,9 +627,9 @@ module Google
613
627
  # end
614
628
  #
615
629
  # @!attribute [rw] endpoint
616
- # The hostname or hostname:port of the service endpoint.
617
- # Defaults to `"dialogflow.googleapis.com"`.
618
- # @return [::String]
630
+ # A custom service endpoint, as a hostname or hostname:port. The default is
631
+ # nil, indicating to use the default endpoint in the current universe domain.
632
+ # @return [::String,nil]
619
633
  # @!attribute [rw] credentials
620
634
  # Credentials to send with calls. You may provide any of the following types:
621
635
  # * (`String`) The path to a service account key file in JSON format
@@ -661,13 +675,20 @@ module Google
661
675
  # @!attribute [rw] quota_project
662
676
  # A separate project against which to charge quota.
663
677
  # @return [::String]
678
+ # @!attribute [rw] universe_domain
679
+ # The universe domain within which to make requests. This determines the
680
+ # default endpoint URL. The default value of nil uses the environment
681
+ # universe (usually the default "googleapis.com" universe).
682
+ # @return [::String,nil]
664
683
  #
665
684
  class Configuration
666
685
  extend ::Gapic::Config
667
686
 
687
+ # @private
688
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
668
689
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
669
690
 
670
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
691
+ config_attr :endpoint, nil, ::String, nil
671
692
  config_attr :credentials, nil do |value|
672
693
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
673
694
  allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
@@ -682,6 +703,7 @@ module Google
682
703
  config_attr :metadata, nil, ::Hash, nil
683
704
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
684
705
  config_attr :quota_project, nil, ::String, nil
706
+ config_attr :universe_domain, nil, ::String, nil
685
707
 
686
708
  # @private
687
709
  def initialize parent_config = nil
@@ -33,6 +33,9 @@ module Google
33
33
  # Manages a collection of models for human agent assistant.
34
34
  #
35
35
  class Client
36
+ # @private
37
+ DEFAULT_ENDPOINT_TEMPLATE = "dialogflow.$UNIVERSE_DOMAIN$"
38
+
36
39
  include Paths
37
40
 
38
41
  # @private
@@ -98,6 +101,15 @@ module Google
98
101
  @config
99
102
  end
100
103
 
104
+ ##
105
+ # The effective universe domain
106
+ #
107
+ # @return [String]
108
+ #
109
+ def universe_domain
110
+ @conversation_models_stub.universe_domain
111
+ end
112
+
101
113
  ##
102
114
  # Create a new ConversationModels REST client object.
103
115
  #
@@ -125,8 +137,9 @@ module Google
125
137
  credentials = @config.credentials
126
138
  # Use self-signed JWT if the endpoint is unchanged from default,
127
139
  # but only if the default endpoint does not have a region prefix.
128
- enable_self_signed_jwt = @config.endpoint == Configuration::DEFAULT_ENDPOINT &&
129
- !@config.endpoint.split(".").first.include?("-")
140
+ enable_self_signed_jwt = @config.endpoint.nil? ||
141
+ (@config.endpoint == Configuration::DEFAULT_ENDPOINT &&
142
+ !@config.endpoint.split(".").first.include?("-"))
130
143
  credentials ||= Credentials.default scope: @config.scope,
131
144
  enable_self_signed_jwt: enable_self_signed_jwt
132
145
  if credentials.is_a?(::String) || credentials.is_a?(::Hash)
@@ -140,16 +153,23 @@ module Google
140
153
  config.credentials = credentials
141
154
  config.quota_project = @quota_project_id
142
155
  config.endpoint = @config.endpoint
156
+ config.universe_domain = @config.universe_domain
143
157
  end
144
158
 
145
159
  @location_client = Google::Cloud::Location::Locations::Rest::Client.new do |config|
146
160
  config.credentials = credentials
147
161
  config.quota_project = @quota_project_id
148
162
  config.endpoint = @config.endpoint
163
+ config.universe_domain = @config.universe_domain
149
164
  config.bindings_override = @config.bindings_override
150
165
  end
151
166
 
152
- @conversation_models_stub = ::Google::Cloud::Dialogflow::V2::ConversationModels::Rest::ServiceStub.new endpoint: @config.endpoint, credentials: credentials
167
+ @conversation_models_stub = ::Google::Cloud::Dialogflow::V2::ConversationModels::Rest::ServiceStub.new(
168
+ endpoint: @config.endpoint,
169
+ endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
170
+ universe_domain: @config.universe_domain,
171
+ credentials: credentials
172
+ )
153
173
  end
154
174
 
155
175
  ##
@@ -1017,9 +1037,9 @@ module Google
1017
1037
  # end
1018
1038
  #
1019
1039
  # @!attribute [rw] endpoint
1020
- # The hostname or hostname:port of the service endpoint.
1021
- # Defaults to `"dialogflow.googleapis.com"`.
1022
- # @return [::String]
1040
+ # A custom service endpoint, as a hostname or hostname:port. The default is
1041
+ # nil, indicating to use the default endpoint in the current universe domain.
1042
+ # @return [::String,nil]
1023
1043
  # @!attribute [rw] credentials
1024
1044
  # Credentials to send with calls. You may provide any of the following types:
1025
1045
  # * (`String`) The path to a service account key file in JSON format
@@ -1056,13 +1076,20 @@ module Google
1056
1076
  # @!attribute [rw] quota_project
1057
1077
  # A separate project against which to charge quota.
1058
1078
  # @return [::String]
1079
+ # @!attribute [rw] universe_domain
1080
+ # The universe domain within which to make requests. This determines the
1081
+ # default endpoint URL. The default value of nil uses the environment
1082
+ # universe (usually the default "googleapis.com" universe).
1083
+ # @return [::String,nil]
1059
1084
  #
1060
1085
  class Configuration
1061
1086
  extend ::Gapic::Config
1062
1087
 
1088
+ # @private
1089
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
1063
1090
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
1064
1091
 
1065
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
1092
+ config_attr :endpoint, nil, ::String, nil
1066
1093
  config_attr :credentials, nil do |value|
1067
1094
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
1068
1095
  allowed.any? { |klass| klass === value }
@@ -1074,6 +1101,7 @@ module Google
1074
1101
  config_attr :metadata, nil, ::Hash, nil
1075
1102
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
1076
1103
  config_attr :quota_project, nil, ::String, nil
1104
+ config_attr :universe_domain, nil, ::String, nil
1077
1105
 
1078
1106
  # @private
1079
1107
  # Overrides for http bindings for the RPCs of this service