From 465846be031b27ed128fc4fa18b48b1623bdc4bf Mon Sep 17 00:00:00 2001 From: Tim Deeb-Swihart Date: Wed, 21 Feb 2024 11:32:53 -0800 Subject: [PATCH] Pin api-go in order to resolve protojson.Marshal bug This was fixed by https://github.com/temporalio/temporal/pull/5396 but because there are incompatible changes between api-go, our sdk, and the temporal server itself we haven't pulled this change into the server. Those should be resolved soon but in the meantime we're going to pin the version of the API used. --- go.mod | 6 ++++-- go.sum | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 5eae9b9d..0287c5d2 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/temporalio/cli go 1.21 +replace go.temporal.io/api => go.temporal.io/api v1.26.1-0.20240123194300-5b253c84a3cc + require ( github.com/dustin/go-humanize v1.0.1 github.com/fatih/color v1.16.0 @@ -13,8 +15,8 @@ require ( github.com/stretchr/testify v1.8.4 github.com/temporalio/ui-server/v2 v2.23.1-0.20240212143757-2e990617b977 go.temporal.io/api v1.26.2-0.20231129165614-630d88440548 - go.temporal.io/sdk v1.25.2-0.20231204212658-5fdbecc56c8c - go.temporal.io/server v1.23.0-rc2.0.20231212000105-51ea367f9f37 + go.temporal.io/sdk v1.25.2-0.20240108174654-c1744ee2c8cb + go.temporal.io/server v1.23.0-rc9 google.golang.org/grpc v1.61.0 google.golang.org/protobuf v1.32.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index d482c3f8..6991117b 100644 --- a/go.sum +++ b/go.sum @@ -394,12 +394,12 @@ go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8 go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= -go.temporal.io/api v1.26.2-0.20231129165614-630d88440548 h1:9CV7l/WG7Nd4Ai8mSIUlCvf0W+Mdra5ei38I860Esac= -go.temporal.io/api v1.26.2-0.20231129165614-630d88440548/go.mod h1:Y/rALXTprFO+bvAlAfLFoJj7KpQIcL4GDQVN6fhYIa4= -go.temporal.io/sdk v1.25.2-0.20231204212658-5fdbecc56c8c h1:264a53/ghHOP1Z31yBvHeuXQ6eouE9HyIAjI96BWebI= -go.temporal.io/sdk v1.25.2-0.20231204212658-5fdbecc56c8c/go.mod h1:Qyy1qrOoMcMk7C+AW/LrqiDm+C0CRGGbVIPUAMCGJtQ= -go.temporal.io/server v1.23.0-rc2.0.20231212000105-51ea367f9f37 h1:8Kanu4PKa4nHaPtC8uSARUn+RvFDt382myH0sl2M5dw= -go.temporal.io/server v1.23.0-rc2.0.20231212000105-51ea367f9f37/go.mod h1:mdtzSG++dTsWrJ8EmY7XTc4qhcCkrosHpo3ANySFyt8= +go.temporal.io/api v1.26.1-0.20240123194300-5b253c84a3cc h1:NOtmXBUd0heryLaBV7MJO67lfOHc/PD74zRwWAQ+AKE= +go.temporal.io/api v1.26.1-0.20240123194300-5b253c84a3cc/go.mod h1:ccaGRzYOx2iUq2e7zx0BEm0t2V3rmcliFalMCixn1/4= +go.temporal.io/sdk v1.25.2-0.20240108174654-c1744ee2c8cb h1:rceOI1pCc9DtY3ASPZbl9XTHxbvHbYvZuGwGdZtYBLw= +go.temporal.io/sdk v1.25.2-0.20240108174654-c1744ee2c8cb/go.mod h1:nRT6pheoo7UXrrgMh26r7t4IuJFZmu277SkaiVp/tZE= +go.temporal.io/server v1.23.0-rc9 h1:XmwWMW57BL/WVH1XhquRwvkNsCUQyue0WkU8PiB9tCI= +go.temporal.io/server v1.23.0-rc9/go.mod h1:orkm00raKKZt7B0u1Z37DldLp8K9WjiImGL20fzR4Js= go.temporal.io/version v0.3.0 h1:dMrei9l9NyHt8nG6EB8vAwDLLTwx2SvRyucCSumAiig= go.temporal.io/version v0.3.0/go.mod h1:UA9S8/1LaKYae6TyD9NaPMJTZb911JcbqghI2CBSP78= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=