Skip to content

Commit

Permalink
Add longrunning (#12)
Browse files Browse the repository at this point in the history
* adding google/longrunning/operations.proto but having trouble

* disable CompareAll for operations.proto

* added missing replacement

* fixed bad import replacements
  • Loading branch information
sgtsquiggs authored Mar 12, 2020
1 parent 01e0f9c commit 528330d
Show file tree
Hide file tree
Showing 13 changed files with 4,345 additions and 199 deletions.
29 changes: 28 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ regenerate:
:. \
-I=. \
google/api/http.proto \
google/api/annotations.proto
google/api/annotations.proto \
google/api/client.proto

protoc \
--gogogoogleapis_out=\
Expand All @@ -33,6 +34,20 @@ regenerate:
google/api/expr/v1alpha1/syntax.proto \
google/api/expr/v1alpha1/value.proto

protoc \
--gogogoogleapis_out=\
Mgoogle/api/annotations.proto=github.com/gogo/googleapis/google/api,\
Mgoogle/api/http.proto=github.com/gogo/googleapis/google/api,\
Mgoogle/api/client.proto=github.com/gogo/googleapis/google/api,\
Mgoogle/rpc/status.proto=github.com/gogo/googleapis/google/rpc,\
Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,\
Mgoogle/protobuf/empty.proto=github.com/gogo/protobuf/types,\
Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,\
Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,\
:. \
-I=. \
google/longrunning/operations.proto

protoc \
--gogogoogleapis_out=\
Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,\
Expand Down Expand Up @@ -98,6 +113,12 @@ update:
'option go_package = "api";' \
./google/api/annotations.proto

(cd ./google/api && rm client.proto; wget ${URL}/google/api/client.proto)
gogoreplace \
'option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";' \
'option go_package = "api";' \
./google/api/client.proto

(cd ./google/api/expr/v1alpha1 && rm syntax.proto; wget ${URL}/google/api/expr/v1alpha1/syntax.proto)
gogoreplace \
'option go_package = "google.golang.org/genproto/googleapis/api/expr/v1alpha1;expr";' \
Expand All @@ -110,6 +131,12 @@ update:
'option go_package = "expr";' \
./google/api/expr/v1alpha1/value.proto

(cd ./google/longrunning && rm operations.proto; wget ${URL}/google/longrunning/operations.proto)
gogoreplace \
'option go_package = "google.golang.org/genproto/googleapis/longrunning;longrunning";' \
'option go_package = "longrunning";' \
./google/longrunning/operations.proto

(cd ./google/type && rm calendar_period.proto; wget ${URL}/google/type/calendar_period.proto)
gogoreplace \
'option go_package = "google.golang.org/genproto/googleapis/type/calendarperiod;calendarperiod";' \
Expand Down
79 changes: 79 additions & 0 deletions google/api/client.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 100 additions & 0 deletions google/api/client.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
// Copyright 2019 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
//
// http://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.
//

syntax = "proto3";

package google.api;

import "google/protobuf/descriptor.proto";

option go_package = "api";
option java_multiple_files = true;
option java_outer_classname = "ClientProto";
option java_package = "com.google.api";
option objc_class_prefix = "GAPI";

extend google.protobuf.MethodOptions {
// A definition of a client library method signature.
//
// In client libraries, each proto RPC corresponds to one or more methods
// which the end user is able to call, and calls the underlying RPC.
// Normally, this method receives a single argument (a struct or instance
// corresponding to the RPC request object). Defining this field will
// add one or more overloads providing flattened or simpler method signatures
// in some languages.
//
// The fields on the method signature are provided as a comma-separated
// string.
//
// For example, the proto RPC and annotation:
//
// rpc CreateSubscription(CreateSubscriptionRequest)
// returns (Subscription) {
// option (google.api.method_signature) = "name,topic";
// }
//
// Would add the following Java overload (in addition to the method accepting
// the request object):
//
// public final Subscription createSubscription(String name, String topic)
//
// The following backwards-compatibility guidelines apply:
//
// * Adding this annotation to an unannotated method is backwards
// compatible.
// * Adding this annotation to a method which already has existing
// method signature annotations is backwards compatible if and only if
// the new method signature annotation is last in the sequence.
// * Modifying or removing an existing method signature annotation is
// a breaking change.
// * Re-ordering existing method signature annotations is a breaking
// change.
repeated string method_signature = 1051;
}

extend google.protobuf.ServiceOptions {
// The hostname for this service.
// This should be specified with no prefix or protocol.
//
// Example:
//
// service Foo {
// option (google.api.default_host) = "foo.googleapi.com";
// ...
// }
string default_host = 1049;

// OAuth scopes needed for the client.
//
// Example:
//
// service Foo {
// option (google.api.oauth_scopes) = \
// "https://www.googleapis.com/auth/cloud-platform";
// ...
// }
//
// If there is more than one scope, use a comma-separated string:
//
// Example:
//
// service Foo {
// option (google.api.oauth_scopes) = \
// "https://www.googleapis.com/auth/cloud-platform,"
// "https://www.googleapis.com/auth/monitoring";
// ...
// }
string oauth_scopes = 1050;
}
Loading

0 comments on commit 528330d

Please sign in to comment.