DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix cue resource definitions

Browse Source
This commit is contained in:
Denis Arh 2022-04-23 17:13:12 +02:00
parent faa1dc57b2
commit 5fe1e63f22
9 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codegen/assets/templates/gocode/store/rdbms/rdbms.go.tpl
View File

@ -315,7 +315,7 @@ func (s Store) Query{{ .expIdentPlural }}(
{{ end }}
set = make([]*{{ .goType }}, 0, DefaultSliceCapacity)
res *{{ .goType }}
aux {{ .auxIdent }}
aux *{{ .auxIdent }}
rows *sql.Rows
count uint
expr, tExpr []goqu.Expression
@ -376,9 +376,6 @@ func (s Store) Query{{ .expIdentPlural }}(
return
}
if err = rows.Err(); err != nil {
err = fmt.Errorf("could not query {{ .expIdent }}: %w", err)
return
@ -398,6 +395,7 @@ func (s Store) Query{{ .expIdentPlural }}(
return
}
aux = new({{ .auxIdent }})
if err = aux.scan(rows); err != nil {
err = fmt.Errorf("could not scan rows for {{ .expIdent }}: %w", err)
return

2
codegen/schema/resource.cue
View File

@ -62,7 +62,7 @@ import (
}]
// All known RBAC operations for this resource
rbac: #rbacResource & {
rbac?: #rbacResource & {
resourceExpIdent: expIdent
}

4
codegen/server.envoy-rbac.cue
View File

@ -18,7 +18,7 @@ import (
]
resources: [
for res in cmp.resources {
for res in cmp.resources if res.rbac != _|_ {
rbacRefFunc: "\(cmp.expIdent)\(res.expIdent)RbacReferences"
references: [
for p in res.parents {p},
@ -42,7 +42,7 @@ import (
]
resources: [
for cmp in app.corteza.components for res in cmp.resources {
for cmp in app.corteza.components for res in cmp.resources if res.rbac != _|_ {
importAlias: "\(cmp.ident)Types"
expIdent: res.expIdent

4
codegen/server.rbac-access_control.cue
View File

@ -19,7 +19,7 @@ import (
// All possible RBAC operations on component and resources
// flattened
operations: [
for res in cmp.resources for op in res.rbac.operations {
for res in cmp.resources if res.rbac != _|_ for op in res.rbac.operations {
"op": op.handle
const: "types.\(res.expIdent)ResourceType"
resFunc: "types.\(res.expIdent)RbacResource"
@ -42,7 +42,7 @@ import (
// Operation/resource validators, grouped by resource
validation: [
for res in cmp.resources {
for res in cmp.resources if res.rbac != _|_ {
label: res.ident
const: "types.\(res.expIdent)ResourceType"
funcName: "rbac\(res.expIdent)ResourceValidator"

2
codegen/server.rbac-types.cue
View File

@ -16,7 +16,7 @@ import (
cmpIdent: cmp.ident
// Operation/resource validators, grouped by resource
types: [
for res in cmp.resources {
for res in cmp.resources if res.rbac != _|_ {
const: "\(res.expIdent)ResourceType"
type: res.fqrn
resFunc: "\(res.expIdent)RbacResource"

8
federation/exposed-module.cue
View File

@ -17,9 +17,9 @@ exposedModule: schema.#Resource & {
id: schema.IdField
handle: schema.HandleField
name: {}
node_id: { ident: "nodeID", goType: "uint64" }
compose_module_id: { ident: "composeModuleID", goType: "uint64" }
compose_namespace_id: { ident: "composeNamespaceID", goType: "uint64" }
node_id: { ident: "nodeID", goType: "uint64", storeIdent: "rel_node" }
compose_module_id: { ident: "composeModuleID", goType: "uint64", storeIdent: "rel_compose_module" }
compose_namespace_id: { ident: "composeNamespaceID", goType: "uint64", storeIdent: "rel_compose_namespace" }
fields: { goType: "types.ModuleFieldSet" }
created_at: schema.SortableTimestampField
@ -52,7 +52,7 @@ exposedModule: schema.#Resource & {
settings: {
rdbms: {
table: "federation_exposed_module"
table: "federation_module_exposed"
}
}

6
federation/module-mapping.cue
View File

@ -31,12 +31,6 @@ moduleMapping: schema.#Resource & {
byValue: ["compose_module_id", "compose_namespace_id", "federation_module_id"]
}
rbac: {
operations: {
"manage": description: "Manage exposed module module"
}
}
store: {
ident: "federationModuleMapping"

8
federation/shared-module.cue
View File

@ -16,9 +16,9 @@ sharedModule: schema.#Resource & {
struct: {
id: schema.IdField
handle: schema.HandleField
node_id: { ident: "nodeID", goType: "uint64" }
node_id: { ident: "nodeID", goType: "uint64", storeIdent: "rel_node" }
name: {}
external_federation_module_id: { ident: "externalFederationModuleID", goType: "uint64" }
external_federation_module_id: { ident: "externalFederationModuleID", goType: "uint64", storeIdent: "xref_module", }
fields: { goType: "types.ModuleFieldSet" }
created_at: schema.SortableTimestampField
@ -31,7 +31,7 @@ sharedModule: schema.#Resource & {
filter: {
struct: {
node_id: { goType: "uint64", ident: "nodeID", storeIdent: "ref_node" }
node_id: { goType: "uint64", ident: "nodeID", storeIdent: "rel_node" }
handle: { goType: "string" }
name: { goType: "string" }
external_federation_module_id: { goType: "uint64", storeIdent: "xref_module", ident: "externalFederationModuleID" }
@ -52,7 +52,7 @@ sharedModule: schema.#Resource & {
settings: {
rdbms: {
table: "federation_shared_module"
table: "federation_module_shared"
}
}

8
system/role_member.cue
View File

@ -26,14 +26,6 @@ role_member: schema.#Resource & {
byValue: [ "user_id", "role_id"]
}
rbac: {
operations: {
read: description: "Read role"
update: description: "Update role"
delete: description: "Delete role"
"members.manage": description: "Manage members"
}}
store: {
api: {
lookups: []