feat: Add node identity

cli/cli.go

@@ -116,13 +116,18 @@ func NewDefraCommand() *cobra.Command {
 		MakeCollectionPatchCommand(),
 	)
 
+	nodeIdentity := MakeNodeIdentityCommand()
+	nodeIdentity.AddCommand(
+		MakeNodeIdentityGetCommand(),
+		MakeNodeIdentityAssignCommand(),
+	)
+
 	client := MakeClientCommand()
 	client.AddCommand(
 		MakePurgeCommand(),
 		MakeDumpCommand(),
 		MakeRequestCommand(),
-		MakeNodeIdentityCommand(),
-		MakeAssignNodeIdentityCommand(),
+		nodeIdentity,
 		schema,
 		acp,
 		view,

cli/node_identity.go

@@ -17,30 +17,9 @@ import (
 func MakeNodeIdentityCommand() *cobra.Command {
 	var cmd = &cobra.Command{
 		Use:   "node-identity",
-		Short: "Get the information public about the node's identity",
-		Long: `Get the information public about the node's identity.
-
-Node uses the identity to be able to exchange encryption keys with other nodes.
-
-A public identity contains:
-- A compressed 33-byte secp256k1 public key in HEX format.
-- A "did:key" generated from the public key.
-`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			db := mustGetContextDB(cmd)
-			identity, err := db.GetNodeIdentity(cmd.Context())
-			if err != nil {
-				return err
-			}
-
-			if identity.HasValue() {
-				return writeJSON(cmd, identity.Value())
-			}
-
-			out := cmd.OutOrStdout()
-			_, err = out.Write([]byte("Node has no identity assigned to it\n"))
-			return err
-		},
+		Short: "Manage DefraDB node's identity",
+		Long:  `Manage DefraDB node's identity`,
 	}
+
 	return cmd
 }

cli/assign_node_identity.go → cli/node_identity_assign.go

@@ -22,31 +22,31 @@
 	acpIdentity "github.com/sourcenetwork/defradb/acp/identity"
 )
 
-func MakeAssignNodeIdentityCommand() *cobra.Command {
+func MakeNodeIdentityAssignCommand() *cobra.Command {
 	var cmd = &cobra.Command{
-		Use:   "assign-node-identity [identity]",
+		Use:   "assign [identity]",
 		Short: "Assign an identity to the node",
 		Long: `Assign an identity to the node.
 
 Identity is hex-formatted private key.
 Node uses the identity to be able to exchange encryption keys with other nodes.
 
 Example to assign an identity to the node:
-  defradb client assign-node-identity 028d53f37a19afb9a0dbc5b4be30c65731479ee8cfa0c9bc8f8bf198cc3c075f 
+  defradb client node-identity assign 028d53f37a19afb9a0dbc5b4be30c65731479ee8cfa0c9bc8f8bf198cc3c075f 
 
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
 				return fmt.Errorf("only 1 [identity] argument is allowed")
 			}
 
 			cfg := mustGetContextConfig(cmd)
 
 			db := mustGetContextDB(cmd)
 			data, err := hex.DecodeString(args[0])
 			if err != nil {
 				return err
 			}
 			privKey := secp256k1.PrivKeyFromBytes(data)
 			identity, err := acpIdentity.FromPrivateKey(
 				privKey,
@@ -56,8 +56,8 @@
 				false,
 			)
 			if err != nil {
 				return err
 			}
 			return db.AssignNodeIdentity(cmd.Context(), identity)
 		},
 	}

cli/node_identity_get.go

@@ -0,0 +1,50 @@
+// Copyright 2024 Democratized Data Foundation
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+package cli
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func MakeNodeIdentityGetCommand() *cobra.Command {
+	var cmd = &cobra.Command{
+		Use:   "get",
+		Short: "Get the information public about the node's identity",
+		Long: `Get the information public about the node's identity.
+
+Node uses the identity to be able to exchange encryption keys with other nodes.
+
+A public identity contains:
+- A compressed 33-byte secp256k1 public key in HEX format.
+- A "did:key" generated from the public key.
+
+Example to get the identity of the node:
+  defradb client node-identity get 
+
+`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			db := mustGetContextDB(cmd)
+			identity, err := db.GetNodeIdentity(cmd.Context())
+			if err != nil {
+				return err
+			}
+
+			if identity.HasValue() {
+				return writeJSON(cmd, identity.Value())
+			}
+
+			out := cmd.OutOrStdout()
+			_, err = out.Write([]byte("Node has no identity assigned to it\n"))
+			return err
+		},
+	}
+	return cmd
+}

docs/website/references/cli/defradb_client.md

@@ -39,12 +39,11 @@ Execute queries, add schema types, obtain node info, etc.
 
 * [defradb](defradb.md)	 - DefraDB Edge Database
 * [defradb client acp](defradb_client_acp.md)	 - Interact with the access control system of a DefraDB node
-* [defradb client assign-node-identity](defradb_client_assign-node-identity.md)	 - Assign an identity to the node
 * [defradb client backup](defradb_client_backup.md)	 - Interact with the backup utility
 * [defradb client collection](defradb_client_collection.md)	 - Interact with a collection.
 * [defradb client dump](defradb_client_dump.md)	 - Dump the contents of DefraDB node-side
 * [defradb client index](defradb_client_index.md)	 - Manage collections' indexes of a running DefraDB instance
-* [defradb client node-identity](defradb_client_node-identity.md)	 - Get the information public about the node's identity
+* [defradb client node-identity](defradb_client_node-identity.md)	 - Manage DefraDB node's identity
 * [defradb client p2p](defradb_client_p2p.md)	 - Interact with the DefraDB P2P system
 * [defradb client purge](defradb_client_purge.md)	 - Delete all persisted data and restart
 * [defradb client query](defradb_client_query.md)	 - Send a DefraDB GraphQL query request

docs/website/references/cli/defradb_client_node-identity.md

@@ -1,21 +1,10 @@
 ## defradb client node-identity
 
-Get the information public about the node's identity
+Manage DefraDB node's identity
 
 ### Synopsis
 
-Get the information public about the node's identity.
-
-Node uses the identity to be able to exchange encryption keys with other nodes.
-
-A public identity contains:
-- A compressed 33-byte secp256k1 public key in HEX format.
-- A "did:key" generated from the public key.
-
-
-```
-defradb client node-identity [flags]
-```
+Manage DefraDB node's identity
 
 ### Options
 
@@ -48,4 +37,6 @@ defradb client node-identity [flags]
 ### SEE ALSO
 
 * [defradb client](defradb_client.md)	 - Interact with a DefraDB node
+* [defradb client node-identity assign](defradb_client_node-identity_assign.md)	 - Assign an identity to the node
+* [defradb client node-identity get](defradb_client_node-identity_get.md)	 - Get the information public about the node's identity
 

docs/website/references/cli/defradb_client_assign-node-identity.md → docs/website/references/cli/defradb_client_node-identity_assign.md

@@ -1,4 +1,4 @@
-## defradb client assign-node-identity
+## defradb client node-identity assign
 
 Assign an identity to the node
 
@@ -10,18 +10,18 @@ Identity is hex-formatted private key.
 Node uses the identity to be able to exchange encryption keys with other nodes.
 
 Example to assign an identity to the node:
-  defradb client assign-node-identity 028d53f37a19afb9a0dbc5b4be30c65731479ee8cfa0c9bc8f8bf198cc3c075f 
+  defradb client node-identity assign 028d53f37a19afb9a0dbc5b4be30c65731479ee8cfa0c9bc8f8bf198cc3c075f 
 
 
 
 ```
-defradb client assign-node-identity [identity] [flags]
+defradb client node-identity assign [identity] [flags]
 ```
 
 ### Options
 
 ```
-  -h, --help   help for assign-node-identity
+  -h, --help   help for assign
 ```
 
 ### Options inherited from parent commands
@@ -48,5 +48,5 @@ defradb client assign-node-identity [identity] [flags]
 
 ### SEE ALSO
 
-* [defradb client](defradb_client.md)	 - Interact with a DefraDB node
+* [defradb client node-identity](defradb_client_node-identity.md)	 - Manage DefraDB node's identity
 

docs/website/references/cli/defradb_client_node-identity_get.md

@@ -0,0 +1,55 @@
+## defradb client node-identity get
+
+Get the information public about the node's identity
+
+### Synopsis
+
+Get the information public about the node's identity.
+
+Node uses the identity to be able to exchange encryption keys with other nodes.
+
+A public identity contains:
+- A compressed 33-byte secp256k1 public key in HEX format.
+- A "did:key" generated from the public key.
+
+Example to get the identity of the node:
+  defradb client node-identity get 
+
+
+
+```
+defradb client node-identity get [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for get
+```
+
+### Options inherited from parent commands
+
+```
+  -i, --identity string             Hex formatted private key used to authenticate with ACP
+      --keyring-backend string      Keyring backend to use. Options are file or system (default "file")
+      --keyring-namespace string    Service name to use when using the system backend (default "defradb")
+      --keyring-path string         Path to store encrypted keys when using the file backend (default "keys")
+      --log-format string           Log format to use. Options are text or json (default "text")
+      --log-level string            Log level to use. Options are debug, info, error, fatal (default "info")
+      --log-output string           Log output path. Options are stderr or stdout. (default "stderr")
+      --log-overrides string        Logger config overrides. Format <name>,<key>=<val>,...;<name>,...
+      --log-source                  Include source location in logs
+      --log-stacktrace              Include stacktrace in error and fatal logs
+      --no-keyring                  Disable the keyring and generate ephemeral keys
+      --no-log-color                Disable colored log output
+      --rootdir string              Directory for persistent data (default: $HOME/.defradb)
+      --secret-file string          Path to the file containing secrets (default ".env")
+      --source-hub-address string   The SourceHub address authorized by the client to make SourceHub transactions on behalf of the actor
+      --tx uint                     Transaction ID
+      --url string                  URL of HTTP endpoint to listen on or connect to (default "127.0.0.1:9181")
+```
+
+### SEE ALSO
+
+* [defradb client node-identity](defradb_client_node-identity.md)	 - Manage DefraDB node's identity
+

docs/website/references/http/openapi.json

@@ -1688,13 +1688,20 @@
                 ]
             }
         },
-        "/node/assign-identity": {
-            "post": {
-                "description": "Assign node's identity",
-                "operationId": "assign_node_identity",
+        "/node/identity": {
+            "get": {
+                "description": "Get node's public identity",
+                "operationId": "node_identity",
                 "responses": {
                     "200": {
-                        "$ref": "#/components/responses/success"
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/identity"
+                                }
+                            }
+                        },
+                        "description": "Identity"
                     },
                     "400": {
                         "$ref": "#/components/responses/error"
@@ -1707,22 +1714,13 @@
                     "node",
                     "identity"
                 ]
-            }
-        },
-        "/node/identity": {
-            "get": {
-                "description": "Get node's public identity",
-                "operationId": "node_identity",
+            },
+            "post": {
+                "description": "Assign node's identity",
+                "operationId": "assign_node_identity",
                 "responses": {
                     "200": {
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/identity"
-                                }
-                            }
-                        },
-                        "description": "Identity"
+                        "$ref": "#/components/responses/success"
                     },
                     "400": {
                         "$ref": "#/components/responses/error"

http/client.go

@@ -515,23 +515,23 @@
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, methodURL.String(), nil)
 	if err != nil {
 		return immutable.None[identity.PublicRawIdentity](), err
 	}
 	var ident immutable.Option[identity.PublicRawIdentity]
 	if err := c.http.requestJson(req, &ident); err != nil {
 		return immutable.None[identity.PublicRawIdentity](), err
 	}
 	return ident, err
 }
 
 func (c *Client) AssignNodeIdentity(ctx context.Context, ident identity.Identity) error {
-	methodURL := c.http.baseURL.JoinPath("node", "assign-identity")
+	methodURL := c.http.baseURL.JoinPath("node", "identity")
 
 	ctx = identity.WithContext(ctx, immutable.Some(ident))
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, methodURL.String(), nil)
 	if err != nil {
 		return err
 	}
 	_, err = c.http.request(req)
 	return err
 }

http/handler_store.go

@@ -348,9 +348,9 @@
 
 	identity, err := db.GetNodeIdentity(req.Context())
 	if err != nil {
 		responseJSON(rw, http.StatusBadRequest, errorResponse{err})
 		return
 	}
 	responseJSON(rw, http.StatusOK, identity)
 }
 
@@ -360,15 +360,15 @@
 	ident := identity.FromContext(req.Context())
 
 	if !ident.HasValue() {
 		responseJSON(rw, http.StatusBadRequest, errorResponse{ErrMissingIdentity})
 		return
 	}
 
 	err := db.AssignNodeIdentity(req.Context(), ident.Value())
 	if err != nil {
 		responseJSON(rw, http.StatusBadRequest, errorResponse{err})
 		return
 	}
 }
 
 func (h *storeHandler) bindRoutes(router *Router) {
@@ -695,5 +695,5 @@
 	router.AddRoute("/schema/default", http.MethodPost, setActiveSchemaVersion, h.SetActiveSchemaVersion)
 	router.AddRoute("/lens", http.MethodPost, setMigration, h.SetMigration)
 	router.AddRoute("/node/identity", http.MethodGet, nodeIdentity, h.GetNodeIdentity)
-	router.AddRoute("/node/assign-identity", http.MethodPost, assignNodeIdentity, h.AssignNodeIdentity)
+	router.AddRoute("/node/identity", http.MethodPost, assignNodeIdentity, h.AssignNodeIdentity)
 }

tests/clients/cli/wrapper.go

@@ -567,7 +567,7 @@ func (w *Wrapper) Host() string {
 }
 
 func (w *Wrapper) GetNodeIdentity(ctx context.Context) (immutable.Option[identity.PublicRawIdentity], error) {
-	args := []string{"client", "node-identity"}
+	args := []string{"client", "node-identity", "get"}
 
 	data, err := w.cmd.execute(ctx, args)
 	if err != nil {
@@ -582,7 +582,7 @@ func (w *Wrapper) GetNodeIdentity(ctx context.Context) (immutable.Option[identit
 
 func (w *Wrapper) AssignNodeIdentity(ctx context.Context, ident identity.Identity) error {
 	privateKeyHex := hex.EncodeToString(ident.PrivateKey.Serialize())
-	args := []string{"client", "assign-node-identity", privateKeyHex}
+	args := []string{"client", "node-identity", "assign", privateKeyHex}
 
 	_, err := w.cmd.execute(ctx, args)
 	return err

tests/integration/utils.go

@@ -167,15 +167,15 @@ func ExecuteTestCase(
 	skipIfViewCacheTypeUnsupported(t, testCase.SupportedViewTypes)
 
 	var clients []ClientType
-	if httpClient {
-		clients = append(clients, HTTPClientType)
-	}
-	if goClient {
-		clients = append(clients, GoClientType)
-	}
-	if cliClient {
-		clients = append(clients, CLIClientType)
-	}
+	//if httpClient {
+	clients = append(clients, HTTPClientType)
+	//}
+	//if goClient {
+	clients = append(clients, GoClientType)
+	//}
+	//if cliClient {
+	clients = append(clients, CLIClientType)
+	//}
 
 	var databases []DatabaseType
 	if badgerInMemory {