test: add test cases for test command (#410)

* test: add test cases for test command Co-authored-by: Roy Hadad <roy@datree.io>
datreeio · Apr 3, 2022 · 3a78d0e · 3a78d0e
1 parent ca00128
commit 3a78d0e
Show file tree

Hide file tree

Showing 10 changed files with 565 additions and 30 deletions.
diff --git a/bl/files/files.go b/bl/files/files.go
@@ -11,7 +11,18 @@ import (
 
 type UnknownStruct map[string]interface{}
 
-func ExtractFilesConfigurations(paths []string, concurrency int) (chan *extractor.FileConfigurations, chan *extractor.InvalidFile) {
+type FilesExtractor struct{}
+
+type FilesExtractorInterface interface {
+	ExtractFilesConfigurations(paths []string, concurrency int) (chan *extractor.FileConfigurations, chan *extractor.InvalidFile)
+	ExtractYamlFileToUnknownStruct(path string) (UnknownStruct, error)
+}
+
+func New() *FilesExtractor {
+	return &FilesExtractor{}
+}
+
+func (f *FilesExtractor) ExtractFilesConfigurations(paths []string, concurrency int) (chan *extractor.FileConfigurations, chan *extractor.InvalidFile) {
 	filesConfigurationsChan := make(chan *extractor.FileConfigurations, concurrency)
 	invalidFilesChan := make(chan *extractor.InvalidFile, concurrency)
 
@@ -37,7 +48,7 @@ func ExtractFilesConfigurations(paths []string, concurrency int) (chan *extracto
 	return filesConfigurationsChan, invalidFilesChan
 }
 
-func ExtractYamlFileToUnknownStruct(path string) (UnknownStruct, error) {
+func (f *FilesExtractor) ExtractYamlFileToUnknownStruct(path string) (UnknownStruct, error) {
 	absolutePath, err := extractor.ToAbsolutePath(path)
 	if err != nil {
 		return nil, err

diff --git a/bl/files/files_test.go b/bl/files/files_test.go
@@ -77,14 +77,15 @@ func test_directory_file() *toAbsolutePathsTestCase {
 }
 
 func TestExtractYamlFileToUnknownStruct(t *testing.T) {
+	filesExtractor := FilesExtractor{}
 	t.Run("valid yaml file, should return an unknown struct and no error", func(t *testing.T) {
-		actualResult, actualErr := ExtractYamlFileToUnknownStruct("../../internal/fixtures/policyAsCode/valid-schema.yaml")
+		actualResult, actualErr := filesExtractor.ExtractYamlFileToUnknownStruct("../../internal/fixtures/policyAsCode/valid-schema.yaml")
 		assert.NotEqual(t, nil, actualResult)
 		assert.Equal(t, nil, actualErr)
 	})
 
 	t.Run("invalid yaml file, should return an error", func(t *testing.T) {
-		actualResult, actualErr := ExtractYamlFileToUnknownStruct("../../internal/fixtures/policyAsCode/invalid-yaml.yaml")
+		actualResult, actualErr := filesExtractor.ExtractYamlFileToUnknownStruct("../../internal/fixtures/policyAsCode/invalid-yaml.yaml")
 		assert.Equal(t, UnknownStruct(nil), actualResult)
 		assert.NotEqual(t, nil, actualErr)
 		assert.Equal(t, errors.New("yaml: line 2: did not find expected key"), actualErr)

diff --git a/cmd/publish/main.go b/cmd/publish/main.go
@@ -33,6 +33,7 @@ type PublishCommandContext struct {
 	Messager         Messager
 	Printer          Printer
 	PublishCliClient CliClient
+	FilesExtractor   files.FilesExtractorInterface
 }
 
 func New(ctx *PublishCommandContext) *cobra.Command {
@@ -103,7 +104,7 @@ type MessagesContext struct {
 }
 
 func publish(ctx *PublishCommandContext, path string, localConfigContent *localConfig.LocalConfig) (*cliClient.PublishFailedResponse, error) {
-	policiesConfiguration, err := files.ExtractYamlFileToUnknownStruct(path)
+	policiesConfiguration, err := ctx.FilesExtractor.ExtractYamlFileToUnknownStruct(path)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cmd/publish/main_test.go b/cmd/publish/main_test.go
@@ -84,6 +84,7 @@ func TestPublishCommand(t *testing.T) {
 		Messager:         messagerMock,
 		Printer:          printerMock,
 		PublishCliClient: publishClientMock,
+		FilesExtractor:   &files.FilesExtractor{},
 	}
 
 	localConfigContent, _ := ctx.LocalConfig.GetLocalConfiguration()

diff --git a/cmd/root.go b/cmd/root.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/datreeio/datree/bl/evaluation"
+	"github.com/datreeio/datree/bl/files"
 	"github.com/datreeio/datree/bl/messager"
 	"github.com/datreeio/datree/bl/validation"
 	"github.com/datreeio/datree/cmd/completion"
@@ -34,14 +35,15 @@ func init() {
 	app := startup()
 
 	rootCmd.AddCommand(test.New(&test.TestCommandContext{
-		CliVersion:   CliVersion,
-		Evaluator:    app.context.Evaluator,
-		LocalConfig:  app.context.LocalConfig,
-		Messager:     app.context.Messager,
-		Printer:      app.context.Printer,
-		Reader:       app.context.Reader,
-		K8sValidator: app.context.K8sValidator,
-		CliClient:    app.context.CliClient,
+		CliVersion:     CliVersion,
+		Evaluator:      app.context.Evaluator,
+		LocalConfig:    app.context.LocalConfig,
+		Messager:       app.context.Messager,
+		Printer:        app.context.Printer,
+		Reader:         app.context.Reader,
+		K8sValidator:   app.context.K8sValidator,
+		CliClient:      app.context.CliClient,
+		FilesExtractor: app.context.FilesExtractor,
 	}))
 
 	rootCmd.AddCommand(kustomize.New(&test.TestCommandContext{
@@ -74,6 +76,7 @@ func init() {
 		Messager:         app.context.Messager,
 		Printer:          app.context.Printer,
 		PublishCliClient: app.context.CliClient,
+		FilesExtractor:   app.context.FilesExtractor,
 	}))
 
 	rootCmd.AddCommand(completion.New())
@@ -98,6 +101,7 @@ type context struct {
 	K8sValidator        *validation.K8sValidator
 	JSONSchemaValidator *jsonSchemaValidator.JSONSchemaValidator
 	CommandRunner       *executor.CommandRunner
+	FilesExtractor      *files.FilesExtractor
 }
 
 type app struct {
@@ -121,6 +125,7 @@ func startup() *app {
 			K8sValidator:        validation.New(),
 			JSONSchemaValidator: jsonSchemaValidator.New(),
 			CommandRunner:       executor.CreateNewCommandRunner(),
+			FilesExtractor:      files.New(),
 		},
 	}
 }
diff --git a/cmd/test/main.go b/cmd/test/main.go
@@ -125,14 +125,15 @@ type TestCommandData struct {
 }
 
 type TestCommandContext struct {
-	CliVersion   string
-	LocalConfig  LocalConfig
-	Evaluator    Evaluator
-	Messager     Messager
-	K8sValidator K8sValidator
-	Printer      EvaluationPrinter
-	Reader       Reader
-	CliClient    CliClient
+	CliVersion     string
+	LocalConfig    LocalConfig
+	Evaluator      Evaluator
+	Messager       Messager
+	K8sValidator   K8sValidator
+	Printer        EvaluationPrinter
+	Reader         Reader
+	CliClient      CliClient
+	FilesExtractor files.FilesExtractorInterface
 }
 
 func LoadVersionMessages(ctx *TestCommandContext, args []string, cmd *cobra.Command) error {
@@ -416,7 +417,7 @@ func evaluate(ctx *TestCommandContext, filesPaths []string, prerunData *TestComm
 
 	concurrency := 100
 
-	validYamlConfigurationsChan, invalidYamlFilesChan := files.ExtractFilesConfigurations(filesPaths, concurrency)
+	validYamlConfigurationsChan, invalidYamlFilesChan := ctx.FilesExtractor.ExtractFilesConfigurations(filesPaths, concurrency)
 
 	validationManager.AggregateInvalidYamlFiles(invalidYamlFilesChan)