Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"bytes"

"github.com/nullify-platform/config-file-parser/pkg/parser"
"github.com/nullify-platform/config-file-parser/v2/pkg/parser"
"gopkg.in/yaml.v3"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/nullify-platform/config-file-parser
module github.com/nullify-platform/config-file-parser/v2

go 1.23.0

Expand Down
6 changes: 3 additions & 3 deletions pkg/merger/merger.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package merger

import (
"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/pkg/validator"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/validator"
)

func MergeConfigFiles(
Expand Down Expand Up @@ -42,7 +42,7 @@ func MergeConfigFiles(
config.SeverityThreshold = extraConfig.SeverityThreshold
}

if extraConfig.PriorityThreshold != "" && validator.ValidateSeverityThreshold(extraConfig) {
if extraConfig.PriorityThreshold != "" && validator.ValidatePriorityThreshold(extraConfig) {
config.PriorityThreshold = extraConfig.PriorityThreshold
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/merger/merger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package merger
import (
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/pkg/parser"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/parser"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/parser/defaults.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package parser

import "github.com/nullify-platform/config-file-parser/pkg/models"
import "github.com/nullify-platform/config-file-parser/v2/pkg/models"

const DefaultSeverityThreshold = models.SeverityMedium
const DefaultPriorityThreshold = models.PriorityImportant
Expand Down
2 changes: 1 addition & 1 deletion pkg/parser/load_from_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package parser
import (
"os"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
)

func LoadFromFile(path string) (*models.Configuration, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/parser/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package parser
import (
"strings"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"gopkg.in/yaml.v3"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/parser/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package parser
import (
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/autofix.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package validator

import (
"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
)

func ValidateAutoFix(config *models.Configuration) bool {
Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/autofix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/notifications.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package validator
import (
"net/mail"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
)

func ValidateNotifications(config *models.Configuration) bool {
Expand Down
4 changes: 2 additions & 2 deletions pkg/validator/notifications_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"

"github.com/nullify-platform/config-file-parser/pkg/parser"
"github.com/nullify-platform/config-file-parser/v2/pkg/parser"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package validator

import (
"github.com/gobwas/glob"
"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
)

func ValidatePaths(config *models.Configuration) bool {
Expand Down
4 changes: 2 additions & 2 deletions pkg/validator/paths_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/pkg/parser"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/parser"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/scheduled_notifications.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/mail"
"time"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/robfig/cron/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/scheduled_notifications_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/secrets.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package validator

import "github.com/nullify-platform/config-file-parser/pkg/models"
import "github.com/nullify-platform/config-file-parser/v2/pkg/models"

func ValidateSecrets(config *models.Configuration) bool {
// the list of strings can be any mix of characters so no validation needed at this stage
Expand Down
2 changes: 1 addition & 1 deletion pkg/validator/severity.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package validator

import (
"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"golang.org/x/exp/slices"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/validator/severity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package validator
import (
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/pkg/parser"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/parser"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/validator/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package validator
import (
"context"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/pkg/parser"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/parser"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions tests/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package tests
import (
"testing"

"github.com/nullify-platform/config-file-parser/pkg/models"
"github.com/nullify-platform/config-file-parser/pkg/parser"
"github.com/nullify-platform/config-file-parser/pkg/validator"
"github.com/nullify-platform/config-file-parser/v2/pkg/models"
"github.com/nullify-platform/config-file-parser/v2/pkg/parser"
"github.com/nullify-platform/config-file-parser/v2/pkg/validator"
"github.com/stretchr/testify/require"
)

Expand Down