[configopaque, confmap] Change yaml test by confmap test

config/configopaque/go.mod

@@ -4,14 +4,24 @@ go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
+	go.opentelemetry.io/collector/confmap v0.93.0
 	go.uber.org/goleak v1.3.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/knadh/koanf/maps v0.1.1 // indirect
+	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
+	github.com/knadh/koanf/v2 v2.0.1 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
+
+replace go.opentelemetry.io/collector/confmap => ../../confmap

config/configopaque/opaque_test.go

@@ -11,7 +11,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+
+	"go.opentelemetry.io/collector/confmap"
 )
 
 var _ encoding.TextMarshaler = String("")
@@ -47,10 +48,11 @@ func TestStringJSON(t *testing.T) {
 	assert.Equal(t, `{"opaque":"[REDACTED]","plain":"plain"}`, string(bytes))
 }
 
-func TestStringYAML(t *testing.T) {
-	bytes, err := yaml.Marshal(example)
-	require.NoError(t, err)
-	assert.Equal(t, "opaque: '[REDACTED]'\nplain: plain\n", string(bytes))
+func TestConfMapMarshalConfigOpaque(t *testing.T) {
+	conf := confmap.New()
+	assert.NoError(t, conf.Marshal(example))
+	assert.Equal(t, "[REDACTED]", conf.Get("opaque"))
+	assert.Equal(t, "plain", conf.Get("plain"))
 }
 
 func TestStringFmt(t *testing.T) {

config/configtls/go.mod

@@ -17,3 +17,5 @@ require (
 )
 
 replace go.opentelemetry.io/collector/config/configopaque => ../configopaque
+
+replace go.opentelemetry.io/collector/confmap => ../../confmap

confmap/go.mod

@@ -15,12 +15,10 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
 
 retract (