Browse Source

Fix missing references to enterprise metadata (#16237)

pull/16228/head^2
Andrew Stucki 2 years ago committed by GitHub
parent
commit
4c848a554d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      agent/proxycfg/api_gateway.go

12
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) 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{ ref := structs.ResourceReference{
Kind: cfg.GetKind(), Kind: cfg.GetKind(),
Name: cfg.GetName(), Name: cfg.GetName(),
EnterpriseMeta: *cfg.GetEnterpriseMeta(),
} }
snap.APIGateway.Certificates.Set(ref, cfg) snap.APIGateway.Certificates.Set(ref, cfg)
@ -264,10 +264,10 @@ func (h *handlerAPIGateway) handleRouteConfigUpdate(ctx context.Context, u Updat
return nil return nil
} }
// TODO Consider if unset SectionName and acl.EnterpriseMeta could trip us up
ref := structs.ResourceReference{ ref := structs.ResourceReference{
Kind: resp.Entry.GetKind(), Kind: resp.Entry.GetKind(),
Name: resp.Entry.GetName(), Name: resp.Entry.GetName(),
EnterpriseMeta: *resp.Entry.GetEnterpriseMeta(),
} }
seenUpstreamIDs := make(map[UpstreamID]struct{}) seenUpstreamIDs := make(map[UpstreamID]struct{})

Loading…
Cancel
Save