feat(resourcemapping): resource mapping implementation

cmd/start.go

@@ -16,6 +16,7 @@ import (
 	"github.com/opentdf/opentdf-v2-poc/internal/logger"
 	"github.com/opentdf/opentdf-v2-poc/internal/opa"
 	"github.com/opentdf/opentdf-v2-poc/internal/server"
+	"github.com/opentdf/opentdf-v2-poc/services/resourcemapping"
 
 	// "github.com/opentdf/opentdf-v2-poc/services/acre"
 	"github.com/opentdf/opentdf-v2-poc/services/attributes"
@@ -132,11 +133,11 @@ func RegisterServices(_ config.Config, otdf *server.OpenTDFServer, dbClient *db.
 	var (
 		err error
 	)
-	// slog.Info("registering acre server")
-	// err = acre.NewResourceEncoding(dbClient, otdf.GrpcServer, otdf.Mux)
-	// if err != nil {
-	// 	return fmt.Errorf("could not register acre service: %w", err)
-	// }
+	slog.Info("registering acre server")
+	err = resourcemapping.NewResourceMappingServer(dbClient, otdf.GrpcServer, otdf.Mux)
+	if err != nil {
+		return fmt.Errorf("could not register acre service: %w", err)
+	}
 
 	slog.Info("registering attributes server")
 	err = attributes.NewAttributesServer(dbClient, otdf.GrpcServer, otdf.Mux)

internal/db/resource_mapping.go

@@ -0,0 +1,254 @@
+package db
+
+import (
+	"context"
+
+	sq "github.com/Masterminds/squirrel"
+	"github.com/jackc/pgx/v5"
+	"github.com/opentdf/opentdf-v2-poc/sdk/attributes"
+	"github.com/opentdf/opentdf-v2-poc/sdk/common"
+	"github.com/opentdf/opentdf-v2-poc/sdk/resourcemapping"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+var ResourceMappingTable = tableName(TableResourceMappings)
+
+func resourceMappingHydrateList(rows pgx.Rows) ([]*resourcemapping.ResourceMapping, error) {
+	var list []*resourcemapping.ResourceMapping
+
+	for rows.Next() {
+		rm, err := resourceMappingHydrateItem(rows)
+		if err != nil {
+			return nil, err
+		}
+		list = append(list, rm)
+	}
+	return list, nil
+}
+
+func resourceMappingHydrateItem(row pgx.Row) (*resourcemapping.ResourceMapping, error) {
+	var (
+		id                 string
+		metadataJSON       []byte
+		metadata           = new(common.Metadata)
+		terms              []string
+		attributeValueJSON []byte
+		attributeValue     = new(attributes.Value)
+	)
+
+	err := row.Scan(
+		&id,
+		&metadataJSON,
+		&terms,
+		&attributeValueJSON,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	err = protojson.Unmarshal(metadataJSON, metadata)
+	if err != nil {
+		return nil, err
+	}
+
+	err = protojson.Unmarshal(attributeValueJSON, attributeValue)
+	if err != nil {
+		return nil, err
+	}
+
+	return &resourcemapping.ResourceMapping{
+		Id:             id,
+		Metadata:       metadata,
+		AttributeValue: attributeValue,
+		Terms:          terms,
+	}, nil
+}
+
+func resourceMappingSelect() sq.SelectBuilder {
+	return newStatementBuilder().Select(
+		tableField(ResourceMappingTable, "id"),
+		tableField(ResourceMappingTable, "metadata"),
+		tableField(ResourceMappingTable, "terms"),
+		"JSON_BUILD_OBJECT("+
+			"'id', "+tableField(AttributeValueTable, "id")+", "+
+			"'value', "+tableField(AttributeValueTable, "value")+","+
+			"'members', "+tableField(AttributeValueTable, "members")+
+			")"+
+			" AS attribute_value",
+	).
+		LeftJoin(AttributeValueTable+" ON "+tableField(AttributeValueTable, "id")+" = "+tableField(ResourceMappingTable, "attribute_value_id")).
+		GroupBy(tableField(ResourceMappingTable, "id"), tableField(AttributeValueTable, "id"))
+}
+
+/*
+ Resource Mapping CRUD
+*/
+
+func createResourceMappingSQL(attributeValueID string, metadata []byte, terms []string) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Insert(ResourceMappingTable).
+		Columns(
+			"attribute_value_id",
+			"metadata",
+			"terms",
+		).
+		Values(
+			attributeValueID,
+			metadata,
+			terms,
+		).
+		Suffix("RETURNING \"id\"").
+		ToSql()
+}
+
+func (c Client) CreateResourceMapping(ctx context.Context, rm *resourcemapping.ResourceMappingCreateUpdate) (*resourcemapping.ResourceMapping, error) {
+	metadataJSON, metadata, err := marshalCreateMetadata(rm.Metadata)
+	if err != nil {
+		return nil, err
+	}
+
+	sql, args, err := createResourceMappingSQL(rm.AttributeValueId, metadataJSON, rm.Terms)
+	if err != nil {
+		return nil, err
+	}
+
+	row, err := c.queryRow(ctx, sql, args, err)
+	if err != nil {
+		return nil, err
+	}
+
+	var id string
+	if err := row.Scan(&id); err != nil {
+		return nil, err
+	}
+
+	av, err := c.GetAttributeValue(ctx, rm.AttributeValueId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &resourcemapping.ResourceMapping{
+		Id:             id,
+		Metadata:       metadata,
+		AttributeValue: av,
+		Terms:          rm.Terms,
+	}, nil
+}
+
+func getResourceMappingSQL(id string) (string, []interface{}, error) {
+	return resourceMappingSelect().
+		Where(sq.Eq{tableField(ResourceMappingTable, "id"): id}).
+		From(ResourceMappingTable).
+		ToSql()
+}
+
+func (c Client) GetResourceMapping(ctx context.Context, id string) (*resourcemapping.ResourceMapping, error) {
+	sql, args, err := getResourceMappingSQL(id)
+
+	row, err := c.queryRow(ctx, sql, args, err)
+	if err != nil {
+		return nil, err
+	}
+
+	rm, err := resourceMappingHydrateItem(row)
+	if err != nil {
+		return nil, err
+	}
+	return rm, nil
+}
+
+func listResourceMappingsSQL() (string, []interface{}, error) {
+	return resourceMappingSelect().
+		From(ResourceMappingTable).
+		ToSql()
+}
+
+func (c Client) ListResourceMappings(ctx context.Context) ([]*resourcemapping.ResourceMapping, error) {
+	sql, args, err := listResourceMappingsSQL()
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := c.query(ctx, sql, args, err)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	list, err := resourceMappingHydrateList(rows)
+	if err != nil {
+		return nil, err
+	}
+
+	return list, nil
+}
+
+func updateResourceMappingSQL(id string, attribute_value_id string, metadata []byte, terms []string) (string, []interface{}, error) {
+	sb := newStatementBuilder().
+		Update(ResourceMappingTable)
+
+	if attribute_value_id != "" {
+		sb = sb.Set("attribute_value_id", attribute_value_id)
+	}
+
+	if metadata != nil {
+		sb = sb.Set("metadata", metadata)
+	}
+
+	if terms != nil {
+		sb = sb.Set("terms", terms)
+	}
+
+	return sb.
+		Where(sq.Eq{"id": id}).
+		ToSql()
+}
+
+func (c Client) UpdateResourceMapping(ctx context.Context, id string, rm *resourcemapping.ResourceMappingCreateUpdate) (*resourcemapping.ResourceMapping, error) {
+	prev, err := c.GetResourceMapping(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	metadataJSON, _, err := marshalUpdateMetadata(prev.Metadata, rm.Metadata)
+	if err != nil {
+		return nil, err
+	}
+
+	sql, args, err := updateResourceMappingSQL(
+		id,
+		rm.AttributeValueId,
+		metadataJSON,
+		rm.Terms,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := c.exec(ctx, sql, args, err); err != nil {
+		return nil, err
+	}
+
+	return prev, nil
+}
+
+func deleteResourceMappingSQL(id string) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Delete(ResourceMappingTable).
+		Where(sq.Eq{"id": id}).
+		ToSql()
+}
+
+func (c Client) DeleteResourceMapping(ctx context.Context, id string) (*resourcemapping.ResourceMapping, error) {
+	prev, err := c.GetResourceMapping(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	sql, args, err := deleteResourceMappingSQL(id)
+	if err := c.exec(ctx, sql, args, err); err != nil {
+		return nil, err
+	}
+
+	return prev, nil
+}

migrations/20240118000000_create_new_tables.sql

@@ -58,7 +58,6 @@ CREATE TABLE IF NOT EXISTS opentdf.resource_mappings
 (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     attribute_value_id UUID NOT NULL REFERENCES opentdf.attribute_values(id),
-    name VARCHAR NOT NULL,
     terms VARCHAR[],
     metadata JSONB
 );