clean up proto

costinm · Apr 25, 2023 · 1ff3613 · 1ff3613
1 parent ba6a44a
commit 1ff3613
Show file tree

Hide file tree

Showing 32 changed files with 31 additions and 278 deletions.
diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
@@ -5,7 +5,7 @@ plugins:
     opt:
       - paths=source_relative
 
-  - remote: buf.build/grpc/plugins/go:v1.2.0-1
+  - plugin: buf.build/grpc/go
     out: ../gen/grpc-go
     opt:
       - paths=source_relative

diff --git a/proto/buf.yaml b/proto/buf.yaml
@@ -1,5 +1,5 @@
 version: v1
-name: "buf.build/costin/grpc-mesh"
+name: "buf.build/costin/istiod"
 deps: []
 build:
   excludes: []

diff --git a/proto/envoy/service/discovery/v3/xds.proto b/proto/envoy/service/discovery/v3/xds.proto
@@ -6,7 +6,7 @@ package envoy.service.discovery.v3;
 import "xds/envoy_simplified.proto";
 import "xds/delta.proto";
 
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/envoy/service/discovery/v3";
+option go_package="github.com/costinm/istiod/gen/grpc-go/envoy/service/discovery/v3";
 
 //	ServiceName: "envoy.service.discovery.v2.AggregatedDiscoveryService",
 

diff --git a/proto/envoy/service/load_stats/v2/lrs.proto b/proto/envoy/service/load_stats/v2/lrs.proto
@@ -12,7 +12,7 @@ import "google/protobuf/struct.proto";
 option java_package = "io.envoyproxy.envoy.service.load_stats.v2";
 option java_outer_classname = "LrsProto";
 option java_multiple_files = true;
-option go_package = "github.com/costinm/grpc-mesh/gen/proto/go/envoy/service/load_stats/v2";
+option go_package = "github.com/costinm/istiod/gen/grpc-go/envoy/service/load_stats/v2";
 
 // [#protodoc-title: Load reporting service]
 

diff --git a/proto/fgrpc/ping.proto b/proto/fgrpc/ping.proto
@@ -2,7 +2,7 @@
 // protoc ping.proto --go_out=plugins=grpc:.
 syntax = "proto3";
 package fgrpc;
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/fgrpc";
+option go_package="github.com/costinm/istiod/gen/grpc-go/fgrpc";
 
 message PingMessage {
   int64 seq      = 1; // sequence number

diff --git a/proto/google/api/annotations.proto b/proto/google/api/annotations.proto
@@ -19,7 +19,7 @@ package google.api;
 import "google/api/http.proto";
 import "google/protobuf/descriptor.proto";
 
-option go_package = "github.com/costinm/grpc-mesh/gen/proto/go/googleapis/api/annotations;annotations";
+option go_package = "github.com/costinm/istiod/gen/grpc-go/googleapis/api/annotations;annotations";
 option java_multiple_files = true;
 option java_outer_classname = "AnnotationsProto";
 option java_package = "com.google.api";

diff --git a/proto/google/api/client.proto b/proto/google/api/client.proto
@@ -18,7 +18,7 @@ package google.api;
 
 import "google/protobuf/descriptor.proto";
 
-option go_package = "github.com/costinm/grpc-mesh/gen/proto/go/googleapis/api/annotations;annotations";
+option go_package = "github.com/costinm/istiod/gen/grpc-go/googleapis/api/annotations;annotations";
 option java_multiple_files = true;
 option java_outer_classname = "ClientProto";
 option java_package = "com.google.api";

diff --git a/proto/google/api/field_behavior.proto b/proto/google/api/field_behavior.proto
@@ -18,7 +18,7 @@ package google.api;
 
 import "google/protobuf/descriptor.proto";
 
-option go_package = "github.com/costinm/grpc-mesh/gen/proto/go/googleapis/api/annotations;annotations";
+option go_package = "github.com/costinm/istiod/gen/grpc-go/googleapis/api/annotations;annotations";
 option java_multiple_files = true;
 option java_outer_classname = "FieldBehaviorProto";
 option java_package = "com.google.api";

diff --git a/proto/google/api/http.proto b/proto/google/api/http.proto
@@ -17,7 +17,7 @@ syntax = "proto3";
 package google.api;
 
 option cc_enable_arenas = true;
-option go_package = "github.com/costinm/grpc-mesh/gen/proto/go/googleapis/api/annotations;annotations";
+option go_package = "github.com/costinm/istiod/gen/grpc-go/googleapis/api/annotations;annotations";
 option java_multiple_files = true;
 option java_outer_classname = "HttpProto";
 option java_package = "com.google.api";

diff --git a/proto/google/longrunning/operations.proto b/proto/google/longrunning/operations.proto
diff --git a/proto/google/security/meshca/v1/meshca.proto b/proto/google/security/meshca/v1/meshca.proto
@@ -21,7 +21,7 @@ import "google/protobuf/duration.proto";
 option java_multiple_files = true;
 option java_outer_classname = "MeshCaProto";
 option java_package = "com.google.security.meshca.v1";
-option go_package = "github.com/costinm/grpc-mesh/gen/proto/go/google/security/meshca/v1";
+option go_package = "github.com/costinm/istiod/gen/grpc-go/google/security/meshca/v1";
 
 // Certificate request message.
 message MeshCertificateRequest {

diff --git a/proto/grpc/core/stats.proto b/proto/grpc/core/stats.proto
@@ -15,7 +15,7 @@
 syntax = "proto3";
 
 package grpc.core;
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/grpc/core";
+option go_package="github.com/costinm/istiod/gen/grpc-go/grpc/core";
 
 message Bucket {
   double start = 1;

diff --git a/proto/grpc/testing/benchmark_service.proto b/proto/grpc/testing/benchmark_service.proto
@@ -19,7 +19,7 @@ syntax = "proto3";
 import "grpc/testing/messages.proto";
 
 package grpc.testing;
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/grpc/testing";
+option go_package="github.com/costinm/istiod/gen/grpc-go/grpc/testing";
 
 option java_multiple_files = true;
 option java_package = "io.grpc.testing";

diff --git a/proto/grpc/testing/control.proto b/proto/grpc/testing/control.proto
@@ -18,7 +18,7 @@ import "grpc/testing/payloads.proto";
 import "grpc/testing/stats.proto";
 
 package grpc.testing;
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/grpc/testing";
+option go_package="github.com/costinm/istiod/gen/grpc-go/grpc/testing";
 
 option java_multiple_files = true;
 option java_package = "io.grpc.testing";

diff --git a/proto/grpc/testing/empty.proto b/proto/grpc/testing/empty.proto
@@ -19,7 +19,7 @@ package grpc.testing;
 
 option java_package = "io.grpc.testing.integration";
 option java_outer_classname = "EmptyProtos";
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/grpc/testing";
+option go_package="github.com/costinm/istiod/gen/grpc-go/grpc/testing";
 
 // An empty message that you can re-use to avoid defining duplicated empty
 // messages in your project. A typical example is to use it as argument or the

diff --git a/proto/grpc/testing/messages.proto b/proto/grpc/testing/messages.proto
@@ -20,7 +20,7 @@ syntax = "proto3";
 package grpc.testing;
 
 option java_package = "io.grpc.testing.integration";
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/grpc/testing";
+option go_package="github.com/costinm/istiod/gen/grpc-go/grpc/testing";
 
 // TODO(dgq): Go back to using well-known types once
 // https://github.com/grpc/grpc/issues/6980 has been fixed.

diff --git a/proto/grpc/testing/payloads.proto b/proto/grpc/testing/payloads.proto
@@ -19,7 +19,7 @@ package grpc.testing;
 option java_multiple_files = true;
 option java_package = "io.grpc.testing";
 option java_outer_classname = "PayloadsProto";
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/grpc/testing";
+option go_package="github.com/costinm/istiod/gen/grpc-go/grpc/testing";
 
 message ByteBufferParams {
   int32 req_size = 1;

diff --git a/proto/grpc/testing/report_qps_scenario_service.proto b/proto/grpc/testing/report_qps_scenario_service.proto
@@ -19,7 +19,7 @@ syntax = "proto3";
 import "grpc/testing/control.proto";
 
 package grpc.testing;
-option go_package="github.com/costinm/grpc-mesh/gen/proto/go/grpc/testing";
+option go_package="github.com/costinm/istiod/gen/grpc-go/grpc/testing";
 
 option java_multiple_files = true;
 option java_package = "io.grpc.testing";