Skip to content

Commit

Permalink
Sync Gloo Mesh APIs. Destination Branch: gloo-mesh-v2.5.x (#1106)
Browse files Browse the repository at this point in the history
Co-authored-by: soloio-bot <[email protected]>
  • Loading branch information
soloio-bot and soloio-bot authored Jan 5, 2024
1 parent ec05eab commit 8a26198
Show file tree
Hide file tree
Showing 7 changed files with 546 additions and 535 deletions.
13 changes: 9 additions & 4 deletions api/gloo.solo.io/admin/v2/workspace_settings.proto
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,15 @@ message WorkspaceSettingsSpec {
// Select ExternalService objects.
EXTERNAL_SERVICE = 4;

// Select ApiDoc objects.
// Deprecated since we no longer import/export across workspaces: route tables can
// now automatically access ApiDocs for all available destinations.
API_DOC = 5 [deprecated = true];
// Select ApiDoc objects. Please note that explicit import/export
// is only necessary for GraphQL ApiDocs that are referenced in
// graphql routes. ApiDocs that are used only in the context of the
// portal features (currently only OpenAPI ones) are implicitly
// imported/exported together with their corresponding destination,
// i.e. if a destination (e.g. a service) is visible to a RouteTable,
// the ApiDoc associated with it will be available when the RouteTable
// is referenced in a Portal.
API_DOC = 5;

// Select GraphQLResolverMap objects.
GRAPHQL_RESOLVER_MAP = 6;
Expand Down
4 changes: 4 additions & 0 deletions api/gloo.solo.io/policy/v2/security/jwt_policy.proto
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@ message JWTPolicySpec {
// Set up the provider for the JWT configuration.
// You can have multiple providers in the same JWT policy, or create separate policies per provider.
//
// Successfully verified JWT payloads will be written to Envoy Dynamic Metadata in the format `{{ policy generated prefix }}.{{ provider }}`.
// For more info, see the `payload_in_metadata` field
// [here](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/jwt_authn/v3/config.proto.html).
//
// Note: You can name the providers to help you map the provider when viewing logs to debug.
// However, the provider name does not affect the policy's behavior and cannot be used by other resources to select the policy.
map<string, Provider> providers = 1;
Expand Down
287 changes: 145 additions & 142 deletions client-go/admin.gloo.solo.io/v2/workspace_settings.pb.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client-go/ratelimit.solo.io/v1alpha1/ratelimit.pb.equal.go

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

769 changes: 382 additions & 387 deletions client-go/ratelimit.solo.io/v1alpha1/ratelimit.pb.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client-go/ratelimit.solo.io/v1alpha1/ratelimit.pb.hash.go

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

4 changes: 4 additions & 0 deletions client-go/security.policy.gloo.solo.io/v2/jwt_policy.pb.go
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@ type JWTPolicySpec_Config struct {
// Set up the provider for the JWT configuration.
// You can have multiple providers in the same JWT policy, or create separate policies per provider.
//
// Successfully verified JWT payloads will be written to Envoy Dynamic Metadata in the format `{{ policy generated prefix }}.{{ provider }}`.
// For more info, see the `payload_in_metadata` field
// [here](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/jwt_authn/v3/config.proto.html).
//
// Note: You can name the providers to help you map the provider when viewing logs to debug.
// However, the provider name does not affect the policy's behavior and cannot be used by other resources to select the policy.
Providers map[string]*JWTPolicySpec_Config_Provider `protobuf:"bytes,1,rep,name=providers,proto3" json:"providers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
Expand Down

0 comments on commit 8a26198

Please sign in to comment.