From 9a96817a8886c9659cb1a229d18afc2029b5a20b Mon Sep 17 00:00:00 2001 From: Shivanshu Raj Shrivastava Date: Tue, 29 Apr 2025 17:19:29 +0530 Subject: [PATCH] chore: fix naming convention Signed-off-by: Shivanshu Raj Shrivastava --- .../impltracefunnel/handler_test.go | 4 +- pkg/modules/tracefunnel/utils.go | 4 +- pkg/modules/tracefunnel/utils_test.go | 38 +++++++++---------- pkg/types/tracefunnel/tracefunnel.go | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkg/modules/tracefunnel/impltracefunnel/handler_test.go b/pkg/modules/tracefunnel/impltracefunnel/handler_test.go index c9364a5429..fa113521b8 100644 --- a/pkg/modules/tracefunnel/impltracefunnel/handler_test.go +++ b/pkg/modules/tracefunnel/impltracefunnel/handler_test.go @@ -125,14 +125,14 @@ func TestHandler_Update(t *testing.T) { Name: "updated-funnel", Steps: []traceFunnels.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", Order: 1, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", diff --git a/pkg/modules/tracefunnel/utils.go b/pkg/modules/tracefunnel/utils.go index 2163634406..042540bc24 100644 --- a/pkg/modules/tracefunnel/utils.go +++ b/pkg/modules/tracefunnel/utils.go @@ -115,8 +115,8 @@ func ProcessFunnelSteps(steps []tracefunnel.FunnelStep) ([]tracefunnel.FunnelSte if steps[i].Order < 1 { steps[i].Order = int64(i + 1) } - if steps[i].Id.IsZero() { - steps[i].Id = valuer.GenerateUUID() + if steps[i].ID.IsZero() { + steps[i].ID = valuer.GenerateUUID() } } diff --git a/pkg/modules/tracefunnel/utils_test.go b/pkg/modules/tracefunnel/utils_test.go index 2f7ed891b1..17556b8a73 100644 --- a/pkg/modules/tracefunnel/utils_test.go +++ b/pkg/modules/tracefunnel/utils_test.go @@ -98,14 +98,14 @@ func TestValidateFunnelSteps(t *testing.T) { name: "valid steps", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", Order: 1, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", @@ -118,7 +118,7 @@ func TestValidateFunnelSteps(t *testing.T) { name: "too few steps", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", @@ -131,13 +131,13 @@ func TestValidateFunnelSteps(t *testing.T) { name: "missing service name", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", SpanName: "test-span", Order: 1, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", @@ -150,13 +150,13 @@ func TestValidateFunnelSteps(t *testing.T) { name: "missing span name", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", Order: 1, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", @@ -169,14 +169,14 @@ func TestValidateFunnelSteps(t *testing.T) { name: "negative order", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", Order: -1, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", @@ -209,14 +209,14 @@ func TestNormalizeFunnelSteps(t *testing.T) { name: "already normalized steps", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", Order: 1, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", @@ -242,14 +242,14 @@ func TestNormalizeFunnelSteps(t *testing.T) { name: "unordered steps", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", Order: 2, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", @@ -275,21 +275,21 @@ func TestNormalizeFunnelSteps(t *testing.T) { name: "steps with gaps in order", steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", Order: 1, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 3", ServiceName: "test-service", SpanName: "test-span-3", Order: 3, }, { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 2", ServiceName: "test-service", SpanName: "test-span-2", @@ -457,7 +457,7 @@ func TestConstructFunnelResponse(t *testing.T) { }, Steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", @@ -509,7 +509,7 @@ func TestConstructFunnelResponse(t *testing.T) { }, Steps: []tracefunnel.FunnelStep{ { - Id: valuer.GenerateUUID(), + ID: valuer.GenerateUUID(), Name: "Step 1", ServiceName: "test-service", SpanName: "test-span", @@ -644,7 +644,7 @@ func TestProcessFunnelSteps(t *testing.T) { // Verify IDs are generated for _, step := range result { - assert.False(t, step.Id.IsZero()) + assert.False(t, step.ID.IsZero()) } // Verify orders are normalized diff --git a/pkg/types/tracefunnel/tracefunnel.go b/pkg/types/tracefunnel/tracefunnel.go index 782fce7c33..d1ffc81c20 100644 --- a/pkg/types/tracefunnel/tracefunnel.go +++ b/pkg/types/tracefunnel/tracefunnel.go @@ -27,7 +27,7 @@ type Funnel struct { } type FunnelStep struct { - Id valuer.UUID `json:"id,omitempty"` + ID valuer.UUID `json:"id,omitempty"` Name string `json:"name,omitempty"` // step name Description string `json:"description,omitempty"` // step description Order int64 `json:"step_order"`