From 6fec6ec90a51ee671e57990456ab4ee232d2318a Mon Sep 17 00:00:00 2001 From: Matt Chaffe Date: Thu, 22 May 2025 19:37:28 +0100 Subject: [PATCH 1/4] chore: cleanup --- main.go | 100 +++----------------------------------------------------- 1 file changed, 5 insertions(+), 95 deletions(-) diff --git a/main.go b/main.go index af940ae..1151b5d 100644 --- a/main.go +++ b/main.go @@ -8,8 +8,6 @@ import ( "log" "net/http" "os" - "strconv" - "time" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" @@ -26,19 +24,6 @@ func getEnv(key, defaultValue string) string { return defaultValue } -// Payload represents the structure of a Temporal payload -type Payload struct { - Metadata map[string]string `json:"metadata"` - Data string `json:"data"` -} - -// PayloadData represents the structure of data within a Temporal payload -type PayloadData struct { - Data interface{} `json:"data"` - Timeout int `json:"timeout,omitempty"` // Timeout in seconds, optional -} - -// CodecRequest represents the request body for encode/decode operations type CodecRequest struct { Payloads []*commonpb.Payload `json:"payloads"` } @@ -50,18 +35,14 @@ type CodecResponse struct { // Config holds the server configuration type Config struct { - Port string - DefaultTimeout time.Duration - SimulateTimeout bool - KeyID string - Keys map[string][]byte + Port string + KeyID string + Keys map[string][]byte } var config = Config{ - Port: getEnv("PORT", "8080"), - DefaultTimeout: 5 * time.Second, - SimulateTimeout: false, - KeyID: getEnv("KEY_ID", "test-key"), + Port: getEnv("PORT", "8080"), + KeyID: getEnv("KEY_ID", "test-key"), Keys: map[string][]byte{ "test-key": []byte(getEnv("ENCRYPTION_KEY", "12345678901234567890123456789012")), // 32 bytes for AES-256 }, @@ -84,34 +65,6 @@ func main() { c.JSON(http.StatusOK, gin.H{"status": "healthy"}) }) - // Toggle timeout simulation - r.POST("/toggle-timeout", func(c *gin.Context) { - config.SimulateTimeout = !config.SimulateTimeout - c.JSON(http.StatusOK, gin.H{ - "simulate_timeout": config.SimulateTimeout, - }) - }) - - // Set timeout duration - r.POST("/set-timeout", func(c *gin.Context) { - timeoutStr := c.Query("duration") - if timeoutStr == "" { - c.JSON(http.StatusBadRequest, gin.H{"error": "duration parameter is required"}) - return - } - - timeout, err := strconv.Atoi(timeoutStr) - if err != nil { - c.JSON(http.StatusBadRequest, gin.H{"error": "invalid duration format"}) - return - } - - config.DefaultTimeout = time.Duration(timeout) * time.Second - c.JSON(http.StatusOK, gin.H{ - "timeout": config.DefaultTimeout.Seconds(), - }) - }) - // Create codec instance codec := &codec.Codec{ KeyID: config.KeyID, @@ -133,7 +86,6 @@ func main() { c.JSON(http.StatusBadRequest, gin.H{"error": "failed to read request body"}) return } - log.Printf("Received decode request: %s", string(body)) // Parse the request var req CodecRequest @@ -180,27 +132,6 @@ func handleEncode(c *gin.Context) { Keys: config.Keys, } - // Process each payload - for _, payload := range req.Payloads { - log.Printf("Payload: %+v", payload) - // Try to extract timeout from payload data - if len(payload.Data) > 0 { - // First unmarshal to get the JSON string - var jsonStr string - if err := json.Unmarshal(payload.Data, &jsonStr); err == nil { - // Then unmarshal the actual data structure - var payloadData PayloadData - if err := json.Unmarshal([]byte(jsonStr), &payloadData); err == nil { - log.Printf("Payload data: %+v", payloadData) - // If timeout is specified and simulation is enabled, apply it - if payloadData.Timeout > 0 && config.SimulateTimeout { - time.Sleep(time.Duration(payloadData.Timeout) * time.Second) - } - } - } - } - - } // Encode single payload encoded, err := codec.Encode(req.Payloads) if err != nil { @@ -228,27 +159,6 @@ func handleDecode(c *gin.Context) { Keys: config.Keys, } - // Process each payload - for _, payload := range req.Payloads { - log.Printf("Payload: %+v", payload) - // Try to extract timeout from payload data - if len(payload.Data) > 0 { - // First unmarshal to get the JSON string - var jsonStr string - if err := json.Unmarshal(payload.Data, &jsonStr); err == nil { - // Then unmarshal the actual data structure - var payloadData PayloadData - if err := json.Unmarshal([]byte(jsonStr), &payloadData); err == nil { - log.Printf("Payload data: %+v", payloadData) - // If timeout is specified and simulation is enabled, apply it - if payloadData.Timeout > 0 && config.SimulateTimeout { - time.Sleep(time.Duration(payloadData.Timeout) * time.Second) - } - } - } - } - - } // Decode single payload decoded, err := codec.Decode(req.Payloads) if err != nil { From 8c9f0a1b9b27619ff087049d60467b9a17086f4f Mon Sep 17 00:00:00 2001 From: Matt Chaffe Date: Thu, 22 May 2025 20:23:23 +0100 Subject: [PATCH 2/4] chore: added docker compose instructions --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f30b21..9d4e3c2 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ A Go implementation of a Temporal Codec server that provides encryption and decr ## Features - `/encode` endpoint for encrypting payloads using AES-GCM +- `/decoder` endpoint for encdecryptingypting payloads using AES-GCM - `/decode` endpoint for decrypting payloads -- Configurable timeout simulation for testing - CORS support for Temporal Web UI integration - Health check endpoint - Key rotation support via key IDs @@ -34,6 +34,13 @@ For detailed implementation examples and usage instructions, see [codec/README.m ## Running the Server +### Docker Compose (includes Temporal) + +1. docker compose up +2. docker compose down + +### Standalone + 1. Install dependencies: ```bash go mod download From 12077842a7cad7ff8778259c8c2e22ab4b63955c Mon Sep 17 00:00:00 2001 From: dlee-bitovi Date: Fri, 23 May 2025 11:07:13 -0500 Subject: [PATCH 3/4] added worker, workflow and activity, and client code --- .gitignore | 3 +- codec/README.md | 11 +++++ codec/starter/main.go | 63 +++++++++++++++++++++++++++ codec/worker/main.go | 48 +++++++++++++++++++++ codec/workflow.go | 92 ++++++++++++++++++++++++++++++++++++++++ go.mod | 12 ++++++ go.sum | 99 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 327 insertions(+), 1 deletion(-) create mode 100644 codec/starter/main.go create mode 100644 codec/worker/main.go create mode 100644 codec/workflow.go diff --git a/.gitignore b/.gitignore index 1c2f433..137047e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -tmp \ No newline at end of file +tmp +.env \ No newline at end of file diff --git a/codec/README.md b/codec/README.md index c839fd1..c3717de 100644 --- a/codec/README.md +++ b/codec/README.md @@ -76,6 +76,17 @@ func main() { } ``` +## Run steps + +1) Run the following command to start the worker + ``` + go run codec/worker/main.go + ``` +2) Run the following command to start the example + ``` + go run codec/starter/main.go + ``` + ## Important Notes 1. The codec server must be running before starting your worker diff --git a/codec/starter/main.go b/codec/starter/main.go new file mode 100644 index 0000000..a5c719c --- /dev/null +++ b/codec/starter/main.go @@ -0,0 +1,63 @@ +package main + +import ( + codec "codec-server/codec" + "context" + "log" + + "go.temporal.io/sdk/client" + "go.temporal.io/sdk/converter" + "go.temporal.io/sdk/workflow" +) + +func main() { + + // Create the codec instance + cInstance := codec.New("http://localhost:8081") + + // Create a data converter that uses our codec + dataConverter := converter.NewCodecDataConverter( + converter.GetDefaultDataConverter(), + cInstance, + ) + + // Create a data converter without deadlock detection + dataConverterWithoutDeadlock := workflow.DataConverterWithoutDeadlockDetection(dataConverter) + + c, err := client.Dial(client.Options{ + HostPort: "localhost:7233", + Namespace: "default", + DataConverter: dataConverterWithoutDeadlock, + }) + + if err != nil { + log.Fatalln("Unable to create client", err) + } + defer c.Close() + + workflowOptions := client.StartWorkflowOptions{ + ID: "codecserver_workflowID", + TaskQueue: "codecserver", + } + + // The workflow input "My Compressed Friend" will be encoded by the codec before being sent to Temporal + we, err := c.ExecuteWorkflow( + context.Background(), + workflowOptions, + codec.Workflow, + "Plain text input", + ) + if err != nil { + log.Fatalln("Unable to execute workflow", err) + } + + log.Println("Started workflow", "WorkflowID", we.GetID(), "RunID", we.GetRunID()) + + // Synchronously wait for the workflow completion. + var result string + err = we.Get(context.Background(), &result) + if err != nil { + log.Fatalln("Unable get workflow result", err) + } + log.Println("Workflow result:", result) +} diff --git a/codec/worker/main.go b/codec/worker/main.go new file mode 100644 index 0000000..d5fc4f3 --- /dev/null +++ b/codec/worker/main.go @@ -0,0 +1,48 @@ +package main + +import ( + codec "codec-server/codec" + "log" + + "go.temporal.io/sdk/client" + "go.temporal.io/sdk/converter" + "go.temporal.io/sdk/worker" + "go.temporal.io/sdk/workflow" +) + +func main() { + + // Create the codec instance + cInstance := codec.New("http://localhost:8081") + + // Create a data converter that uses our codec + dataConverter := converter.NewCodecDataConverter( + converter.GetDefaultDataConverter(), + cInstance, + ) + + // Create a data converter without deadlock detection + dataConverterWithoutDeadlock := workflow.DataConverterWithoutDeadlockDetection(dataConverter) + + c, err := client.Dial(client.Options{ + HostPort: "localhost:7233", + Namespace: "default", + DataConverter: dataConverterWithoutDeadlock, + }) + + if err != nil { + log.Fatalln("Unable to create client", err) + } + defer c.Close() + + w := worker.New(c, "codecserver", worker.Options{}) + + w.RegisterWorkflow(codec.Workflow) + w.RegisterActivity(codec.Activity) + w.RegisterActivity(codec.TimeoutActivity) + + err = w.Run(worker.InterruptCh()) + if err != nil { + log.Fatalln("Unable to start worker", err) + } +} diff --git a/codec/workflow.go b/codec/workflow.go new file mode 100644 index 0000000..27d48e3 --- /dev/null +++ b/codec/workflow.go @@ -0,0 +1,92 @@ +package codec + +import ( + "context" + "errors" + "io" + "net/http" + "time" + + "github.com/google/uuid" + "go.temporal.io/sdk/activity" + "go.temporal.io/sdk/workflow" +) + +// Workflow is a standard workflow definition. +// Note that the Workflow and Activity don't need to care that +// their inputs/results are being encoded. +func Workflow(ctx workflow.Context, input string) (string, error) { + ao := workflow.ActivityOptions{ + StartToCloseTimeout: 10 * time.Second, + } + lao := workflow.LocalActivityOptions{ + StartToCloseTimeout: 10 * time.Second, + } + ctx = workflow.WithActivityOptions(ctx, ao) + ctx = workflow.WithLocalActivityOptions(ctx, lao) + + logger := workflow.GetLogger(ctx) + logger.Info("Codec Server workflow started", "input", input) + + var result string + + err := workflow.SideEffect(ctx, func(ctx workflow.Context) interface{} { + return uuid.New() + }).Get(&result) + if err != nil { + logger.Error("SideEffect failed.", "Error", err) + return "", err + } + + err = workflow.ExecuteLocalActivity(ctx, Activity, input).Get(ctx, &result) + if err != nil { + logger.Error("Local Activity failed.", "Error", err) + return "", err + } + + err = workflow.ExecuteActivity(ctx, Activity, input).Get(ctx, &result) + if err != nil { + logger.Error("Activity failed.", "Error", err) + return "", err + } + + workflow.Sleep(ctx, 10*time.Second) + logger.Info("Codec Server workflow slept for 10 seconds, about to attempt /timeout activity.") + + err = workflow.ExecuteActivity(ctx, TimeoutActivity, input).Get(ctx, &result) + if err != nil { + logger.Error("TimeoutActivity failed.", "Error", err) + return "", err + } + + logger.Info("Codec Server workflow completed.", "result", result) + + return result, nil +} + +func Activity(ctx context.Context, input string) (string, error) { + logger := activity.GetLogger(ctx) + logger.Info("Activity", "input", input) + + return "Received " + input, nil +} + +func TimeoutActivity(ctx context.Context, expenseID string) error { + + resp, err := http.Get("http://localhost:5173/timeout") + if err != nil { + return err + } + body, err := io.ReadAll(resp.Body) + _ = resp.Body.Close() + if err != nil { + return err + } + + if string(body) == "SUCCEED" { + activity.GetLogger(ctx).Info("Expense created.", "ExpenseID", expenseID) + return nil + } + + return errors.New(string(body)) +} diff --git a/go.mod b/go.mod index bff8428..6238a4a 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ toolchain go1.23.4 require ( github.com/gin-contrib/cors v1.5.0 github.com/gin-gonic/gin v1.9.1 + github.com/google/uuid v1.6.0 go.temporal.io/api v1.49.1 go.temporal.io/sdk v1.34.0 ) @@ -15,6 +16,8 @@ require ( github.com/bytedance/sonic v1.10.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect @@ -22,6 +25,8 @@ require ( github.com/go-playground/validator/v10 v10.15.5 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/mock v1.6.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect @@ -29,14 +34,21 @@ require ( github.com/mattn/go-isatty v0.0.19 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nexus-rpc/sdk-go v0.3.0 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/robfig/cron v1.2.0 // indirect + github.com/stretchr/objx v0.5.2 // indirect + github.com/stretchr/testify v1.10.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.11 // indirect golang.org/x/arch v0.5.0 // indirect golang.org/x/crypto v0.35.0 // indirect golang.org/x/net v0.36.0 // indirect + golang.org/x/sync v0.11.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 // indirect + golang.org/x/time v0.3.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/grpc v1.66.0 // indirect diff --git a/go.sum b/go.sum index 55d2d46..ddc6e71 100644 --- a/go.sum +++ b/go.sum @@ -1,16 +1,28 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc= github.com/bytedance/sonic v1.10.1/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw= +github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk= @@ -19,6 +31,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -27,13 +41,28 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.15.5 h1:LEBecTWb/1j5TNY1YYG2RcOUN3R7NLylN+x8TTueE24= github.com/go-playground/validator/v10 v10.15.5/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -44,8 +73,12 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= @@ -57,16 +90,29 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/nexus-rpc/sdk-go v0.3.0 h1:Y3B0kLYbMhd4C2u00kcYajvmOrfozEtTV/nHSnV57jA= +github.com/nexus-rpc/sdk-go v0.3.0/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= +github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -81,10 +127,15 @@ github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4d github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= 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.49.1 h1:CdiIohibamF4YP9k261DjrzPVnuomRoh1iC//gZ1puA= go.temporal.io/api v1.49.1/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM= go.temporal.io/sdk v1.34.0 h1:VLg/h6ny7GvLFVoQPqz2NcC93V9yXboQwblkRvZ1cZE= go.temporal.io/sdk v1.34.0/go.mod h1:iE4U5vFrH3asOhqpBBphpj9zNtw8btp8+MSaf5A0D3w= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y= golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= @@ -93,49 +144,97 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed h1:3RgNmBoI9MZhsj3QxC+AP/qQhNwpCLOvYDYYsFrhFt0= google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg= google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= From b373799252bb6180babea260d3ccce0871d7612a Mon Sep 17 00:00:00 2001 From: dlee-bitovi Date: Fri, 23 May 2025 13:16:39 -0500 Subject: [PATCH 4/4] using the PayloadData models in order to actually pass timeout values into codec-server --- codec/main.go | 25 ++++---------------- codec/starter/main.go | 8 ++++++- codec/workflow.go | 24 +++++++++---------- main.go | 54 ++++++++----------------------------------- models/models.go | 43 ++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 78 deletions(-) create mode 100644 models/models.go diff --git a/codec/main.go b/codec/main.go index 973cb96..aecf53e 100644 --- a/codec/main.go +++ b/codec/main.go @@ -2,6 +2,7 @@ package codec import ( "bytes" + "codec-server/models" "encoding/json" "fmt" "io" @@ -16,25 +17,9 @@ type HTTPCodec struct { CodecServerURL string } -// Payload represents the structure for codec server communication -type Payload struct { - Metadata map[string]string `json:"metadata"` - Data string `json:"data"` -} - -// CodecRequest represents the request to the codec server -type CodecRequest struct { - Payloads []*commonpb.Payload `json:"payloads"` -} - -// CodecResponse represents the response from the codec server -type CodecResponse struct { - Payloads []*commonpb.Payload `json:"payloads"` -} - func (c *HTTPCodec) Encode(payloads []*commonpb.Payload) ([]*commonpb.Payload, error) { // Send request to codec server - reqBody, err := json.Marshal(CodecRequest{Payloads: payloads}) + reqBody, err := json.Marshal(models.CodecRequest{Payloads: payloads}) if err != nil { return nil, fmt.Errorf("failed to marshal request: %v", err) } @@ -51,7 +36,7 @@ func (c *HTTPCodec) Encode(payloads []*commonpb.Payload) ([]*commonpb.Payload, e return nil, fmt.Errorf("codec server returned error: %s (URL: %s, Body: %s)", resp.Status, c.CodecServerURL, string(bodyBytes)) } - var codecResp CodecResponse + var codecResp models.CodecResponse if err := json.NewDecoder(resp.Body).Decode(&codecResp); err != nil { return nil, fmt.Errorf("failed to decode response: %v", err) } @@ -61,7 +46,7 @@ func (c *HTTPCodec) Encode(payloads []*commonpb.Payload) ([]*commonpb.Payload, e func (c *HTTPCodec) Decode(payloads []*commonpb.Payload) ([]*commonpb.Payload, error) { // Send request to codec server - reqBody, err := json.Marshal(CodecRequest{Payloads: payloads}) + reqBody, err := json.Marshal(models.CodecRequest{Payloads: payloads}) if err != nil { return nil, fmt.Errorf("failed to marshal request: %v", err) } @@ -78,7 +63,7 @@ func (c *HTTPCodec) Decode(payloads []*commonpb.Payload) ([]*commonpb.Payload, e return nil, fmt.Errorf("codec server returned error: %s", resp.Status) } - var codecResp CodecResponse + var codecResp models.CodecResponse if err := json.NewDecoder(resp.Body).Decode(&codecResp); err != nil { return nil, fmt.Errorf("failed to decode response: %v", err) } diff --git a/codec/starter/main.go b/codec/starter/main.go index a5c719c..f9a134f 100644 --- a/codec/starter/main.go +++ b/codec/starter/main.go @@ -2,6 +2,7 @@ package main import ( codec "codec-server/codec" + "codec-server/models" "context" "log" @@ -40,12 +41,17 @@ func main() { TaskQueue: "codecserver", } + payload := models.PayloadData{ + Data: "Plain text input", + ActivityType: "SimpleActivity", + Timeout: 9, + } // The workflow input "My Compressed Friend" will be encoded by the codec before being sent to Temporal we, err := c.ExecuteWorkflow( context.Background(), workflowOptions, codec.Workflow, - "Plain text input", + payload, ) if err != nil { log.Fatalln("Unable to execute workflow", err) diff --git a/codec/workflow.go b/codec/workflow.go index 27d48e3..3d22596 100644 --- a/codec/workflow.go +++ b/codec/workflow.go @@ -1,8 +1,10 @@ package codec import ( + "codec-server/models" "context" "errors" + "fmt" "io" "net/http" "time" @@ -15,12 +17,12 @@ import ( // Workflow is a standard workflow definition. // Note that the Workflow and Activity don't need to care that // their inputs/results are being encoded. -func Workflow(ctx workflow.Context, input string) (string, error) { +func Workflow(ctx workflow.Context, input models.PayloadData) (string, error) { ao := workflow.ActivityOptions{ - StartToCloseTimeout: 10 * time.Second, + StartToCloseTimeout: 5 * time.Second, } lao := workflow.LocalActivityOptions{ - StartToCloseTimeout: 10 * time.Second, + StartToCloseTimeout: 5 * time.Second, } ctx = workflow.WithActivityOptions(ctx, ao) ctx = workflow.WithLocalActivityOptions(ctx, lao) @@ -50,12 +52,10 @@ func Workflow(ctx workflow.Context, input string) (string, error) { return "", err } - workflow.Sleep(ctx, 10*time.Second) - logger.Info("Codec Server workflow slept for 10 seconds, about to attempt /timeout activity.") - - err = workflow.ExecuteActivity(ctx, TimeoutActivity, input).Get(ctx, &result) + logger.Info("About to execute next activity...") + err = workflow.ExecuteActivity(ctx, Activity, input).Get(ctx, &result) if err != nil { - logger.Error("TimeoutActivity failed.", "Error", err) + logger.Error("Activity failed.", "Error", err) return "", err } @@ -64,14 +64,14 @@ func Workflow(ctx workflow.Context, input string) (string, error) { return result, nil } -func Activity(ctx context.Context, input string) (string, error) { +func Activity(ctx context.Context, input models.PayloadData) (string, error) { logger := activity.GetLogger(ctx) logger.Info("Activity", "input", input) - return "Received " + input, nil + return fmt.Sprintf("Received %s", input.Data), nil } -func TimeoutActivity(ctx context.Context, expenseID string) error { +func TimeoutActivity(ctx context.Context, input models.PayloadData) error { resp, err := http.Get("http://localhost:5173/timeout") if err != nil { @@ -84,7 +84,7 @@ func TimeoutActivity(ctx context.Context, expenseID string) error { } if string(body) == "SUCCEED" { - activity.GetLogger(ctx).Info("Expense created.", "ExpenseID", expenseID) + activity.GetLogger(ctx).Info("Activity unexpectedly succeeded.", "input", input) return nil } diff --git a/main.go b/main.go index 091b27d..2c0ed51 100644 --- a/main.go +++ b/main.go @@ -13,9 +13,9 @@ import ( "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" - commonpb "go.temporal.io/api/common/v1" "go.temporal.io/sdk/converter" + "codec-server/models" "codec-server/pkg/codec" ) @@ -26,43 +26,7 @@ func getEnv(key, defaultValue string) string { return defaultValue } -// Payload represents the structure of a Temporal payload -type Payload struct { - Metadata map[string]string `json:"metadata"` - Data string `json:"data"` -} - -// PayloadData represents the structure of data within a Temporal payload -type PayloadData struct { - Data interface{} `json:"data"` - Timeout int `json:"timeout,omitempty"` // Timeout in seconds, optional - ActivityID string `json:"ActivityID,omitempty"` - ActivityType string `json:"ActivityType,omitempty"` - ReplayTime string `json:"ReplayTime,omitempty"` - Attempt int `json:"Attempt,omitempty"` - Backoff int `json:"Backoff,omitempty"` -} - -// CodecRequest represents the request body for encode/decode operations -type CodecRequest struct { - Payloads []*commonpb.Payload `json:"payloads"` -} - -// CodecResponse represents the response body for encode/decode operations -type CodecResponse struct { - Payloads []*commonpb.Payload `json:"payloads"` -} - -// Config holds the server configuration -type Config struct { - Port string - DefaultTimeout time.Duration - SimulateTimeout bool - KeyID string - Keys map[string][]byte -} - -var config = Config{ +var config = &models.Config{ Port: getEnv("PORT", "8080"), DefaultTimeout: 5 * time.Second, SimulateTimeout: true, @@ -146,7 +110,7 @@ func main() { } // Parse the request - var req CodecRequest + var req models.CodecRequest if err := json.Unmarshal(body, &req); err != nil { log.Printf("Error parsing request: %v", err) c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request format"}) @@ -178,7 +142,7 @@ func main() { } func handleEncode(c *gin.Context) { - var req CodecRequest + var req models.CodecRequest if err := c.ShouldBindJSON(&req); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("invalid request format: %v", err)}) return @@ -195,7 +159,7 @@ func handleEncode(c *gin.Context) { log.Printf("Payload: %+v", payload) // Try to extract timeout from payload data if len(payload.Data) > 0 { - var payloadData PayloadData + var payloadData models.PayloadData // Try to unmarshal directly first if err := json.Unmarshal(payload.Data, &payloadData); err != nil { // If direct unmarshal fails, try to unmarshal as string first @@ -250,14 +214,14 @@ func handleEncode(c *gin.Context) { } // Convert back to response format - response := CodecResponse{ + response := models.CodecResponse{ Payloads: encoded, } c.JSON(http.StatusOK, response) } func handleDecode(c *gin.Context) { - var req CodecRequest + var req models.CodecRequest if err := c.ShouldBindJSON(&req); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("invalid request format: %v", err)}) return @@ -273,7 +237,7 @@ func handleDecode(c *gin.Context) { for _, payload := range req.Payloads { // Try to extract timeout from payload data if len(payload.Data) > 0 { - var payloadData PayloadData + var payloadData models.PayloadData // Try to unmarshal directly first if err := json.Unmarshal(payload.Data, &payloadData); err != nil { // If direct unmarshal fails, try to unmarshal as string first @@ -327,7 +291,7 @@ func handleDecode(c *gin.Context) { return } // Convert back to response format - response := CodecResponse{ + response := models.CodecResponse{ Payloads: decoded, } c.JSON(http.StatusOK, response) diff --git a/models/models.go b/models/models.go new file mode 100644 index 0000000..c087562 --- /dev/null +++ b/models/models.go @@ -0,0 +1,43 @@ +package models + +import ( + "time" + + commonpb "go.temporal.io/api/common/v1" +) + +// Payload represents the structure of a Temporal payload +type Payload struct { + Metadata map[string]string `json:"metadata"` + Data string `json:"data"` +} + +// PayloadData represents the structure of data within a Temporal payload +type PayloadData struct { + Data interface{} `json:"data"` + Timeout int `json:"timeout,omitempty"` // Timeout in seconds, optional + ActivityID string `json:"ActivityID,omitempty"` + ActivityType string `json:"ActivityType,omitempty"` + ReplayTime string `json:"ReplayTime,omitempty"` + Attempt int `json:"Attempt,omitempty"` + Backoff int `json:"Backoff,omitempty"` +} + +// CodecRequest represents the request body for encode/decode operations +type CodecRequest struct { + Payloads []*commonpb.Payload `json:"payloads"` +} + +// CodecResponse represents the response body for encode/decode operations +type CodecResponse struct { + Payloads []*commonpb.Payload `json:"payloads"` +} + +// Config holds the server configuration +type Config struct { + Port string + DefaultTimeout time.Duration + SimulateTimeout bool + KeyID string + Keys map[string][]byte +}