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 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 list_documents REST call
45
57
  #
@@ -31,6 +31,9 @@ module Google
31
31
  # Service for managing {::Google::Cloud::Dialogflow::V2::EntityType EntityTypes}.
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
+ @entity_types_stub.universe_domain
109
+ end
110
+
99
111
  ##
100
112
  # Create a new EntityTypes 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
  @entity_types_stub = ::Gapic::ServiceStub.new(
155
170
  ::Google::Cloud::Dialogflow::V2::EntityTypes::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
@@ -1269,9 +1286,9 @@ module Google
1269
1286
  # end
1270
1287
  #
1271
1288
  # @!attribute [rw] endpoint
1272
- # The hostname or hostname:port of the service endpoint.
1273
- # Defaults to `"dialogflow.googleapis.com"`.
1274
- # @return [::String]
1289
+ # A custom service endpoint, as a hostname or hostname:port. The default is
1290
+ # nil, indicating to use the default endpoint in the current universe domain.
1291
+ # @return [::String,nil]
1275
1292
  # @!attribute [rw] credentials
1276
1293
  # Credentials to send with calls. You may provide any of the following types:
1277
1294
  # * (`String`) The path to a service account key file in JSON format
@@ -1317,13 +1334,20 @@ module Google
1317
1334
  # @!attribute [rw] quota_project
1318
1335
  # A separate project against which to charge quota.
1319
1336
  # @return [::String]
1337
+ # @!attribute [rw] universe_domain
1338
+ # The universe domain within which to make requests. This determines the
1339
+ # default endpoint URL. The default value of nil uses the environment
1340
+ # universe (usually the default "googleapis.com" universe).
1341
+ # @return [::String,nil]
1320
1342
  #
1321
1343
  class Configuration
1322
1344
  extend ::Gapic::Config
1323
1345
 
1346
+ # @private
1347
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
1324
1348
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
1325
1349
 
1326
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
1350
+ config_attr :endpoint, nil, ::String, nil
1327
1351
  config_attr :credentials, nil do |value|
1328
1352
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
1329
1353
  allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
@@ -1338,6 +1362,7 @@ module Google
1338
1362
  config_attr :metadata, nil, ::Hash, nil
1339
1363
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
1340
1364
  config_attr :quota_project, nil, ::String, nil
1365
+ config_attr :universe_domain, nil, ::String, nil
1341
1366
 
1342
1367
  # @private
1343
1368
  def initialize parent_config = nil
@@ -26,6 +26,9 @@ module Google
26
26
  module EntityTypes
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
  # Service for managing {::Google::Cloud::Dialogflow::V2::EntityType EntityTypes}.
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
+ @entity_types_stub.universe_domain
111
+ end
112
+
101
113
  ##
102
114
  # Create a new EntityTypes 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
- @entity_types_stub = ::Google::Cloud::Dialogflow::V2::EntityTypes::Rest::ServiceStub.new endpoint: @config.endpoint, credentials: credentials
167
+ @entity_types_stub = ::Google::Cloud::Dialogflow::V2::EntityTypes::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
  ##
@@ -1190,9 +1210,9 @@ module Google
1190
1210
  # end
1191
1211
  #
1192
1212
  # @!attribute [rw] endpoint
1193
- # The hostname or hostname:port of the service endpoint.
1194
- # Defaults to `"dialogflow.googleapis.com"`.
1195
- # @return [::String]
1213
+ # A custom service endpoint, as a hostname or hostname:port. The default is
1214
+ # nil, indicating to use the default endpoint in the current universe domain.
1215
+ # @return [::String,nil]
1196
1216
  # @!attribute [rw] credentials
1197
1217
  # Credentials to send with calls. You may provide any of the following types:
1198
1218
  # * (`String`) The path to a service account key file in JSON format
@@ -1229,13 +1249,20 @@ module Google
1229
1249
  # @!attribute [rw] quota_project
1230
1250
  # A separate project against which to charge quota.
1231
1251
  # @return [::String]
1252
+ # @!attribute [rw] universe_domain
1253
+ # The universe domain within which to make requests. This determines the
1254
+ # default endpoint URL. The default value of nil uses the environment
1255
+ # universe (usually the default "googleapis.com" universe).
1256
+ # @return [::String,nil]
1232
1257
  #
1233
1258
  class Configuration
1234
1259
  extend ::Gapic::Config
1235
1260
 
1261
+ # @private
1262
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
1236
1263
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
1237
1264
 
1238
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
1265
+ config_attr :endpoint, nil, ::String, nil
1239
1266
  config_attr :credentials, nil do |value|
1240
1267
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
1241
1268
  allowed.any? { |klass| klass === value }
@@ -1247,6 +1274,7 @@ module Google
1247
1274
  config_attr :metadata, nil, ::Hash, nil
1248
1275
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
1249
1276
  config_attr :quota_project, nil, ::String, nil
1277
+ config_attr :universe_domain, nil, ::String, nil
1250
1278
 
1251
1279
  # @private
1252
1280
  # 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 list_entity_types REST call
45
57
  #
@@ -31,6 +31,9 @@ module Google
31
31
  # Service for managing {::Google::Cloud::Dialogflow::V2::Environment Environments}.
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
+ @environments_stub.universe_domain
109
+ end
110
+
99
111
  ##
100
112
  # Create a new Environments 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,12 +156,15 @@ 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
  @environments_stub = ::Gapic::ServiceStub.new(
149
163
  ::Google::Cloud::Dialogflow::V2::Environments::Stub,
150
- credentials: credentials,
151
- endpoint: @config.endpoint,
164
+ credentials: credentials,
165
+ endpoint: @config.endpoint,
166
+ endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
167
+ universe_domain: @config.universe_domain,
152
168
  channel_args: @config.channel_args,
153
169
  interceptors: @config.interceptors,
154
170
  channel_pool_config: @config.channel_pool
@@ -775,9 +791,9 @@ module Google
775
791
  # end
776
792
  #
777
793
  # @!attribute [rw] endpoint
778
- # The hostname or hostname:port of the service endpoint.
779
- # Defaults to `"dialogflow.googleapis.com"`.
780
- # @return [::String]
794
+ # A custom service endpoint, as a hostname or hostname:port. The default is
795
+ # nil, indicating to use the default endpoint in the current universe domain.
796
+ # @return [::String,nil]
781
797
  # @!attribute [rw] credentials
782
798
  # Credentials to send with calls. You may provide any of the following types:
783
799
  # * (`String`) The path to a service account key file in JSON format
@@ -823,13 +839,20 @@ module Google
823
839
  # @!attribute [rw] quota_project
824
840
  # A separate project against which to charge quota.
825
841
  # @return [::String]
842
+ # @!attribute [rw] universe_domain
843
+ # The universe domain within which to make requests. This determines the
844
+ # default endpoint URL. The default value of nil uses the environment
845
+ # universe (usually the default "googleapis.com" universe).
846
+ # @return [::String,nil]
826
847
  #
827
848
  class Configuration
828
849
  extend ::Gapic::Config
829
850
 
851
+ # @private
852
+ # The endpoint specific to the default "googleapis.com" universe. Deprecated.
830
853
  DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
831
854
 
832
- config_attr :endpoint, DEFAULT_ENDPOINT, ::String
855
+ config_attr :endpoint, nil, ::String, nil
833
856
  config_attr :credentials, nil do |value|
834
857
  allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
835
858
  allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
@@ -844,6 +867,7 @@ module Google
844
867
  config_attr :metadata, nil, ::Hash, nil
845
868
  config_attr :retry_policy, nil, ::Hash, ::Proc, nil
846
869
  config_attr :quota_project, nil, ::String, nil
870
+ config_attr :universe_domain, nil, ::String, nil
847
871
 
848
872
  # @private
849
873
  def initialize parent_config = nil