diff --git a/cmd/firmware-action/container/container.go b/cmd/firmware-action/container/container.go index 776b6dd2..41cdb48f 100644 --- a/cmd/firmware-action/container/container.go +++ b/cmd/firmware-action/container/container.go @@ -15,7 +15,7 @@ import ( "strings" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/logging" + "github.com/9elements/firmware-action/logging" ) var ( diff --git a/cmd/firmware-action/container/container_test.go b/cmd/firmware-action/container/container_test.go index e65c58ba..0d835b92 100644 --- a/cmd/firmware-action/container/container_test.go +++ b/cmd/firmware-action/container/container_test.go @@ -11,7 +11,7 @@ import ( "testing" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/filesystem" + "github.com/9elements/firmware-action/filesystem" "github.com/stretchr/testify/assert" ) diff --git a/cmd/firmware-action/go.mod b/cmd/firmware-action/go.mod index 43a1ed43..0da461a9 100644 --- a/cmd/firmware-action/go.mod +++ b/cmd/firmware-action/go.mod @@ -1,4 +1,4 @@ -module github.com/9elements/firmware-action/action +module github.com/9elements/firmware-action go 1.22.5 diff --git a/cmd/firmware-action/logging/logging.go b/cmd/firmware-action/logging/logging.go index f91cbd28..b7adc2c5 100644 --- a/cmd/firmware-action/logging/logging.go +++ b/cmd/firmware-action/logging/logging.go @@ -36,7 +36,7 @@ func InitLogger(level slog.Level, opts ...PrettyHandlerOption) { // TrimNameFunction just trims the name func TrimNameFunction(pc uintptr) string { // 'runtime.FuncForPC(pc).Name()' is nice and all, but it will return this monstrosity: - // github.com/9elements/firmware-action/action/.... + // github.com/9elements/firmware-action/.... // So this function is just to trim it down // Usage: // pc, _, _, _ := runtime.Caller(0) diff --git a/cmd/firmware-action/main.go b/cmd/firmware-action/main.go index 4fd374df..c6045870 100644 --- a/cmd/firmware-action/main.go +++ b/cmd/firmware-action/main.go @@ -13,9 +13,9 @@ import ( "os" "regexp" - "github.com/9elements/firmware-action/action/filesystem" - "github.com/9elements/firmware-action/action/logging" - "github.com/9elements/firmware-action/action/recipes" + "github.com/9elements/firmware-action/filesystem" + "github.com/9elements/firmware-action/logging" + "github.com/9elements/firmware-action/recipes" "github.com/alecthomas/kong" "github.com/go-git/go-git/v5" "github.com/jedib0t/go-pretty/v6/table" diff --git a/cmd/firmware-action/recipes/config.go b/cmd/firmware-action/recipes/config.go index 9ee8ac85..2f64d850 100644 --- a/cmd/firmware-action/recipes/config.go +++ b/cmd/firmware-action/recipes/config.go @@ -15,8 +15,8 @@ import ( "strings" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" - "github.com/9elements/firmware-action/action/logging" + "github.com/9elements/firmware-action/container" + "github.com/9elements/firmware-action/logging" "github.com/go-playground/validator/v10" ) diff --git a/cmd/firmware-action/recipes/coreboot.go b/cmd/firmware-action/recipes/coreboot.go index 33404a55..f9fa0184 100644 --- a/cmd/firmware-action/recipes/coreboot.go +++ b/cmd/firmware-action/recipes/coreboot.go @@ -15,9 +15,9 @@ import ( "strings" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" - "github.com/9elements/firmware-action/action/filesystem" - "github.com/9elements/firmware-action/action/logging" + "github.com/9elements/firmware-action/container" + "github.com/9elements/firmware-action/filesystem" + "github.com/9elements/firmware-action/logging" ) // BlobDef is used to store information about a single blob. diff --git a/cmd/firmware-action/recipes/coreboot_test.go b/cmd/firmware-action/recipes/coreboot_test.go index 8041d092..d028c249 100644 --- a/cmd/firmware-action/recipes/coreboot_test.go +++ b/cmd/firmware-action/recipes/coreboot_test.go @@ -12,7 +12,7 @@ import ( "testing" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/filesystem" + "github.com/9elements/firmware-action/filesystem" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/cmd/firmware-action/recipes/edk2.go b/cmd/firmware-action/recipes/edk2.go index f2ecd552..cd6d9030 100644 --- a/cmd/firmware-action/recipes/edk2.go +++ b/cmd/firmware-action/recipes/edk2.go @@ -12,7 +12,7 @@ import ( "runtime" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" + "github.com/9elements/firmware-action/container" ) // ANCHOR: Edk2Specific diff --git a/cmd/firmware-action/recipes/linux.go b/cmd/firmware-action/recipes/linux.go index e5707336..c4ba93ba 100644 --- a/cmd/firmware-action/recipes/linux.go +++ b/cmd/firmware-action/recipes/linux.go @@ -15,8 +15,8 @@ import ( "strings" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" - "github.com/9elements/firmware-action/action/logging" + "github.com/9elements/firmware-action/container" + "github.com/9elements/firmware-action/logging" ) var errUnknownArchCrossCompile = errors.New("unknown architecture for cross-compilation") diff --git a/cmd/firmware-action/recipes/linux_test.go b/cmd/firmware-action/recipes/linux_test.go index 29d49486..57341432 100644 --- a/cmd/firmware-action/recipes/linux_test.go +++ b/cmd/firmware-action/recipes/linux_test.go @@ -13,7 +13,7 @@ import ( "testing" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/filesystem" + "github.com/9elements/firmware-action/filesystem" "github.com/Masterminds/semver" "github.com/stretchr/testify/assert" ) diff --git a/cmd/firmware-action/recipes/recipes.go b/cmd/firmware-action/recipes/recipes.go index a6f53f33..c61599cc 100644 --- a/cmd/firmware-action/recipes/recipes.go +++ b/cmd/firmware-action/recipes/recipes.go @@ -15,8 +15,8 @@ import ( "sync" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" - "github.com/9elements/firmware-action/action/filesystem" + "github.com/9elements/firmware-action/container" + "github.com/9elements/firmware-action/filesystem" "github.com/heimdalr/dag" ) diff --git a/cmd/firmware-action/recipes/stitching.go b/cmd/firmware-action/recipes/stitching.go index fc213759..5726b8ea 100644 --- a/cmd/firmware-action/recipes/stitching.go +++ b/cmd/firmware-action/recipes/stitching.go @@ -14,8 +14,8 @@ import ( "strings" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" - "github.com/9elements/firmware-action/action/logging" + "github.com/9elements/firmware-action/container" + "github.com/9elements/firmware-action/logging" "github.com/dustin/go-humanize" ) diff --git a/cmd/firmware-action/recipes/stitching_test.go b/cmd/firmware-action/recipes/stitching_test.go index e9b6e36f..fe8c9561 100644 --- a/cmd/firmware-action/recipes/stitching_test.go +++ b/cmd/firmware-action/recipes/stitching_test.go @@ -15,7 +15,7 @@ import ( "testing" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/filesystem" + "github.com/9elements/firmware-action/filesystem" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/cmd/firmware-action/recipes/universal.go b/cmd/firmware-action/recipes/universal.go index 234d74f2..b79a7d30 100644 --- a/cmd/firmware-action/recipes/universal.go +++ b/cmd/firmware-action/recipes/universal.go @@ -9,7 +9,7 @@ import ( "log/slog" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" + "github.com/9elements/firmware-action/container" ) // UniversalSpecific is used to store data specific to the universal command module diff --git a/cmd/firmware-action/recipes/universal_test.go b/cmd/firmware-action/recipes/universal_test.go index 3d7d0bf0..6384145e 100644 --- a/cmd/firmware-action/recipes/universal_test.go +++ b/cmd/firmware-action/recipes/universal_test.go @@ -10,7 +10,7 @@ import ( "testing" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/filesystem" + "github.com/9elements/firmware-action/filesystem" "github.com/stretchr/testify/assert" ) diff --git a/cmd/firmware-action/recipes/uroot.go b/cmd/firmware-action/recipes/uroot.go index 1b8ae375..5d332b48 100644 --- a/cmd/firmware-action/recipes/uroot.go +++ b/cmd/firmware-action/recipes/uroot.go @@ -9,7 +9,7 @@ import ( "log/slog" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/container" + "github.com/9elements/firmware-action/container" ) // URootSpecific is used to store data specific to u-root diff --git a/cmd/firmware-action/recipes/uroot_test.go b/cmd/firmware-action/recipes/uroot_test.go index 39fa94c4..c2f89654 100644 --- a/cmd/firmware-action/recipes/uroot_test.go +++ b/cmd/firmware-action/recipes/uroot_test.go @@ -12,7 +12,7 @@ import ( "testing" "dagger.io/dagger" - "github.com/9elements/firmware-action/action/filesystem" + "github.com/9elements/firmware-action/filesystem" "github.com/stretchr/testify/assert" )