From d0b44560633f958e0974239f6afd31e70fcb4877 Mon Sep 17 00:00:00 2001 From: Brian McNamara Date: Fri, 14 Apr 2023 08:52:07 -0700 Subject: [PATCH 1/2] Update import --- protos/pomerium-console/databroker_svc.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/pomerium-console/databroker_svc.proto b/protos/pomerium-console/databroker_svc.proto index 211e59e..72b0e53 100644 --- a/protos/pomerium-console/databroker_svc.proto +++ b/protos/pomerium-console/databroker_svc.proto @@ -4,7 +4,7 @@ package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; -import "github.com/pomerium/pomerium/pkg/grpc/databroker/databroker.proto"; +import "databroker/databroker.proto"; import "google/protobuf/empty.proto"; message ListDataBrokerRecordsRequest { string record_type = 1; } From 6f52853118fcf5adadc94d79f490bdafd7aa35a7 Mon Sep 17 00:00:00 2001 From: Brian McNamara Date: Fri, 14 Apr 2023 08:59:06 -0700 Subject: [PATCH 2/2] Add java package --- protos/pomerium-console/activity_log.proto | 1 + protos/pomerium-console/audit_svc.proto | 1 + protos/pomerium-console/console_config.proto | 1 + protos/pomerium-console/console_last_error.proto | 1 + protos/pomerium-console/databroker_svc.proto | 1 + protos/pomerium-console/devices.proto | 1 + protos/pomerium-console/events.proto | 1 + protos/pomerium-console/external_data_sources.proto | 1 + protos/pomerium-console/key_chain.proto | 1 + protos/pomerium-console/namespaces.proto | 1 + protos/pomerium-console/policy.proto | 1 + protos/pomerium-console/report.proto | 1 + protos/pomerium-console/routes.proto | 1 + protos/pomerium-console/settings.proto | 1 + protos/pomerium-console/tsdb.proto | 1 + protos/pomerium-console/users.proto | 1 + protos/pomerium/api.proto | 1 + protos/pomerium/audit.proto | 1 + protos/pomerium/config.proto | 1 + protos/pomerium/crypt.proto | 1 + protos/pomerium/databroker.proto | 1 + protos/pomerium/device.proto | 1 + protos/pomerium/identity.proto | 1 + protos/pomerium/idp.proto | 1 + protos/pomerium/last_error.proto | 1 + protos/pomerium/registry.proto | 1 + protos/pomerium/session.proto | 1 + protos/pomerium/user.proto | 1 + protos/pomerium/xds.proto | 1 + 29 files changed, 29 insertions(+) diff --git a/protos/pomerium-console/activity_log.proto b/protos/pomerium-console/activity_log.proto index 000eda9..b452b85 100644 --- a/protos/pomerium-console/activity_log.proto +++ b/protos/pomerium-console/activity_log.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/audit_svc.proto b/protos/pomerium-console/audit_svc.proto index 87b3fb7..9a4d7ea 100644 --- a/protos/pomerium-console/audit_svc.proto +++ b/protos/pomerium-console/audit_svc.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "audit/audit.proto"; import "crypt/crypt.proto"; diff --git a/protos/pomerium-console/console_config.proto b/protos/pomerium-console/console_config.proto index 439a546..735f50f 100644 --- a/protos/pomerium-console/console_config.proto +++ b/protos/pomerium-console/console_config.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "key_chain.proto"; import "namespaces.proto"; diff --git a/protos/pomerium-console/console_last_error.proto b/protos/pomerium-console/console_last_error.proto index 1e840cf..8dcb256 100644 --- a/protos/pomerium-console/console_last_error.proto +++ b/protos/pomerium-console/console_last_error.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/databroker_svc.proto b/protos/pomerium-console/databroker_svc.proto index 72b0e53..29489eb 100644 --- a/protos/pomerium-console/databroker_svc.proto +++ b/protos/pomerium-console/databroker_svc.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "databroker/databroker.proto"; import "google/protobuf/empty.proto"; diff --git a/protos/pomerium-console/devices.proto b/protos/pomerium-console/devices.proto index d0ec6e7..d7c9993 100644 --- a/protos/pomerium-console/devices.proto +++ b/protos/pomerium-console/devices.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/events.proto b/protos/pomerium-console/events.proto index 3295fb9..d4a0cf6 100644 --- a/protos/pomerium-console/events.proto +++ b/protos/pomerium-console/events.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/external_data_sources.proto b/protos/pomerium-console/external_data_sources.proto index 6ea8983..944ed71 100644 --- a/protos/pomerium-console/external_data_sources.proto +++ b/protos/pomerium-console/external_data_sources.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; diff --git a/protos/pomerium-console/key_chain.proto b/protos/pomerium-console/key_chain.proto index 3764e4d..6aa2b6d 100644 --- a/protos/pomerium-console/key_chain.proto +++ b/protos/pomerium-console/key_chain.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/namespaces.proto b/protos/pomerium-console/namespaces.proto index ac1b8f1..6f703e8 100644 --- a/protos/pomerium-console/namespaces.proto +++ b/protos/pomerium-console/namespaces.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/policy.proto b/protos/pomerium-console/policy.proto index e25d8ba..325c536 100644 --- a/protos/pomerium-console/policy.proto +++ b/protos/pomerium-console/policy.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/report.proto b/protos/pomerium-console/report.proto index 4c9fa85..0447c53 100644 --- a/protos/pomerium-console/report.proto +++ b/protos/pomerium-console/report.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "policy.proto"; import "routes.proto"; diff --git a/protos/pomerium-console/routes.proto b/protos/pomerium-console/routes.proto index aef7ebe..d28c5b0 100644 --- a/protos/pomerium-console/routes.proto +++ b/protos/pomerium-console/routes.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium-console/settings.proto b/protos/pomerium-console/settings.proto index 2df0006..964dc27 100644 --- a/protos/pomerium-console/settings.proto +++ b/protos/pomerium-console/settings.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/duration.proto"; import "google/protobuf/struct.proto"; diff --git a/protos/pomerium-console/tsdb.proto b/protos/pomerium-console/tsdb.proto index c6898e3..93552d2 100644 --- a/protos/pomerium-console/tsdb.proto +++ b/protos/pomerium-console/tsdb.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; diff --git a/protos/pomerium-console/users.proto b/protos/pomerium-console/users.proto index 9dc2780..84b2122 100644 --- a/protos/pomerium-console/users.proto +++ b/protos/pomerium-console/users.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package pomerium.dashboard; option go_package = "github.com/pomerium/pomerium-console/pkg/pb"; +option java_package = "com.pomerium.grpc.console" import "google/protobuf/timestamp.proto"; import "google/protobuf/struct.proto"; diff --git a/protos/pomerium/api.proto b/protos/pomerium/api.proto index 90e080d..f9dc3e7 100644 --- a/protos/pomerium/api.proto +++ b/protos/pomerium/api.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.cli; option go_package = "github.com/pomerium/pomerium/pkg/grpc/cli"; +option java_package = "com.pomerium.grpc.cli" service Config { rpc List(Selector) returns (ListRecordsResponse); diff --git a/protos/pomerium/audit.proto b/protos/pomerium/audit.proto index cd86e81..c943497 100644 --- a/protos/pomerium/audit.proto +++ b/protos/pomerium/audit.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.audit; option go_package = "github.com/pomerium/pomerium/pkg/grpc/audit"; +option java_package = "com.pomerium.grpc.audit" import "envoy/service/auth/v3/external_auth.proto"; diff --git a/protos/pomerium/config.proto b/protos/pomerium/config.proto index 5bcf22f..a7b42f9 100644 --- a/protos/pomerium/config.proto +++ b/protos/pomerium/config.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.config; option go_package = "github.com/pomerium/pomerium/pkg/grpc/config"; +option java_package = "com.pomerium.grpc.config" import "google/protobuf/duration.proto"; import "google/protobuf/struct.proto"; diff --git a/protos/pomerium/crypt.proto b/protos/pomerium/crypt.proto index 23981d7..e1e8a48 100644 --- a/protos/pomerium/crypt.proto +++ b/protos/pomerium/crypt.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.crypt; option go_package = "github.com/pomerium/pomerium/pkg/grpc/crypt"; +option java_package = "com.pomerium.grpc.crypt" // A SealedMessage is an encrypted protobuf message. message SealedMessage { diff --git a/protos/pomerium/databroker.proto b/protos/pomerium/databroker.proto index 1fde8a1..a6c4bc0 100644 --- a/protos/pomerium/databroker.proto +++ b/protos/pomerium/databroker.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package databroker; option go_package = "github.com/pomerium/pomerium/pkg/grpc/databroker"; +option java_package = "com.pomerium.grpc.databroker" import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/protos/pomerium/device.proto b/protos/pomerium/device.proto index dd2e81f..5ac9987 100644 --- a/protos/pomerium/device.proto +++ b/protos/pomerium/device.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.device; option go_package = "github.com/pomerium/pomerium/pkg/grpc/device"; +option java_package = "com.pomerium.grpc.device" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium/identity.proto b/protos/pomerium/identity.proto index 89e212a..b306d6f 100644 --- a/protos/pomerium/identity.proto +++ b/protos/pomerium/identity.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.identity; option go_package = "github.com/pomerium/pomerium/pkg/grpc/identity"; +option java_package = "com.pomerium.grpc.identity" import "google/protobuf/struct.proto"; diff --git a/protos/pomerium/idp.proto b/protos/pomerium/idp.proto index 92abe07..38d0b1c 100644 --- a/protos/pomerium/idp.proto +++ b/protos/pomerium/idp.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.events; option go_package = "github.com/pomerium/pomerium/pkg/grpc/events"; +option java_package = "com.pomerium.grpc.events" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium/last_error.proto b/protos/pomerium/last_error.proto index 10cdb34..4a1123a 100644 --- a/protos/pomerium/last_error.proto +++ b/protos/pomerium/last_error.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.events; option go_package = "github.com/pomerium/pomerium/pkg/grpc/events"; +option java_package = "com.pomerium.grpc.events" import "google/protobuf/timestamp.proto"; diff --git a/protos/pomerium/registry.proto b/protos/pomerium/registry.proto index 1b5b2b7..9fdb573 100644 --- a/protos/pomerium/registry.proto +++ b/protos/pomerium/registry.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package registry; option go_package = "github.com/pomerium/pomerium/pkg/grpc/registry"; +option java_package = "com.pomerium.grpc.registry" import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; diff --git a/protos/pomerium/session.proto b/protos/pomerium/session.proto index 93ac324..e4f2c1e 100644 --- a/protos/pomerium/session.proto +++ b/protos/pomerium/session.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package session; option go_package = "github.com/pomerium/pomerium/pkg/grpc/session"; +option java_package = "com.pomerium.grpc.session" import "google/protobuf/empty.proto"; import "google/protobuf/struct.proto"; diff --git a/protos/pomerium/user.proto b/protos/pomerium/user.proto index f8f9ff1..c893664 100644 --- a/protos/pomerium/user.proto +++ b/protos/pomerium/user.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package user; option go_package = "github.com/pomerium/pomerium/pkg/grpc/user"; +option java_package = "com.pomerium.grpc.user" import "google/protobuf/timestamp.proto"; import "google/protobuf/struct.proto"; diff --git a/protos/pomerium/xds.proto b/protos/pomerium/xds.proto index 94d938e..7ede0ca 100644 --- a/protos/pomerium/xds.proto +++ b/protos/pomerium/xds.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package pomerium.events; option go_package = "github.com/pomerium/pomerium/pkg/grpc/events"; +option java_package = "com.pomerium.grpc.events" import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto";