From d457e40038a4f3671ad5e806b0b1f10a62b6bc71 Mon Sep 17 00:00:00 2001 From: Andrew Stucki Date: Fri, 10 Feb 2023 15:47:16 -0500 Subject: [PATCH] Fix missing references to enterprise metadata (#16237) --- agent/proxycfg/api_gateway.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agent/proxycfg/api_gateway.go b/agent/proxycfg/api_gateway.go index 698b1359a..79e9d4995 100644 --- a/agent/proxycfg/api_gateway.go +++ b/agent/proxycfg/api_gateway.go @@ -243,10 +243,10 @@ func (h *handlerAPIGateway) handleInlineCertConfigUpdate(_ context.Context, u Up return fmt.Errorf("invalid type for config entry: %T", resp.Entry) } - // TODO Consider if unset SectionName and acl.EnterpriseMeta could trip us up ref := structs.ResourceReference{ - Kind: cfg.GetKind(), - Name: cfg.GetName(), + Kind: cfg.GetKind(), + Name: cfg.GetName(), + EnterpriseMeta: *cfg.GetEnterpriseMeta(), } snap.APIGateway.Certificates.Set(ref, cfg) @@ -264,10 +264,10 @@ func (h *handlerAPIGateway) handleRouteConfigUpdate(ctx context.Context, u Updat return nil } - // TODO Consider if unset SectionName and acl.EnterpriseMeta could trip us up ref := structs.ResourceReference{ - Kind: resp.Entry.GetKind(), - Name: resp.Entry.GetName(), + Kind: resp.Entry.GetKind(), + Name: resp.Entry.GetName(), + EnterpriseMeta: *resp.Entry.GetEnterpriseMeta(), } seenUpstreamIDs := make(map[UpstreamID]struct{})