Skip to content

Commit

Permalink
fix: add missing prefix to most internal import paths
Browse files Browse the repository at this point in the history
  • Loading branch information
omissis committed Aug 23, 2022
1 parent ff99319 commit 85327dc
Show file tree
Hide file tree
Showing 36 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module goarkitect
module github.com/omissis/goarkitect

go 1.18

Expand Down
4 changes: 2 additions & 2 deletions internal/arch/file/except/except.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package except

import (
"goarkitect/internal/arch/file"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/rule"
)

type Expression interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/except/this.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"path/filepath"
"strings"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func This(filePath string) *ThisExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/except/this_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package except_test
import (
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/except"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/except"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/be_gitencrypted.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os/exec"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func BeGitencrypted(opts ...Option) *gitEncryptedExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/be_gitencrypted_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/be_gitignored.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/exec"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func BeGitignored(opts ...Option) *gitIgnoredExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/be_gitignored_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/contain_value.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func ContainValue(value []byte, opts ...Option) *containValueExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/contain_value_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/end_with.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func EndWith(suffix string, opts ...Option) *endWithExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/end_with_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package expect_test
import (
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/exist.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func Exist(opts ...Option) *existExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/exist_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package expect_test
import (
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/have_content_matching.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"

"golang.org/x/exp/slices"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/have_content_matching_regex.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"regexp"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func HaveContentMatchingRegex(regex string, opts ...Option) *haveContentMatchingRegex {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/have_content_matching_regex_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/have_content_matching_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/have_permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"regexp"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

var ErrInvalidPermissions = errors.New(
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/have_permissions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/match_glob.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func MatchGlob(glob string, basePath string, opts ...Option) *matchGlobExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/match_glob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/match_regex.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path/filepath"
"regexp"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func MatchRegex(res string, opts ...Option) *matchRegexExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/match_regex_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package expect_test
import (
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
4 changes: 2 additions & 2 deletions internal/arch/file/expect/should.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package expect
import (
"fmt"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/rule"
)

var ErrEmptyOpts = fmt.Errorf("empty options")
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/expect/start_with.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"path/filepath"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func StartWith(prefix string, opts ...Option) *startWithExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/expect/start_with_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package expect_test
import (
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/expect"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/expect"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/arch/file/rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package file
import (
"errors"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

var ErrRuleBuilderLocked = errors.New(
Expand Down
10 changes: 5 additions & 5 deletions internal/arch/file/rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package file_test
import (
"testing"

"goarkitect/internal/arch/file"
fe "goarkitect/internal/arch/file/except"
fs "goarkitect/internal/arch/file/expect"
ft "goarkitect/internal/arch/file/that"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
fe "github.com/omissis/goarkitect/internal/arch/file/except"
fs "github.com/omissis/goarkitect/internal/arch/file/expect"
ft "github.com/omissis/goarkitect/internal/arch/file/that"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
4 changes: 2 additions & 2 deletions internal/arch/file/that/are_in_folder.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func AreInFolder(folder string, recursive bool) *AreInFolderExpression {
Expand Down
4 changes: 2 additions & 2 deletions internal/arch/file/that/are_in_folder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package that_test
import (
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/that"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/that"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
4 changes: 2 additions & 2 deletions internal/arch/file/that/end_with.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package that
import (
"strings"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func EndWith(s string) *EndWithExpression {
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/file/that/end_with_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package that_test
import (
"testing"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/file/that"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/file/that"
"github.com/omissis/goarkitect/internal/arch/rule"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
6 changes: 3 additions & 3 deletions internal/arch/rule/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package rule_test
import (
"testing"

"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/rule"
)

func Test_NewViolation(t *testing.T) {
v := rule.NewViolation("message", rule.Error)
if v.String() != "message" {
t.Errorf("NewViolation(\"message\") returns %v, want %v", v.String(), "message")
if v.String() != "[ERROR] message" {
t.Errorf("NewViolation(\"message\") returns %v, want %v", v.String(), "[ERROR] message")
}
}

Expand Down
10 changes: 5 additions & 5 deletions internal/config/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package config
import (
"fmt"

"goarkitect/internal/arch/file"
"goarkitect/internal/arch/rule"
"github.com/omissis/goarkitect/internal/arch/file"
"github.com/omissis/goarkitect/internal/arch/rule"

fe "goarkitect/internal/arch/file/except"
fs "goarkitect/internal/arch/file/expect"
ft "goarkitect/internal/arch/file/that"
fe "github.com/omissis/goarkitect/internal/arch/file/except"
fs "github.com/omissis/goarkitect/internal/arch/file/expect"
ft "github.com/omissis/goarkitect/internal/arch/file/that"
)

type Root struct {
Expand Down
Loading

0 comments on commit 85327dc

Please sign in to comment.