Fixes #11168: Search believe that CFEngine agents with "dsc" in their keys are also DSC agent #1752
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
VinceMacBuche
force-pushed
the
bug_11168/search_believe_that_cfengine_agents_with_dsc_in_their_keys_are_also_dsc_agent
branch
from
be3fb12
to
9efb220
Compare
|
Commit modified |
VinceMacBuche
force-pushed
the
bug_11168/search_believe_that_cfengine_agents_with_dsc_in_their_keys_are_also_dsc_agent
branch
from
9efb220
to
099b132
Compare
|
Commit modified |
VinceMacBuche
force-pushed
the
bug_11168/search_believe_that_cfengine_agents_with_dsc_in_their_keys_are_also_dsc_agent
branch
from
099b132
to
4505038
Compare
|
Commit modified |
|
could you add a test with the offending key, to ensure correct behaviour ? |
fanf
requested changes
Oct 10, 2017
|
|
||
| val agentMap = AgentType.allValues.toList.map(a => (a.id, a :: Nil)).toMap |
There was a problem hiding this comment.
I believe you didn't do what you intented here: agentMap does not contain ANY_CFENGINE, I believe you wanted to do something like:
- delete agentTypes
- val agentMap = ( (ANY_CFENGINE, "Any CFEngine based agent") :: AgentType.allValues.toList.map(a => (a.id, a :: Nil))).toMap
There was a problem hiding this comment.
Was on first version then eclipse havoc ... adding it back
VinceMacBuche
force-pushed
the
bug_11168/search_believe_that_cfengine_agents_with_dsc_in_their_keys_are_also_dsc_agent
branch
from
4505038
to
96a056b
Compare
|
Commit modified |
fanf
requested changes
Oct 10, 2017
| private[this] def filterAgent(agent: String) = SUB(A_AGENTS_NAME, null, Array(agent), null) | ||
| private[this] def filterAgent(agent: AgentType) = | ||
| SUB(A_AGENTS_NAME, null, Array(s""""agentType":"${agent.id}""""), null) :: | ||
| EQ(A_AGENTS_NAME, agent.oldShortName) :: |
There was a problem hiding this comment.
Could you add a comment here so that we remember why we need to keep old short name here?
|
Commit modified |
VinceMacBuche
force-pushed
the
bug_11168/search_believe_that_cfengine_agents_with_dsc_in_their_keys_are_also_dsc_agent
branch
from
96a056b
to
c9657a4
Compare
…ir keys are also DSC agent
|
Commit modified |
VinceMacBuche
force-pushed
the
bug_11168/search_believe_that_cfengine_agents_with_dsc_in_their_keys_are_also_dsc_agent
branch
from
c9657a4
to
bd64dbe
Compare
|
OK, merging this PR |
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://www.rudder-project.org/redmine/issues/11168