Skip to content

Commit

Permalink
Rename function
Browse files Browse the repository at this point in the history
  • Loading branch information
lsroe committed Feb 12, 2025
1 parent a5aec25 commit 41534c9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions pkg/values/falcovalues.go
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,10 @@ func (c *ConfigBuilder) loadRuleConfig(ctx context.Context, log logr.Logger, nam
ruleFilesBinaryData[name] = file
}
}
return loadRulesFromRulesFiles(ruleFilesData, ruleFilesBinaryData)
return extractRulesFromRulesFiles(ruleFilesData, ruleFilesBinaryData)
}

func loadRulesFromRulesFiles(ruleFilesData map[string]string, ruleFilesBinaryData map[string][]byte) ([]customRulesFile, error) {
func extractRulesFromRulesFiles(ruleFilesData map[string]string, ruleFilesBinaryData map[string][]byte) ([]customRulesFile, error) {
rules := make([]customRulesFile, 0)
for name, content := range ruleFilesData {
if err := validateYaml(content); err != nil {
Expand Down
10 changes: 5 additions & 5 deletions pkg/values/falcovalues_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ var _ = Describe("loadRulesFromRulesFiles", func() {
"rule2.yaml": "valid_yaml_content_2",
}

rules, err := loadRulesFromRulesFiles(ruleFilesData, nil)
rules, err := extractRulesFromRulesFiles(ruleFilesData, nil)
Expect(err).To(BeNil())
Expect(len(rules)).To(Equal(2))
Expect(rules[0].Filename).To(Equal("rule1.yaml"))
Expand All @@ -586,7 +586,7 @@ var _ = Describe("loadRulesFromRulesFiles", func() {
"rule1.yaml.gz": buf.Bytes(),
}

rules, err := loadRulesFromRulesFiles(nil, ruleFilesBinaryData)
rules, err := extractRulesFromRulesFiles(nil, ruleFilesBinaryData)
Expect(err).To(BeNil())
Expect(len(rules)).To(Equal(1))
Expect(rules[0].Filename).To(Equal("rule1.yaml"))
Expand All @@ -600,7 +600,7 @@ var _ = Describe("loadRulesFromRulesFiles", func() {
"rule1.yaml.gz": invalidGzipContent,
}

rules, err := loadRulesFromRulesFiles(nil, ruleFilesBinaryData)
rules, err := extractRulesFromRulesFiles(nil, ruleFilesBinaryData)
Expect(err).NotTo(BeNil())
Expect(err.Error()).To(ContainSubstring("failed to decompress rule file"))
Expect(rules).To(BeNil())
Expand All @@ -623,7 +623,7 @@ key1:
"rule1.yaml.gz": buf.Bytes(),
}

rules, err := loadRulesFromRulesFiles(nil, ruleFilesBinaryData)
rules, err := extractRulesFromRulesFiles(nil, ruleFilesBinaryData)
Expect(err).NotTo(BeNil())
Expect(err.Error()).To(ContainSubstring("rule file rule1.yaml is not valid yaml"))
Expect(rules).To(BeNil())
Expand All @@ -646,7 +646,7 @@ key1:
"rule2.yaml.gz": buf.Bytes(),
}

rules, err := loadRulesFromRulesFiles(ruleFilesData, ruleFilesBinaryData)
rules, err := extractRulesFromRulesFiles(ruleFilesData, ruleFilesBinaryData)
Expect(err).To(BeNil())
Expect(len(rules)).To(Equal(3))
Expect(rules[0].Filename).To(Equal("rule1.yaml"))
Expand Down

0 comments on commit 41534c9

Please sign in to comment.