Skip to content

Commit 5b86427

Browse files
committed
trying to fix service
1 parent 341f0ca commit 5b86427

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ go.work.sum
2323

2424
# env file
2525
.env
26+
27+
# IDE
28+
.idea/

ext/o5/app.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runtimes:
3030
subscriptions:
3131
- name: "/o5.trigger.v1.topic.TriggerTopic"
3232
routes:
33-
- prefix: "/trigger/v1/"
33+
- prefix: "/trigger/v1/*"
3434
protocol: ROUTE_PROTOCOL_HTTP
3535

3636
containers:

integration/trigger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestTickRequest(tt *testing.T) {
3434
Action: &trigger_pb.ActionType{
3535
Type: &trigger_pb.ActionType_Create_{
3636
Create: &trigger_pb.ActionType_Create{
37-
TriggerId: triggerID,
37+
TriggerId: &triggerID,
3838
AppName: "test",
3939
TriggerName: "TestCron",
4040
Cron: "CRON_TZ=America/New_York 0 7 * * *",

integration/universe.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,11 @@ func (uu *Universe) CreateTrigger(ctx context.Context, config triggerConfig) err
130130
cron = config.Cron
131131
}
132132

133-
triggerID := id62.New().String()
133+
var generatedTriggerID = id62.New().String()
134+
var triggerID = &generatedTriggerID
135+
134136
if config.TriggerID != "" {
135-
triggerID = config.TriggerID
137+
triggerID = &config.TriggerID
136138
}
137139

138140
req := &trigger_tpb.TickRequestMessage{
@@ -234,7 +236,7 @@ func (uu *Universe) ArchiveTrigger(ctx context.Context, triggerID string) error
234236

235237
func (uu *Universe) mustTruncateSelfTable(ctx context.Context, t flowtest.Asserter) {
236238
err := uu.db.Transact(ctx, utils.MutableTxOptions, func(ctx context.Context, tx sqrlx.Transaction) error {
237-
_, err := tx.ExecRaw(ctx, "TRUNCATE TABLE selftick")
239+
_, err := tx.ExecRaw(ctx, "truncate table selftick")
238240
if err != nil {
239241
t.Fatalf("failed to truncate self tick table: %v", err)
240242
}

service/trigger.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,15 @@ func (w *TriggerWorker) TickRequest(ctx context.Context, req *trigger_tpb.TickRe
7777
return nil, fmt.Errorf("invalid cron string: %v", validateCron(req.Action.GetCreate().Cron).Error())
7878
}
7979

80-
triggerid := id62.NewString()
81-
if req.GetAction().GetCreate().TriggerId != "" {
82-
triggerid = req.GetAction().GetCreate().GetTriggerId()
80+
newTriggerID := id62.NewString()
81+
triggerIDFromAction := req.GetAction().GetCreate().TriggerId
82+
if triggerIDFromAction != nil && *triggerIDFromAction != "" {
83+
newTriggerID = *triggerIDFromAction
8384
}
8485

8586
evt = &trigger_pb.TriggerPSMEventSpec{
8687
Keys: &trigger_pb.TriggerKeys{
87-
TriggerId: triggerid,
88+
TriggerId: newTriggerID,
8889
},
8990
Cause: &psm_j5pb.Cause{
9091
Type: &psm_j5pb.Cause_ExternalEvent{

0 commit comments

Comments
 (0)