Fixes #20437: Error when writing techniques via the technique editor #4059
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fanf
added
Trigger test
WIP
amousset
reviewed
Dec 16, 2021
webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
Outdated
Show resolved
Hide resolved
|
PR updated with a new commit |
fanf
commented
Dec 16, 2021
| @@ -158,8 +183,12 @@ class RudderCRunner ( | |||
|
|
|||
| def writeOne[T <: RuddercTarget](target: T, ruddercTargets: Set[RuddercTarget], technique: EditorTechnique, methods: Map[BundleName, GenericMethod], fallback: AgentSpecificTechniqueWriter, outputPath: String, configFilePath: String) = { | |||
| if(ruddercTargets.contains(target)) { | |||
| TechniqueWriterLoggerPure.debug(s"Using rudderc for target '${target.name}' for technique '${technique.path}'") *> | |||
| compileForTarget[RuddercTarget.CFEngine.type](s"""${outputPath}/${technique.path}/technique.json""", configFilePath) | |||
| TechniqueWriterLoggerPure.debug(s"Using rudderc for target '${target.name}' for technique '${technique.path}'") *> { | |||
There was a problem hiding this comment.
we need test integration from end to end to catch these things
fanf
removed
the
WIP
amousset
reviewed
Dec 16, 2021
webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
Outdated
Show resolved
Hide resolved
amousset
reviewed
Dec 16, 2021
webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
Outdated
Show resolved
Hide resolved
amousset
reviewed
Dec 16, 2021
webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
Outdated
Show resolved
Hide resolved
VinceMacBuche
approved these changes
Dec 16, 2021
|
This PR is not mergeable to upper versions. |
|
OK, squash merging this PR |
…/rudder/ncf/TechniqueWriter.scala Co-authored-by: Alexis Mousset <contact@amousset.me>
…/rudder/ncf/TechniqueWriter.scala Co-authored-by: Alexis Mousset <contact@amousset.me>
…/rudder/ncf/TechniqueWriter.scala Co-authored-by: Alexis Mousset <contact@amousset.me>
fanf
force-pushed
the
bug_20437/error_when_writing_techniques_via_the_technique_editor
branch
from
749e58a
to
4c3eaec
Compare
fanf
deleted the
bug_20437/error_when_writing_techniques_via_the_technique_editor
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/20437
There was (at least) three problem in previous code:
outputpath, and it was hard to see because we duplicated much code in path creation => factor out common path in an object specific to a compiler instance, and use it to remove some boilerplate