meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases15 Packages1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Mirco 2025-01-22 21:05:51 +01:00
commit ced4f063d7
4 changed files with 15 additions and 9 deletions
README.mdbuild.gradle
src
main/kotlin/org/domaindrivenarchitecture/provs/framework/core
Prov.kt
test/kotlin/org/domaindrivenarchitecture/provs/framework/core
ProvTest.kt

1
README.md
View file

@ -191,6 +191,7 @@ provs-server.jar k3s -h
Development happens at: https://repo.prod.meissa.de/meissa/provs
Mirrors are:
* https://codeberg.org/meissa/provs.git
* https://gitlab.com/domaindrivenarchitecture/provs (CI issues and PR)
* https://github.com/DomainDrivenArchitecture/provs

2
build.gradle
View file

@ -16,7 +16,7 @@ plugins {
apply plugin: "maven-publish"
version = "0.39.5-SNAPSHOT"
version = "0.39.6-SNAPSHOT"
group = "org.domaindrivenarchitecture.provs"

9
src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Prov.kt
View file

@ -1,5 +1,6 @@
package org.domaindrivenarchitecture.provs.framework.core
import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL
import org.domaindrivenarchitecture.provs.framework.core.platforms.UbuntuProv
import org.domaindrivenarchitecture.provs.framework.core.processors.LocalProcessor
import org.domaindrivenarchitecture.provs.framework.core.processors.Processor
@ -325,7 +326,11 @@ open class Prov protected constructor(
ProvResult(false, err = "mode unknown")
}
internalResults[resultIndex].provResult = returnValue
// removes potential prefix from cmd in ProvResult, e.g. removes "/bin/bash -c "
fun cleanedResult(result: ProvResult): ProvResult { return result.copy(cmd = returnValue.cmd?.replace("[" + SHELL + ", -c, ", "[")) }
val resultValueWithCmdCleanedUp = cleanedResult(returnValue)
internalResults[resultIndex].provResult = resultValueWithCmdCleanedUp
// Add failure result to output if not yet included,
// which is the case if the result was not part of another subtask but created and returned by the lambda itself.
@ -333,7 +338,7 @@ open class Prov protected constructor(
// whereas the failure results may have a useful error message, which should be in the output.
// Only direct result objects are added, but not result objects that were passed from a subtask as they are already handled in the subtask.
if (!resultOfTaskLambda.success && (resultIndex < internalResults.size - 1) && (resultOfTaskLambda != internalResults[resultIndex + 1].provResult)) {
internalResults.add(ResultLine(level + 1, "<<returned result>>", resultOfTaskLambda))
internalResults.add(ResultLine(level + 1, name + " (returned result)", cleanedResult(resultOfTaskLambda)))
}
if (level == 0) {

12
src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt
View file

@ -318,10 +318,10 @@ internal class ProvTest {
"---> \u001B[92mSuccess\u001B[0m -- testMethodForOutputTest_with_mode_requireLast (requireLast) \n" +
"------> \u001B[93mFAILED\u001B[0m -- checkPrereq_evaluateToFailure (requireLast) -- Error: This is a test error.\n" +
"------> \u001B[92mSuccess\u001B[0m -- sh \n" +
"---------> \u001B[92mSuccess\u001B[0m -- cmd [/bin/bash, -c, echo -Start test-]\n" +
"---------> \u001B[92mSuccess\u001B[0m -- cmd [/bin/bash, -c, echo Some output]\n" +
"---------> \u001B[92mSuccess\u001B[0m -- cmd [echo -Start test-]\n" +
"---------> \u001B[92mSuccess\u001B[0m -- cmd [echo Some output]\n" +
"------> \u001B[92mSuccess\u001B[0m -- sh \n" +
"---------> \u001B[92mSuccess\u001B[0m -- cmd [/bin/bash, -c, echo -End test-]\n" +
"---------> \u001B[92mSuccess\u001B[0m -- cmd [echo -End test-]\n" +
"----------------------------------------------------------------------------------------------------\n" +
"Overall > \u001B[92mSuccess\u001B[0m\n" +
"============================================ SUMMARY END ===========================================\n" +
@ -362,8 +362,8 @@ internal class ProvTest {
"---> \u001B[91mFAILED\u001B[0m -- testMethodForOutputTest_nested_with_failure \n" +
"------> \u001B[91mFAILED\u001B[0m -- sub1 \n" +
"---------> \u001B[92mSuccess\u001B[0m -- testMethodForOutputTest_nested_with_failure \n" +
"---------> \u001B[91mFAILED\u001B[0m -- <<returned result>> -- Error: Iamanerrormessage\n" +
"------> \u001B[92mSuccess\u001B[0m -- cmd [/bin/bash, -c, echo -End test-]\n" +
"---------> \u001B[91mFAILED\u001B[0m -- sub1 (returned result) -- Error: Iamanerrormessage\n" +
"------> \u001B[92mSuccess\u001B[0m -- cmd [echo -End test-]\n" +
"----------------------------------------------------------------------------------------------------\n" +
"Overall > \u001B[91mFAILED\u001B[0m \n" +
"============================================ SUMMARY END ===========================================\n" +
@ -734,7 +734,7 @@ internal class ProvTest {
"------> \u001B[92mSuccess\u001B[0m -- sub2e-task \n" +
"---------> \u001B[92mSuccess\u001B[0m -- addResultToEval \n" +
"------> \u001B[91mFAILED\u001B[0m -- sub2f-taskWithResult -- Error: returned-result - error msg C should be once in output - at the end of sub3taskWithResult \n" +
"------> \u001B[91mFAILED\u001B[0m -- <<returned result>> -- Error: returned-result - error msg D should be once in output - at the end of sub1 \n" +
"------> \u001B[91mFAILED\u001B[0m -- sub1 (returned result) -- Error: returned-result - error msg D should be once in output - at the end of sub1 \n" +
"----------------------------------------------------------------------------------------------------\n" +
"Overall > \u001B[91mFAILED\u001B[0m \n" +
"============================================ SUMMARY END ===========================================\n" +