From 94cc5ade65b6ff241e84a2dda623397f5ac61130 Mon Sep 17 00:00:00 2001 From: Michael Zalimeni Date: Tue, 5 Mar 2024 16:59:19 -0500 Subject: [PATCH] remove replace and add go.work --- .gitignore | 2 -- api/go.mod | 5 ----- envoyextensions/go.mod | 6 ------ go.mod | 8 -------- go.work | 17 +++++++++++++++++ .../tools/protoc-gen-consul-rate-limit/go.mod | 2 -- test-integ/go.mod | 10 ---------- test/integration/consul-container/go.mod | 9 --------- testing/deployer/go.mod | 6 ------ troubleshoot/go.mod | 6 ------ 10 files changed, 17 insertions(+), 54 deletions(-) create mode 100644 go.work diff --git a/.gitignore b/.gitignore index 9649c4a8cb..aedab87a26 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,4 @@ override.tf.json # Ignore CLI configuration files .terraformrc terraform.rc -/go.work -/go.work.sum .docker diff --git a/api/go.mod b/api/go.mod index 1124be3065..072da85e07 100644 --- a/api/go.mod +++ b/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 ( diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod index 7364cfd625..39678570b9 100644 --- a/envoyextensions/go.mod +++ b/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 diff --git a/go.mod b/go.mod index b6ae1e7d40..e06b902e86 100644 --- a/go.mod +++ b/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 diff --git a/go.work b/go.work new file mode 100644 index 0000000000..3826358729 --- /dev/null +++ b/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 +) diff --git a/internal/tools/protoc-gen-consul-rate-limit/go.mod b/internal/tools/protoc-gen-consul-rate-limit/go.mod index 1337ca7371..f83ee9b73d 100644 --- a/internal/tools/protoc-gen-consul-rate-limit/go.mod +++ b/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 diff --git a/test-integ/go.mod b/test-integ/go.mod index a114a037dc..b4ff525625 100644 --- a/test-integ/go.mod +++ b/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 -) diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index 8dbbd820f4..2755b05029 100644 --- a/test/integration/consul-container/go.mod +++ b/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 -) diff --git a/testing/deployer/go.mod b/testing/deployer/go.mod index e1be88a7cc..648a21ad99 100644 --- a/testing/deployer/go.mod +++ b/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 -) diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod index 532cdc8fe6..1492a5fa0d 100644 --- a/troubleshoot/go.mod +++ b/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