Update repo with latest weaver changes

ServiceWeaver · May 6, 2024 · 66fbbdd · 66fbbdd
1 parent 1eb247e
commit 66fbbdd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/examples/echo/weaver_gen.go b/examples/echo/weaver_gen.go
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/ServiceWeaver/weaver-kube
 go 1.21
 
 require (
-	github.com/ServiceWeaver/weaver v0.23.0
+	github.com/ServiceWeaver/weaver v0.23.2
 	github.com/google/uuid v1.3.1
 	go.opentelemetry.io/otel v1.19.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0

diff --git a/go.sum b/go.sum
@@ -39,8 +39,8 @@ github.com/DataDog/hyperloglog v0.0.0-20220804205443-1806d9b66146 h1:S5WsRc58vIe
 github.com/DataDog/hyperloglog v0.0.0-20220804205443-1806d9b66146/go.mod h1:hFPkswc42pKhRbeKDKXy05mRi7J1kJ2vMNbvd9erH0M=
 github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ=
 github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg=
-github.com/ServiceWeaver/weaver v0.23.0 h1:Mme7hdj7qFJYr1tvuPWYTNjYXQCPe9SQHhvQQA6tTjM=
-github.com/ServiceWeaver/weaver v0.23.0/go.mod h1:0/sacOP0MGBb4HqsQVhnEo7GYar1Y7isUzWmmYM2Wys=
+github.com/ServiceWeaver/weaver v0.23.2 h1:qvmO4E1OS2API/puxk8baQzSPP533HFs8Tym7dW/sSA=
+github.com/ServiceWeaver/weaver v0.23.2/go.mod h1:oq4alYn2QTP616jUBvbGj0hNTXhBDC9326YZQlrrwkk=
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=

diff --git a/internal/impl/deploy.go b/internal/impl/deploy.go
@@ -135,7 +135,8 @@ func checkVersionCompatibility(appBinary string) error {
 	if err != nil {
 		return fmt.Errorf("read versions: %w", err)
 	}
-	selfVersion, _, err := ToolVersion()
+	exec, err := os.Executable()
+	selfVersion, err := bin.ReadVersions(exec) //ToolVersion()
 	if err != nil {
 		return fmt.Errorf("read weaver-kube version: %w", err)
 	}
@@ -156,10 +157,9 @@ func checkVersionCompatibility(appBinary string) error {
 
 	if appBinaryVersions.DeployerVersion != version.DeployerVersion {
 		return fmt.Errorf(`
-ERROR: The binary you're trying to deploy (%q) was built with
-github.com/ServiceWeaver/weaver module version %s (internal version %s).
-However, the 'weaver-kube' binary you're using (%s) was built with weaver
-module version %s (internal version %s). These versions are incompatible.
+	ERROR: The binary you're trying to deploy (%q) was built with
+	github.com/ServiceWeaver/weaver module version %s. However, the 'weaver-kube'
+	binary you're using (%s) is incompatible.
 
 We recommend updating both the weaver module your application is built with and
 updating the 'weaver-kube' command by running the following.