Skip to content
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

Moves CodeGen to shared location #486

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Moves CodeGen to shared location #486

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
75 changes: 23 additions & 52 deletions Taskfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,61 +25,32 @@ tasks:
- protoc --proto_path=. --go_out=. --go_opt=paths=source_relative *.proto

all-code-gen:
deps: [gen-schema, proto]
deps: [gen-schema-api, proto]

gen-schema:
deps: [gen-schema-nodecontrol, gen-schema-agent]

gen-schema-agent:
dir: api/agent
gen-schema-api:
dir: api
cmds:
- go-jsonschema
--package=gen --tags json
--schema-package=https://github.com/synadia-io/nex/api/agent/register-agent-request=github.com/synadia-io/nex/agentapi/go/gen
--schema-output=https://github.com/synadia-io/nex/api/agent/register-agent-request=go/gen/register_agent_request.go
--schema-package=https://github.com/synadia-io/nex/api/agent/start-workload-request=github.com/synadia-io/nex/api/agent/go/gen
--schema-output=https://github.com/synadia-io/nex/api/agent/start-workload-request=go/gen/start_workload_request.go
--schema-package=https://github.com/synadia-io/nex/api/agent/stop-workload-request=github.com/synadia-io/nex/agentapi/go/gen
--schema-output=https://github.com/synadia-io/nex/api/agent/stop-workload-request=go/gen/stop_workload_request.go
*.json

gen-schema-nodecontrol:
dir: api/nodecontrol
cmds:
- go-jsonschema
--package=gen --tags json
--schema-package=io.nats.nex.v2.start_workload_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.start_workload_response=gen/start_workload_response.go
--schema-package=io.nats.nex.v2.stop_workload_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.stop_workload_response=gen/stop_workload_response.go
--schema-package=io.nats.nex.v2.stop_workload_request=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.stop_workload_request=gen/stop_workload_request.go
--schema-package=io.nats.nex.v2.node_info_request=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.node_info_request=gen/node_info_request.go
--schema-package=io.nats.nex.v2.node_info_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.node_info_response=gen/node_info_response.go
--schema-package=io.nats.nex.v2.lameduck_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.lameduck_response=gen/lameduck_response.go
--schema-package=io.nats.nex.v2.lameduck_request=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.lameduck_request=gen/lameduck_request.go
--schema-package=io.nats.nex.v2.workload_ping_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.workload_ping_response=gen/workload_ping_response.go
--schema-package=io.nats.nex.v2.agent_ping_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.agent_ping_response=gen/agent_ping_response.go
--schema-package=io.nats.nex.v2.node_ping_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.node_ping_response=gen/node_ping_response.go
--schema-package=io.nats.nex.v2.auction_request=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.auction_request=gen/auction_request.go
--schema-package=io.nats.nex.v2.auction_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.auction_response=gen/auction_response.go
--schema-package=io.nats.nex.v2.start_workload_request=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.start_workload_request=gen/start_workload_request.go
--schema-package=io.nats.nex.v2.clone_workload_request=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.clone_workload_request=gen/clone_workload_request.go
--schema-package=io.nats.nex.v2.clone_workload_response=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=io.nats.nex.v2.clone_workload_response=gen/clone_workload_response.go
--schema-package=shared=github.com/synadia-io/nex/api/nodecontrol/gen
--schema-output=shared=gen/shared.go
--package api --tags json
--schema-output=io.nats.nex.v2.agent_register_request=go/agent.go
--schema-output=io.nats.nex.v2.agent_register_response=go/agent.go
--schema-output=io.nats.nex.v2.agent_heartbeat=go/agent.go
--schema-output=io.nats.nex.v2.start_workload_request=go/shared.go
--schema-output=io.nats.nex.v2.start_workload_response=go/shared.go
--schema-output=io.nats.nex.v2.stop_workload_request=go/shared.go
--schema-output=io.nats.nex.v2.stop_workload_response=go/shared.go
--schema-output=io.nats.nex.v2.lameduck_request=go/shared.go
--schema-output=io.nats.nex.v2.lameduck_response=go/shared.go
--schema-output=io.nats.nex.v2.agent_ping_response=go/shared.go
--schema-output=io.nats.nex.v2.workload_ping_response=go/shared.go
--schema-output=shared=go/shared.go
--schema-output=io.nats.nex.v2.node_info_request=go/node.go
--schema-output=io.nats.nex.v2.node_info_response=go/node.go
--schema-output=io.nats.nex.v2.node_ping_response=go/node.go
--schema-output=io.nats.nex.v2.auction_request=go/node.go
--schema-output=io.nats.nex.v2.auction_response=go/node.go
--schema-output=io.nats.nex.v2.clone_workload_request=go/node.go
--schema-output=io.nats.nex.v2.clone_workload_response=go/node.go
*.json

nex:
Expand Down
0 api/nodecontrol/agent-ping-response.json → api/agent-ping-response.json
View file
Open in desktop
File renamed without changes.
75 changes: 0 additions & 75 deletions api/agent/go/gen/start_workload_request.go
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions api/agent/go/gen/stop_workload_request.go
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions api/agent/start-workload-request.json
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions api/agent/stop-workload-request.json
View file
Open in desktop

This file was deleted.

0 api/nodecontrol/auction-request.json → api/auction-request.json
View file
Open in desktop
File renamed without changes.
0 api/nodecontrol/auction-response.json → api/auction-response.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions api/nodecontrol/client.go → api/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nodecontrol
package api

import (
"encoding/json"
Expand All @@ -7,7 +7,7 @@ import (

"github.com/nats-io/nats.go"
"github.com/nats-io/nuid"
nodegen "github.com/synadia-io/nex/api/nodecontrol/gen"
nodegen "github.com/synadia-io/nex/api/go"
"github.com/synadia-io/nex/models"
)

Expand Down
12 changes: 6 additions & 6 deletions api/nodecontrol/client_test.go → api/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nodecontrol
package api

import (
"bytes"
Expand All @@ -17,7 +17,7 @@ import (
"github.com/nats-io/nats.go"
"github.com/nats-io/nkeys"

"github.com/synadia-io/nex/api/nodecontrol/gen"
gen "github.com/synadia-io/nex/api/go"
"github.com/synadia-io/nex/models"
"github.com/synadia-io/nex/test"
)
Expand Down Expand Up @@ -181,7 +181,7 @@ func TestAuctionDeployAndFindWorkload(t *testing.T) {
encEnv, err := tAKey.Seal(envB, auctionResp[0].TargetXkey)
be.NilErr(t, err)

binPath := test.BuildTestBinary(t, "../../test/testdata/forever/main.go", workingDir)
binPath := test.BuildTestBinary(t, "../test/testdata/forever/main.go", workingDir)

resp, err := control.AuctionDeployWorkload(models.NodeSystemNamespace, auctionResp[0].BidderId, gen.StartWorkloadRequestJson{
Description: "Test Workload",
Expand Down Expand Up @@ -253,7 +253,7 @@ func TestDirectDeployAndListWorkloads(t *testing.T) {
encEnv, err := tAKey.Seal(envB, test.Node1XkeyPublicKey)
be.NilErr(t, err)

binPath := test.BuildTestBinary(t, "../../test/testdata/forever/main.go", workingDir)
binPath := test.BuildTestBinary(t, "../test/testdata/forever/main.go", workingDir)

resp, err := control.DeployWorkload(models.NodeSystemNamespace, test.Node1ServerPublicKey, gen.StartWorkloadRequestJson{
Description: "Test Workload",
Expand Down Expand Up @@ -326,7 +326,7 @@ func TestUndeployWorkload(t *testing.T) {
encEnv, err := tAKey.Seal(envB, test.Node1XkeyPublicKey)
be.NilErr(t, err)

binPath := test.BuildTestBinary(t, "../../test/testdata/forever/main.go", workingDir)
binPath := test.BuildTestBinary(t, "../test/testdata/forever/main.go", workingDir)

resp, err := control.DeployWorkload(models.NodeSystemNamespace, test.Node1ServerPublicKey, gen.StartWorkloadRequestJson{
Description: "Test Workload",
Expand Down Expand Up @@ -485,7 +485,7 @@ func TestCopyWorkload(t *testing.T) {
encEnv, err := tAKey.Seal(envB, test.Node1XkeyPublicKey)
be.NilErr(t, err)

binPath := test.BuildTestBinary(t, "../../test/testdata/forever/main.go", workingDir)
binPath := test.BuildTestBinary(t, "../test/testdata/forever/main.go", workingDir)

resp, err := control.DeployWorkload(models.NodeSystemNamespace, test.Node1ServerPublicKey, gen.StartWorkloadRequestJson{
Description: "Test Workload",
Expand Down
0 api/nodecontrol/clone-workload-request.json → api/clone-workload-request.json
View file
Open in desktop
File renamed without changes.
0 api/nodecontrol/clone-workload-response.json → api/clone-workload-response.json
View file
Open in desktop
File renamed without changes.
6 changes: 5 additions & 1 deletion api/agent/go/gen/register_agent_request.go → api/go/agent.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading