Skip to content

Commit

Permalink
[chore] remove deprecated LoadTLSConfigContext methods (#10284)
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
codeboten authored May 31, 2024
1 parent c30b294 commit e07b297
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 14 deletions.
25 changes: 25 additions & 0 deletions .chloggen/codeboten_rm-loadtlsconfigcontext.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: configtls

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: remove deprecated LoadTLSConfigContext funcs

# One or more tracking issues or pull requests related to the change
issues: [10283]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
14 changes: 0 additions & 14 deletions config/configtls/configtls.go
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,6 @@ func (c Config) loadCert(caPath string) (*x509.CertPool, error) {
return certPool, nil
}

// LoadTLSConfigContext loads the TLS configuration.
//
// Deprecated: [v0.99.0] Use LoadTLSConfig instead.
func (c ClientConfig) LoadTLSConfigContext(ctx context.Context) (*tls.Config, error) {
return c.LoadTLSConfig(ctx)
}

// LoadTLSConfig loads the TLS configuration.
func (c ClientConfig) LoadTLSConfig(_ context.Context) (*tls.Config, error) {
if c.Insecure && !c.hasCA() {
Expand All @@ -398,13 +391,6 @@ func (c ClientConfig) LoadTLSConfig(_ context.Context) (*tls.Config, error) {
return tlsCfg, nil
}

// LoadTLSConfigContext loads the TLS configuration.
//
// Deprecated: [v0.99.0] Use LoadTLSConfig instead.
func (c ServerConfig) LoadTLSConfigContext(ctx context.Context) (*tls.Config, error) {
return c.LoadTLSConfig(ctx)
}

// LoadTLSConfig loads the TLS configuration.
func (c ServerConfig) LoadTLSConfig(_ context.Context) (*tls.Config, error) {
tlsCfg, err := c.loadTLSConfig()
Expand Down

0 comments on commit e07b297

Please sign in to comment.