Skip to content

Commit

Permalink
Check in synth script and update google-gax (#100)
Browse files Browse the repository at this point in the history
* codegen: check in synth.py
* chore: update google-gax to 0.17.0
  • Loading branch information
jkwlui authored and crwilcox committed Jun 29, 2018
1 parent 99fc3ef commit 4575964
Show file tree
Hide file tree
Showing 9 changed files with 1,207 additions and 307 deletions.
748 changes: 450 additions & 298 deletions packages/google-cloud-speech/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/google-cloud-speech/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"dependencies": {
"extend": "^3.0.1",
"google-gax": "^0.16.0",
"google-gax": "^0.17.0",
"google-proto-files": "^0.16.0",
"lodash.merge": "^4.6.1",
"protobufjs": "^6.8.6",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
// Copyright 2018 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Note: this file is purely for documentation. Any contents are not expected
// to be loaded as the JS file.

/**
* This resource represents a long-running operation that is the result of a
* network API call.
*
* @property {string} name
* The server-assigned name, which is only unique within the same service that
* originally returns it. If you use the default HTTP mapping, the
* `name` should have the format of `operations/some/unique/name`.
*
* @property {Object} metadata
* Service-specific metadata associated with the operation. It typically
* contains progress information and common metadata such as create time.
* Some services might not provide such metadata. Any method that returns a
* long-running operation should document the metadata type, if any.
*
* This object should have the same structure as [Any]{@link google.protobuf.Any}
*
* @property {boolean} done
* If the value is `false`, it means the operation is still in progress.
* If true, the operation is completed, and either `error` or `response` is
* available.
*
* @property {Object} error
* The error result of the operation in case of failure or cancellation.
*
* This object should have the same structure as [Status]{@link google.rpc.Status}
*
* @property {Object} response
* The normal response of the operation in case of success. If the original
* method returns no data on success, such as `Delete`, the response is
* `google.protobuf.Empty`. If the original method is standard
* `Get`/`Create`/`Update`, the response should be the resource. For other
* methods, the response should have the type `XxxResponse`, where `Xxx`
* is the original method name. For example, if the original method name
* is `TakeSnapshot()`, the inferred response type is
* `TakeSnapshotResponse`.
*
* This object should have the same structure as [Any]{@link google.protobuf.Any}
*
* @typedef Operation
* @memberof google.longrunning
* @see [google.longrunning.Operation definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var Operation = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.GetOperation.
*
* @property {string} name
* The name of the operation resource.
*
* @typedef GetOperationRequest
* @memberof google.longrunning
* @see [google.longrunning.GetOperationRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var GetOperationRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.ListOperations.
*
* @property {string} name
* The name of the operation collection.
*
* @property {string} filter
* The standard list filter.
*
* @property {number} pageSize
* The standard list page size.
*
* @property {string} pageToken
* The standard list page token.
*
* @typedef ListOperationsRequest
* @memberof google.longrunning
* @see [google.longrunning.ListOperationsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var ListOperationsRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The response message for Operations.ListOperations.
*
* @property {Object[]} operations
* A list of operations that matches the specified filter in the request.
*
* This object should have the same structure as [Operation]{@link google.longrunning.Operation}
*
* @property {string} nextPageToken
* The standard List next-page token.
*
* @typedef ListOperationsResponse
* @memberof google.longrunning
* @see [google.longrunning.ListOperationsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var ListOperationsResponse = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.CancelOperation.
*
* @property {string} name
* The name of the operation resource to be cancelled.
*
* @typedef CancelOperationRequest
* @memberof google.longrunning
* @see [google.longrunning.CancelOperationRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var CancelOperationRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.DeleteOperation.
*
* @property {string} name
* The name of the operation resource to be deleted.
*
* @typedef DeleteOperationRequest
* @memberof google.longrunning
* @see [google.longrunning.DeleteOperationRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var DeleteOperationRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};
10 changes: 5 additions & 5 deletions packages/google-cloud-speech/src/v1/speech_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ class SpeechClient {
* @param {string} [options.credentials.client_email]
* @param {string} [options.credentials.private_key]
* @param {string} [options.email] - Account email address. Required when
* usaing a .pem or .p12 keyFilename.
* using a .pem or .p12 keyFilename.
* @param {string} [options.keyFilename] - Full path to the a .json, .pem, or
* .p12 key downloaded from the Google Developers Console. If you provide
* a path to a JSON file, the projectId option above is not necessary.
* a path to a JSON file, the projectId option below is not necessary.
* NOTE: .pem and .p12 require you to specify options.email as well.
* @param {number} [options.port] - The port on which to connect to
* the remote host.
Expand Down Expand Up @@ -72,14 +72,14 @@ class SpeechClient {
// Create a `gaxGrpc` object, with any grpc-specific options
// sent to the client.
opts.scopes = this.constructor.scopes;
var gaxGrpc = gax.grpc(opts);
var gaxGrpc = new gax.GrpcClient(opts);

// Save the auth object to the client, for use by other methods.
this.auth = gaxGrpc.auth;

// Determine the client header string.
var clientHeader = [
`gl-node/${process.version.node}`,
`gl-node/${process.version}`,
`grpc/${gaxGrpc.grpcVersion}`,
`gax/${gax.version}`,
`gapic/${VERSION}`,
Expand All @@ -104,7 +104,7 @@ class SpeechClient {
gax.StreamType.BIDI_STREAMING
),
};
var protoFilesRoot = new gax.grpc.GoogleProtoFilesRoot();
var protoFilesRoot = new gax.GoogleProtoFilesRoot();
protoFilesRoot = protobuf.loadSync(
path.join(
__dirname,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
// Copyright 2018 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Note: this file is purely for documentation. Any contents are not expected
// to be loaded as the JS file.

/**
* This resource represents a long-running operation that is the result of a
* network API call.
*
* @property {string} name
* The server-assigned name, which is only unique within the same service that
* originally returns it. If you use the default HTTP mapping, the
* `name` should have the format of `operations/some/unique/name`.
*
* @property {Object} metadata
* Service-specific metadata associated with the operation. It typically
* contains progress information and common metadata such as create time.
* Some services might not provide such metadata. Any method that returns a
* long-running operation should document the metadata type, if any.
*
* This object should have the same structure as [Any]{@link google.protobuf.Any}
*
* @property {boolean} done
* If the value is `false`, it means the operation is still in progress.
* If true, the operation is completed, and either `error` or `response` is
* available.
*
* @property {Object} error
* The error result of the operation in case of failure or cancellation.
*
* This object should have the same structure as [Status]{@link google.rpc.Status}
*
* @property {Object} response
* The normal response of the operation in case of success. If the original
* method returns no data on success, such as `Delete`, the response is
* `google.protobuf.Empty`. If the original method is standard
* `Get`/`Create`/`Update`, the response should be the resource. For other
* methods, the response should have the type `XxxResponse`, where `Xxx`
* is the original method name. For example, if the original method name
* is `TakeSnapshot()`, the inferred response type is
* `TakeSnapshotResponse`.
*
* This object should have the same structure as [Any]{@link google.protobuf.Any}
*
* @typedef Operation
* @memberof google.longrunning
* @see [google.longrunning.Operation definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var Operation = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.GetOperation.
*
* @property {string} name
* The name of the operation resource.
*
* @typedef GetOperationRequest
* @memberof google.longrunning
* @see [google.longrunning.GetOperationRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var GetOperationRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.ListOperations.
*
* @property {string} name
* The name of the operation collection.
*
* @property {string} filter
* The standard list filter.
*
* @property {number} pageSize
* The standard list page size.
*
* @property {string} pageToken
* The standard list page token.
*
* @typedef ListOperationsRequest
* @memberof google.longrunning
* @see [google.longrunning.ListOperationsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var ListOperationsRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The response message for Operations.ListOperations.
*
* @property {Object[]} operations
* A list of operations that matches the specified filter in the request.
*
* This object should have the same structure as [Operation]{@link google.longrunning.Operation}
*
* @property {string} nextPageToken
* The standard List next-page token.
*
* @typedef ListOperationsResponse
* @memberof google.longrunning
* @see [google.longrunning.ListOperationsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var ListOperationsResponse = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.CancelOperation.
*
* @property {string} name
* The name of the operation resource to be cancelled.
*
* @typedef CancelOperationRequest
* @memberof google.longrunning
* @see [google.longrunning.CancelOperationRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var CancelOperationRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};

/**
* The request message for Operations.DeleteOperation.
*
* @property {string} name
* The name of the operation resource to be deleted.
*
* @typedef DeleteOperationRequest
* @memberof google.longrunning
* @see [google.longrunning.DeleteOperationRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/longrunning/operations.proto}
*/
var DeleteOperationRequest = {
// This is for documentation. Actual contents will be loaded by gRPC.
};
6 changes: 3 additions & 3 deletions packages/google-cloud-speech/src/v1p1beta1/speech_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ class SpeechClient {
// Create a `gaxGrpc` object, with any grpc-specific options
// sent to the client.
opts.scopes = this.constructor.scopes;
var gaxGrpc = gax.grpc(opts);
var gaxGrpc = new gax.GrpcClient(opts);

// Save the auth object to the client, for use by other methods.
this.auth = gaxGrpc.auth;

// Determine the client header string.
var clientHeader = [
`gl-node/${process.version.node}`,
`gl-node/${process.version}`,
`grpc/${gaxGrpc.grpcVersion}`,
`gax/${gax.version}`,
`gapic/${VERSION}`,
Expand All @@ -104,7 +104,7 @@ class SpeechClient {
gax.StreamType.BIDI_STREAMING
),
};
var protoFilesRoot = new gax.grpc.GoogleProtoFilesRoot();
var protoFilesRoot = new gax.GoogleProtoFilesRoot();
protoFilesRoot = protobuf.loadSync(
path.join(
__dirname,
Expand Down
Loading

0 comments on commit 4575964

Please sign in to comment.