remove replace and add go.work

.gitignore

@@ -68,6 +68,4 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
-/go.work
-/go.work.sum
 .docker

api/go.mod

@@ -2,11 +2,6 @@ module github.com/hashicorp/consul/api
 
 go 1.19
 
-replace (
-	github.com/hashicorp/consul/proto-public => ../proto-public
-	github.com/hashicorp/consul/sdk => ../sdk
-)
-
 retract v1.28.0 // tag was mutated
 
 require (

envoyextensions/go.mod

@@ -2,12 +2,6 @@ module github.com/hashicorp/consul/envoyextensions
 
 go 1.20
 
-replace (
-	github.com/hashicorp/consul/api => ../api
-	github.com/hashicorp/consul/proto-public => ../proto-public
-	github.com/hashicorp/consul/sdk => ../sdk
-)
-
 require (
 	github.com/envoyproxy/go-control-plane v0.11.0
 	github.com/google/go-cmp v0.5.9

go.mod

@@ -2,14 +2,6 @@ module github.com/hashicorp/consul
 
 go 1.20
 
-replace (
-	github.com/hashicorp/consul/api => ./api
-	github.com/hashicorp/consul/envoyextensions => ./envoyextensions
-	github.com/hashicorp/consul/proto-public => ./proto-public
-	github.com/hashicorp/consul/sdk => ./sdk
-	github.com/hashicorp/consul/troubleshoot => ./troubleshoot
-)
-
 exclude (
 	github.com/hashicorp/go-msgpack v1.1.5 // has breaking changes and must be avoided
 	github.com/hashicorp/go-msgpack v1.1.6 // contains retractions but same as v1.1.5

go.work

@@ -0,0 +1,17 @@
+go 1.21.7
+
+// Note that the ./internal/tools/proto-gen-rpc-glue/e2e and ./internal/tools/proto-gen-rpc-glue/e2e/consul
+// modules are omitted because they cause problems due to the latter claiming to be the main consul module.
+use (
+	.
+	./api
+	./envoyextensions
+	./internal/tools/proto-gen-rpc-glue
+	./internal/tools/protoc-gen-consul-rate-limit
+	./proto-public
+	./sdk
+	./test/integration/connect/envoy/test-sds-server
+	./test/integration/consul-container
+	./testing/deployer
+	./troubleshoot
+)

internal/tools/protoc-gen-consul-rate-limit/go.mod

@@ -2,8 +2,6 @@ module github.com/hashicorp/consul/internal/tools/protoc-gen-consul-rate-limit
 
 go 1.19
 
-replace github.com/hashicorp/consul/proto-public => ../../../proto-public
-
 require (
 	github.com/hashicorp/consul/proto-public v0.0.0-00010101000000-000000000000
 	google.golang.org/protobuf v1.30.0

test-integ/go.mod

@@ -107,13 +107,3 @@ require (
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace (
-	github.com/hashicorp/consul => ../
-	github.com/hashicorp/consul/api => ../api
-	github.com/hashicorp/consul/envoyextensions => ../envoyextensions
-	github.com/hashicorp/consul/proto-public => ../proto-public
-	github.com/hashicorp/consul/sdk => ../sdk
-	github.com/hashicorp/consul/test/integration/consul-container => ../test/integration/consul-container
-	github.com/hashicorp/consul/testing/deployer => ../testing/deployer
-)

test/integration/consul-container/go.mod

@@ -129,12 +129,3 @@ require (
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace (
-	github.com/hashicorp/consul => ../../..
-	github.com/hashicorp/consul/api => ../../../api
-	github.com/hashicorp/consul/envoyextensions => ../../../envoyextensions
-	github.com/hashicorp/consul/proto-public => ../../../proto-public
-	github.com/hashicorp/consul/sdk => ../../../sdk
-	github.com/hashicorp/consul/testing/deployer => ../../../testing/deployer
-)

testing/deployer/go.mod

@@ -60,9 +60,3 @@ require (
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace (
-	github.com/hashicorp/consul/api => ../../api
-	github.com/hashicorp/consul/proto-public => ../../proto-public
-	github.com/hashicorp/consul/sdk => ../../sdk
-)

troubleshoot/go.mod

@@ -2,12 +2,6 @@ module github.com/hashicorp/consul/troubleshoot
 
 go 1.19
 
-replace (
-	github.com/hashicorp/consul/api => ../api
-	github.com/hashicorp/consul/envoyextensions => ../envoyextensions
-	github.com/hashicorp/consul/proto-public => ../proto-public
-)
-
 exclude (
 	github.com/hashicorp/go-msgpack v1.1.5 // has breaking changes and must be avoided
 	github.com/hashicorp/go-msgpack v1.1.6 // contains retractions but same as v1.1.5