feat(namespaces CRUD): protos, generated SDK, db interactivity for namespaces table

cmd/start.go

@@ -23,6 +23,7 @@ import (
 	"github.com/opentdf/opentdf-v2-poc/services/kasregistry"
 	"github.com/opentdf/opentdf-v2-poc/services/subjectmapping"
 
+	"github.com/opentdf/opentdf-v2-poc/services/namespaces"
 	// "github.com/opentdf/opentdf-v2-poc/services/keyaccessgrants"
 	"github.com/spf13/cobra"
 )
@@ -130,9 +131,7 @@ func createDatabaseClient(conf db.Config) (*db.Client, error) {
 
 //nolint:revive // the opa engine will be used in the future
 func RegisterServices(_ config.Config, otdf *server.OpenTDFServer, dbClient *db.Client, eng *opa.Engine) error {
-	var (
-		err error
-	)
+	var err error
 	slog.Info("registering acre server")
 	err = resourcemapping.NewResourceMappingServer(dbClient, otdf.GrpcServer, otdf.Mux)
 	if err != nil {
@@ -157,5 +156,11 @@ func RegisterServices(_ config.Config, otdf *server.OpenTDFServer, dbClient *db.
 		return fmt.Errorf("could not register key access grants service: %w", err)
 	}
 
+	slog.Info("registering namespaces server")
+	err = namespaces.NewNamespacesServer(dbClient, otdf.GrpcServer, otdf.Mux)
+	if err != nil {
+		return fmt.Errorf("could not register namespaces service: %w", err)
+	}
+
 	return nil
 }

internal/db/attributes.go

@@ -16,8 +16,10 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 )
 
-var AttributeTable = tableName(TableAttributes)
-var AttributeRuleTypeEnumPrefix = "ATTRIBUTE_RULE_TYPE_ENUM_"
+var (
+	AttributeTable              = tableName(TableAttributes)
+	AttributeRuleTypeEnumPrefix = "ATTRIBUTE_RULE_TYPE_ENUM_"
+)
 
 func attributesRuleTypeEnumTransformIn(value string) string {
 	return strings.TrimPrefix(value, AttributeRuleTypeEnumPrefix)
@@ -197,7 +199,7 @@ func (c Client) GetAttribute(ctx context.Context, id string) (*attributes.Attrib
 
 func getAttributesByNamespaceSql(namespaceId string) (string, []interface{}, error) {
 	return attributesSelect().
-		Where(sq.Eq{"namespace_id": namespaceId}).
+		Where(sq.Eq{tableField(AttributeTable, "namespace_id"): namespaceId}).
 		From(AttributeTable).
 		ToSql()
 }
@@ -266,7 +268,7 @@ func updateAttributeSql(id string, name string, rule string, metadata []byte) (s
 	}
 
 	return sb.Set("metadata", metadata).
-		Where(sq.Eq{"id": id}).
+		Where(sq.Eq{tableField(AttributeTable, "id"): id}).
 		ToSql()
 }
 func (c Client) UpdateAttribute(ctx context.Context, id string, attr *attributes.AttributeCreateUpdate) (*attributes.Attribute, error) {
@@ -294,7 +296,7 @@ func (c Client) UpdateAttribute(ctx context.Context, id string, attr *attributes
 func deleteAttributeSql(id string) (string, []interface{}, error) {
 	return newStatementBuilder().
 		Delete(AttributeTable).
-		Where(sq.Eq{"id": id}).
+		Where(sq.Eq{tableField(AttributeTable, "id"): id}).
 		ToSql()
 }
 func (c Client) DeleteAttribute(ctx context.Context, id string) (*attributes.Attribute, error) {

internal/db/namespaces.go

@@ -0,0 +1,157 @@
+package db
+
+import (
+	"context"
+	"errors"
+	"log/slog"
+
+	sq "github.com/Masterminds/squirrel"
+	"github.com/opentdf/opentdf-v2-poc/sdk/namespaces"
+	"github.com/opentdf/opentdf-v2-poc/services"
+)
+
+var NamespacesTable = tableName(TableNamespaces)
+
+func getNamespaceSql(id string) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Select("*").
+		From(NamespacesTable).
+		Where(sq.Eq{tableField(NamespacesTable, "id"): id}).
+		ToSql()
+}
+
+func (c Client) GetNamespace(ctx context.Context, id string) (*namespaces.Namespace, error) {
+	sql, args, err := getNamespaceSql(id)
+	if err != nil {
+		slog.Error(services.ErrGettingResource, slog.String("error", err.Error()))
+		return nil, err
+	}
+
+	row, err := c.queryRow(ctx, sql, args, err)
+	if err != nil {
+		slog.Error(services.ErrGettingResource, slog.String("error", err.Error()))
+		return nil, err
+	}
+
+	namespace := namespaces.Namespace{Id: "", Name: ""}
+	if err := row.Scan(&namespace.Id, &namespace.Name); err != nil {
+		if e := WrapIfKnownInvalidQueryErr(err); e != nil {
+			slog.Error(services.ErrNotFound, slog.String("error", e.Error()))
+			return nil, e
+		}
+
+		slog.Error(services.ErrGettingResource, slog.String("error", err.Error()))
+		return nil, err
+	}
+
+	return &namespace, nil
+}
+
+func listNamespacesSql() (string, []interface{}, error) {
+	return newStatementBuilder().
+		Select("*").
+		From(NamespacesTable).
+		ToSql()
+}
+
+func (c Client) ListNamespaces(ctx context.Context) ([]*namespaces.Namespace, error) {
+	namespacesList := []*namespaces.Namespace{}
+
+	sql, args, err := listNamespacesSql()
+	if err != nil {
+		slog.Error(services.ErrListingResource, slog.String("error", err.Error()))
+		return nil, err
+	}
+
+	rows, err := c.query(ctx, sql, args, err)
+	if err != nil {
+		slog.Error(services.ErrListingResource, slog.String("error", err.Error()))
+		return nil, err
+	}
+
+	for rows.Next() {
+		var namespace namespaces.Namespace
+		if err := rows.Scan(&namespace.Id, &namespace.Name); err != nil {
+			slog.Error(services.ErrListingResource, slog.String("error", err.Error()))
+			return nil, err
+		}
+		namespacesList = append(namespacesList, &namespace)
+	}
+
+	return namespacesList, nil
+}
+
+func createNamespaceSql(name string) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Insert(NamespacesTable).
+		Columns("name").
+		Values(name).
+		Suffix("RETURNING \"id\"").
+		ToSql()
+}
+
+func (c Client) CreateNamespace(ctx context.Context, name string) (string, error) {
+	sql, args, err := createNamespaceSql(name)
+	var id string
+
+	if r, e := c.queryRow(ctx, sql, args, err); e != nil {
+		slog.Error(services.ErrCreatingResource, slog.String("error", e.Error()))
+		return "", e
+	} else if e := r.Scan(&id); e != nil {
+		if IsConstraintViolationForColumnVal(e, TableNamespaces, "name") {
+			e = errors.Join(NewUniqueAlreadyExistsError(name), e)
+			slog.Error(services.ErrConflict, slog.String("error", e.Error()))
+			return "", e
+		}
+
+		slog.Error(services.ErrCreatingResource, slog.String("error", e.Error()))
+		return "", e
+	}
+	return id, nil
+}
+
+func updateNamespaceSql(id string, name string) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Update(NamespacesTable).
+		Set("name", name).
+		Where(sq.Eq{tableField(NamespacesTable, "id"): id}).
+		ToSql()
+}
+
+func (c Client) UpdateNamespace(ctx context.Context, id string, name string) (*namespaces.Namespace, error) {
+	sql, args, err := updateNamespaceSql(id, name)
+
+	if e := c.exec(ctx, sql, args, err); e != nil {
+		if IsConstraintViolationForColumnVal(e, TableNamespaces, "name") {
+			e = errors.Join(NewUniqueAlreadyExistsError(name), e)
+			slog.Error(services.ErrConflict, slog.String("error", e.Error()))
+			return nil, e
+		}
+
+		if err := WrapIfKnownInvalidQueryErr(e); err != nil {
+			if errors.Is(err, ErrNotFound) {
+				slog.Error(services.ErrNotFound, slog.String("error", err.Error()))
+			}
+			return nil, err
+		}
+
+		slog.Error(services.ErrUpdatingResource, slog.String("error", e.Error()))
+		return nil, e
+	}
+
+	return c.GetNamespace(ctx, id)
+}
+
+func deleteNamespaceSql(id string) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Delete(NamespacesTable).
+		Where(sq.Eq{"id": id}).
+		Suffix("RETURNING \"id\"").
+		ToSql()
+}
+
+func (c Client) DeleteNamespace(ctx context.Context, id string) error {
+	sql, args, err := deleteNamespaceSql(id)
+
+	return c.exec(ctx, sql, args, err)
+}

migrations/20240118000000_create_new_tables.sql

@@ -5,7 +5,7 @@ CREATE SCHEMA IF NOT EXISTS opentdf;
 CREATE TYPE attribute_definition_rule AS ENUM ('UNSPECIFIED', 'ALL_OF', 'ANY_OF', 'HIERARCHY');
 CREATE TYPE subject_mappings_operator AS ENUM ('UNSPECIFIED', 'IN', 'NOT_IN');
 
-CREATE TABLE IF NOT EXISTS opentdf.namespaces
+CREATE TABLE IF NOT EXISTS opentdf.attribute_namespaces
 (
     -- generate on create
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS opentdf.namespaces
 CREATE TABLE IF NOT EXISTS opentdf.attribute_definitions
 (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    namespace_id UUID NOT NULL REFERENCES opentdf.namespaces(id),
+    namespace_id UUID NOT NULL REFERENCES opentdf.attribute_namespaces(id),
     name VARCHAR NOT NULL,
     rule attribute_definition_rule NOT NULL,
     metadata JSONB,
@@ -82,7 +82,7 @@ DROP TABLE IF EXISTS opentdf.attribute_definition_key_access_grants;
 DROP TABLE IF EXISTS opentdf.key_access_servers;
 DROP TABLE IF EXISTS opentdf.attribute_values;
 DROP TABLE IF EXISTS opentdf.attribute_definitions;
-DROP TABLE IF EXISTS opentdf.namespaces;
+DROP TABLE IF EXISTS opentdf.attribute_namespaces;
 
 DROP TYPE attribute_definition_rule;
 DROP TYPE subject_mappings_operator;