Skip to content

chore(updatecli): migreate depreciated CLI commands to pipeline subcommands #996

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

Open
jayfranco999 wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −12
Open

chore(updatecli): migreate depreciated CLI commands to pipeline subcommands #996

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
22 changes: 11 additions & 11 deletions test/groovy/UpdatecliStepTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class UpdatecliStepTests extends BaseTest {
assertFalse(assertMethodCallContainsPattern('sh', 'tar --extract'))

// And only the diff command called with default values
assertTrue(assertMethodCallContainsPattern('sh','updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh','updatecli apply'))
assertTrue(assertMethodCallContainsPattern('sh','updatecli pipeline diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh','updatecli pipeline apply'))
}

@Test
Expand All @@ -62,8 +62,8 @@ class UpdatecliStepTests extends BaseTest {
assertTrue(assertMethodCallContainsPattern('checkout',''))

// And only the custom command called with default values
assertFalse(assertMethodCallContainsPattern('sh','updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertTrue(assertMethodCallContainsPattern('sh','updatecli eat --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh','updatecli pipeline diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertTrue(assertMethodCallContainsPattern('sh','updatecli pipeline eat --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
}

@Test
Expand All @@ -81,7 +81,7 @@ class UpdatecliStepTests extends BaseTest {
assertTrue(assertMethodCallContainsPattern('checkout',''))

// And only the default command called with custom config and NO values
assertTrue(assertMethodCallContainsPattern('sh','updatecli diff --config ./ops/config.yml'))
assertTrue(assertMethodCallContainsPattern('sh','updatecli pipeline diff --config ./ops/config.yml'))
assertFalse(assertMethodCallContainsPattern('sh','--values'))
}

Expand All @@ -101,7 +101,7 @@ class UpdatecliStepTests extends BaseTest {
assertTrue(assertMethodCallContainsPattern('checkout',''))

// And only the default command called with custom config and NO values
assertTrue(assertMethodCallContainsPattern('sh','updatecli diff --values ./values.yaml'))
assertTrue(assertMethodCallContainsPattern('sh','updatecli pipeline diff --values ./values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh','--config'))
}

Expand All @@ -123,8 +123,8 @@ class UpdatecliStepTests extends BaseTest {
assertTrue(assertMethodCallContainsPattern('node', 'jnlp-linux-amd64'))

// And only the diff command called with default values
assertTrue(assertMethodCallContainsPattern('sh','updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh','updatecli apply'))
assertTrue(assertMethodCallContainsPattern('sh','updatecli pipeline diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh','updatecli pipeline apply'))
}

@Test
Expand Down Expand Up @@ -152,7 +152,7 @@ class UpdatecliStepTests extends BaseTest {
assertTrue(assertMethodCallContainsPattern('sh', 'curl --silent --show-error --location --output'))
assertTrue(assertMethodCallContainsPattern('sh', 'mkdir -p "${CUSTOM_UPDATECLI_PATH}"'))
assertTrue(assertMethodCallContainsPattern('sh', 'tar --extract --gzip --file="${tarFileName}" --directory="${CUSTOM_UPDATECLI_PATH}" updatecli'))
assertTrue(assertMethodCallContainsPattern('sh', 'updatecli diff'))
assertTrue(assertMethodCallContainsPattern('sh', 'updatecli pipeline diff'))
}

// Test that when a runInCurrentAgent: true is specified, the pipeline does not provision an agent node.
Expand All @@ -174,7 +174,7 @@ class UpdatecliStepTests extends BaseTest {
assertTrue(assertMethodCallContainsPattern('checkout', ''))

// And only the diff command is called with default values
assertTrue(assertMethodCallContainsPattern('sh', 'updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh', 'updatecli apply'))
assertTrue(assertMethodCallContainsPattern('sh', 'updatecli pipeline diff --config ./updatecli/updatecli.d --values ./updatecli/values.yaml'))
assertFalse(assertMethodCallContainsPattern('sh', 'updatecli pipeline apply'))
}
}
2 changes: 1 addition & 1 deletion vars/updatecli.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def call(userConfig = [:]) {

// Build the updatecli command
String updatecliCommand = ""
updatecliCommand = "updatecli ${finalConfig.action}"
updatecliCommand = "updatecli pipeline ${finalConfig.action}"
if (finalConfig.debug) {
updatecliCommand += ' --debug'
}
Expand Down