status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add inline-certificate as possible payload of config-entry wrapper (#16254) 

Co-authored-by: Andrew Stucki <3577250+andrewstucki@users.noreply.github.com>
This commit is contained in:
Nathan Coleman 2023-02-15 11:06:44 -05:00 committed by GitHub
parent fd61605ffb
commit dd0ca4825c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1149 additions and 1109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
proto/pbconfigentry/config_entry.go
View File

@ -81,6 +81,14 @@ func ConfigEntryToStructs(s *ConfigEntry) structs.ConfigEntry {
pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex) pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta) pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
return &target return &target
case Kind_KindInlineCertificate:
var target structs.InlineCertificateConfigEntry
target.Name = s.Name
InlineCertificateToStructs(s.GetInlineCertificate(), &target)
pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
return &target
case Kind_KindServiceDefaults: case Kind_KindServiceDefaults:
var target structs.ServiceConfigEntry var target structs.ServiceConfigEntry
target.Name = s.Name target.Name = s.Name
@ -177,6 +185,14 @@ func ConfigEntryFromStructs(s structs.ConfigEntry) *ConfigEntry {
configEntry.Entry = &ConfigEntry_HTTPRoute{ configEntry.Entry = &ConfigEntry_HTTPRoute{
HTTPRoute: &route, HTTPRoute: &route,
} }
case *structs.InlineCertificateConfigEntry:
var cert InlineCertificate
InlineCertificateFromStructs(v, &cert)
configEntry.Kind = Kind_KindInlineCertificate
configEntry.Entry = &ConfigEntry_InlineCertificate{
InlineCertificate: &cert,
}
default: default:
panic(fmt.Sprintf("unable to convert %T to proto", s)) panic(fmt.Sprintf("unable to convert %T to proto", s))
} }

2241
proto/pbconfigentry/config_entry.pb.go
View File

File diff suppressed because it is too large Load Diff

1
proto/pbconfigentry/config_entry.proto
View File

@ -37,6 +37,7 @@ message ConfigEntry {
BoundAPIGateway BoundAPIGateway = 11; BoundAPIGateway BoundAPIGateway = 11;
TCPRoute TCPRoute = 12; TCPRoute TCPRoute = 12;
HTTPRoute HTTPRoute = 13; HTTPRoute HTTPRoute = 13;
InlineCertificate InlineCertificate = 14;
} }
} }