mirror of
https://github.com/passbolt/go-passbolt-cli.git
synced 2025-05-11 02:28:22 +00:00
Initialize the CEL program in a util function
This commit is contained in:
parent
f30590588e
commit
0a542bfdba
5 changed files with 35 additions and 48 deletions
|
@ -5,6 +5,7 @@ import (
|
|||
"fmt"
|
||||
|
||||
"github.com/google/cel-go/cel"
|
||||
"github.com/passbolt/go-passbolt-cli/util"
|
||||
"github.com/passbolt/go-passbolt/api"
|
||||
)
|
||||
|
||||
|
@ -23,24 +24,14 @@ func filterFolders(folders *[]api.Folder, celCmd string, ctx context.Context) ([
|
|||
return *folders, nil
|
||||
}
|
||||
|
||||
env, err := cel.NewEnv(celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ast, issue := env.Compile(celCmd)
|
||||
if issue.Err() != nil {
|
||||
return nil, issue.Err()
|
||||
}
|
||||
|
||||
program, err := env.Program(ast)
|
||||
program, err := util.InitCELProgram(celCmd, celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
filteredFolders := []api.Folder{}
|
||||
for _, folder := range *folders {
|
||||
val, _, err := program.ContextEval(ctx, map[string]any{
|
||||
val, _, err := (*program).ContextEval(ctx, map[string]any{
|
||||
"ID": folder.ID,
|
||||
"FolderParentID": folder.FolderParentID,
|
||||
"Name": folder.Name,
|
||||
|
|
|
@ -5,6 +5,7 @@ import (
|
|||
"fmt"
|
||||
|
||||
"github.com/google/cel-go/cel"
|
||||
"github.com/passbolt/go-passbolt-cli/util"
|
||||
"github.com/passbolt/go-passbolt/api"
|
||||
)
|
||||
|
||||
|
@ -22,24 +23,14 @@ func filterGroups(groups *[]api.Group, celCmd string, ctx context.Context) ([]ap
|
|||
return *groups, nil
|
||||
}
|
||||
|
||||
env, err := cel.NewEnv(celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ast, issue := env.Compile(celCmd)
|
||||
if issue.Err() != nil {
|
||||
return nil, issue.Err()
|
||||
}
|
||||
|
||||
program, err := env.Program(ast)
|
||||
program, err := util.InitCELProgram(celCmd, celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
filteredGroups := []api.Group{}
|
||||
for _, group := range *groups {
|
||||
val, _, err := program.ContextEval(ctx, map[string]any{
|
||||
val, _, err := (*program).ContextEval(ctx, map[string]any{
|
||||
"ID": group.ID,
|
||||
"Name": group.Name,
|
||||
"CreatedTimestamp": group.Created.Time,
|
||||
|
|
|
@ -7,6 +7,7 @@ import (
|
|||
"github.com/google/cel-go/cel"
|
||||
"github.com/google/cel-go/common/types"
|
||||
"github.com/google/cel-go/common/types/ref"
|
||||
"github.com/passbolt/go-passbolt-cli/util"
|
||||
"github.com/passbolt/go-passbolt/api"
|
||||
"github.com/passbolt/go-passbolt/helper"
|
||||
)
|
||||
|
@ -30,24 +31,14 @@ func filterResources(resources *[]api.Resource, celCmd string, ctx context.Conte
|
|||
return *resources, nil
|
||||
}
|
||||
|
||||
env, err := cel.NewEnv(celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ast, issue := env.Compile(celCmd)
|
||||
if issue.Err() != nil {
|
||||
return nil, issue.Err()
|
||||
}
|
||||
|
||||
program, err := env.Program(ast)
|
||||
program, err := util.InitCELProgram(celCmd, celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
filteredResources := []api.Resource{}
|
||||
for _, resource := range *resources {
|
||||
val, _, err := program.ContextEval(ctx, map[string]any{
|
||||
val, _, err := (*program).ContextEval(ctx, map[string]any{
|
||||
"Id": resource.ID,
|
||||
"FolderParentID": resource.FolderParentID,
|
||||
"Name": resource.Name,
|
||||
|
|
|
@ -5,6 +5,7 @@ import (
|
|||
"fmt"
|
||||
|
||||
"github.com/google/cel-go/cel"
|
||||
"github.com/passbolt/go-passbolt-cli/util"
|
||||
"github.com/passbolt/go-passbolt/api"
|
||||
)
|
||||
|
||||
|
@ -25,24 +26,14 @@ func filterUsers(users *[]api.User, celCmd string, ctx context.Context) ([]api.U
|
|||
return *users, nil
|
||||
}
|
||||
|
||||
env, err := cel.NewEnv(celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ast, issue := env.Compile(celCmd)
|
||||
if issue.Err() != nil {
|
||||
return nil, issue.Err()
|
||||
}
|
||||
|
||||
program, err := env.Program(ast)
|
||||
program, err := util.InitCELProgram(celCmd, celEnvOptions...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
filteredUsers := []api.User{}
|
||||
for _, user := range *users {
|
||||
val, _, err := program.ContextEval(ctx, map[string]any{
|
||||
val, _, err := (*program).ContextEval(ctx, map[string]any{
|
||||
"ID": user.ID,
|
||||
"Username": user.Username,
|
||||
"FirstName": user.Profile.FirstName,
|
||||
|
|
23
util/cel.go
Normal file
23
util/cel.go
Normal file
|
@ -0,0 +1,23 @@
|
|||
package util
|
||||
|
||||
import "github.com/google/cel-go/cel"
|
||||
|
||||
// InitCELProgram - Initialize a CEL program with given CEL command and a set of environments
|
||||
func InitCELProgram(celCmd string, options ...cel.EnvOption) (*cel.Program, error) {
|
||||
env, err := cel.NewEnv(options...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ast, issue := env.Compile(celCmd)
|
||||
if issue.Err() != nil {
|
||||
return nil, issue.Err()
|
||||
}
|
||||
|
||||
program, err := env.Program(ast)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &program, nil
|
||||
}
|
Loading…
Add table
Reference in a new issue