mirror of
https://github.com/kubescape/kubescape.git
synced 2026-04-15 06:58:11 +00:00
Handle Single Line Sequence Node in Replacement
This commit is contained in:
@@ -143,10 +143,10 @@ func TestFixHandler_applyFixToFile(t *testing.T) {
|
||||
testDirectoryApplyFix(t, "remove_scenarios")
|
||||
|
||||
// Tests for Replace scenarios
|
||||
// testDirectoryApplyFix(t, "replace_scenarios")
|
||||
testDirectoryApplyFix(t, "replace_scenarios")
|
||||
|
||||
// Tests for Hybrid Scenarios
|
||||
// testDirectoryApplyFix(t, "hybrid_scenarios")
|
||||
testDirectoryApplyFix(t, "hybrid_scenarios")
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -234,6 +234,33 @@ func addLinesToInsert(fixInfoMetadata *FixInfoMetadata) (int, int) {
|
||||
func updateLinesToReplace(fixInfoMetadata *FixInfoMetadata) (int, int) {
|
||||
currentDFSNode := (*fixInfoMetadata.fixedList)[fixInfoMetadata.fixedListTracker]
|
||||
|
||||
isOneLine, line := isOneLineSequenceNode(fixInfoMetadata.fixedList, fixInfoMetadata.fixedListTracker)
|
||||
|
||||
if isOneLine {
|
||||
originalListTracker := getFirstNodeInLine(fixInfoMetadata.originalList, line)
|
||||
fixedListTracker := getFirstNodeInLine(fixInfoMetadata.fixedList, line)
|
||||
|
||||
currentDFSNode = (*fixInfoMetadata.fixedList)[fixedListTracker]
|
||||
content := getContent(currentDFSNode.parent, fixInfoMetadata.fixedList, fixedListTracker)
|
||||
|
||||
// Remove the Single line
|
||||
*fixInfoMetadata.contentToRemove = append(*fixInfoMetadata.contentToRemove, ContentToRemove{
|
||||
startLine: line,
|
||||
endLine: line,
|
||||
})
|
||||
|
||||
// Encode entire Sequence Node and Insert
|
||||
*fixInfoMetadata.contentToAdd = append(*fixInfoMetadata.contentToAdd, ContentToAdd{
|
||||
Line: line,
|
||||
Content: content,
|
||||
})
|
||||
|
||||
originalListTracker = updateTracker(fixInfoMetadata.originalList, originalListTracker)
|
||||
fixedListTracker = updateTracker(fixInfoMetadata.fixedList, fixedListTracker)
|
||||
|
||||
return originalListTracker, fixedListTracker
|
||||
}
|
||||
|
||||
if isValueNodeinMapping(¤tDFSNode) {
|
||||
fixInfoMetadata.originalListTracker -= 1
|
||||
fixInfoMetadata.fixedListTracker -= 1
|
||||
|
||||
@@ -16,4 +16,4 @@ spec:
|
||||
- name: nginx_container
|
||||
image: nginx
|
||||
securityContext:
|
||||
runAsRoot: false
|
||||
runAsRoot: false
|
||||
|
||||
@@ -11,4 +11,4 @@ spec:
|
||||
- name: nginx_container
|
||||
image: nginx
|
||||
securityContext:
|
||||
runAsRoot: false
|
||||
runAsRoot: false
|
||||
|
||||
@@ -14,6 +14,5 @@ spec:
|
||||
securityContext:
|
||||
capabilities:
|
||||
drop:
|
||||
- "SYS_ADM"
|
||||
add:
|
||||
- "NET_RAW"
|
||||
- "SYS_ADM"
|
||||
add: ["NET_RAW"]
|
||||
|
||||
Reference in New Issue
Block a user