google-cloud-dialogflow-v2 0.31.0 → 0.32.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/AUTHENTICATION.md +72 -101
- data/lib/google/cloud/dialogflow/v2/agents/client.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/agents/operations.rb +28 -6
- data/lib/google/cloud/dialogflow/v2/agents/rest/client.rb +35 -7
- data/lib/google/cloud/dialogflow/v2/agents/rest/operations.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/agents/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/answer_records/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/answer_records/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/answer_records/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/contexts/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/contexts/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/contexts/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/conversation_datasets/client.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/conversation_datasets/operations.rb +28 -6
- data/lib/google/cloud/dialogflow/v2/conversation_datasets/rest/client.rb +35 -7
- data/lib/google/cloud/dialogflow/v2/conversation_datasets/rest/operations.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/conversation_datasets/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/conversation_models/client.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/conversation_models/operations.rb +28 -6
- data/lib/google/cloud/dialogflow/v2/conversation_models/rest/client.rb +35 -7
- data/lib/google/cloud/dialogflow/v2/conversation_models/rest/operations.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/conversation_models/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/conversation_profiles/client.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/conversation_profiles/operations.rb +28 -6
- data/lib/google/cloud/dialogflow/v2/conversation_profiles/rest/client.rb +35 -7
- data/lib/google/cloud/dialogflow/v2/conversation_profiles/rest/operations.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/conversation_profiles/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/conversations/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/conversations/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/conversations/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/documents/client.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/documents/operations.rb +28 -6
- data/lib/google/cloud/dialogflow/v2/documents/rest/client.rb +35 -7
- data/lib/google/cloud/dialogflow/v2/documents/rest/operations.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/documents/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/entity_types/client.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/entity_types/operations.rb +28 -6
- data/lib/google/cloud/dialogflow/v2/entity_types/rest/client.rb +35 -7
- data/lib/google/cloud/dialogflow/v2/entity_types/rest/operations.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/entity_types/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/environments/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/environments/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/environments/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/fulfillments/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/fulfillments/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/fulfillments/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/intents/client.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/intents/operations.rb +28 -6
- data/lib/google/cloud/dialogflow/v2/intents/rest/client.rb +35 -7
- data/lib/google/cloud/dialogflow/v2/intents/rest/operations.rb +33 -8
- data/lib/google/cloud/dialogflow/v2/intents/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/knowledge_bases/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/knowledge_bases/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/knowledge_bases/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/participants/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/participants/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/participants/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/session_entity_types/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/session_entity_types/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/session_entity_types/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/sessions/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/sessions/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/sessions/rest/service_stub.rb +14 -2
- data/lib/google/cloud/dialogflow/v2/version.rb +1 -1
- data/lib/google/cloud/dialogflow/v2/versions/client.rb +32 -8
- data/lib/google/cloud/dialogflow/v2/versions/rest/client.rb +34 -7
- data/lib/google/cloud/dialogflow/v2/versions/rest/service_stub.rb +14 -2
- data/proto_docs/google/api/client.rb +1 -0
- data/proto_docs/google/cloud/dialogflow/v2/agent.rb +1 -0
- data/proto_docs/google/cloud/dialogflow/v2/answer_record.rb +1 -0
- data/proto_docs/google/cloud/dialogflow/v2/audio_config.rb +1 -0
- data/proto_docs/google/cloud/dialogflow/v2/fulfillment.rb +1 -0
- data/proto_docs/google/cloud/dialogflow/v2/session.rb +1 -0
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8ede7ec343a2e8dbb2f8b37191a6f7f7a750b5cb256208b0168c662a391ac6f9
|
4
|
+
data.tar.gz: a62a8c31664d78f7bd280a09904ef067219aedc173e374e56dff27e90a761068
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 430a4785e1c44533f0d70685566e054783984aaca146066a0d67c9e0ae02cd1aa36e27335a1b79131c2ec023c2e8249feec519e9dec5d8fa373c586f82df4fb6
|
7
|
+
data.tar.gz: c3d3791107181001617c64f2b0b5e18d5cade910a95d6762e18987b7cb1ba18aa3f00110a1f5a030f4357d5360471545bdb8945954b2c4abf1871fe3cc00f975
|
data/AUTHENTICATION.md
CHANGED
@@ -1,151 +1,122 @@
|
|
1
1
|
# Authentication
|
2
2
|
|
3
|
-
|
4
|
-
[
|
5
|
-
|
6
|
-
[Google Cloud Platform environments](#google-cloud-platform-environments) the
|
7
|
-
credentials will be discovered automatically. When running on other
|
8
|
-
environments, the Service Account credentials can be specified by providing the
|
9
|
-
path to the
|
10
|
-
[JSON keyfile](https://cloud.google.com/iam/docs/managing-service-account-keys)
|
11
|
-
for the account (or the JSON itself) in
|
12
|
-
[environment variables](#environment-variables). Additionally, Cloud SDK
|
13
|
-
credentials can also be discovered automatically, but this is only recommended
|
14
|
-
during development.
|
3
|
+
The recommended way to authenticate to the google-cloud-dialogflow-v2 library is to use
|
4
|
+
[Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/application-default-credentials).
|
5
|
+
To review all of your authentication options, see [Credentials lookup](#credential-lookup).
|
15
6
|
|
16
7
|
## Quickstart
|
17
8
|
|
18
|
-
|
19
|
-
|
9
|
+
The following example shows how to set up authentication for a local development
|
10
|
+
environment with your user credentials.
|
20
11
|
|
21
|
-
|
22
|
-
|
23
|
-
```
|
24
|
-
|
25
|
-
3. Initialize the client.
|
12
|
+
**NOTE:** This method is _not_ recommended for running in production. User credentials
|
13
|
+
should be used only during development.
|
26
14
|
|
27
|
-
|
28
|
-
|
15
|
+
1. [Download and install the Google Cloud CLI](https://cloud.google.com/sdk).
|
16
|
+
2. Set up a local ADC file with your user credentials:
|
29
17
|
|
30
|
-
|
18
|
+
```sh
|
19
|
+
gcloud auth application-default login
|
31
20
|
```
|
32
21
|
|
33
|
-
|
34
|
-
|
35
|
-
The google-cloud-dialogflow-v2 library aims to make authentication
|
36
|
-
as simple as possible, and provides several mechanisms to configure your system
|
37
|
-
without requiring **Service Account Credentials** directly in code.
|
38
|
-
|
39
|
-
**Credentials** are discovered in the following order:
|
40
|
-
|
41
|
-
1. Specify credentials in method arguments
|
42
|
-
2. Specify credentials in configuration
|
43
|
-
3. Discover credentials path in environment variables
|
44
|
-
4. Discover credentials JSON in environment variables
|
45
|
-
5. Discover credentials file in the Cloud SDK's path
|
46
|
-
6. Discover GCP credentials
|
47
|
-
|
48
|
-
### Google Cloud Platform environments
|
22
|
+
3. Write code as if already authenticated.
|
49
23
|
|
50
|
-
|
51
|
-
|
52
|
-
Functions (GCF) and Cloud Run, **Credentials** are discovered automatically.
|
53
|
-
Code should be written as if already authenticated.
|
24
|
+
For more information about setting up authentication for a local development environment, see
|
25
|
+
[Set up Application Default Credentials](https://cloud.google.com/docs/authentication/provide-credentials-adc#local-dev).
|
54
26
|
|
55
|
-
|
27
|
+
## Credential Lookup
|
56
28
|
|
57
|
-
The
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
**Credentials JSON** file can be stored in the environment variable, or the
|
62
|
-
**Credentials JSON** itself can be stored for environments such as Docker
|
63
|
-
containers where writing files is difficult or not encouraged.
|
29
|
+
The google-cloud-dialogflow-v2 library provides several mechanisms to configure your system.
|
30
|
+
Generally, using Application Default Credentials to facilitate automatic
|
31
|
+
credentials discovery is the easist method. But if you need to explicitly specify
|
32
|
+
credentials, there are several methods available to you.
|
64
33
|
|
65
|
-
|
66
|
-
checks for credentials are configured on the service Credentials class (such as
|
67
|
-
{::Google::Cloud::Dialogflow::V2::Agents::Credentials}):
|
34
|
+
Credentials are accepted in the following ways, in the following order or precedence:
|
68
35
|
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
36
|
+
1. Credentials specified in method arguments
|
37
|
+
2. Credentials specified in configuration
|
38
|
+
3. Credentials pointed to or included in environment variables
|
39
|
+
4. Credentials found in local ADC file
|
40
|
+
5. Credentials returned by the metadata server for the attached service account (GCP)
|
74
41
|
|
75
|
-
|
76
|
-
require "google/cloud/dialogflow/v2"
|
77
|
-
|
78
|
-
ENV["DIALOGFLOW_CREDENTIALS"] = "path/to/keyfile.json"
|
42
|
+
### Configuration
|
79
43
|
|
80
|
-
client
|
81
|
-
|
44
|
+
You can configure a path to a JSON credentials file, either for an individual client object or
|
45
|
+
globally, for all client objects. The JSON file can contain credentials created for
|
46
|
+
[workload identity federation](https://cloud.google.com/iam/docs/workload-identity-federation),
|
47
|
+
[workforce identity federation](https://cloud.google.com/iam/docs/workforce-identity-federation), or a
|
48
|
+
[service account key](https://cloud.google.com/docs/authentication/provide-credentials-adc#local-key).
|
82
49
|
|
83
|
-
|
50
|
+
Note: Service account keys are a security risk if not managed correctly. You should
|
51
|
+
[choose a more secure alternative to service account keys](https://cloud.google.com/docs/authentication#auth-decision-tree)
|
52
|
+
whenever possible.
|
84
53
|
|
85
|
-
|
86
|
-
it in an environment variable. Either on an individual client initialization:
|
54
|
+
To configure a credentials file for an individual client initialization:
|
87
55
|
|
88
56
|
```ruby
|
89
57
|
require "google/cloud/dialogflow/v2"
|
90
58
|
|
91
59
|
client = ::Google::Cloud::Dialogflow::V2::Agents::Client.new do |config|
|
92
|
-
config.credentials = "path/to/
|
60
|
+
config.credentials = "path/to/credentialfile.json"
|
93
61
|
end
|
94
62
|
```
|
95
63
|
|
96
|
-
|
64
|
+
To configure a credentials file globally for all clients:
|
97
65
|
|
98
66
|
```ruby
|
99
67
|
require "google/cloud/dialogflow/v2"
|
100
68
|
|
101
69
|
::Google::Cloud::Dialogflow::V2::Agents::Client.configure do |config|
|
102
|
-
config.credentials = "path/to/
|
70
|
+
config.credentials = "path/to/credentialfile.json"
|
103
71
|
end
|
104
72
|
|
105
73
|
client = ::Google::Cloud::Dialogflow::V2::Agents::Client.new
|
106
74
|
```
|
107
75
|
|
108
|
-
###
|
76
|
+
### Environment Variables
|
109
77
|
|
110
|
-
|
111
|
-
|
112
|
-
|
78
|
+
You can also use an environment variable to provide a JSON credentials file.
|
79
|
+
The environment variable can contain a path to the credentials file or, for
|
80
|
+
environments such as Docker containers where writing files is not encouraged,
|
81
|
+
you can include the credentials file itself.
|
113
82
|
|
114
|
-
|
83
|
+
The JSON file can contain credentials created for
|
84
|
+
[workload identity federation](https://cloud.google.com/iam/docs/workload-identity-federation),
|
85
|
+
[workforce identity federation](https://cloud.google.com/iam/docs/workforce-identity-federation), or a
|
86
|
+
[service account key](https://cloud.google.com/docs/authentication/provide-credentials-adc#local-key).
|
115
87
|
|
116
|
-
|
117
|
-
|
118
|
-
|
88
|
+
Note: Service account keys are a security risk if not managed correctly. You should
|
89
|
+
[choose a more secure alternative to service account keys](https://cloud.google.com/docs/authentication#auth-decision-tree)
|
90
|
+
whenever possible.
|
91
|
+
|
92
|
+
The environment variables that google-cloud-dialogflow-v2
|
93
|
+
checks for credentials are:
|
119
94
|
|
120
|
-
|
121
|
-
*
|
95
|
+
* `GOOGLE_CLOUD_CREDENTIALS` - Path to JSON file, or JSON contents
|
96
|
+
* `GOOGLE_APPLICATION_CREDENTIALS` - Path to JSON file
|
122
97
|
|
123
|
-
|
98
|
+
```ruby
|
99
|
+
require "google/cloud/dialogflow/v2"
|
124
100
|
|
125
|
-
|
126
|
-
connect to the APIs. You will use the **JSON key file** to
|
127
|
-
connect to most services with google-cloud-dialogflow-v2.
|
101
|
+
ENV["GOOGLE_APPLICATION_CREDENTIALS"] = "path/to/credentialfile.json"
|
128
102
|
|
129
|
-
|
130
|
-
|
131
|
-
need a Google Developers service account.
|
103
|
+
client = ::Google::Cloud::Dialogflow::V2::Agents::Client.new
|
104
|
+
```
|
132
105
|
|
133
|
-
|
134
|
-
2. Create a new project or click on an existing project.
|
135
|
-
3. Activate the menu in the upper left and select **APIs & Services**. From
|
136
|
-
here, you will enable the APIs that your application requires.
|
106
|
+
### Local ADC file
|
137
107
|
|
138
|
-
|
108
|
+
You can set up a local ADC file with your user credentials for authentication during
|
109
|
+
development. If credentials are not provided in code or in environment variables,
|
110
|
+
then the local ADC credentials are discovered.
|
139
111
|
|
140
|
-
|
112
|
+
Follow the steps in [Quickstart](#quickstart) to set up a local ADC file.
|
141
113
|
|
142
|
-
|
143
|
-
"Service account" to be guided through downloading a new JSON key file.
|
114
|
+
### Google Cloud Platform environments
|
144
115
|
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
116
|
+
When running on Google Cloud Platform (GCP), including Google Compute Engine
|
117
|
+
(GCE), Google Kubernetes Engine (GKE), Google App Engine (GAE), Google Cloud
|
118
|
+
Functions (GCF) and Cloud Run, credentials are retrieved from the attached
|
119
|
+
service account automatically. Code should be written as if already authenticated.
|
149
120
|
|
150
|
-
|
151
|
-
|
121
|
+
For more information, see
|
122
|
+
[Set up ADC for Google Cloud services](https://cloud.google.com/docs/authentication/provide-credentials-adc#attached-sa).
|
@@ -31,6 +31,9 @@ module Google
|
|
31
31
|
# Service for managing {::Google::Cloud::Dialogflow::V2::Agent Agents}.
|
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
|
+
@agents_stub.universe_domain
|
109
|
+
end
|
110
|
+
|
99
111
|
##
|
100
112
|
# Create a new Agents 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
|
133
|
-
|
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
|
@agents_stub = ::Gapic::ServiceStub.new(
|
155
170
|
::Google::Cloud::Dialogflow::V2::Agents::Stub,
|
156
|
-
credentials:
|
157
|
-
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
|
@@ -1146,9 +1163,9 @@ module Google
|
|
1146
1163
|
# end
|
1147
1164
|
#
|
1148
1165
|
# @!attribute [rw] endpoint
|
1149
|
-
#
|
1150
|
-
#
|
1151
|
-
# @return [::String]
|
1166
|
+
# A custom service endpoint, as a hostname or hostname:port. The default is
|
1167
|
+
# nil, indicating to use the default endpoint in the current universe domain.
|
1168
|
+
# @return [::String,nil]
|
1152
1169
|
# @!attribute [rw] credentials
|
1153
1170
|
# Credentials to send with calls. You may provide any of the following types:
|
1154
1171
|
# * (`String`) The path to a service account key file in JSON format
|
@@ -1194,13 +1211,20 @@ module Google
|
|
1194
1211
|
# @!attribute [rw] quota_project
|
1195
1212
|
# A separate project against which to charge quota.
|
1196
1213
|
# @return [::String]
|
1214
|
+
# @!attribute [rw] universe_domain
|
1215
|
+
# The universe domain within which to make requests. This determines the
|
1216
|
+
# default endpoint URL. The default value of nil uses the environment
|
1217
|
+
# universe (usually the default "googleapis.com" universe).
|
1218
|
+
# @return [::String,nil]
|
1197
1219
|
#
|
1198
1220
|
class Configuration
|
1199
1221
|
extend ::Gapic::Config
|
1200
1222
|
|
1223
|
+
# @private
|
1224
|
+
# The endpoint specific to the default "googleapis.com" universe. Deprecated.
|
1201
1225
|
DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
|
1202
1226
|
|
1203
|
-
config_attr :endpoint,
|
1227
|
+
config_attr :endpoint, nil, ::String, nil
|
1204
1228
|
config_attr :credentials, nil do |value|
|
1205
1229
|
allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
|
1206
1230
|
allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
|
@@ -1215,6 +1239,7 @@ module Google
|
|
1215
1239
|
config_attr :metadata, nil, ::Hash, nil
|
1216
1240
|
config_attr :retry_policy, nil, ::Hash, ::Proc, nil
|
1217
1241
|
config_attr :quota_project, nil, ::String, nil
|
1242
|
+
config_attr :universe_domain, nil, ::String, nil
|
1218
1243
|
|
1219
1244
|
# @private
|
1220
1245
|
def initialize parent_config = nil
|
@@ -26,6 +26,9 @@ module Google
|
|
26
26
|
module Agents
|
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:
|
94
|
-
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
|
-
#
|
617
|
-
#
|
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,
|
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::Agent Agents}.
|
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
|
+
@agents_stub.universe_domain
|
111
|
+
end
|
112
|
+
|
101
113
|
##
|
102
114
|
# Create a new Agents 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
|
129
|
-
|
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
|
-
@agents_stub = ::Google::Cloud::Dialogflow::V2::Agents::Rest::ServiceStub.new
|
167
|
+
@agents_stub = ::Google::Cloud::Dialogflow::V2::Agents::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
|
##
|
@@ -1074,9 +1094,9 @@ module Google
|
|
1074
1094
|
# end
|
1075
1095
|
#
|
1076
1096
|
# @!attribute [rw] endpoint
|
1077
|
-
#
|
1078
|
-
#
|
1079
|
-
# @return [::String]
|
1097
|
+
# A custom service endpoint, as a hostname or hostname:port. The default is
|
1098
|
+
# nil, indicating to use the default endpoint in the current universe domain.
|
1099
|
+
# @return [::String,nil]
|
1080
1100
|
# @!attribute [rw] credentials
|
1081
1101
|
# Credentials to send with calls. You may provide any of the following types:
|
1082
1102
|
# * (`String`) The path to a service account key file in JSON format
|
@@ -1113,13 +1133,20 @@ module Google
|
|
1113
1133
|
# @!attribute [rw] quota_project
|
1114
1134
|
# A separate project against which to charge quota.
|
1115
1135
|
# @return [::String]
|
1136
|
+
# @!attribute [rw] universe_domain
|
1137
|
+
# The universe domain within which to make requests. This determines the
|
1138
|
+
# default endpoint URL. The default value of nil uses the environment
|
1139
|
+
# universe (usually the default "googleapis.com" universe).
|
1140
|
+
# @return [::String,nil]
|
1116
1141
|
#
|
1117
1142
|
class Configuration
|
1118
1143
|
extend ::Gapic::Config
|
1119
1144
|
|
1145
|
+
# @private
|
1146
|
+
# The endpoint specific to the default "googleapis.com" universe. Deprecated.
|
1120
1147
|
DEFAULT_ENDPOINT = "dialogflow.googleapis.com"
|
1121
1148
|
|
1122
|
-
config_attr :endpoint,
|
1149
|
+
config_attr :endpoint, nil, ::String, nil
|
1123
1150
|
config_attr :credentials, nil do |value|
|
1124
1151
|
allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
|
1125
1152
|
allowed.any? { |klass| klass === value }
|
@@ -1131,6 +1158,7 @@ module Google
|
|
1131
1158
|
config_attr :metadata, nil, ::Hash, nil
|
1132
1159
|
config_attr :retry_policy, nil, ::Hash, ::Proc, nil
|
1133
1160
|
config_attr :quota_project, nil, ::String, nil
|
1161
|
+
config_attr :universe_domain, nil, ::String, nil
|
1134
1162
|
|
1135
1163
|
# @private
|
1136
1164
|
# 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:
|
88
|
-
|
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
|
-
#
|
482
|
-
#
|
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,
|
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,
|
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
|
##
|