Skip to content

Commit 20fd758

Browse files
chore: Rename method to be go-idiomatic (#32)
Signed-off-by: Javier Aliaga <[email protected]>
1 parent 24aa630 commit 20fd758

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

samples/taskexecutionid/taskexecutionid.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ func getCounter(taskExecutionId string) *atomic.Int32 {
115115
}
116116

117117
func RandomFailActivity(ctx task.ActivityContext) (any, error) {
118-
log.Println(fmt.Sprintf("#### [%v] activity %v failure", ctx.GetTaskExecutionId(), ctx.GetTaskID()))
119-
counter := getCounter(ctx.GetTaskExecutionId())
118+
log.Println(fmt.Sprintf("#### [%v] activity %v failure", ctx.GetTaskExecutionID(), ctx.GetTaskID()))
119+
counter := getCounter(ctx.GetTaskExecutionID())
120120
// The activity should fail 5 times before succeeding.
121121
if counter.Load() != 5 {
122122
log.Println("random activity failure")

task/activity.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ func WithActivityRetryPolicy(policy *RetryPolicy) callActivityOption {
105105
type ActivityContext interface {
106106
GetInput(resultPtr any) error
107107
GetTaskID() int32
108-
GetTaskExecutionId() string
108+
GetTaskExecutionID() string
109109
Context() context.Context
110110
}
111111

112112
type activityContext struct {
113113
TaskID int32
114-
TaskExecutionId string
114+
TaskExecutionID string
115115
Name string
116116

117117
rawInput []byte
@@ -124,7 +124,7 @@ type Activity func(ctx ActivityContext) (any, error)
124124
func newTaskActivityContext(ctx context.Context, taskID int32, ts *protos.TaskScheduledEvent) *activityContext {
125125
return &activityContext{
126126
TaskID: taskID,
127-
TaskExecutionId: ts.TaskExecutionId,
127+
TaskExecutionID: ts.TaskExecutionId,
128128
Name: ts.Name,
129129
rawInput: []byte(ts.Input.GetValue()),
130130
ctx: ctx,
@@ -144,6 +144,6 @@ func (actx *activityContext) GetTaskID() int32 {
144144
return actx.TaskID
145145
}
146146

147-
func (actx *activityContext) GetTaskExecutionId() string {
148-
return actx.TaskExecutionId
147+
func (actx *activityContext) GetTaskExecutionID() string {
148+
return actx.TaskExecutionID
149149
}

tests/orchestrations_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,7 +1346,7 @@ func Test_TaskExecutionId(t *testing.T) {
13461346
t.Run("SingleActivityWithRetry", func(t *testing.T) {
13471347
// Registration
13481348
r := task.NewTaskRegistry()
1349-
require.NoError(t, r.AddOrchestratorN("TaskExecutionId", func(ctx *task.OrchestrationContext) (any, error) {
1349+
require.NoError(t, r.AddOrchestratorN("TaskExecutionID", func(ctx *task.OrchestrationContext) (any, error) {
13501350
if err := ctx.CallActivity("FailActivity", task.WithActivityRetryPolicy(&task.RetryPolicy{
13511351
MaxAttempts: 3,
13521352
InitialRetryInterval: 10 * time.Millisecond,
@@ -1359,7 +1359,7 @@ func Test_TaskExecutionId(t *testing.T) {
13591359
executionMap := make(map[string]int)
13601360
var executionId string
13611361
require.NoError(t, r.AddActivityN("FailActivity", func(ctx task.ActivityContext) (any, error) {
1362-
executionId = ctx.GetTaskExecutionId()
1362+
executionId = ctx.GetTaskExecutionID()
13631363
executionMap[executionId]++
13641364
if executionMap[executionId] == 3 {
13651365
return nil, nil
@@ -1374,7 +1374,7 @@ func Test_TaskExecutionId(t *testing.T) {
13741374
defer worker.Shutdown(ctx)
13751375

13761376
// Run the orchestration
1377-
id, err := client.ScheduleNewOrchestration(ctx, "TaskExecutionId")
1377+
id, err := client.ScheduleNewOrchestration(ctx, "TaskExecutionID")
13781378
require.NoError(t, err)
13791379

13801380
metadata, err := client.WaitForOrchestrationCompletion(ctx, id)
@@ -1391,7 +1391,7 @@ func Test_TaskExecutionId(t *testing.T) {
13911391
t.Run("ParallelActivityWithRetry", func(t *testing.T) {
13921392
// Registration
13931393
r := task.NewTaskRegistry()
1394-
require.NoError(t, r.AddOrchestratorN("TaskExecutionId", func(ctx *task.OrchestrationContext) (any, error) {
1394+
require.NoError(t, r.AddOrchestratorN("TaskExecutionID", func(ctx *task.OrchestrationContext) (any, error) {
13951395
t1 := ctx.CallActivity("FailActivity", task.WithActivityRetryPolicy(&task.RetryPolicy{
13961396
MaxAttempts: 3,
13971397
InitialRetryInterval: 10 * time.Millisecond,
@@ -1421,8 +1421,8 @@ func Test_TaskExecutionId(t *testing.T) {
14211421
require.NoError(t, r.AddActivityN("FailActivity", func(ctx task.ActivityContext) (any, error) {
14221422
lock.Lock()
14231423
defer lock.Unlock()
1424-
executionMap[ctx.GetTaskExecutionId()] = executionMap[ctx.GetTaskExecutionId()] + 1
1425-
if executionMap[ctx.GetTaskExecutionId()] == 3 {
1424+
executionMap[ctx.GetTaskExecutionID()] = executionMap[ctx.GetTaskExecutionID()] + 1
1425+
if executionMap[ctx.GetTaskExecutionID()] == 3 {
14261426
return nil, nil
14271427
}
14281428
return nil, errors.New("activity failure")
@@ -1435,7 +1435,7 @@ func Test_TaskExecutionId(t *testing.T) {
14351435
defer worker.Shutdown(ctx)
14361436

14371437
// Run the orchestration
1438-
id, err := client.ScheduleNewOrchestration(ctx, "TaskExecutionId")
1438+
id, err := client.ScheduleNewOrchestration(ctx, "TaskExecutionID")
14391439
require.NoError(t, err)
14401440

14411441
metadata, err := client.WaitForOrchestrationCompletion(ctx, id)
@@ -1456,7 +1456,7 @@ func Test_TaskExecutionId(t *testing.T) {
14561456
t.Run("SingleActivityWithNoRetry", func(t *testing.T) {
14571457
// Registration
14581458
r := task.NewTaskRegistry()
1459-
require.NoError(t, r.AddOrchestratorN("TaskExecutionId", func(ctx *task.OrchestrationContext) (any, error) {
1459+
require.NoError(t, r.AddOrchestratorN("TaskExecutionID", func(ctx *task.OrchestrationContext) (any, error) {
14601460
if err := ctx.CallActivity("Activity").Await(nil); err != nil {
14611461
return nil, err
14621462
}
@@ -1465,7 +1465,7 @@ func Test_TaskExecutionId(t *testing.T) {
14651465

14661466
var executionId string
14671467
require.NoError(t, r.AddActivityN("Activity", func(ctx task.ActivityContext) (any, error) {
1468-
executionId = ctx.GetTaskExecutionId()
1468+
executionId = ctx.GetTaskExecutionID()
14691469
return nil, nil
14701470
}))
14711471

@@ -1476,7 +1476,7 @@ func Test_TaskExecutionId(t *testing.T) {
14761476
defer worker.Shutdown(ctx)
14771477

14781478
// Run the orchestration
1479-
id, err := client.ScheduleNewOrchestration(ctx, "TaskExecutionId")
1479+
id, err := client.ScheduleNewOrchestration(ctx, "TaskExecutionID")
14801480
require.NoError(t, err)
14811481

14821482
metadata, err := client.WaitForOrchestrationCompletion(ctx, id)

0 commit comments

Comments
 (0)