Skip to content

trying to fix service #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshuaslate merged 1 commit into from
Jun 18, 2025
Merged

trying to fix service #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ go.work.sum

# env file
.env

# IDE
.idea/
2 changes: 1 addition & 1 deletion ext/o5/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runtimes:
subscriptions:
- name: "/o5.trigger.v1.topic.TriggerTopic"
routes:
- prefix: "/trigger/v1/"
- prefix: "/trigger/v1/*"
protocol: ROUTE_PROTOCOL_HTTP

containers:
Expand Down
2 changes: 1 addition & 1 deletion integration/trigger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestTickRequest(tt *testing.T) {
Action: &trigger_pb.ActionType{
Type: &trigger_pb.ActionType_Create_{
Create: &trigger_pb.ActionType_Create{
TriggerId: triggerID,
TriggerId: &triggerID,
AppName: "test",
TriggerName: "TestCron",
Cron: "CRON_TZ=America/New_York 0 7 * * *",
Expand Down
8 changes: 5 additions & 3 deletions integration/universe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,11 @@ func (uu *Universe) CreateTrigger(ctx context.Context, config triggerConfig) err
cron = config.Cron
}

triggerID := id62.New().String()
var generatedTriggerID = id62.New().String()
var triggerID = &generatedTriggerID

if config.TriggerID != "" {
triggerID = config.TriggerID
triggerID = &config.TriggerID
}

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

func (uu *Universe) mustTruncateSelfTable(ctx context.Context, t flowtest.Asserter) {
err := uu.db.Transact(ctx, utils.MutableTxOptions, func(ctx context.Context, tx sqrlx.Transaction) error {
_, err := tx.ExecRaw(ctx, "TRUNCATE TABLE selftick")
_, err := tx.ExecRaw(ctx, "truncate table selftick")
if err != nil {
t.Fatalf("failed to truncate self tick table: %v", err)
}
Expand Down
9 changes: 5 additions & 4 deletions service/trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,15 @@ func (w *TriggerWorker) TickRequest(ctx context.Context, req *trigger_tpb.TickRe
return nil, fmt.Errorf("invalid cron string: %v", validateCron(req.Action.GetCreate().Cron).Error())
}

triggerid := id62.NewString()
if req.GetAction().GetCreate().TriggerId != "" {
triggerid = req.GetAction().GetCreate().GetTriggerId()
newTriggerID := id62.NewString()
triggerIDFromAction := req.GetAction().GetCreate().TriggerId
if triggerIDFromAction != nil && *triggerIDFromAction != "" {
newTriggerID = *triggerIDFromAction
}

evt = &trigger_pb.TriggerPSMEventSpec{
Keys: &trigger_pb.TriggerKeys{
TriggerId: triggerid,
TriggerId: newTriggerID,
},
Cause: &psm_j5pb.Cause{
Type: &psm_j5pb.Cause_ExternalEvent{
Expand Down