Permalink
Browse files

Rename *grpc_proto packages to *grpc.

The _proto ending in the package name is causing problems.
  • Loading branch information...
gdbelvin committed Oct 10, 2017
1 parent 389bcb5 commit d9bb7824f684240955a793d07fce90ccdc455c16
Showing with 104 additions and 105 deletions.
  1. +2 −2 cmd/keytransparency-monitor/main.go
  2. +1 −1 cmd/keytransparency-server/main.go
  3. +3 −3 core/proto/{monitor_v1_grpc_proto → monitor_v1_grpc}/gen.go
  4. +26 −27 ...proto/{monitor_v1_grpc_proto/monitor_v1_grpc_proto.pb.go → monitor_v1_grpc/monitor_v1_grpc.pb.go}
  5. +3 −3 ...{monitor_v1_grpc_proto/monitor_v1_grpc_proto.pb.gw.go → monitor_v1_grpc/monitor_v1_grpc.pb.gw.go}
  6. +1 −1 ...proto/{monitor_v1_grpc_proto/monitor_v1_grpc_proto.proto → monitor_v1_grpc/monitor_v1_grpc.proto}
  7. +3 −3 core/proto/{mutation_v1_grpc_proto → mutation_v1_grpc}/gen.go
  8. +27 −27 ...o/{mutation_v1_grpc_proto/mutation_v1_grpc_proto.pb.go → mutation_v1_grpc/mutation_v1_grpc.pb.go}
  9. +3 −3 ...ation_v1_grpc_proto/mutation_v1_grpc_proto.pb.gw.go → mutation_v1_grpc/mutation_v1_grpc.pb.gw.go}
  10. +1 −1 ...o/{mutation_v1_grpc_proto/mutation_v1_grpc_proto.proto → mutation_v1_grpc/mutation_v1_grpc.proto}
  11. +3 −3 core/proto/{sequencer_v1_grpc_proto → sequencer_v1_grpc}/gen.go
  12. +23 −23 ...equencer_v1_grpc_proto/sequencer_v1_grpc_proto.pb.go → sequencer_v1_grpc/sequencer_v1_grpc.pb.go}
  13. +3 −3 ...er_v1_grpc_proto/sequencer_v1_grpc_proto.pb.gw.go → sequencer_v1_grpc/sequencer_v1_grpc.pb.gw.go}
  14. +1 −1 ...equencer_v1_grpc_proto/sequencer_v1_grpc_proto.proto → sequencer_v1_grpc/sequencer_v1_grpc.proto}
  15. +1 −1 impl/monitor/client/client.go
  16. +1 −1 impl/mutation/mutation.go
  17. +1 −1 integration/monitor_test.go
  18. +1 −1 integration/testutil.go
@@ -43,8 +43,8 @@ import (
cmon "github.com/google/keytransparency/core/monitor"
spb "github.com/google/keytransparency/core/proto/keytransparency_v1_grpc"
kpb "github.com/google/keytransparency/core/proto/keytransparency_v1_proto"
mopb "github.com/google/keytransparency/core/proto/monitor_v1_grpc_proto"
mupb "github.com/google/keytransparency/core/proto/mutation_v1_grpc_proto"
mopb "github.com/google/keytransparency/core/proto/monitor_v1_grpc"
mupb "github.com/google/keytransparency/core/proto/mutation_v1_grpc"
tlogcli "github.com/google/trillian/client"
_ "github.com/google/trillian/merkle/coniks" // Register coniks
_ "github.com/google/trillian/merkle/objhasher" // Register objhasher
@@ -46,7 +46,7 @@ import (
cmutation "github.com/google/keytransparency/core/mutation"
ktpb "github.com/google/keytransparency/core/proto/keytransparency_v1_grpc"
mpb "github.com/google/keytransparency/core/proto/mutation_v1_grpc_proto"
mpb "github.com/google/keytransparency/core/proto/mutation_v1_grpc"
gauth "github.com/google/keytransparency/impl/google/authentication"
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
)
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --go_out=,plugins=grpc:. monitor_v1_grpc_proto.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --go_out=,plugins=grpc:. monitor_v1_grpc.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --grpc-gateway_out=logtostderr=true:. monitor_v1_grpc_proto.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --grpc-gateway_out=logtostderr=true:. monitor_v1_grpc.proto
package monitor_v1_grpc_proto
package monitor_v1_grpc

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -18,7 +18,7 @@ syntax = "proto3";
//
// The Key Transparency monitor server service consists of APIs to fetch
// monitor results queried using the mutations API.
package monitor.v1.grpc.proto;
package monitor.v1.grpc;
import "github.com/google/keytransparency/core/proto/monitor_v1_proto/monitor_v1_proto.proto";
import "google/api/annotations.proto";
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --go_out=,plugins=grpc:. mutation_v1_grpc_proto.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --go_out=,plugins=grpc:. mutation_v1_grpc.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --grpc-gateway_out=logtostderr=true:. mutation_v1_grpc_proto.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --grpc-gateway_out=logtostderr=true:. mutation_v1_grpc.proto
package mutation_v1_grpc_proto
package mutation_v1_grpc

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -18,7 +18,7 @@ syntax = "proto3";
//
// The Key Transparency mutation server service consists of APIs to fetch
// mutations.
package mutation.v1.grpc.proto;
package mutation.v1.grpc;
import "github.com/google/keytransparency/core/proto/keytransparency_v1_proto/keytransparency_v1_proto.proto";
import "google/api/annotations.proto";
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --go_out=,plugins=grpc:. sequencer_v1_grpc_proto.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --go_out=,plugins=grpc:. sequencer_v1_grpc.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --grpc-gateway_out=logtostderr=true:. sequencer_v1_grpc_proto.proto
//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/google/trillian/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --grpc-gateway_out=logtostderr=true:. sequencer_v1_grpc.proto
package sequencer_v1_grpc_proto
package sequencer_v1_grpc
Oops, something went wrong.

0 comments on commit d9bb782

Please sign in to comment.