Skip to content

fix(legacy): forward --level from variable:create --update to variable:update #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pjcdawkins wants to merge 1 commit into from
Closed

fix(legacy): forward --level from variable:create --update to variable:update #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions integration-tests/variable_write_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,31 @@ func TestVariableCreate(t *testing.T) {
assertTrimmed(t, "false", f.Run("var:get", "-p", p, "env:TEST", "-l", "p", "-P", "visible_runtime"))
}

func TestVariableCreateUpdateWithLevel(t *testing.T) {
// Regression test: var:create --update must forward --level to var:update
// when the variable exists at both levels.
s := setupVariableTest(t)
s.apiHandler.SetEnvironments([]*mockapi.Environment{s.mainEnv})

f, p := s.factory, s.projectID

f.Run("var:create", "-p", p, "-l", "p", "env:FOO", "--value", "project-value")
f.Run("var:create", "-p", p, "-e", "main", "-l", "e", "env:FOO", "--value", "env-value")

_, stdErr, err := f.RunCombinedOutput("var:create", "-p", p, "-e", "main", "-u", "-l", "e",
"--name", "env:FOO", "--value", "env-value2")
assert.NoError(t, err)
assert.NotContains(t, stdErr, "Variable found at both project and environment levels")

_, stdErr, err = f.RunCombinedOutput("var:create", "-p", p, "-e", "main", "-u", "-l", "p",
"--name", "env:FOO", "--value", "project-value2")
assert.NoError(t, err)
assert.NotContains(t, stdErr, "Variable found at both project and environment levels")

assertTrimmed(t, "env-value2", f.Run("var:get", "-p", p, "-e", "main", "env:FOO", "-l", "e", "-P", "value"))
assertTrimmed(t, "project-value2", f.Run("var:get", "-p", p, "-e", "main", "env:FOO", "-l", "p", "-P", "value"))
}

func TestVariableCreateDefaultEnvironment(t *testing.T) {
// Regression test for CLI-164: using "-e ." (the default-environment code)
// must not fail form validation of the --environment option.
Expand Down
6 changes: 5 additions & 1 deletion legacy/src/Command/Variable/VariableCreateCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
if (($prefix = Option::stringOrNull($input, 'prefix')) && $prefix !== 'none') {
$name = rtrim($prefix, ':') . ':' . $name;
}
$existing = $this->variableCommandUtil->getExistingVariable($name, $selection, $this->variableCommandUtil->getRequestedLevel($input), false);
$level = $this->variableCommandUtil->getRequestedLevel($input);
$existing = $this->variableCommandUtil->getExistingVariable($name, $selection, $level, false);
if ($existing) {
if (!Option::bool($input, 'update')) {
$this->stdErr->writeln('The variable already exists: <error>' . $name . '</error>');
Expand All @@ -115,6 +116,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
if ($selection->hasEnvironment()) {
$arguments['--environment'] = $selection->getEnvironment()->id;
}
if ($level !== null) {
$arguments['--level'] = $level;
}
foreach ($this->form->getFields() as $field) {
$argName = '--' . $field->getOptionName();
$value = $field->getValueFromInput($input, false);
Expand Down
Loading