Skip to content

define httppaths for the command methods #10

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
energyvault462 merged 2 commits into from
Jun 20, 2025
Merged

define httppaths for the command methods #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d13438
define httppaths for the command methods
energyvault462 Jun 20, 2025
fd072db
swap action and id per request
energyvault462 Jun 20, 2025
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
398 changes: 198 additions & 200 deletions gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

332 changes: 168 additions & 164 deletions gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

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
2 changes: 1 addition & 1 deletion integration/universe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (uu *Universe) CreateTrigger(ctx context.Context, config triggerConfig) err
Action: &trigger_pb.ActionType{
Type: &trigger_pb.ActionType_Create_{
Create: &trigger_pb.ActionType_Create{
TriggerId: triggerID,
TriggerId: *triggerID,
TriggerName: triggerName,
AppName: appName,
Cron: cron,
Expand Down
6 changes: 3 additions & 3 deletions proto/o5/trigger/v1/service/trigger.p.j5s.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ service TriggerCommandService {

rpc PauseTrigger(PauseTriggerRequest) returns (PauseTriggerResponse) {
option (google.api.http) = {
post: "/trigger/v1/trigger/c"
post: "/trigger/v1/trigger/c/{trigger_id}/pause"
body: "*"
};
}

rpc ResumeTrigger(ResumeTriggerRequest) returns (ResumeTriggerResponse) {
option (google.api.http) = {
post: "/trigger/v1/trigger/c"
post: "/trigger/v1/trigger/c/{trigger_id}/resume"
body: "*"
};
}

rpc ManuallyTrigger(ManuallyTriggerRequest) returns (ManuallyTriggerResponse) {
option (google.api.http) = {
post: "/trigger/v1/trigger/c"
post: "/trigger/v1/trigger/c/{trigger_id}/manual"
body: "*"
};
}
Expand Down
6 changes: 3 additions & 3 deletions proto/o5/trigger/v1/trigger.j5s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ entity Trigger {
method PauseTrigger {
| Pause a trigger
httpMethod = "POST"
httpPath = ""
httpPath = "/:triggerID/pause"

request {
field triggerID key:id62 {
Expand All @@ -102,7 +102,7 @@ entity Trigger {
method ResumeTrigger {
| Resume a paused trigger
httpMethod = "POST"
httpPath = ""
httpPath = "/:triggerID/resume"

request {
field triggerID key:id62 {
Expand All @@ -121,7 +121,7 @@ entity Trigger {
| Manually trigger for a time

httpMethod = "POST"
httpPath = ""
httpPath = "/:triggerID/manual"

request {
field triggerID key:id62 {
Expand Down
4 changes: 2 additions & 2 deletions service/trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ func (w *TriggerWorker) TickRequest(ctx context.Context, req *trigger_tpb.TickRe

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

evt = &trigger_pb.TriggerPSMEventSpec{
Expand Down