remove createTLSConfig, reuse refactored code

Signed-off-by: alex boten <[email protected]>

Author: codeboten

otelconf/config.go

@@ -6,11 +6,8 @@ package otelconf // import "go.opentelemetry.io/contrib/otelconf/v1.0.0-rc.1"
 
 import (
 	"context"
-	"crypto/tls"
-	"crypto/x509"
 	"errors"
 	"fmt"
-	"os"
 
 	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/log"
@@ -194,33 +191,6 @@ func ParseYAML(file []byte) (*OpenTelemetryConfiguration, error) {
 	return &cfg, nil
 }
 
-// createTLSConfig creates a tls.Config from certificate files.
-func createTLSConfig(caCertFile, clientCertFile, clientKeyFile *string) (*tls.Config, error) {
-	tlsConfig := &tls.Config{}
-	if caCertFile != nil {
-		caText, err := os.ReadFile(*caCertFile)
-		if err != nil {
-			return nil, err
-		}
-		certPool := x509.NewCertPool()
-		if !certPool.AppendCertsFromPEM(caText) {
-			return nil, errors.New("could not create certificate authority chain from certificate")
-		}
-		tlsConfig.RootCAs = certPool
-	}
-	if clientCertFile != nil {
-		if clientKeyFile == nil {
-			return nil, errors.New("client certificate was provided but no client key was provided")
-		}
-		clientCert, err := tls.LoadX509KeyPair(*clientCertFile, *clientKeyFile)
-		if err != nil {
-			return nil, fmt.Errorf("could not use client certificate: %w", err)
-		}
-		tlsConfig.Certificates = []tls.Certificate{clientCert}
-	}
-	return tlsConfig, nil
-}
-
 // createHeadersConfig combines the two header config fields. Headers take precedence over headersList.
 func createHeadersConfig(headers []NameStringValuePair, headersList *string) (map[string]string, error) {
 	result := make(map[string]string)

otelconf/config_test.go

@@ -4,7 +4,6 @@
 package otelconf
 
 import (
-	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"os"
@@ -1242,61 +1241,6 @@ func TestUnmarshalPeriodicMetricReader(t *testing.T) {
 		})
 	}
 }
-func TestCreateTLSConfig(t *testing.T) {
-	tests := []struct {
-		name            string
-		caCertFile      *string
-		clientCertFile  *string
-		clientKeyFile   *string
-		wantErrContains string
-		want            func(*tls.Config, *testing.T)
-	}{
-		{
-			name: "no-input",
-			want: func(result *tls.Config, t *testing.T) {
-				require.Nil(t, result.Certificates)
-				require.Nil(t, result.RootCAs)
-			},
-		},
-		{
-			name:       "only-cacert-provided",
-			caCertFile: ptr(filepath.Join("..", "testdata", "ca.crt")),
-			want: func(result *tls.Config, t *testing.T) {
-				require.Nil(t, result.Certificates)
-				require.NotNil(t, result.RootCAs)
-			},
-		},
-		{
-			name:            "nonexistent-cacert-file",
-			caCertFile:      ptr("nowhere.crt"),
-			wantErrContains: "open nowhere.crt:",
-		},
-		{
-			name:            "nonexistent-clientcert-file",
-			clientCertFile:  ptr("nowhere.crt"),
-			clientKeyFile:   ptr("nowhere.crt"),
-			wantErrContains: "could not use client certificate: open nowhere.crt:",
-		},
-		{
-			name:            "bad-cacert-file",
-			caCertFile:      ptr(filepath.Join("..", "testdata", "bad_cert.crt")),
-			wantErrContains: "could not create certificate authority chain from certificate",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := createTLSConfig(tt.caCertFile, tt.clientCertFile, tt.clientKeyFile)
-
-			if tt.wantErrContains != "" {
-				require.Contains(t, err.Error(), tt.wantErrContains)
-			} else {
-				require.NoError(t, err)
-				tt.want(got, t)
-			}
-		})
-	}
-}
 
 func TestUnmarshalCardinalityLimits(t *testing.T) {
 	for _, tt := range []struct {