Skip to content

Commit 5091671

Browse files
calebdoxseycalebdoxsey
authored
update definitions (#77)
1 parent fa100b7 commit 5091671

9 files changed

+497
-29
lines changed

‎API.md

+53-8
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ MoveRoutes takes an array of routeIds and moves them to a new namespace
838838
| Field | Type | Description |
839839
| ----- | ---- | ----------- |
840840
| groups | [repeated string](#string) | Explicit list of group IDs/names to include. |
841-
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _infer_from_ppl.infer_from_ppl | [optional bool](#bool) | Infer group IDs/names based on PPL groups criteria. (Not yet implemented.) |
841+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _infer_from_ppl.infer_from_ppl | [optional bool](#bool) | Infer group IDs/names based on PPL groups criteria. |
842842
<!-- end Fields -->
843843
<!-- end HasFields -->
844844

@@ -914,7 +914,7 @@ LoadRoutesRequest
914914

915915
### Route
916916
Route defines a proxy route's settings and policy associations
917-
Next ID: 67
917+
Next ID: 70
918918

919919

920920
| Field | Type | Description |
@@ -930,7 +930,7 @@ Next ID: 67
930930
| stat_name | [ string](#string) | name for prometheus stats, computed on first save |
931931
| from | [ string](#string) | none |
932932
| to | [repeated string](#string) | none |
933-
| redirect | [ envoy.config.route.v3.RedirectAction](#envoyconfigroutev3redirectaction) | none |
933+
| redirect | [ RedirectAction](#redirectaction) | none |
934934
| response | [ RouteDirectResponse](#routedirectresponse) | none |
935935
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _prefix.prefix | [optional string](#string) | none |
936936
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _path.path | [optional string](#string) | none |
@@ -965,6 +965,7 @@ Next ID: 67
965965
| envoy_opts | [ envoy.config.cluster.v3.Cluster](#envoyconfigclusterv3cluster) | none |
966966
| enable_google_cloud_serverless_authentication | [ bool](#bool) | none |
967967
| jwt_issuer_format | [ IssuerFormat](#issuerformat) | none |
968+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _bearer_token_format.bearer_token_format | [optional BearerTokenFormat](#bearertokenformat) | none |
968969
| jwt_groups_filter | [ JwtGroupsFilter](#jwtgroupsfilter) | none |
969970
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _idp_client_id.idp_client_id | [optional string](#string) | none |
970971
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _idp_client_secret.idp_client_secret | [optional string](#string) | none |
@@ -975,6 +976,7 @@ Next ID: 67
975976
| namespace_name | [ string](#string) | computed |
976977
| enforced_policy_ids | [repeated string](#string) | computed |
977978
| enforced_policy_names | [repeated string](#string) | none |
979+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _idp_access_token_allowed_audiences.idp_access_token_allowed_audiences | [optional Route.StringList](#routestringlist) | none |
978980
<!-- end Fields -->
979981
<!-- end HasFields -->
980982

@@ -1003,6 +1005,17 @@ Next ID: 67
10031005
<!-- end HasFields -->
10041006

10051007

1008+
### Route.StringList
1009+
1010+
1011+
1012+
| Field | Type | Description |
1013+
| ----- | ---- | ----------- |
1014+
| values | [repeated string](#string) | none |
1015+
<!-- end Fields -->
1016+
<!-- end HasFields -->
1017+
1018+
10061019
### RouteDirectResponse
10071020

10081021

@@ -1088,6 +1101,19 @@ LoadRoutesRequest
10881101
## Enums
10891102

10901103

1104+
### BearerTokenFormat {#bearertokenformat}
1105+
1106+
1107+
| Name | Number | Description |
1108+
| ---- | ------ | ----------- |
1109+
| BEARER_TOKEN_FORMAT_UNKNOWN | 0 | none |
1110+
| BEARER_TOKEN_FORMAT_DEFAULT | 1 | none |
1111+
| BEARER_TOKEN_FORMAT_IDP_ACCESS_TOKEN | 2 | none |
1112+
| BEARER_TOKEN_FORMAT_IDP_IDENTITY_TOKEN | 3 | none |
1113+
1114+
1115+
1116+
10911117
### IssuerFormat {#issuerformat}
10921118

10931119

@@ -1204,7 +1230,7 @@ GetConsoleSettings retrieves the console settings.
12041230

12051231
### Settings
12061232
Settings defines the global pomerium settings
1207-
Next id: 88.
1233+
Next id: 106.
12081234

12091235

12101236
| Field | Type | Description |
@@ -1250,10 +1276,21 @@ Next id: 88.
12501276
| jwt_groups_filter | [ JwtGroupsFilter](#jwtgroupsfilter) | none |
12511277
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _default_upstream_timeout.default_upstream_timeout | [optional google.protobuf.Duration](#googleprotobufduration) | none |
12521278
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _metrics_address.metrics_address | [optional string](#string) | none |
1253-
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _tracing_provider.tracing_provider | [optional string](#string) | none |
1254-
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _tracing_sample_rate.tracing_sample_rate | [optional double](#double) | none |
1255-
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _tracing_otlp_endpoint.tracing_otlp_endpoint | [optional string](#string) | none |
1256-
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _tracing_otlp_protocol.tracing_otlp_protocol | [optional string](#string) | none |
1279+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_traces_exporter.otel_traces_exporter | [optional string](#string) | none |
1280+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_traces_sampler_arg.otel_traces_sampler_arg | [optional double](#double) | none |
1281+
| otel_resource_attributes | [repeated string](#string) | none |
1282+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_log_level.otel_log_level | [optional string](#string) | none |
1283+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_attribute_value_length_limit.otel_attribute_value_length_limit | [optional int32](#int32) | none |
1284+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_exporter_otlp_endpoint.otel_exporter_otlp_endpoint | [optional string](#string) | none |
1285+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_exporter_otlp_traces_endpoint.otel_exporter_otlp_traces_endpoint | [optional string](#string) | none |
1286+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_exporter_otlp_protocol.otel_exporter_otlp_protocol | [optional string](#string) | none |
1287+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_exporter_otlp_traces_protocol.otel_exporter_otlp_traces_protocol | [optional string](#string) | none |
1288+
| otel_exporter_otlp_headers | [repeated string](#string) | none |
1289+
| otel_exporter_otlp_traces_headers | [repeated string](#string) | none |
1290+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_exporter_otlp_timeout.otel_exporter_otlp_timeout | [optional google.protobuf.Duration](#googleprotobufduration) | none |
1291+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_exporter_otlp_traces_timeout.otel_exporter_otlp_traces_timeout | [optional google.protobuf.Duration](#googleprotobufduration) | none |
1292+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_bsp_schedule_delay.otel_bsp_schedule_delay | [optional google.protobuf.Duration](#googleprotobufduration) | none |
1293+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _otel_bsp_max_export_batch_size.otel_bsp_max_export_batch_size | [optional int32](#int32) | none |
12571294
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _grpc_address.grpc_address | [optional string](#string) | none |
12581295
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _grpc_insecure.grpc_insecure | [optional bool](#bool) | none |
12591296
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _cache_service_url.cache_service_url | [optional string](#string) | none |
@@ -1281,6 +1318,9 @@ Next id: 88.
12811318
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _access_log_fields.access_log_fields | [optional Settings.StringList](#settingsstringlist) | none |
12821319
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _authorize_log_fields.authorize_log_fields | [optional Settings.StringList](#settingsstringlist) | none |
12831320
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _pass_identity_headers.pass_identity_headers | [optional bool](#bool) | none |
1321+
| originator_id | [ string](#string) | none |
1322+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _bearer_token_format.bearer_token_format | [optional BearerTokenFormat](#bearertokenformat) | none |
1323+
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _idp_access_token_allowed_audiences.idp_access_token_allowed_audiences | [optional Settings.StringList](#settingsstringlist) | none |
12841324
<!-- end Fields -->
12851325
<!-- end HasFields -->
12861326

@@ -2319,6 +2359,7 @@ CreateKeyPairRequest defines a Key Pair to create
23192359

23202360
| Field | Type | Description |
23212361
| ----- | ---- | ----------- |
2362+
| originator_id | [ string](#string) | none |
23222363
| name | [ string](#string) | none |
23232364
| namespace_id | [ string](#string) | none |
23242365
| format | [ Format](#format) | encoding format of data |
@@ -2391,6 +2432,7 @@ KeyPair represents raw Key Pair data for internal usage
23912432
| modified_at | [ google.protobuf.Timestamp](#googleprotobuftimestamp) | none |
23922433
| certificate | [ bytes](#bytes) | public certificate data |
23932434
| key | [ bytes](#bytes) | private key data |
2435+
| originator_id | [ string](#string) | none |
23942436
<!-- end Fields -->
23952437
<!-- end HasFields -->
23962438

@@ -2409,6 +2451,7 @@ KeyPairRecord provides existing Key Pair metadata
24092451
| cert_info | [ CertificateInfo](#certificateinfo) | information about the public certificate |
24102452
| has_private_key | [ bool](#bool) | Key Pair has a private key attached |
24112453
| certificate | [ bytes](#bytes) | public certificate data |
2454+
| originator_id | [ string](#string) | none |
24122455
<!-- end Fields -->
24132456
<!-- end HasFields -->
24142457

@@ -2489,6 +2532,7 @@ Name defines the x509 identity
24892532
| Field | Type | Description |
24902533
| ----- | ---- | ----------- |
24912534
| id | [ string](#string) | none |
2535+
| originator_id | [ string](#string) | none |
24922536
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _name.name | [optional string](#string) | none |
24932537
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _format.format | [optional Format](#format) | encoding format of data |
24942538
| [**oneof**](https://developers.google.com/protocol-buffers/docs/proto3#oneof) _certificate.certificate | [optional bytes](#bytes) | public certificate data |
@@ -3067,6 +3111,7 @@ A DeviceType constrains which kinds of devices are allowed to be registered.
30673111
| Field | Type | Description |
30683112
| ----- | ---- | ----------- |
30693113
| id | [ string](#string) | none |
3114+
| originator_id | [ string](#string) | none |
30703115
| created_at | [ google.protobuf.Timestamp](#googleprotobuftimestamp) | none |
30713116
| modified_at | [ google.protobuf.Timestamp](#googleprotobuftimestamp) | none |
30723117
| deleted_at | [ google.protobuf.Timestamp](#googleprotobuftimestamp) | none |

‎protos/pomerium-console/external_data_sources.proto

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import "google/protobuf/timestamp.proto";
1010

1111
message ExternalDataSource {
1212
string id = 1;
13+
string originator_id = 13;
1314
google.protobuf.Timestamp created_at = 2;
1415
google.protobuf.Timestamp modified_at = 3;
1516
google.protobuf.Timestamp deleted_at = 4;

‎protos/pomerium-console/key_chain.proto

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ message KeyPair {
1818
bytes certificate = 7;
1919
// private key data
2020
bytes key = 8;
21+
string originator_id = 9;
2122
}
2223

2324
// PublicKeyAlgorithm is the algorithm of a public key
@@ -113,6 +114,7 @@ message KeyPairRecord {
113114
bool has_private_key = 8;
114115
// public certificate data
115116
bytes certificate = 9;
117+
string originator_id = 10;
116118
}
117119

118120
message DeleteKeyPairRequest { string id = 1; }
@@ -145,6 +147,7 @@ message ListKeyPairsResponse {
145147

146148
// CreateKeyPairRequest defines a Key Pair to create
147149
message CreateKeyPairRequest {
150+
string originator_id = 6;
148151
string name = 1;
149152
string namespace_id = 2;
150153
// encoding format of data
@@ -159,6 +162,7 @@ message CreateKeyPairResponse { KeyPairRecord key_pair = 1; }
159162

160163
message UpdateKeyPairRequest {
161164
string id = 1;
165+
string originator_id = 6;
162166
optional string name = 2;
163167
// encoding format of data
164168
optional Format format = 3;

0 commit comments

Comments
 (0)