From f53acb26fe57873211a10c73be70a4a6745d52cf Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Thu, 26 Mar 2020 16:55:08 -0400 Subject: [PATCH] Lookup config/config-type ids when names are provided --- ziti/cmd/ziti/cmd/edge_controller/create_config.go | 7 ++++++- ziti/cmd/ziti/cmd/edge_controller/create_service.go | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ziti/cmd/ziti/cmd/edge_controller/create_config.go b/ziti/cmd/ziti/cmd/edge_controller/create_config.go index edcffa88c..6218027f9 100644 --- a/ziti/cmd/ziti/cmd/edge_controller/create_config.go +++ b/ziti/cmd/ziti/cmd/edge_controller/create_config.go @@ -72,9 +72,14 @@ func runCreateConfig(o *createConfigOptions) error { return errors.Errorf("unable to parse data as json: %v", err) } + configTypeId, err := mapNameToID("config-types", o.Args[1]) + if err != nil { + return err + } + entityData := gabs.New() setJSONValue(entityData, o.Args[0], "name") - setJSONValue(entityData, o.Args[1], "type") + setJSONValue(entityData, configTypeId, "type") setJSONValue(entityData, dataMap, "data") result, err := createEntityOfType("configs", entityData.String(), &o.commonOptions) diff --git a/ziti/cmd/ziti/cmd/edge_controller/create_service.go b/ziti/cmd/ziti/cmd/edge_controller/create_service.go index 86b74e017..f33731ae3 100644 --- a/ziti/cmd/ziti/cmd/edge_controller/create_service.go +++ b/ziti/cmd/ziti/cmd/edge_controller/create_service.go @@ -74,13 +74,19 @@ func newCreateServiceCmd(f cmdutil.Factory, out io.Writer, errOut io.Writer) *co // runCreateService implements the command to create a service func runCreateService(o *createServiceOptions) (err error) { + + configs, err := mapNamesToIDs("configs", o.configs...) + if err != nil { + return err + } + entityData := gabs.New() setJSONValue(entityData, o.Args[0], "name") if o.terminatorStrategy != "" { setJSONValue(entityData, o.terminatorStrategy, "terminatorStrategy") } setJSONValue(entityData, o.roleAttributes, "roleAttributes") - setJSONValue(entityData, o.configs, "configs") + setJSONValue(entityData, configs, "configs") setJSONValue(entityData, o.tags, "tags") result, err := createEntityOfType("services", entityData.String(), &o.commonOptions)