Merge pull request #90 from UiPath/feature/parameter-override-support

Add support to predefine CLI parameters using config

commandline/command_builder.go

@@ -126,13 +126,18 @@ func (b CommandBuilder) createExecutionParameters(context *cli.Context, config *
 			}
 			parameter := executor.NewExecutionParameter(param.FieldName, value, param.In)
 			parameters = append(parameters, *parameter)
+		} else if configValue, ok := config.Parameter[param.Name]; ok {
+			value, err := typeConverter.Convert(configValue, param)
+			if err != nil {
+				return nil, err
+			}
+			parameter := executor.NewExecutionParameter(param.FieldName, value, param.In)
+			parameters = append(parameters, *parameter)
 		} else if param.Required && param.DefaultValue != nil {
 			parameter := executor.NewExecutionParameter(param.FieldName, param.DefaultValue, param.In)
 			parameters = append(parameters, *parameter)
 		}
 	}
-	parameters = append(parameters, b.createExecutionParametersFromConfigMap(config.Path, parser.ParameterInPath)...)
-	parameters = append(parameters, b.createExecutionParametersFromConfigMap(config.Query, parser.ParameterInQuery)...)
 	parameters = append(parameters, b.createExecutionParametersFromConfigMap(config.Header, parser.ParameterInHeader)...)
 	return parameters, nil
 }
@@ -232,11 +237,7 @@ func (b CommandBuilder) getValue(parameter parser.Parameter, context *cli.Contex
 	if value != "" {
 		return value
 	}
-	value = config.Path[parameter.Name]
-	if value != "" {
-		return value
-	}
-	value = config.Query[parameter.Name]
+	value = config.Parameter[parameter.Name]
 	if value != "" {
 		return value
 	}

commandline/config_command_handler.go

@@ -81,11 +81,8 @@ func (h ConfigCommandHandler) setConfigValue(config *config.Config, key string,
 	} else if h.isHeaderKey(keyParts) {
 		config.SetHeader(keyParts[1], value)
 		return nil
-	} else if h.isPathKey(keyParts) {
-		config.SetPath(keyParts[1], value)
-		return nil
-	} else if h.isQueryKey(keyParts) {
-		config.SetQuery(keyParts[1], value)
+	} else if h.isParameterKey(keyParts) {
+		config.SetParameter(keyParts[1], value)
 		return nil
 	} else if h.isAuthPropertyKey(keyParts) {
 		config.SetAuthProperty(keyParts[2], value)
@@ -98,12 +95,8 @@ func (h ConfigCommandHandler) isHeaderKey(keyParts []string) bool {
 	return len(keyParts) == 2 && keyParts[0] == "header"
 }
 
-func (h ConfigCommandHandler) isPathKey(keyParts []string) bool {
-	return len(keyParts) == 2 && keyParts[0] == "path"
-}
-
-func (h ConfigCommandHandler) isQueryKey(keyParts []string) bool {
-	return len(keyParts) == 2 && keyParts[0] == "query"
+func (h ConfigCommandHandler) isParameterKey(keyParts []string) bool {
+	return len(keyParts) == 2 && keyParts[0] == "parameter"
 }
 
 func (h ConfigCommandHandler) isAuthPropertyKey(keyParts []string) bool {

config/config.go

@@ -12,8 +12,7 @@ type Config struct {
 	Uri          *url.URL
 	Organization string
 	Tenant       string
-	Path         map[string]string
-	Query        map[string]string
+	Parameter    map[string]string
 	Header       map[string]string
 	Auth         AuthConfig
 	Insecure     bool
@@ -149,12 +148,8 @@ func (c Config) SetHeader(key string, value string) {
 	c.Header[key] = value
 }
 
-func (c Config) SetPath(key string, value string) {
-	c.Path[key] = value
-}
-
-func (c Config) SetQuery(key string, value string) {
-	c.Query[key] = value
+func (c Config) SetParameter(key string, value string) {
+	c.Parameter[key] = value
 }
 
 func (c Config) SetAuthGrantType(grantType string) {

config/config_provider.go

@@ -46,8 +46,7 @@ func (p *ConfigProvider) Update(profileName string, config Config) error {
 	profile.Tenant = config.Tenant
 	profile.Auth = config.Auth.Config
 	profile.Header = config.Header
-	profile.Path = config.Path
-	profile.Query = config.Query
+	profile.Parameter = config.Parameter
 	profile.Version = config.Version
 
 	if index == -1 {
@@ -67,21 +66,17 @@ func (p ConfigProvider) convertToConfig(profile profileYaml) Config {
 	if profile.Auth == nil {
 		profile.Auth = map[string]interface{}{}
 	}
-	if profile.Path == nil {
-		profile.Path = map[string]string{}
+	if profile.Parameter == nil {
+		profile.Parameter = map[string]string{}
 	}
 	if profile.Header == nil {
 		profile.Header = map[string]string{}
 	}
-	if profile.Query == nil {
-		profile.Query = map[string]string{}
-	}
 	return Config{
 		Organization: profile.Organization,
 		Tenant:       profile.Tenant,
 		Uri:          profile.Uri.URL,
-		Path:         profile.Path,
-		Query:        profile.Query,
+		Parameter:    profile.Parameter,
 		Header:       profile.Header,
 		Auth: AuthConfig{
 			Type:   fmt.Sprintf("%v", profile.Auth["type"]),

config/profile_yaml.go

@@ -5,8 +5,7 @@ type profileYaml struct {
 	Organization string                 `yaml:"organization,omitempty"`
 	Tenant       string                 `yaml:"tenant,omitempty"`
 	Uri          urlYaml                `yaml:"uri,omitempty"`
-	Path         map[string]string      `yaml:"path,omitempty"`
-	Query        map[string]string      `yaml:"query,omitempty"`
+	Parameter    map[string]string      `yaml:"parameter,omitempty"`
 	Header       map[string]string      `yaml:"header,omitempty"`
 	Auth         map[string]interface{} `yaml:"auth,omitempty"`
 	Insecure     bool                   `yaml:"insecure,omitempty"`

test/config_set_test.go

@@ -231,50 +231,28 @@ func TestConfigSetHeader(t *testing.T) {
 	}
 }
 
-func TestConfigSetPath(t *testing.T) {
+func TestConfigSetParameter(t *testing.T) {
 	configFile := createFile(t)
 	context := NewContextBuilder().
 		WithConfigFile(configFile).
 		Build()
 
-	RunCli([]string{"config", "set", "--key", "path.org", "--value", "my-org"}, context)
+	RunCli([]string{"config", "set", "--key", "parameter.org", "--value", "my-org"}, context)
 
 	config, err := os.ReadFile(configFile)
 	if err != nil {
 		t.Errorf("Config file does not exist: %v", err)
 	}
 	expectedConfig := `profiles:
 - name: default
-  path:
+  parameter:
     org: my-org
 `
 	if string(config) != expectedConfig {
 		t.Errorf("Expected generated config %v, but got %v", expectedConfig, string(config))
 	}
 }
 
-func TestConfigSetQuery(t *testing.T) {
-	configFile := createFile(t)
-	context := NewContextBuilder().
-		WithConfigFile(configFile).
-		Build()
-
-	RunCli([]string{"config", "set", "--key", "query.filter", "--value", "my-filter"}, context)
-
-	config, err := os.ReadFile(configFile)
-	if err != nil {
-		t.Errorf("Config file does not exist: %v", err)
-	}
-	expectedConfig := `profiles:
-- name: default
-  query:
-    filter: my-filter
-`
-	if string(config) != expectedConfig {
-		t.Errorf("Expected generated config %v, but got %v", expectedConfig, string(config))
-	}
-}
-
 func TestConfigSetAuthGrantType(t *testing.T) {
 	configFile := createFile(t)
 	context := NewContextBuilder().