Remove references to my fork of api-go

I'll remove the usage of my fork of features for CI in a second pass
temporalio · Nov 21, 2023 · a11ee59 · a11ee59
1 parent 07a2c7e
commit a11ee59
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 39 deletions.
diff --git a/contrib/datadog/go.mod b/contrib/datadog/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/robfig/cron v1.2.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/tinylib/msgp v1.1.2 // indirect
-	go.temporal.io/api v1.24.0 // indirect
+	go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
@@ -50,7 +50,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace (
-	go.temporal.io/api => github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391
-	go.temporal.io/sdk => ../../
-)
+replace go.temporal.io/sdk => ../../
diff --git a/contrib/datadog/go.sum b/contrib/datadog/go.sum
@@ -103,13 +103,13 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391 h1:6D0620C9m0pwPM+G5mM6BGEnA+F3pq2nUs0rhny+sqo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ=
 github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 h1:NtVNuZcm3YWZ4jXYFH+qDMTeqHAKDItpl1dg0OnckxE=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

diff --git a/contrib/opentelemetry/go.mod b/contrib/opentelemetry/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/robfig/cron v1.2.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	go.temporal.io/api v1.24.0 // indirect
+	go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
@@ -37,7 +37,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace (
-	go.temporal.io/api => github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391
-	go.temporal.io/sdk => ../../
-)
+replace go.temporal.io/sdk => ../../
diff --git a/contrib/opentelemetry/go.sum b/contrib/opentelemetry/go.sum
@@ -68,8 +68,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391 h1:6D0620C9m0pwPM+G5mM6BGEnA+F3pq2nUs0rhny+sqo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -79,6 +77,8 @@ go.opentelemetry.io/otel/sdk v1.2.0 h1:wKN260u4DesJYhyjxDa7LRFkuhH7ncEVKU37LWcyN
 go.opentelemetry.io/otel/sdk v1.2.0/go.mod h1:jNN8QtpvbsKhgaC6V5lHiejMoKD+V8uadoSafgHPx1U=
 go.opentelemetry.io/otel/trace v1.2.0 h1:Ys3iqbqZhcf28hHzrm5WAquMkDHNZTUkw7KHbuNjej0=
 go.opentelemetry.io/otel/trace v1.2.0/go.mod h1:N5FLswTubnxKxOJHM7XZC074qpeEdLy3CgAVsdMucK0=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 h1:NtVNuZcm3YWZ4jXYFH+qDMTeqHAKDItpl1dg0OnckxE=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

diff --git a/contrib/opentracing/go.mod b/contrib/opentracing/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/robfig/cron v1.2.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	go.temporal.io/api v1.24.0 // indirect
+	go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
@@ -35,7 +35,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace (
-	go.temporal.io/api => github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391
-	go.temporal.io/sdk => ../../
-)
+replace go.temporal.io/sdk => ../../
diff --git a/contrib/opentracing/go.sum b/contrib/opentracing/go.sum
@@ -68,11 +68,11 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391 h1:6D0620C9m0pwPM+G5mM6BGEnA+F3pq2nUs0rhny+sqo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 h1:NtVNuZcm3YWZ4jXYFH+qDMTeqHAKDItpl1dg0OnckxE=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

diff --git a/contrib/tally/go.mod b/contrib/tally/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/robfig/cron v1.2.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/twmb/murmur3 v1.1.5 // indirect
-	go.temporal.io/api v1.24.0 // indirect
+	go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
@@ -36,7 +36,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace (
-	go.temporal.io/api => github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391
-	go.temporal.io/sdk => ../../
-)
+replace go.temporal.io/sdk => ../../
diff --git a/contrib/tally/go.sum b/contrib/tally/go.sum
@@ -130,15 +130,15 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391 h1:6D0620C9m0pwPM+G5mM6BGEnA+F3pq2nUs0rhny+sqo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 github.com/twmb/murmur3 v1.1.5 h1:i9OLS9fkuLzBXjt6dptlAEyk58fJsSTXbRg3SgVyqgk=
 github.com/twmb/murmur3 v1.1.5/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
 github.com/uber-go/tally/v4 v4.1.1 h1:jhy6WOZp4nHyCqeV43x3Wz370LXUGBhgW2JmzOIHCWI=
 github.com/uber-go/tally/v4 v4.1.1/go.mod h1:aXeSTDMl4tNosyf6rdU8jlgScHyjEGGtfJ/uwCIf/vM=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 h1:NtVNuZcm3YWZ4jXYFH+qDMTeqHAKDItpl1dg0OnckxE=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=

diff --git a/contrib/tools/workflowcheck/go.mod b/contrib/tools/workflowcheck/go.mod
@@ -14,5 +14,3 @@ require (
 	golang.org/x/sys v0.12.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
-
-replace go.temporal.io/api => github.com/tdeebswihart/temporal-api v0.0.0-20231009181144-860b4c805880
diff --git a/go.mod b/go.mod
@@ -2,8 +2,6 @@ module go.temporal.io/sdk
 
 go 1.20
 
-replace go.temporal.io/api => github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391
-
 require (
 	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a
 	github.com/gogo/protobuf v1.3.2
@@ -12,7 +10,7 @@ require (
 	github.com/pborman/uuid v1.2.1
 	github.com/robfig/cron v1.2.0
 	github.com/stretchr/testify v1.8.4
-	go.temporal.io/api v1.24.0
+	go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0
 	go.uber.org/atomic v1.9.0
 	golang.org/x/sys v0.14.0
 	golang.org/x/time v0.3.0

diff --git a/go.sum b/go.sum
@@ -66,11 +66,11 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391 h1:6D0620C9m0pwPM+G5mM6BGEnA+F3pq2nUs0rhny+sqo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 h1:NtVNuZcm3YWZ4jXYFH+qDMTeqHAKDItpl1dg0OnckxE=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

diff --git a/test/go.mod b/test/go.mod
@@ -12,7 +12,7 @@ require (
 	go.opentelemetry.io/otel v1.2.0
 	go.opentelemetry.io/otel/sdk v1.2.0
 	go.opentelemetry.io/otel/trace v1.2.0
-	go.temporal.io/api v1.24.0
+	go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0
 	go.temporal.io/sdk v1.12.0
 	go.temporal.io/sdk/contrib/opentelemetry v0.1.0
 	go.temporal.io/sdk/contrib/opentracing v0.0.0-00010101000000-000000000000
@@ -45,7 +45,6 @@ require (
 )
 
 replace (
-	go.temporal.io/api => github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391
 	go.temporal.io/sdk => ../
 	go.temporal.io/sdk/contrib/opentelemetry => ../contrib/opentelemetry
 	go.temporal.io/sdk/contrib/opentracing => ../contrib/opentracing

diff --git a/test/go.sum b/test/go.sum
@@ -134,8 +134,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391 h1:6D0620C9m0pwPM+G5mM6BGEnA+F3pq2nUs0rhny+sqo=
-github.com/tdeebswihart/temporal-api-go v0.0.0-20231121192838-2507a2402391/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 github.com/twmb/murmur3 v1.1.5 h1:i9OLS9fkuLzBXjt6dptlAEyk58fJsSTXbRg3SgVyqgk=
 github.com/twmb/murmur3 v1.1.5/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
 github.com/uber-go/tally/v4 v4.1.1 h1:jhy6WOZp4nHyCqeV43x3Wz370LXUGBhgW2JmzOIHCWI=
@@ -149,6 +147,8 @@ go.opentelemetry.io/otel/sdk v1.2.0 h1:wKN260u4DesJYhyjxDa7LRFkuhH7ncEVKU37LWcyN
 go.opentelemetry.io/otel/sdk v1.2.0/go.mod h1:jNN8QtpvbsKhgaC6V5lHiejMoKD+V8uadoSafgHPx1U=
 go.opentelemetry.io/otel/trace v1.2.0 h1:Ys3iqbqZhcf28hHzrm5WAquMkDHNZTUkw7KHbuNjej0=
 go.opentelemetry.io/otel/trace v1.2.0/go.mod h1:N5FLswTubnxKxOJHM7XZC074qpeEdLy3CgAVsdMucK0=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 h1:NtVNuZcm3YWZ4jXYFH+qDMTeqHAKDItpl1dg0OnckxE=
+go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0/go.mod h1:WZzeAGohIjHCVGJA9fs8enVpR3nRzpSZIitqEnbdc/E=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=