Skip to content

Commit 14178fb

Browse files
committed
[confighttp] Unembed fields
1 parent 0378e9a commit 14178fb

2 files changed

Lines changed: 27 additions & 2 deletions

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/confighttp
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Make `configauth.Config` a named field of `AuthConfig` instead of an embedded one.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [15308]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: |
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

config/confighttp/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func NewDefaultServerConfig() ServerConfig {
126126

127127
type AuthConfig struct {
128128
// Auth for this receiver.
129-
configauth.Config `mapstructure:",squash"`
129+
Config configauth.Config `mapstructure:",squash"`
130130

131131
// RequestParameters is a list of parameters that should be extracted from the request and added to the context.
132132
// When a parameter is found in both the query string and the header, the value from the query string will be used.
@@ -236,7 +236,7 @@ func (sc *ServerConfig) ToServer(ctx context.Context, extensions map[component.I
236236
}
237237

238238
auth := sc.Auth.Get()
239-
server, err := auth.GetServerAuthenticator(ctx, extensions)
239+
server, err := auth.Config.GetServerAuthenticator(ctx, extensions)
240240
if err != nil {
241241
return nil, err
242242
}

0 commit comments

Comments
 (0)