From d27955daf34160511a76b3977b654a1639bd5d96 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Wed, 9 Feb 2022 10:09:47 +0100 Subject: [PATCH] Add missing locations to cue.fmt make task and re-run formatting --- Makefile | 10 +++++----- automation/component.cue | 12 ++++++------ automation/workflow.cue | 14 +++++++------- codegen/options.cue | 5 +++-- federation/component.cue | 12 ++++++------ federation/exposed-module.cue | 2 +- federation/node.cue | 4 ++-- federation/shared-module.cue | 2 +- 8 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index f26d1378c..9120daba0 100644 --- a/Makefile +++ b/Makefile @@ -142,11 +142,14 @@ test.codegen: $(CUE) $(JSONTPLEXEC) cue.fmt: $(CUE) $(CUE) fmt -v codegen/*.cue $(CUE) fmt -v codegen/schema/*.cue + $(CUE) fmt -v app/*.cue + $(CUE) fmt -v app/options/*.cue + $(CUE) fmt system/*.cue $(CUE) fmt compose/*.cue - # $(CUE) fmt automation/*.cue - # $(CUE) fmt federation/*.cue + $(CUE) fmt automation/*.cue + $(CUE) fmt federation/*.cue codegen-legacy: $(CODEGEN) @ $(CODEGEN) -v @@ -173,9 +176,6 @@ locale.update: outdated: $(MODOUTDATED) $(GO) list -mod=mod -u -m -json all | $(MODOUTDATED) -update -direct - - - ####################################################################################################################### # Quality Assurance diff --git a/automation/component.cue b/automation/component.cue index 02f2eb66a..828bd07e3 100644 --- a/automation/component.cue +++ b/automation/component.cue @@ -12,11 +12,11 @@ component: schema.#component & { } rbac: operations: { - "grant": description: "Manage automation permissions" - "workflow.create": description: "Create workflows" - "triggers.search": description: "List, search or filter triggers" - "sessions.search": description: "List, search or filter sessions" - "workflows.search": description: "List, search or filter workflows" - "resource-translations.manage": description: "List, search, create, or update resource translations" + "grant": description: "Manage automation permissions" + "workflow.create": description: "Create workflows" + "triggers.search": description: "List, search or filter triggers" + "sessions.search": description: "List, search or filter sessions" + "workflows.search": description: "List, search or filter workflows" + "resource-translations.manage": description: "List, search, create, or update resource translations" } } diff --git a/automation/workflow.cue b/automation/workflow.cue index b8dfd40cc..00f941086 100644 --- a/automation/workflow.cue +++ b/automation/workflow.cue @@ -7,13 +7,13 @@ import ( workflow: schema.#resource & { rbac: { operations: { - "read": description: "Read workflow" - "update": description: "Update workflow" - "delete": description: "Delete workflow" - "undelete": description: "Undelete workflow" - "execute": description: "Execute workflow" - "triggers.manage": description: "Manage workflow triggers" - "sessions.manage": description: "Manage workflow sessions" + "read": description: "Read workflow" + "update": description: "Update workflow" + "delete": description: "Delete workflow" + "undelete": description: "Undelete workflow" + "execute": description: "Execute workflow" + "triggers.manage": description: "Manage workflow triggers" + "sessions.manage": description: "Manage workflow sessions" } } } diff --git a/codegen/options.cue b/codegen/options.cue index e9fda9508..ea2e9322e 100644 --- a/codegen/options.cue +++ b/codegen/options.cue @@ -9,6 +9,9 @@ import ( options: [...schema.#codegen] & [ + + // placeholder + // for g in app.corteza.options { // template: "gocode/options/$options_group.go.tpl" // output: "pkg/options/\(g.ident).gen.go" @@ -93,6 +96,4 @@ options: } }, ]+ - - // placeholder [] diff --git a/federation/component.cue b/federation/component.cue index c148788da..febfa3762 100644 --- a/federation/component.cue +++ b/federation/component.cue @@ -14,11 +14,11 @@ component: schema.#component & { } rbac: operations: { - "grant": description: "Manage federation permissions" - "pair": description: "Pair federation nodes" - "settings.read": description: "Read settings" - "settings.manage": description: "Manage settings" - "node.create": description: "Create new federation node" - "nodes.search": description: "List, search or filter federation nodes" + "grant": description: "Manage federation permissions" + "pair": description: "Pair federation nodes" + "settings.read": description: "Read settings" + "settings.manage": description: "Manage settings" + "node.create": description: "Create new federation node" + "nodes.search": description: "List, search or filter federation nodes" } } diff --git a/federation/exposed-module.cue b/federation/exposed-module.cue index 07d0d3626..501d4fe40 100644 --- a/federation/exposed-module.cue +++ b/federation/exposed-module.cue @@ -11,7 +11,7 @@ exposedModule: schema.#resource & { rbac: { operations: { - "manage": description: "Manage exposed module module" + "manage": description: "Manage exposed module module" } } } diff --git a/federation/node.cue b/federation/node.cue index f82269b61..fd5835c6c 100644 --- a/federation/node.cue +++ b/federation/node.cue @@ -7,8 +7,8 @@ import ( node: schema.#resource & { rbac: { operations: { - "manage": description: "Manage federation node" - "module.create": description: "Create shared module" + "manage": description: "Manage federation node" + "module.create": description: "Create shared module" } } } diff --git a/federation/shared-module.cue b/federation/shared-module.cue index 9509315b0..614858066 100644 --- a/federation/shared-module.cue +++ b/federation/shared-module.cue @@ -11,7 +11,7 @@ sharedModule: schema.#resource & { rbac: { operations: { - "map": description: "Map shared module" + "map": description: "Map shared module" } } }