From 926e146dad36839cbe141589a60eb991070c4a10 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Sun, 28 Apr 2024 00:36:16 +0100 Subject: [PATCH] chore: use internal paths lib. --- go.mod | 7 ++++++- pkg/aa/profile.go | 2 +- pkg/aa/profile_test.go | 2 +- pkg/prebuild/cfg/directories.go | 2 +- pkg/prebuild/cfg/files_test.go | 2 +- pkg/prebuild/cfg/os.go | 2 +- pkg/prebuild/cfg/os_test.go | 2 +- pkg/prebuild/directive/core.go | 2 +- pkg/prebuild/directive/core_test.go | 2 +- pkg/prebuild/directive/exec_test.go | 2 +- pkg/prebuild/directive/stack_test.go | 2 +- pkg/prebuild/prebuild.go | 2 +- pkg/prebuild/prebuild_test.go | 2 +- pkg/prebuild/prepare/core_test.go | 2 +- pkg/prebuild/prepare/fsp.go | 2 +- pkg/prebuild/prepare/ignore.go | 2 +- pkg/prebuild/prepare/merge.go | 2 +- pkg/prebuild/prepare/synchronise.go | 2 +- pkg/util/tools.go | 2 +- pkg/util/tools_test.go | 2 +- 20 files changed, 25 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index a8edd743e..6662be29f 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,11 @@ module github.com/roddhjav/apparmor.d go 1.22 require ( - github.com/arduino/go-paths-helper v1.12.0 + github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v3 v3.0.1 ) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect +) diff --git a/pkg/aa/profile.go b/pkg/aa/profile.go index 2e97b9d44..b68d974c5 100644 --- a/pkg/aa/profile.go +++ b/pkg/aa/profile.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) // Default Apparmor magic directory: /etc/apparmor.d/. diff --git a/pkg/aa/profile_test.go b/pkg/aa/profile_test.go index 78206b26f..094c8e5ca 100644 --- a/pkg/aa/profile_test.go +++ b/pkg/aa/profile_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) func readprofile(path string) string { diff --git a/pkg/prebuild/cfg/directories.go b/pkg/prebuild/cfg/directories.go index 7d482c4b1..4032249b4 100644 --- a/pkg/prebuild/cfg/directories.go +++ b/pkg/prebuild/cfg/directories.go @@ -4,7 +4,7 @@ package cfg -import "github.com/arduino/go-paths-helper" +import "github.com/roddhjav/apparmor.d/pkg/paths" var ( // Root is the root directory for the build diff --git a/pkg/prebuild/cfg/files_test.go b/pkg/prebuild/cfg/files_test.go index 00aadc032..c3d89dd20 100644 --- a/pkg/prebuild/cfg/files_test.go +++ b/pkg/prebuild/cfg/files_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) func TestFlagger_Read(t *testing.T) { diff --git a/pkg/prebuild/cfg/os.go b/pkg/prebuild/cfg/os.go index d792c490b..17713c6a6 100644 --- a/pkg/prebuild/cfg/os.go +++ b/pkg/prebuild/cfg/os.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) var ( diff --git a/pkg/prebuild/cfg/os_test.go b/pkg/prebuild/cfg/os_test.go index cb1032ced..b0fbd050f 100644 --- a/pkg/prebuild/cfg/os_test.go +++ b/pkg/prebuild/cfg/os_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) const ( diff --git a/pkg/prebuild/directive/core.go b/pkg/prebuild/directive/core.go index e6f97e02a..0d638c0c0 100644 --- a/pkg/prebuild/directive/core.go +++ b/pkg/prebuild/directive/core.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" ) diff --git a/pkg/prebuild/directive/core_test.go b/pkg/prebuild/directive/core_test.go index c74192ff5..c30a5afd0 100644 --- a/pkg/prebuild/directive/core_test.go +++ b/pkg/prebuild/directive/core_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) func TestNewOption(t *testing.T) { diff --git a/pkg/prebuild/directive/exec_test.go b/pkg/prebuild/directive/exec_test.go index a2c8a6f15..8f6c2ebd6 100644 --- a/pkg/prebuild/directive/exec_test.go +++ b/pkg/prebuild/directive/exec_test.go @@ -7,7 +7,7 @@ package directive import ( "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" ) diff --git a/pkg/prebuild/directive/stack_test.go b/pkg/prebuild/directive/stack_test.go index 4d5a284ae..da3208ab3 100644 --- a/pkg/prebuild/directive/stack_test.go +++ b/pkg/prebuild/directive/stack_test.go @@ -7,7 +7,7 @@ package directive import ( "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" ) diff --git a/pkg/prebuild/prebuild.go b/pkg/prebuild/prebuild.go index 4553156c0..faf7d9149 100644 --- a/pkg/prebuild/prebuild.go +++ b/pkg/prebuild/prebuild.go @@ -7,8 +7,8 @@ package prebuild import ( "strings" - "github.com/arduino/go-paths-helper" "github.com/roddhjav/apparmor.d/pkg/logging" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/builder" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" "github.com/roddhjav/apparmor.d/pkg/prebuild/directive" diff --git a/pkg/prebuild/prebuild_test.go b/pkg/prebuild/prebuild_test.go index 48f7cda7e..db709c315 100644 --- a/pkg/prebuild/prebuild_test.go +++ b/pkg/prebuild/prebuild_test.go @@ -9,7 +9,7 @@ import ( "os/exec" "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/builder" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" "github.com/roddhjav/apparmor.d/pkg/prebuild/prepare" diff --git a/pkg/prebuild/prepare/core_test.go b/pkg/prebuild/prepare/core_test.go index 591bf8389..34071ff30 100644 --- a/pkg/prebuild/prepare/core_test.go +++ b/pkg/prebuild/prepare/core_test.go @@ -10,7 +10,7 @@ import ( "slices" "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" ) diff --git a/pkg/prebuild/prepare/fsp.go b/pkg/prebuild/prepare/fsp.go index 29a7cce2b..ac3e05045 100644 --- a/pkg/prebuild/prepare/fsp.go +++ b/pkg/prebuild/prepare/fsp.go @@ -7,7 +7,7 @@ package prepare import ( "strings" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" "github.com/roddhjav/apparmor.d/pkg/util" ) diff --git a/pkg/prebuild/prepare/ignore.go b/pkg/prebuild/prepare/ignore.go index 3fd01495d..92a1498a7 100644 --- a/pkg/prebuild/prepare/ignore.go +++ b/pkg/prebuild/prepare/ignore.go @@ -5,7 +5,7 @@ package prepare import ( - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" ) diff --git a/pkg/prebuild/prepare/merge.go b/pkg/prebuild/prepare/merge.go index d88f5126c..86a2ceade 100644 --- a/pkg/prebuild/prepare/merge.go +++ b/pkg/prebuild/prepare/merge.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" ) diff --git a/pkg/prebuild/prepare/synchronise.go b/pkg/prebuild/prepare/synchronise.go index 57e27a69c..e2b5dacd6 100644 --- a/pkg/prebuild/prepare/synchronise.go +++ b/pkg/prebuild/prepare/synchronise.go @@ -5,7 +5,7 @@ package prepare import ( - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" "github.com/roddhjav/apparmor.d/pkg/util" ) diff --git a/pkg/util/tools.go b/pkg/util/tools.go index 604b88745..eb339faaa 100644 --- a/pkg/util/tools.go +++ b/pkg/util/tools.go @@ -10,7 +10,7 @@ import ( "slices" "strings" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) var ( diff --git a/pkg/util/tools_test.go b/pkg/util/tools_test.go index a253f5631..b6f85a386 100644 --- a/pkg/util/tools_test.go +++ b/pkg/util/tools_test.go @@ -9,7 +9,7 @@ import ( "regexp" "testing" - "github.com/arduino/go-paths-helper" + "github.com/roddhjav/apparmor.d/pkg/paths" ) func TestDecodeHexInString(t *testing.T) {