deps: fix ambiguous import error of envoyproxy/go-control-plane

Signed-off-by: Paul Meyer <[email protected]>
edgelesssys · Dec 30, 2024 · cec84a5 · cec84a5
1 parent 0f6795d
commit cec84a5
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/service-mesh/go.mod b/service-mesh/go.mod
@@ -17,3 +17,13 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
 )
+
+// A refactoring of the go-control-plane library let's Go detect ambiguous imports:
+//
+// config.go:13:2: ambiguous import: found package github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3 in multiple modules:
+//   github.com/envoyproxy/go-control-plane v0.13.1 (go/pkg/mod/github.com/envoyproxy/[email protected]/envoy/config/bootstrap/v3)
+//   github.com/envoyproxy/go-control-plane/envoy v1.32.2 (go/pkg/mod/github.com/envoyproxy/go-control-plane/[email protected]/config/bootstrap/v3)
+//
+// We point to the newer v0.13.2 version of go-control-plane when resolving the import path, even
+// though the module isn't used after the split.
+replace github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.13.2