Add docs for internal cluster API at /v1/swagger/index.html

Makefile

@@ -23,7 +23,8 @@ build_linux:
 
 ## swagger: Update swagger API documentation (requires github.com/swaggo/swag)
 swagger:
-	swag init -g http/server.go
+	swag init -g http/server.go -o ./docs --exclude ./cluster
+	swag init -g cluster/api.go -o ./cluster/docs --exclude ./http --instanceName ClusterAPI
 
 ## gqlgen: Regenerate GraphQL server from schema
 gqlgen:

cluster/client/client.go

@@ -19,23 +19,16 @@ type JoinRequest struct {
 	RaftAddress string `json:"raft_address"`
 }
 
-type LeaveRequest struct {
-	ID string `json:"id"`
-}
-
 type AddProcessRequest struct {
 	Config app.Config `json:"config"`
 }
 
 type UpdateProcessRequest struct {
-	ID     app.ProcessID `json:"id"`
+	Config app.Config `json:"config"`
-	Config app.Config    `json:"config"`
 }
 
 type SetProcessMetadataRequest struct {
-	ID       app.ProcessID `json:"id"`
+	Metadata interface{} `json:"metadata"`
-	Key      string        `json:"key"`
-	Metadata interface{}   `json:"metadata"`
 }
 
 type AddIdentityRequest struct {
@@ -43,12 +36,10 @@ type AddIdentityRequest struct {
 }
 
 type UpdateIdentityRequest struct {
-	Name     string           `json:"name"`
 	Identity iamidentity.User `json:"identity"`
 }
 
 type SetPoliciesRequest struct {
-	Name     string             `json:"name"`
 	Policies []iamaccess.Policy `json:"policies"`
 }
 
@@ -106,24 +97,24 @@ func (c *APIClient) RemoveProcess(origin string, id app.ProcessID) error {
 	return err
 }
 
-func (c *APIClient) UpdateProcess(origin string, r UpdateProcessRequest) error {
+func (c *APIClient) UpdateProcess(origin string, id app.ProcessID, r UpdateProcessRequest) error {
 	data, err := json.Marshal(r)
 	if err != nil {
 		return err
 	}
 
-	_, err = c.call(http.MethodPut, "/process/"+r.ID.ID+"?domain="+r.ID.Domain, "application/json", bytes.NewReader(data), origin)
+	_, err = c.call(http.MethodPut, "/process/"+id.ID+"?domain="+id.Domain, "application/json", bytes.NewReader(data), origin)
 
 	return err
 }
 
-func (c *APIClient) SetProcessMetadata(origin string, r SetProcessMetadataRequest) error {
+func (c *APIClient) SetProcessMetadata(origin string, id app.ProcessID, key string, r SetProcessMetadataRequest) error {
 	data, err := json.Marshal(r)
 	if err != nil {
 		return err
 	}
 
-	_, err = c.call(http.MethodPut, "/process/"+r.ID.ID+"/metadata/"+r.Key+"?domain="+r.ID.Domain, "application/json", bytes.NewReader(data), origin)
+	_, err = c.call(http.MethodPut, "/process/"+id.ID+"/metadata/"+key+"?domain="+id.Domain, "application/json", bytes.NewReader(data), origin)
 
 	return err
 }

cluster/cluster.go

@@ -25,26 +25,6 @@ import (
 	"github.com/datarhei/core/v16/restream/app"
 )
 
-/*
-	/api/v3:
-		GET /cluster/store/node - list all nodes that are stored in the FSM - Cluster.Store.ListNodes()
-		POST /cluster/store/node - add a node to the FSM - Cluster.Store.AddNode()
-		DELETE /cluster/store/node/:id - remove a node from the FSM - Cluster.Store.RemoveNode()
-
-		GET /cluster/store/process - list all process configs that are stored in the FSM - Cluster.Store.ListProcesses()
-		POST /cluster/store/process - add a process config to the FSM - Cluster.Store.AddProcess()
-		PUT /cluster/store/process/:id - update a process config in the FSM - Cluster.Store.UpdateProcess()
-		DELETE /cluster/store/process/:id - remove a process config from the FSM - Cluster.Store.RemoveProcess()
-
-		** for the processes, the leader will decide where to actually run them. the process configs will
-		also be added to the regular process DB of each core.
-
-		POST /cluster/join - join the cluster - Cluster.Join()
-		DELETE /cluster/:id - leave the cluster - Cluster.Leave()
-
-		** all these endpoints will forward the request to the leader.
-*/
-
 type Cluster interface {
 	// Address returns the raft address of this node
 	Address() string

cluster/forwarder/forwarder.go

@@ -161,7 +161,6 @@ func (f *forwarder) UpdateProcess(origin string, id app.ProcessID, config *app.C
 	}
 
 	r := apiclient.UpdateProcessRequest{
-		ID:     id,
 		Config: *config,
 	}
 
@@ -169,7 +168,7 @@ func (f *forwarder) UpdateProcess(origin string, id app.ProcessID, config *app.C
 	client := f.client
 	f.lock.RUnlock()
 
-	return client.UpdateProcess(origin, r)
+	return client.UpdateProcess(origin, id, r)
 }
 
 func (f *forwarder) SetProcessMetadata(origin string, id app.ProcessID, key string, data interface{}) error {
@@ -178,8 +177,6 @@ func (f *forwarder) SetProcessMetadata(origin string, id app.ProcessID, key stri
 	}
 
 	r := apiclient.SetProcessMetadataRequest{
-		ID:       id,
-		Key:      key,
 		Metadata: data,
 	}
 
@@ -187,7 +184,7 @@ func (f *forwarder) SetProcessMetadata(origin string, id app.ProcessID, key stri
 	client := f.client
 	f.lock.RUnlock()
 
-	return client.SetProcessMetadata(origin, r)
+	return client.SetProcessMetadata(origin, id, key, r)
 }
 
 func (f *forwarder) RemoveProcess(origin string, id app.ProcessID) error {
@@ -224,7 +221,6 @@ func (f *forwarder) UpdateIdentity(origin, name string, identity iamidentity.Use
 	}
 
 	r := apiclient.UpdateIdentityRequest{
-		Name:     name,
 		Identity: identity,
 	}
 
@@ -241,7 +237,6 @@ func (f *forwarder) SetPolicies(origin, name string, policies []iamaccess.Policy
 	}
 
 	r := apiclient.SetPoliciesRequest{
-		Name:     name,
 		Policies: policies,
 	}