f198544270
* Stub Config Entries for Consul Native API Gateway (#15644) * Add empty InlineCertificate struct and protobuf * apigateway stubs * Stub HTTPRoute in api pkg * Stub HTTPRoute in structs pkg * Simplify api.APIGatewayConfigEntry to be consistent w/ other entries * Update makeConfigEntry switch, add docstring for HTTPRouteConfigEntry * Add TCPRoute to MakeConfigEntry, return unique Kind * Stub BoundAPIGatewayConfigEntry in agent * Add RaftIndex to APIGatewayConfigEntry stub * Add new config entry kinds to validation allow-list * Add RaftIndex to other added config entry stubs * Update usage metrics assertions to include new cfg entries * Add Meta and acl.EnterpriseMeta to all new ConfigEntry types * Remove unnecessary Services field from added config entry types * Implement GetMeta(), GetEnterpriseMeta() for added config entry types * Add meta field to proto, name consistently w/ existing config entries * Format config_entry.proto * Add initial implementation of CanRead + CanWrite for new config entry types * Add unit tests for decoding of new config entry types * Add unit tests for parsing of new config entry types * Add unit tests for API Gateway config entry ACLs * Return typed PermissionDeniedError on BoundAPIGateway CanWrite * Add unit tests for added config entry ACLs * Add BoundAPIGateway type to AllConfigEntryKinds * Return proper kind from BoundAPIGateway * Add docstrings for new config entry types * Add missing config entry kinds to proto def * Update usagemetrics_oss_test.go * Use utility func for returning PermissionDeniedError * EventPublisher subscriptions for Consul Native API Gateway (#15757) * Create new event topics in subscribe proto * Add tests for PBSubscribe func * Make configs singular, add all configs to PBToStreamSubscribeRequest * Add snapshot methods * Add config_entry_events tests * Add config entry kind to topic for new configs * Add unit tests for snapshot methods * Start adding integration test * Test using the new controller code * Update agent/consul/state/config_entry_events.go * Check value of error * Add controller stubs for API Gateway (#15837) * update initial stub implementation * move files, clean up mutex references * Remove embed, use idiomatic names for constructors * Remove stray file introduced in merge * Add APIGateway validation (#15847) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Move struct fields around a bit * APIGateway InlineCertificate validation (#15856) * Add APIGateway validation * Add additional validations * Add protobuf definitions * Tabs to spaces * Add API structs * Move struct fields around a bit * Add validation for InlineCertificate * Fix ACL test * APIGateway BoundAPIGateway validation (#15858) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Move struct fields around a bit * Add validation for BoundAPIGateway * APIGateway TCPRoute validation (#15855) * Add APIGateway validation * Add additional validations * Add cert ref validation * Add protobuf definitions * Fix up field types * Add API structs * Add TCPRoute normalization and validation * Add forgotten Status * Add some more field docs in api package * Fix test * Format imports * Rename snapshot test variable names * Add plumbing for Native API GW Subscriptions (#16003) Co-authored-by: Sarah Alsmiller <sarah.alsmiller@hashicorp.com> Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> Co-authored-by: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com> Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
158 lines
4.1 KiB
Go
158 lines
4.1 KiB
Go
package state
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/hashicorp/consul/acl"
|
|
"github.com/hashicorp/consul/agent/consul/stream"
|
|
"github.com/hashicorp/consul/proto/pbsubscribe"
|
|
)
|
|
|
|
const aclToken = "67b04fbc-e35f-494a-ad43-739f1c8b839c"
|
|
|
|
func TestPBToStreamSubscribeRequest(t *testing.T) {
|
|
cases := map[string]struct {
|
|
req *pbsubscribe.SubscribeRequest
|
|
entMeta acl.EnterpriseMeta
|
|
expectedSubscribeRequest *stream.SubscribeRequest
|
|
err error
|
|
}{
|
|
"Wildcard subject": {
|
|
req: &pbsubscribe.SubscribeRequest{
|
|
Topic: EventTopicServiceList,
|
|
Subject: &pbsubscribe.SubscribeRequest_WildcardSubject{WildcardSubject: true},
|
|
Token: aclToken,
|
|
Index: 1,
|
|
},
|
|
entMeta: acl.EnterpriseMeta{},
|
|
expectedSubscribeRequest: &stream.SubscribeRequest{
|
|
Topic: EventTopicServiceList,
|
|
Subject: stream.SubjectWildcard,
|
|
Token: aclToken,
|
|
Index: 1,
|
|
},
|
|
err: nil,
|
|
},
|
|
"Deprecated top level fields": {
|
|
req: &pbsubscribe.SubscribeRequest{
|
|
Topic: EventTopicServiceDefaults,
|
|
Key: "key",
|
|
Partition: "partition",
|
|
Namespace: "consul",
|
|
PeerName: "peer",
|
|
},
|
|
entMeta: acl.EnterpriseMeta{},
|
|
expectedSubscribeRequest: &stream.SubscribeRequest{
|
|
Topic: EventTopicServiceDefaults,
|
|
Subject: EventSubjectConfigEntry{
|
|
Name: "key",
|
|
EnterpriseMeta: &acl.EnterpriseMeta{},
|
|
},
|
|
},
|
|
err: nil,
|
|
},
|
|
"Service health": {
|
|
req: &pbsubscribe.SubscribeRequest{
|
|
Topic: EventTopicServiceHealth,
|
|
Subject: &pbsubscribe.SubscribeRequest_NamedSubject{
|
|
NamedSubject: &pbsubscribe.NamedSubject{
|
|
Key: "key",
|
|
Namespace: "consul",
|
|
Partition: "partition",
|
|
PeerName: "peer",
|
|
},
|
|
},
|
|
Token: aclToken,
|
|
Index: 2,
|
|
},
|
|
entMeta: acl.EnterpriseMeta{},
|
|
expectedSubscribeRequest: &stream.SubscribeRequest{
|
|
Topic: EventTopicServiceHealth,
|
|
Subject: EventSubjectService{
|
|
Key: "key",
|
|
EnterpriseMeta: acl.EnterpriseMeta{},
|
|
PeerName: "peer",
|
|
},
|
|
Token: aclToken,
|
|
Index: 2,
|
|
},
|
|
err: nil,
|
|
},
|
|
"Config": {
|
|
req: &pbsubscribe.SubscribeRequest{
|
|
Topic: EventTopicAPIGateway,
|
|
Subject: &pbsubscribe.SubscribeRequest_NamedSubject{
|
|
NamedSubject: &pbsubscribe.NamedSubject{
|
|
Key: "key",
|
|
Namespace: "consul",
|
|
Partition: "partition",
|
|
PeerName: "peer",
|
|
},
|
|
},
|
|
Token: aclToken,
|
|
Index: 2,
|
|
},
|
|
entMeta: acl.EnterpriseMeta{},
|
|
expectedSubscribeRequest: &stream.SubscribeRequest{
|
|
Topic: EventTopicAPIGateway,
|
|
Subject: EventSubjectConfigEntry{
|
|
Name: "key",
|
|
EnterpriseMeta: &acl.EnterpriseMeta{},
|
|
},
|
|
Token: aclToken,
|
|
Index: 2,
|
|
},
|
|
err: nil,
|
|
},
|
|
"Service list without wildcard returns error": {
|
|
req: &pbsubscribe.SubscribeRequest{
|
|
Topic: EventTopicServiceList,
|
|
Subject: &pbsubscribe.SubscribeRequest_NamedSubject{
|
|
NamedSubject: &pbsubscribe.NamedSubject{
|
|
Key: "key",
|
|
Namespace: "consul",
|
|
Partition: "partition",
|
|
PeerName: "peer",
|
|
},
|
|
},
|
|
},
|
|
entMeta: acl.EnterpriseMeta{},
|
|
expectedSubscribeRequest: nil,
|
|
err: fmt.Errorf("topic %s can only be consumed using WildcardSubject", EventTopicServiceList),
|
|
},
|
|
"Unrecognized topic returns error": {
|
|
req: &pbsubscribe.SubscribeRequest{
|
|
Topic: 99999,
|
|
Subject: &pbsubscribe.SubscribeRequest_NamedSubject{
|
|
NamedSubject: &pbsubscribe.NamedSubject{
|
|
Key: "key",
|
|
Namespace: "consul",
|
|
Partition: "partition",
|
|
PeerName: "peer",
|
|
},
|
|
},
|
|
},
|
|
entMeta: acl.EnterpriseMeta{},
|
|
expectedSubscribeRequest: nil,
|
|
err: fmt.Errorf("cannot construct subject for topic 99999"),
|
|
},
|
|
}
|
|
|
|
for name, tc := range cases {
|
|
t.Run(name, func(t *testing.T) {
|
|
actual, err := PBToStreamSubscribeRequest(tc.req, tc.entMeta)
|
|
|
|
if tc.err != nil {
|
|
require.EqualError(t, err, tc.err.Error())
|
|
} else {
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
require.Equal(t, tc.expectedSubscribeRequest, actual)
|
|
})
|
|
}
|
|
}
|