[chore] clean up koanf 1.5 dep (open-telemetry#27670)

This has been causing ambiguous imports all over the place for some time. Signed-off-by: Alex Boten <[email protected]>
pjanotti · Oct 16, 2023 · 3b30ff0 · 3b30ff0
1 parent 6263925
commit 3b30ff0
Show file tree

Hide file tree

Showing 406 changed files with 1,237 additions and 51,925 deletions.
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -423,7 +423,8 @@ require (
  github.com/klauspost/asmfmt v1.3.2 // indirect
  github.com/klauspost/compress v1.17.0 // indirect
  github.com/klauspost/cpuid/v2 v2.2.3 // indirect
- github.com/knadh/koanf v1.5.0 // 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/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
  github.com/kr/fs v0.1.0 // indirect

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod
@@ -20,7 +20,8 @@ require (
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/protobuf v1.5.3 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/knadh/koanf v1.5.0 // 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/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect

diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum
diff --git a/cmd/telemetrygen/go.mod b/cmd/telemetrygen/go.mod
@@ -42,7 +42,8 @@ require (
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/klauspost/compress v1.17.0 // indirect
- github.com/knadh/koanf v1.5.0 // 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/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect

diff --git a/cmd/telemetrygen/go.sum b/cmd/telemetrygen/go.sum
diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod
@@ -26,7 +26,8 @@ require (
  github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect
  github.com/aws/smithy-go v1.15.0 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/knadh/koanf v1.5.0 // 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/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect

diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum
diff --git a/connector/countconnector/go.mod b/connector/countconnector/go.mod
@@ -28,7 +28,8 @@ require (
  github.com/google/uuid v1.3.1 // indirect
  github.com/iancoleman/strcase v0.3.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/knadh/koanf v1.5.0 // 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/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect

diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum
diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod
@@ -43,7 +43,8 @@ require (
  github.com/google/uuid v1.3.1 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/karrick/godirwalk v1.17.0 // indirect
- github.com/knadh/koanf v1.5.0 // 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/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect

diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum
diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod
@@ -22,7 +22,8 @@ require (
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/protobuf v1.5.3 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/knadh/koanf v1.5.0 // 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/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect

diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum
diff --git a/connector/routingconnector/go.mod b/connector/routingconnector/go.mod
@@ -22,7 +22,8 @@ require (
  github.com/google/uuid v1.3.1 // indirect
  github.com/iancoleman/strcase v0.3.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/knadh/koanf v1.5.0 // 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/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
@@ -57,4 +58,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
 
 // ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules
-replace cloud.google.com/go v0.34.0 => cloud.google.com/go v0.110.7
+replace cloud.google.com/go => cloud.google.com/go v0.110.7