Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove relationship create/delete handlers #174

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Remove relationship create/delete handlers #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46115b2
Remove relationship create/delete handlers
jnschaeffer Sep 7, 2023
a206de7
Remove unused types and functions
jnschaeffer Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 0 additions & 128 deletions internal/api/relationships.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,89 +3,12 @@ package api
import (
"net/http"

"go.infratographer.com/permissions-api/internal/types"

"github.com/labstack/echo/v4"
"go.infratographer.com/x/gidx"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
)

func (r *Router) buildRelationship(resource types.Resource, item createRelationshipItem) (types.Relationship, error) {
itemID, err := gidx.Parse(item.SubjectID)
if err != nil {
return types.Relationship{}, err
}

itemResource, err := r.engine.NewResourceFromID(itemID)
if err != nil {
return types.Relationship{}, err
}

out := types.Relationship{
Subject: itemResource,
Relation: item.Relation,
Resource: resource,
}

return out, nil
}

func (r *Router) buildRelationships(subjResource types.Resource, items []createRelationshipItem) ([]types.Relationship, error) {
out := make([]types.Relationship, len(items))

for i, item := range items {
rel, err := r.buildRelationship(subjResource, item)
if err != nil {
return nil, err
}

out[i] = rel
}

return out, nil
}

func (r *Router) relationshipsCreate(c echo.Context) error {
resourceIDStr := c.Param("id")

ctx, span := tracer.Start(c.Request().Context(), "api.relationshipsCreate", trace.WithAttributes(attribute.String("id", resourceIDStr)))
defer span.End()

resourceID, err := gidx.Parse(resourceIDStr)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error parsing resource ID").SetInternal(err)
}

var reqBody createRelationshipsRequest

err = c.Bind(&reqBody)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error parsing request body").SetInternal(err)
}

resource, err := r.engine.NewResourceFromID(resourceID)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error creating relationships").SetInternal(err)
}

rels, err := r.buildRelationships(resource, reqBody.Relationships)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error creating relationships").SetInternal(err)
}

_, err = r.engine.CreateRelationships(ctx, rels)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "error creating relationships").SetInternal(err)
}

resp := createRelationshipsResponse{
Success: true,
}

return c.JSON(http.StatusCreated, resp)
}

func (r *Router) relationshipListFrom(c echo.Context) error {
resourceIDStr := c.Param("id")

Expand Down Expand Up @@ -159,54 +82,3 @@ func (r *Router) relationshipListTo(c echo.Context) error {

return c.JSON(http.StatusOK, out)
}

func (r *Router) relationshipDelete(c echo.Context) error {
resourceIDStr := c.Param("id")

ctx, span := tracer.Start(c.Request().Context(), "api.relationshipsDelete", trace.WithAttributes(attribute.String("id", resourceIDStr)))
defer span.End()

resourceID, err := gidx.Parse(resourceIDStr)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error parsing resource ID").SetInternal(err)
}

var reqBody deleteRelationshipRequest

err = c.Bind(&reqBody)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error parsing request body").SetInternal(err)
}

resource, err := r.engine.NewResourceFromID(resourceID)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error deleting relationship").SetInternal(err)
}

relatedResourceID, err := gidx.Parse(reqBody.SubjectID)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error deleting relationship").SetInternal(err)
}

relatedResource, err := r.engine.NewResourceFromID(relatedResourceID)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "error deleting relationship").SetInternal(err)
}

relationship := types.Relationship{
Resource: resource,
Relation: reqBody.Relation,
Subject: relatedResource,
}

_, err = r.engine.DeleteRelationships(ctx, relationship)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "error deleting relationship").SetInternal(err)
}

resp := deleteRelationshipsResponse{
Success: true,
}

return c.JSON(http.StatusOK, resp)
}
2 changes: 0 additions & 2 deletions internal/api/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ func (r *Router) Routes(rg *echo.Group) {

v1.POST("/resources/:id/roles", r.roleCreate)
v1.GET("/resources/:id/roles", r.rolesList)
v1.POST("/resources/:id/relationships", r.relationshipsCreate)
v1.DELETE("/resources/:id/relationships", r.relationshipDelete)
v1.GET("/resources/:id/relationships", r.relationshipListFrom)
v1.GET("/relationships/from/:id", r.relationshipListFrom)
v1.GET("/relationships/to/:id", r.relationshipListTo)
Expand Down
22 changes: 0 additions & 22 deletions internal/api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,6 @@ type listRolesResponse struct {
Data []roleResponse `json:"data"`
}

type createRelationshipItem struct {
Relation string `json:"relation" binding:"required"`
SubjectID string `json:"subject_id" binding:"required"`
}

type createRelationshipsRequest struct {
Relationships []createRelationshipItem `json:"relationships" binding:"required"`
}

type createRelationshipsResponse struct {
Success bool `json:"success"`
}

type deleteRelationshipRequest struct {
Relation string `json:"relation" binding:"required"`
SubjectID string `json:"subject_id" binding:"required"`
}

type deleteRelationshipsResponse struct {
Success bool `json:"success"`
}

type relationshipItem struct {
ResourceID string `json:"resource_id,omitempty"`
Relation string `json:"relation"`
Expand Down
Loading