fix deployment handlers and twinid in context

Author: Omarabdul3ziz

cmds/modules/api_gateway/main.go

@@ -106,7 +106,7 @@ func action(cli *cli.Context) error {
 	api.SetupRoutes(router)
 
 	go func() {
-		if err := apirpc.Run(port, msgBrokerCon, manager, redis); err != nil {
+		if err := apirpc.Run(ctx, port, msgBrokerCon, manager, redis); err != nil {
 			log.Error().Err(err).Msg("failed to run rpc server")
 			return
 		}

pkg/api/api.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"fmt"
 
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
@@ -23,7 +24,7 @@ type Api struct {
 	farmerID               uint32
 }
 
-func NewApi(manager substrate.Manager, client zbus.Client, msgBrokerCon string) (*Api, error) {
+func NewApi(ctx context.Context, manager substrate.Manager, client zbus.Client, msgBrokerCon string) (*Api, error) {
 	sub, err := manager.Substrate()
 	if err != nil {
 		return nil, err

pkg/api/deployment.go

@@ -4,30 +4,29 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	"github.com/threefoldtech/zos/pkg/gridtypes"
 )
 
-func (a *Api) DeploymentDeployHandler(ctx context.Context, deployment gridtypes.Deployment) error {
-	return a.provisionStub.CreateOrUpdate(ctx, peer.GetTwinID(ctx), deployment, false)
+func (a *Api) DeploymentDeployHandler(ctx context.Context, twinId uint32, deployment gridtypes.Deployment) error {
+	return a.provisionStub.CreateOrUpdate(ctx, twinId, deployment, false)
 }
 
-func (g *Api) DeploymentUpdateHandler(ctx context.Context, deployment gridtypes.Deployment) error {
-	return g.provisionStub.CreateOrUpdate(ctx, peer.GetTwinID(ctx), deployment, true)
+func (g *Api) DeploymentUpdateHandler(ctx context.Context, twinId uint32, deployment gridtypes.Deployment) error {
+	return g.provisionStub.CreateOrUpdate(ctx, twinId, deployment, true)
 }
 
 func (g *Api) DeploymentDeleteHandler(ctx context.Context) error {
 	return fmt.Errorf("deletion over the Api is disabled, please cancel your contract instead")
 }
 
-func (g *Api) DeploymentGetHandler(ctx context.Context, contractId uint64) (gridtypes.Deployment, error) {
-	return g.provisionStub.Get(ctx, peer.GetTwinID(ctx), contractId)
+func (g *Api) DeploymentGetHandler(ctx context.Context, twinId uint32, contractId uint64) (gridtypes.Deployment, error) {
+	return g.provisionStub.Get(ctx, twinId, contractId)
 }
 
-func (g *Api) DeploymentListHandler(ctx context.Context) ([]gridtypes.Deployment, error) {
-	return g.provisionStub.List(ctx, peer.GetTwinID(ctx))
+func (g *Api) DeploymentListHandler(ctx context.Context, twinId uint32) ([]gridtypes.Deployment, error) {
+	return g.provisionStub.List(ctx, twinId)
 }
 
-func (g *Api) DeploymentChangesHandler(ctx context.Context, contractId uint64) ([]gridtypes.Workload, error) {
-	return g.provisionStub.Changes(ctx, peer.GetTwinID(ctx), contractId)
+func (g *Api) DeploymentChangesHandler(ctx context.Context, twinId uint32, contractId uint64) ([]gridtypes.Workload, error) {
+	return g.provisionStub.Changes(ctx, twinId, contractId)
 }

pkg/api/network.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	"github.com/threefoldtech/zos/pkg"
 	"github.com/threefoldtech/zos/pkg/gridtypes"
 )
@@ -68,6 +67,6 @@ func (g *Api) NetworkListPublicIPsHandler(ctx context.Context) ([]string, error)
 	return g.provisionStub.ListPublicIPs(ctx)
 }
 
-func (g *Api) NetworkListPrivateIPsHandler(ctx context.Context, networkName gridtypes.Name) ([]string, error) {
-	return g.provisionStub.ListPrivateIPs(ctx, peer.GetTwinID(ctx), networkName)
+func (g *Api) NetworkListPrivateIPsHandler(ctx context.Context, twinId uint32, networkName gridtypes.Name) ([]string, error) {
+	return g.provisionStub.ListPrivateIPs(ctx, twinId, networkName)
 }

pkg/apirpc/readme.md

@@ -12,17 +12,3 @@ echo '{"method": "zos.SystemVersion", "params": [], "id": 1}' | nc -q 1 localhos
 {"jsonrpc":"2.0","result":{"zos":"0.0.0","zinit":"v0.2.11"},"id":1}
 ```
 
-
---- 
-- you can assign values directly to reply
-- you only can return/take an object or simple type, not arrays can be defined for both limit from tool and net/rpc
-- json tags is necessary, it is the way for convertion
-- returning error works
-
-todos:
-- sperate perf methods
-- don't leave any map or interface in the api
-- continue fixing spec/generator/service
-- maunally convert. less error-prone 
-- test all handlers carefully
-- reset/clean commit/description with breaking changes

pkg/apirpc/server.go

@@ -1,6 +1,7 @@
 package apirpc
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"net/rpc"
@@ -11,8 +12,8 @@ import (
 	"github.com/threefoldtech/zbus"
 )
 
-func Run(port uint, broker string, manager substrate.Manager, redis zbus.Client) error {
-	service, err := NewApiService(broker, manager, redis)
+func Run(ctx context.Context, port uint, broker string, manager substrate.Manager, redis zbus.Client) error {
+	service, err := NewApiService(ctx, broker, manager, redis)
 	if err != nil {
 		return fmt.Errorf("failed to create api service: %w", err)
 	}
@@ -33,7 +34,29 @@ func Run(port uint, broker string, manager substrate.Manager, redis zbus.Client)
 			log.Error().Err(err).Send()
 			continue
 		}
-		log.Info().Msg("recieved")
+
+		SetTwinId(ctx, GetTwinFromIp(conn.RemoteAddr().String()))
+		log.Info().Uint32("twinId", GetTwinID(ctx)).Msg("got rpc request")
 		go jsonrpc.ServeConn(conn)
 	}
 }
+
+type twinId struct{}
+
+func GetTwinFromIp(ip string) uint32 {
+	// placeholder, waiting for implementation in mycelium
+	return 29
+}
+
+func SetTwinId(ctx context.Context, id uint32) context.Context {
+	return context.WithValue(ctx, twinId{}, id)
+}
+
+func GetTwinID(ctx context.Context) uint32 {
+	twin, ok := ctx.Value(twinId{}).(uint32)
+	if !ok {
+		panic("failed to load twin id from context")
+	}
+
+	return twin
+}