consul/proto/pbconfigentry/config_entry.go

479 lines
14 KiB
Go
Raw Normal View History

package pbconfigentry
import (
"fmt"
"time"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/proto/pbcommon"
"github.com/hashicorp/consul/types"
)
func ConfigEntryToStructs(s *ConfigEntry) structs.ConfigEntry {
switch s.Kind {
case Kind_KindMeshConfig:
var target structs.MeshConfigEntry
MeshConfigToStructs(s.GetMeshConfig(), &target)
pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
return &target
case Kind_KindServiceResolver:
var target structs.ServiceResolverConfigEntry
target.Name = s.Name
ServiceResolverToStructs(s.GetServiceResolver(), &target)
pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
return &target
case Kind_KindIngressGateway:
var target structs.IngressGatewayConfigEntry
target.Name = s.Name
IngressGatewayToStructs(s.GetIngressGateway(), &target)
pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
return &target
case Kind_KindServiceIntentions:
var target structs.ServiceIntentionsConfigEntry
target.Name = s.Name
ServiceIntentionsToStructs(s.GetServiceIntentions(), &target)
pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
return &target
case Kind_KindServiceDefaults:
var target structs.ServiceConfigEntry
target.Name = s.Name
ServiceDefaultsToStructs(s.GetServiceDefaults(), &target)
pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
return &target
default:
panic(fmt.Sprintf("unable to convert ConfigEntry of kind %s to structs", s.Kind))
}
}
func ConfigEntryFromStructs(s structs.ConfigEntry) *ConfigEntry {
configEntry := &ConfigEntry{
Name: s.GetName(),
EnterpriseMeta: pbcommon.NewEnterpriseMetaFromStructs(*s.GetEnterpriseMeta()),
}
var raftIndex pbcommon.RaftIndex
pbcommon.RaftIndexFromStructs(s.GetRaftIndex(), &raftIndex)
configEntry.RaftIndex = &raftIndex
switch v := s.(type) {
case *structs.MeshConfigEntry:
var meshConfig MeshConfig
MeshConfigFromStructs(v, &meshConfig)
configEntry.Kind = Kind_KindMeshConfig
configEntry.Entry = &ConfigEntry_MeshConfig{
MeshConfig: &meshConfig,
}
case *structs.ServiceResolverConfigEntry:
var serviceResolver ServiceResolver
ServiceResolverFromStructs(v, &serviceResolver)
configEntry.Kind = Kind_KindServiceResolver
configEntry.Entry = &ConfigEntry_ServiceResolver{
ServiceResolver: &serviceResolver,
}
case *structs.IngressGatewayConfigEntry:
var ingressGateway IngressGateway
IngressGatewayFromStructs(v, &ingressGateway)
configEntry.Kind = Kind_KindIngressGateway
configEntry.Entry = &ConfigEntry_IngressGateway{
IngressGateway: &ingressGateway,
}
case *structs.ServiceIntentionsConfigEntry:
var serviceIntentions ServiceIntentions
ServiceIntentionsFromStructs(v, &serviceIntentions)
configEntry.Kind = Kind_KindServiceIntentions
configEntry.Entry = &ConfigEntry_ServiceIntentions{
ServiceIntentions: &serviceIntentions,
}
case *structs.ServiceConfigEntry:
var serviceDefaults ServiceDefaults
ServiceDefaultsFromStructs(v, &serviceDefaults)
configEntry.Kind = Kind_KindServiceDefaults
configEntry.Entry = &ConfigEntry_ServiceDefaults{
ServiceDefaults: &serviceDefaults,
}
default:
panic(fmt.Sprintf("unable to convert %T to proto", s))
}
return configEntry
}
func tlsVersionToStructs(s string) types.TLSVersion {
return types.TLSVersion(s)
}
func tlsVersionFromStructs(t types.TLSVersion) string {
return t.String()
}
func cipherSuitesToStructs(cs []string) []types.TLSCipherSuite {
cipherSuites := make([]types.TLSCipherSuite, len(cs))
for idx, suite := range cs {
cipherSuites[idx] = types.TLSCipherSuite(suite)
}
return cipherSuites
}
func cipherSuitesFromStructs(cs []types.TLSCipherSuite) []string {
cipherSuites := make([]string, len(cs))
for idx, suite := range cs {
cipherSuites[idx] = suite.String()
}
return cipherSuites
}
func enterpriseMetaToStructs(m *pbcommon.EnterpriseMeta) acl.EnterpriseMeta {
var entMeta acl.EnterpriseMeta
pbcommon.EnterpriseMetaToStructs(m, &entMeta)
return entMeta
}
func enterpriseMetaFromStructs(m acl.EnterpriseMeta) *pbcommon.EnterpriseMeta {
return pbcommon.NewEnterpriseMetaFromStructs(m)
}
func timeFromStructs(t *time.Time) *timestamppb.Timestamp {
if t == nil {
return nil
}
return timestamppb.New(*t)
}
func timeToStructs(ts *timestamppb.Timestamp) *time.Time {
if ts == nil {
return nil
}
t := ts.AsTime()
return &t
}
func intentionActionFromStructs(a structs.IntentionAction) IntentionAction {
if a == structs.IntentionActionAllow {
return IntentionAction_Allow
}
return IntentionAction_Deny
}
func intentionActionToStructs(a IntentionAction) structs.IntentionAction {
if a == IntentionAction_Allow {
return structs.IntentionActionAllow
}
return structs.IntentionActionDeny
}
func intentionSourceTypeFromStructs(structs.IntentionSourceType) IntentionSourceType {
return IntentionSourceType_Consul
}
func intentionSourceTypeToStructs(IntentionSourceType) structs.IntentionSourceType {
return structs.IntentionSourceConsul
}
func pointerToIntFromInt32(i32 int32) *int {
i := int(i32)
return &i
}
func int32FromPointerToInt(i *int) int32 {
if i != nil {
return int32(*i)
}
return 0
}
func pointerToUint32FromUint32(ui32 uint32) *uint32 {
i := ui32
return &i
}
func uint32FromPointerToUint32(i *uint32) uint32 {
if i != nil {
return *i
}
return 0
}
func proxyModeFromStructs(a structs.ProxyMode) ProxyMode {
switch a {
case structs.ProxyModeDefault:
return ProxyMode_ProxyModeDefault
case structs.ProxyModeTransparent:
return ProxyMode_ProxyModeTransparent
case structs.ProxyModeDirect:
return ProxyMode_ProxyModeDirect
default:
return ProxyMode_ProxyModeDefault
}
}
func proxyModeToStructs(a ProxyMode) structs.ProxyMode {
switch a {
case ProxyMode_ProxyModeDefault:
return structs.ProxyModeDefault
case ProxyMode_ProxyModeTransparent:
return structs.ProxyModeTransparent
case ProxyMode_ProxyModeDirect:
return structs.ProxyModeDirect
default:
return structs.ProxyModeDefault
}
}
func meshGatewayModeFromStructs(a structs.MeshGatewayMode) MeshGatewayMode {
switch a {
case structs.MeshGatewayModeDefault:
return MeshGatewayMode_MeshGatewayModeDefault
case structs.MeshGatewayModeNone:
return MeshGatewayMode_MeshGatewayModeNone
case structs.MeshGatewayModeLocal:
return MeshGatewayMode_MeshGatewayModeLocal
case structs.MeshGatewayModeRemote:
return MeshGatewayMode_MeshGatewayModeRemote
default:
return MeshGatewayMode_MeshGatewayModeDefault
}
}
func meshGatewayModeToStructs(a MeshGatewayMode) structs.MeshGatewayMode {
switch a {
case MeshGatewayMode_MeshGatewayModeDefault:
return structs.MeshGatewayModeDefault
case MeshGatewayMode_MeshGatewayModeNone:
return structs.MeshGatewayModeNone
case MeshGatewayMode_MeshGatewayModeLocal:
return structs.MeshGatewayModeLocal
case MeshGatewayMode_MeshGatewayModeRemote:
return structs.MeshGatewayModeRemote
default:
return structs.MeshGatewayModeDefault
}
}
APIGateway HTTPRoute scaffolding (#15859) * Stub Config Entries for Consul Native API Gateway (#15644) * Add empty InlineCertificate struct and protobuf * apigateway stubs * new files * Stub HTTPRoute in api pkg * checkpoint * 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 * proto generated files * Stub BoundAPIGatewayConfigEntry in agent Since this type is only written by a controller and read by xDS, it doesn't need to be defined in the `api` pkg * Add RaftIndex to APIGatewayConfigEntry stub * Add new config entry kinds to validation allow-list * Add RaftIndex to other added config entry stubs * fix panic * Update usage metrics assertions to include new cfg entries * Regenerate proto w/ Go 1.19 * Run buf formatter on config_entry.proto * Add Meta and acl.EnterpriseMeta to all new ConfigEntry types * Remove optional interface method Warnings() for now Will restore later if we wind up needing it * 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 * Add BoundAPIGateway to proto def Co-authored-by: Sarah Alsmiller <sarah.alsmiller@hashicorp.com> Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> * Add APIGateway validation * Fix comment * Add additional validations * Add cert ref validation * Add protobuf definitions * Tabs to spaces * Fix up field types * Add API structs * Move struct fields around a bit * 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 Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> * Check value of error Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> * 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 Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> * Initial server-side and proto defs * drop trailing whitespace * Add APIGateway validation (#15847) * Add APIGateway validation * Fix comment * Add additional validations * Add cert ref validation * Add protobuf definitions * Tabs to spaces * 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 * Fix comment * Add additional validations * Add cert ref validation * Add protobuf definitions * Tabs to spaces * Fix up field types * Add API structs * Move struct fields around a bit * Add validation for BoundAPIGateway * drop trailing whitespace * APIGateway TCPRoute validation (#15855) * Add APIGateway validation * Fix comment * Add additional validations * Add cert ref validation * Add protobuf definitions * Tabs to spaces * Fix up field types * Add API structs * Move struct fields around a bit * Add TCPRoute normalization and validation * Address PR feedback * Add forgotten Status * Add some more field docs in api package * Fix test * Fix bad merge * Remove duplicate helpers * Fix up proto defs * Fix up stray changes * remove extra newline --------- Co-authored-by: Thomas Eckert <teckert@hashicorp.com> 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>
2023-02-01 12:59:49 +00:00
func apiGatewayProtocolFromStructs(a structs.APIGatewayListenerProtocol) APIGatewayListenerProtocol {
switch a {
case structs.ListenerProtocolHTTP:
return APIGatewayListenerProtocol_ListenerProtocolHTTP
case structs.ListenerProtocolTCP:
return APIGatewayListenerProtocol_ListenerProtocolTCP
default:
return APIGatewayListenerProtocol_ListenerProtocolHTTP
}
}
func apiGatewayProtocolToStructs(a APIGatewayListenerProtocol) structs.APIGatewayListenerProtocol {
switch a {
case APIGatewayListenerProtocol_ListenerProtocolHTTP:
return structs.ListenerProtocolHTTP
case APIGatewayListenerProtocol_ListenerProtocolTCP:
return structs.ListenerProtocolTCP
default:
return structs.ListenerProtocolHTTP
}
}
func httpMatchMethodFromStructs(a structs.HTTPMatchMethod) HTTPMatchMethod {
switch a {
case structs.HTTPMatchMethodAll:
return HTTPMatchMethod_HTTPMatchMethodAll
case structs.HTTPMatchMethodConnect:
return HTTPMatchMethod_HTTPMatchMethodConnect
case structs.HTTPMatchMethodDelete:
return HTTPMatchMethod_HTTPMatchMethodDelete
case structs.HTTPMatchMethodGet:
return HTTPMatchMethod_HTTPMatchMethodGet
case structs.HTTPMatchMethodHead:
return HTTPMatchMethod_HTTPMatchMethodHead
case structs.HTTPMatchMethodOptions:
return HTTPMatchMethod_HTTPMatchMethodOptions
case structs.HTTPMatchMethodPatch:
return HTTPMatchMethod_HTTPMatchMethodPatch
case structs.HTTPMatchMethodPost:
return HTTPMatchMethod_HTTPMatchMethodPost
case structs.HTTPMatchMethodPut:
return HTTPMatchMethod_HTTPMatchMethodPut
case structs.HTTPMatchMethodTrace:
return HTTPMatchMethod_HTTPMatchMethodTrace
default:
return HTTPMatchMethod_HTTPMatchMethodAll
}
}
func httpMatchMethodToStructs(a HTTPMatchMethod) structs.HTTPMatchMethod {
switch a {
case HTTPMatchMethod_HTTPMatchMethodAll:
return structs.HTTPMatchMethodAll
case HTTPMatchMethod_HTTPMatchMethodConnect:
return structs.HTTPMatchMethodConnect
case HTTPMatchMethod_HTTPMatchMethodDelete:
return structs.HTTPMatchMethodDelete
case HTTPMatchMethod_HTTPMatchMethodGet:
return structs.HTTPMatchMethodGet
case HTTPMatchMethod_HTTPMatchMethodHead:
return structs.HTTPMatchMethodHead
case HTTPMatchMethod_HTTPMatchMethodOptions:
return structs.HTTPMatchMethodOptions
case HTTPMatchMethod_HTTPMatchMethodPatch:
return structs.HTTPMatchMethodPatch
case HTTPMatchMethod_HTTPMatchMethodPost:
return structs.HTTPMatchMethodPost
case HTTPMatchMethod_HTTPMatchMethodPut:
return structs.HTTPMatchMethodPut
case HTTPMatchMethod_HTTPMatchMethodTrace:
return structs.HTTPMatchMethodTrace
default:
return structs.HTTPMatchMethodAll
}
}
func httpHeaderMatchFromStructs(a structs.HTTPHeaderMatchType) HTTPHeaderMatchType {
switch a {
case structs.HTTPHeaderMatchExact:
return HTTPHeaderMatchType_HTTPHeaderMatchExact
case structs.HTTPHeaderMatchPrefix:
return HTTPHeaderMatchType_HTTPHeaderMatchPrefix
case structs.HTTPHeaderMatchPresent:
return HTTPHeaderMatchType_HTTPHeaderMatchPresent
case structs.HTTPHeaderMatchRegularExpression:
return HTTPHeaderMatchType_HTTPHeaderMatchRegularExpression
case structs.HTTPHeaderMatchSuffix:
return HTTPHeaderMatchType_HTTPHeaderMatchSuffix
default:
return HTTPHeaderMatchType_HTTPHeaderMatchExact
}
}
func httpHeaderMatchToStructs(a HTTPHeaderMatchType) structs.HTTPHeaderMatchType {
switch a {
case HTTPHeaderMatchType_HTTPHeaderMatchExact:
return structs.HTTPHeaderMatchExact
case HTTPHeaderMatchType_HTTPHeaderMatchPrefix:
return structs.HTTPHeaderMatchPrefix
case HTTPHeaderMatchType_HTTPHeaderMatchPresent:
return structs.HTTPHeaderMatchPresent
case HTTPHeaderMatchType_HTTPHeaderMatchRegularExpression:
return structs.HTTPHeaderMatchRegularExpression
case HTTPHeaderMatchType_HTTPHeaderMatchSuffix:
return structs.HTTPHeaderMatchSuffix
default:
return structs.HTTPHeaderMatchExact
}
}
func httpPathMatchFromStructs(a structs.HTTPPathMatchType) HTTPPathMatchType {
switch a {
case structs.HTTPPathMatchExact:
return HTTPPathMatchType_HTTPPathMatchExact
case structs.HTTPPathMatchPrefix:
return HTTPPathMatchType_HTTPPathMatchPrefix
case structs.HTTPPathMatchRegularExpression:
return HTTPPathMatchType_HTTPPathMatchRegularExpression
default:
return HTTPPathMatchType_HTTPPathMatchExact
}
}
func httpPathMatchToStructs(a HTTPPathMatchType) structs.HTTPPathMatchType {
switch a {
case HTTPPathMatchType_HTTPPathMatchExact:
return structs.HTTPPathMatchExact
case HTTPPathMatchType_HTTPPathMatchPrefix:
return structs.HTTPPathMatchPrefix
case HTTPPathMatchType_HTTPPathMatchRegularExpression:
return structs.HTTPPathMatchRegularExpression
default:
return structs.HTTPPathMatchExact
}
}
func httpQueryMatchFromStructs(a structs.HTTPQueryMatchType) HTTPQueryMatchType {
switch a {
case structs.HTTPQueryMatchExact:
return HTTPQueryMatchType_HTTPQueryMatchExact
case structs.HTTPQueryMatchPresent:
return HTTPQueryMatchType_HTTPQueryMatchPresent
case structs.HTTPQueryMatchRegularExpression:
return HTTPQueryMatchType_HTTPQueryMatchRegularExpression
default:
return HTTPQueryMatchType_HTTPQueryMatchExact
}
}
func httpQueryMatchToStructs(a HTTPQueryMatchType) structs.HTTPQueryMatchType {
switch a {
case HTTPQueryMatchType_HTTPQueryMatchExact:
return structs.HTTPQueryMatchExact
case HTTPQueryMatchType_HTTPQueryMatchPresent:
return structs.HTTPQueryMatchPresent
case HTTPQueryMatchType_HTTPQueryMatchRegularExpression:
return structs.HTTPQueryMatchRegularExpression
default:
return structs.HTTPQueryMatchExact
}
}
func EnvoyExtensionArgumentsToStructs(args *structpb.Value) map[string]interface{} {
if args != nil {
st := args.GetStructValue()
if st != nil {
return st.AsMap()
}
}
return nil
}
func EnvoyExtensionArgumentsFromStructs(args map[string]interface{}) *structpb.Value {
if s, err := structpb.NewValue(args); err == nil {
return s
}
return nil
}
func EnvoyExtensionsToStructs(args []*EnvoyExtension) []structs.EnvoyExtension {
o := make([]structs.EnvoyExtension, len(args))
for i := range args {
var e structs.EnvoyExtension
if args[i] != nil {
e = structs.EnvoyExtension{
Name: args[i].Name,
Required: args[i].Required,
Arguments: EnvoyExtensionArgumentsToStructs(args[i].Arguments),
}
}
o[i] = e
}
return o
}
func EnvoyExtensionsFromStructs(args []structs.EnvoyExtension) []*EnvoyExtension {
o := make([]*EnvoyExtension, len(args))
for i, e := range args {
o[i] = &EnvoyExtension{
Name: e.Name,
Required: e.Required,
Arguments: EnvoyExtensionArgumentsFromStructs(e.Arguments),
}
}
return o
}