Add risk assessment boundary model
Introduce RiskAssessmentBoundary as a first-class, self-nesting entity that
groups nodes within a risk assessment scope, and thread it through every
surface.
- coredata: new risk_assessment_boundaries table + migration, boundary_id on
nodes, self-referential parent_boundary_id, entity type registration
- riskmanagement: boundary CRUD service methods, boundary_id wiring on node
create/update, scope-membership and self-parent validation, nested-subgraph
Mermaid rendering
- IAM: core:risk-assessment-boundary:{get,list,create,update,delete} actions
and viewer/auditor read policies
- console GraphQL: RiskAssessmentBoundary type, connection, order enum, CRUD
mutations, boundaries field on scope, boundaryId on nodes
- CLI: risk-assessment boundary command group and --boundary-id on nodes
- MCP: boundary tools and boundary_id on node tools
- n8n: boundary operations and boundary fields on node operations
- console UI: boundary list/create/edit, boundary selector on nodes, diagram
refetch on boundary changes
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
@@ -124,6 +124,7 @@ const (
|
||||
RiskAssessmentThreatEntityType uint16 = 98
|
||||
RiskAssessmentScopeEntityType uint16 = 99
|
||||
RiskAssessmentScenarioEntityType uint16 = 100
|
||||
RiskAssessmentBoundaryEntityType uint16 = 101
|
||||
)
|
||||
|
||||
func NewEntityFromID(id gid.GID) (any, bool) {
|
||||
@@ -312,6 +313,8 @@ func NewEntityFromID(id gid.GID) (any, bool) {
|
||||
return &RiskAssessmentScope{ID: id}, true
|
||||
case RiskAssessmentScenarioEntityType:
|
||||
return &RiskAssessmentScenario{ID: id}, true
|
||||
case RiskAssessmentBoundaryEntityType:
|
||||
return &RiskAssessmentBoundary{ID: id}, true
|
||||
default:
|
||||
return nil, false
|
||||
}
|
||||
|
||||
70
pkg/coredata/migrations/20260608T122627Z.sql
Normal file
70
pkg/coredata/migrations/20260608T122627Z.sql
Normal file
@@ -0,0 +1,70 @@
|
||||
-- Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
|
||||
--
|
||||
-- Permission to use, copy, modify, and/or distribute this software for any
|
||||
-- purpose with or without fee is hereby granted, provided that the above
|
||||
-- copyright notice and this permission notice appear in all copies.
|
||||
--
|
||||
-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
-- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
-- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
-- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
-- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
-- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
-- PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
CREATE TABLE risk_assessment_boundaries (
|
||||
id TEXT PRIMARY KEY,
|
||||
tenant_id TEXT NOT NULL,
|
||||
organization_id TEXT NOT NULL,
|
||||
risk_assessment_scope_id TEXT NOT NULL REFERENCES risk_assessment_scopes(id) ON DELETE CASCADE,
|
||||
parent_boundary_id TEXT REFERENCES risk_assessment_boundaries(id) ON DELETE SET NULL,
|
||||
name TEXT NOT NULL,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
updated_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
CONSTRAINT risk_assessment_boundaries_unique_name UNIQUE (risk_assessment_scope_id, name)
|
||||
);
|
||||
|
||||
ALTER TABLE risk_assessment_nodes
|
||||
ADD COLUMN boundary_id TEXT REFERENCES risk_assessment_boundaries(id) ON DELETE SET NULL;
|
||||
|
||||
-- Migrate legacy BOUNDARY-typed nodes into the first-class boundary model.
|
||||
-- Each boundary gets a freshly generated GID (entity type 101). Node names are
|
||||
-- already unique per scope, so the boundary (scope_id, name) constraint cannot
|
||||
-- be violated.
|
||||
INSERT INTO risk_assessment_boundaries (
|
||||
id,
|
||||
tenant_id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
parent_boundary_id,
|
||||
name,
|
||||
created_at,
|
||||
updated_at
|
||||
)
|
||||
SELECT
|
||||
generate_gid(decode_base64_unpadded(tenant_id), 101),
|
||||
tenant_id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
NULL,
|
||||
name,
|
||||
created_at,
|
||||
updated_at
|
||||
FROM risk_assessment_nodes
|
||||
WHERE node_type = 'BOUNDARY';
|
||||
|
||||
-- Remove the legacy node representation now that the boundaries exist.
|
||||
DELETE FROM risk_assessment_nodes
|
||||
WHERE node_type = 'BOUNDARY';
|
||||
|
||||
-- Drop the now-unused BOUNDARY value from the node_type enum. PostgreSQL cannot
|
||||
-- remove a value from an enum in place, so the type is rebuilt without it.
|
||||
ALTER TYPE risk_assessment_node_type RENAME TO risk_assessment_node_type_old;
|
||||
|
||||
CREATE TYPE risk_assessment_node_type AS ENUM ('ENTITY', 'ASSET', 'DATA');
|
||||
|
||||
ALTER TABLE risk_assessment_nodes
|
||||
ALTER COLUMN node_type TYPE risk_assessment_node_type
|
||||
USING node_type::text::risk_assessment_node_type;
|
||||
|
||||
DROP TYPE risk_assessment_node_type_old;
|
||||
344
pkg/coredata/risk_assessment_boundary.go
Normal file
344
pkg/coredata/risk_assessment_boundary.go
Normal file
@@ -0,0 +1,344 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
// PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
package coredata
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/jackc/pgx/v5/pgconn"
|
||||
"go.gearno.de/kit/pg"
|
||||
"go.probo.inc/probo/pkg/gid"
|
||||
"go.probo.inc/probo/pkg/iam/policy"
|
||||
"go.probo.inc/probo/pkg/page"
|
||||
)
|
||||
|
||||
type (
|
||||
RiskAssessmentBoundary struct {
|
||||
ID gid.GID `db:"id"`
|
||||
OrganizationID gid.GID `db:"organization_id"`
|
||||
RiskAssessmentScopeID gid.GID `db:"risk_assessment_scope_id"`
|
||||
ParentBoundaryID *gid.GID `db:"parent_boundary_id"`
|
||||
Name string `db:"name"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at"`
|
||||
}
|
||||
|
||||
RiskAssessmentBoundaries []*RiskAssessmentBoundary
|
||||
)
|
||||
|
||||
func (b *RiskAssessmentBoundary) CursorKey(orderBy RiskAssessmentBoundaryOrderField) page.CursorKey {
|
||||
switch orderBy {
|
||||
case RiskAssessmentBoundaryOrderFieldCreatedAt:
|
||||
return page.CursorKey{ID: b.ID, Value: b.CreatedAt}
|
||||
case RiskAssessmentBoundaryOrderFieldName:
|
||||
return page.CursorKey{ID: b.ID, Value: b.Name}
|
||||
}
|
||||
|
||||
panic(fmt.Sprintf("unsupported order by: %s", orderBy))
|
||||
}
|
||||
|
||||
func (b *RiskAssessmentBoundary) AuthorizationAttributes(
|
||||
ctx context.Context,
|
||||
conn pg.Querier,
|
||||
resourceIDs []gid.GID,
|
||||
) (policy.AttributesByID, error) {
|
||||
q := `SELECT id, organization_id FROM risk_assessment_boundaries WHERE id = ANY(@resource_ids::text[])`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"resource_ids": resourceIDs,
|
||||
}
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot query authorization attributes: %w", err)
|
||||
}
|
||||
|
||||
defer rows.Close()
|
||||
|
||||
attrsByID := make(policy.AttributesByID)
|
||||
|
||||
for rows.Next() {
|
||||
var id, organizationID gid.GID
|
||||
|
||||
if err := rows.Scan(&id, &organizationID); err != nil {
|
||||
return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
|
||||
}
|
||||
|
||||
attrsByID[id] = policy.Attributes{
|
||||
"organization_id": organizationID.String(),
|
||||
}
|
||||
}
|
||||
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("cannot iterate authorization attributes: %w", err)
|
||||
}
|
||||
|
||||
return attrsByID, nil
|
||||
}
|
||||
|
||||
func (bs *RiskAssessmentBoundaries) LoadByRiskAssessmentScopeID(
|
||||
ctx context.Context,
|
||||
conn pg.Querier,
|
||||
scope Scoper,
|
||||
riskAssessmentScopeID gid.GID,
|
||||
cursor *page.Cursor[RiskAssessmentBoundaryOrderField],
|
||||
) error {
|
||||
q := `
|
||||
SELECT
|
||||
id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
parent_boundary_id,
|
||||
name,
|
||||
created_at,
|
||||
updated_at
|
||||
FROM
|
||||
risk_assessment_boundaries
|
||||
WHERE
|
||||
%s
|
||||
AND risk_assessment_scope_id = @risk_assessment_scope_id
|
||||
AND %s
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
|
||||
args := pgx.NamedArgs{"risk_assessment_scope_id": riskAssessmentScopeID}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
maps.Copy(args, cursor.SQLArguments())
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query risk assessment boundaries: %w", err)
|
||||
}
|
||||
|
||||
results, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[RiskAssessmentBoundary])
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot collect risk assessment boundaries: %w", err)
|
||||
}
|
||||
|
||||
*bs = results
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (bs *RiskAssessmentBoundaries) LoadAllByRiskAssessmentScopeID(
|
||||
ctx context.Context,
|
||||
conn pg.Querier,
|
||||
scope Scoper,
|
||||
riskAssessmentScopeID gid.GID,
|
||||
) error {
|
||||
q := `
|
||||
SELECT
|
||||
id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
parent_boundary_id,
|
||||
name,
|
||||
created_at,
|
||||
updated_at
|
||||
FROM
|
||||
risk_assessment_boundaries
|
||||
WHERE
|
||||
%s
|
||||
AND risk_assessment_scope_id = @risk_assessment_scope_id
|
||||
ORDER BY
|
||||
created_at ASC, id ASC
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
args := pgx.NamedArgs{"risk_assessment_scope_id": riskAssessmentScopeID}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query risk assessment boundaries: %w", err)
|
||||
}
|
||||
|
||||
results, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[RiskAssessmentBoundary])
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot collect risk assessment boundaries: %w", err)
|
||||
}
|
||||
|
||||
*bs = results
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (bs *RiskAssessmentBoundaries) CountByRiskAssessmentScopeID(
|
||||
ctx context.Context,
|
||||
conn pg.Querier,
|
||||
scope Scoper,
|
||||
riskAssessmentScopeID gid.GID,
|
||||
) (int, error) {
|
||||
q := `
|
||||
SELECT
|
||||
COUNT(id)
|
||||
FROM
|
||||
risk_assessment_boundaries
|
||||
WHERE
|
||||
%s
|
||||
AND risk_assessment_scope_id = @risk_assessment_scope_id
|
||||
`
|
||||
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
args := pgx.NamedArgs{"risk_assessment_scope_id": riskAssessmentScopeID}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
var count int
|
||||
if err := conn.QueryRow(ctx, q, args).Scan(&count); err != nil {
|
||||
return 0, fmt.Errorf("cannot count risk assessment boundaries: %w", err)
|
||||
}
|
||||
|
||||
return count, nil
|
||||
}
|
||||
|
||||
func (b *RiskAssessmentBoundary) LoadByID(ctx context.Context, conn pg.Querier, scope Scoper, id gid.GID) error {
|
||||
q := `
|
||||
SELECT
|
||||
id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
parent_boundary_id,
|
||||
name,
|
||||
created_at,
|
||||
updated_at
|
||||
FROM
|
||||
risk_assessment_boundaries
|
||||
WHERE
|
||||
%s
|
||||
AND id = @id
|
||||
LIMIT 1;
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
args := pgx.StrictNamedArgs{"id": id}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query risk assessment boundary: %w", err)
|
||||
}
|
||||
|
||||
result, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[RiskAssessmentBoundary])
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrResourceNotFound
|
||||
}
|
||||
|
||||
return fmt.Errorf("cannot collect risk assessment boundary: %w", err)
|
||||
}
|
||||
|
||||
*b = result
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *RiskAssessmentBoundary) Insert(ctx context.Context, conn pg.Tx, scope Scoper) error {
|
||||
q := `
|
||||
INSERT INTO risk_assessment_boundaries (
|
||||
id,
|
||||
tenant_id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
parent_boundary_id,
|
||||
name,
|
||||
created_at,
|
||||
updated_at
|
||||
) VALUES (
|
||||
@id,
|
||||
@tenant_id,
|
||||
@organization_id,
|
||||
@risk_assessment_scope_id,
|
||||
@parent_boundary_id,
|
||||
@name,
|
||||
@created_at,
|
||||
@updated_at
|
||||
)
|
||||
`
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": b.ID,
|
||||
"tenant_id": scope.GetTenantID(),
|
||||
"organization_id": b.OrganizationID,
|
||||
"risk_assessment_scope_id": b.RiskAssessmentScopeID,
|
||||
"parent_boundary_id": b.ParentBoundaryID,
|
||||
"name": b.Name,
|
||||
"created_at": b.CreatedAt,
|
||||
"updated_at": b.UpdatedAt,
|
||||
}
|
||||
|
||||
_, err := conn.Exec(ctx, q, args)
|
||||
if err != nil {
|
||||
if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok && pgErr.Code == "23505" && pgErr.ConstraintName == "risk_assessment_boundaries_unique_name" {
|
||||
return ErrResourceAlreadyExists
|
||||
}
|
||||
|
||||
return fmt.Errorf("cannot insert risk assessment boundary: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *RiskAssessmentBoundary) Update(ctx context.Context, conn pg.Tx, scope Scoper) error {
|
||||
q := `
|
||||
UPDATE risk_assessment_boundaries
|
||||
SET
|
||||
parent_boundary_id = @parent_boundary_id,
|
||||
name = @name,
|
||||
updated_at = @updated_at
|
||||
WHERE
|
||||
%s
|
||||
AND id = @id
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": b.ID,
|
||||
"parent_boundary_id": b.ParentBoundaryID,
|
||||
"name": b.Name,
|
||||
"updated_at": b.UpdatedAt,
|
||||
}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
result, err := conn.Exec(ctx, q, args)
|
||||
if err != nil {
|
||||
if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok && pgErr.Code == "23505" && pgErr.ConstraintName == "risk_assessment_boundaries_unique_name" {
|
||||
return ErrResourceAlreadyExists
|
||||
}
|
||||
|
||||
return fmt.Errorf("cannot update risk assessment boundary: %w", err)
|
||||
}
|
||||
|
||||
if result.RowsAffected() == 0 {
|
||||
return ErrResourceNotFound
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *RiskAssessmentBoundary) Delete(ctx context.Context, conn pg.Tx, scope Scoper, id gid.GID) error {
|
||||
q := `
|
||||
DELETE FROM risk_assessment_boundaries
|
||||
WHERE
|
||||
%s
|
||||
AND id = @id
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
args := pgx.StrictNamedArgs{"id": id}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
_, err := conn.Exec(ctx, q, args)
|
||||
|
||||
return err
|
||||
}
|
||||
75
pkg/coredata/risk_assessment_boundary_order_field.go
Normal file
75
pkg/coredata/risk_assessment_boundary_order_field.go
Normal file
@@ -0,0 +1,75 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
// PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
package coredata
|
||||
|
||||
import (
|
||||
"encoding"
|
||||
"fmt"
|
||||
|
||||
"go.probo.inc/probo/pkg/page"
|
||||
)
|
||||
|
||||
type RiskAssessmentBoundaryOrderField string
|
||||
|
||||
const (
|
||||
RiskAssessmentBoundaryOrderFieldCreatedAt RiskAssessmentBoundaryOrderField = "CREATED_AT"
|
||||
RiskAssessmentBoundaryOrderFieldName RiskAssessmentBoundaryOrderField = "NAME"
|
||||
)
|
||||
|
||||
var (
|
||||
_ page.OrderField = RiskAssessmentBoundaryOrderField("")
|
||||
_ fmt.Stringer = RiskAssessmentBoundaryOrderField("")
|
||||
_ encoding.TextMarshaler = RiskAssessmentBoundaryOrderField("")
|
||||
_ encoding.TextUnmarshaler = (*RiskAssessmentBoundaryOrderField)(nil)
|
||||
)
|
||||
|
||||
func RiskAssessmentBoundaryOrderFields() []RiskAssessmentBoundaryOrderField {
|
||||
return []RiskAssessmentBoundaryOrderField{
|
||||
RiskAssessmentBoundaryOrderFieldCreatedAt,
|
||||
RiskAssessmentBoundaryOrderFieldName,
|
||||
}
|
||||
}
|
||||
|
||||
func (v RiskAssessmentBoundaryOrderField) IsValid() bool {
|
||||
switch v {
|
||||
case
|
||||
RiskAssessmentBoundaryOrderFieldCreatedAt,
|
||||
RiskAssessmentBoundaryOrderFieldName:
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func (v RiskAssessmentBoundaryOrderField) String() string {
|
||||
return string(v)
|
||||
}
|
||||
|
||||
func (v RiskAssessmentBoundaryOrderField) MarshalText() ([]byte, error) {
|
||||
return []byte(v.String()), nil
|
||||
}
|
||||
|
||||
func (v *RiskAssessmentBoundaryOrderField) UnmarshalText(text []byte) error {
|
||||
val := RiskAssessmentBoundaryOrderField(text)
|
||||
if !val.IsValid() {
|
||||
return fmt.Errorf("invalid RiskAssessmentBoundaryOrderField value: %q", string(text))
|
||||
}
|
||||
|
||||
*v = val
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p RiskAssessmentBoundaryOrderField) Column() string { return string(p) }
|
||||
@@ -34,6 +34,7 @@ type (
|
||||
ID gid.GID `db:"id"`
|
||||
OrganizationID gid.GID `db:"organization_id"`
|
||||
RiskAssessmentScopeID gid.GID `db:"risk_assessment_scope_id"`
|
||||
BoundaryID *gid.GID `db:"boundary_id"`
|
||||
NodeType RiskAssessmentNodeType `db:"node_type"`
|
||||
Name string `db:"name"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
@@ -105,6 +106,7 @@ SELECT
|
||||
id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
boundary_id,
|
||||
node_type,
|
||||
name,
|
||||
created_at,
|
||||
@@ -147,6 +149,7 @@ SELECT
|
||||
id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
boundary_id,
|
||||
node_type,
|
||||
name,
|
||||
created_at,
|
||||
@@ -212,6 +215,7 @@ SELECT
|
||||
id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
boundary_id,
|
||||
node_type,
|
||||
name,
|
||||
created_at,
|
||||
@@ -253,6 +257,7 @@ INSERT INTO risk_assessment_nodes (
|
||||
tenant_id,
|
||||
organization_id,
|
||||
risk_assessment_scope_id,
|
||||
boundary_id,
|
||||
node_type,
|
||||
name,
|
||||
created_at,
|
||||
@@ -262,6 +267,7 @@ INSERT INTO risk_assessment_nodes (
|
||||
@tenant_id,
|
||||
@organization_id,
|
||||
@risk_assessment_scope_id,
|
||||
@boundary_id,
|
||||
@node_type,
|
||||
@name,
|
||||
@created_at,
|
||||
@@ -273,6 +279,7 @@ INSERT INTO risk_assessment_nodes (
|
||||
"tenant_id": scope.GetTenantID(),
|
||||
"organization_id": n.OrganizationID,
|
||||
"risk_assessment_scope_id": n.RiskAssessmentScopeID,
|
||||
"boundary_id": n.BoundaryID,
|
||||
"node_type": n.NodeType,
|
||||
"name": n.Name,
|
||||
"created_at": n.CreatedAt,
|
||||
@@ -295,6 +302,7 @@ func (n *RiskAssessmentNode) Update(ctx context.Context, conn pg.Tx, scope Scope
|
||||
q := `
|
||||
UPDATE risk_assessment_nodes
|
||||
SET
|
||||
boundary_id = @boundary_id,
|
||||
node_type = @node_type,
|
||||
name = @name,
|
||||
updated_at = @updated_at
|
||||
@@ -304,10 +312,11 @@ WHERE
|
||||
`
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": n.ID,
|
||||
"node_type": n.NodeType,
|
||||
"name": n.Name,
|
||||
"updated_at": n.UpdatedAt,
|
||||
"id": n.ID,
|
||||
"boundary_id": n.BoundaryID,
|
||||
"node_type": n.NodeType,
|
||||
"name": n.Name,
|
||||
"updated_at": n.UpdatedAt,
|
||||
}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
|
||||
@@ -22,10 +22,9 @@ import (
|
||||
type RiskAssessmentNodeType string
|
||||
|
||||
const (
|
||||
RiskAssessmentNodeTypeEntity RiskAssessmentNodeType = "ENTITY"
|
||||
RiskAssessmentNodeTypeBoundary RiskAssessmentNodeType = "BOUNDARY"
|
||||
RiskAssessmentNodeTypeAsset RiskAssessmentNodeType = "ASSET"
|
||||
RiskAssessmentNodeTypeData RiskAssessmentNodeType = "DATA"
|
||||
RiskAssessmentNodeTypeEntity RiskAssessmentNodeType = "ENTITY"
|
||||
RiskAssessmentNodeTypeAsset RiskAssessmentNodeType = "ASSET"
|
||||
RiskAssessmentNodeTypeData RiskAssessmentNodeType = "DATA"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -37,7 +36,6 @@ var (
|
||||
func RiskAssessmentNodeTypes() []RiskAssessmentNodeType {
|
||||
return []RiskAssessmentNodeType{
|
||||
RiskAssessmentNodeTypeEntity,
|
||||
RiskAssessmentNodeTypeBoundary,
|
||||
RiskAssessmentNodeTypeAsset,
|
||||
RiskAssessmentNodeTypeData,
|
||||
}
|
||||
@@ -47,7 +45,6 @@ func (v RiskAssessmentNodeType) IsValid() bool {
|
||||
switch v {
|
||||
case
|
||||
RiskAssessmentNodeTypeEntity,
|
||||
RiskAssessmentNodeTypeBoundary,
|
||||
RiskAssessmentNodeTypeAsset,
|
||||
RiskAssessmentNodeTypeData:
|
||||
return true
|
||||
|
||||
Reference in New Issue
Block a user