From 6d0927c2f967f18b8d8f2aff69a624671ef53b67 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Mon, 31 Mar 2025 12:16:04 +0200 Subject: [PATCH] import: move bib files to correct path Moves the files imported from `bootc-image-builder` to the appropriate path under `pkg/` so they can be imported reverse. Also fix up the import paths that are in these files to refer to their new locations. Signed-off-by: Simon de Vlieger --- {bib/internal => pkg}/podmanutil/podmanutils.go | 0 {bib/internal => pkg}/setup/export_test.go | 0 {bib/internal => pkg}/setup/setup.go | 4 ++-- {bib/internal => pkg}/setup/setup_test.go | 2 +- {bib/internal => pkg}/util/util.go | 0 {bib/internal => pkg}/util/util_test.go | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename {bib/internal => pkg}/podmanutil/podmanutils.go (100%) rename {bib/internal => pkg}/setup/export_test.go (100%) rename {bib/internal => pkg}/setup/setup.go (97%) rename {bib/internal => pkg}/setup/setup_test.go (98%) rename {bib/internal => pkg}/util/util.go (100%) rename {bib/internal => pkg}/util/util_test.go (87%) diff --git a/bib/internal/podmanutil/podmanutils.go b/pkg/podmanutil/podmanutils.go similarity index 100% rename from bib/internal/podmanutil/podmanutils.go rename to pkg/podmanutil/podmanutils.go diff --git a/bib/internal/setup/export_test.go b/pkg/setup/export_test.go similarity index 100% rename from bib/internal/setup/export_test.go rename to pkg/setup/export_test.go diff --git a/bib/internal/setup/setup.go b/pkg/setup/setup.go similarity index 97% rename from bib/internal/setup/setup.go rename to pkg/setup/setup.go index 27009a5..6a93cc1 100644 --- a/bib/internal/setup/setup.go +++ b/pkg/setup/setup.go @@ -12,8 +12,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/osbuild/bootc-image-builder/bib/internal/podmanutil" - "github.com/osbuild/bootc-image-builder/bib/internal/util" + "github.com/osbuild/image-builder-cli/pkg/podmanutil" + "github.com/osbuild/image-builder-cli/pkg/util" ) // EnsureEnvironment mutates external filesystem state as necessary diff --git a/bib/internal/setup/setup_test.go b/pkg/setup/setup_test.go similarity index 98% rename from bib/internal/setup/setup_test.go rename to pkg/setup/setup_test.go index d8b3695..41b5538 100644 --- a/bib/internal/setup/setup_test.go +++ b/pkg/setup/setup_test.go @@ -11,7 +11,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - "github.com/osbuild/bootc-image-builder/bib/internal/setup" + "github.com/osbuild/image-builder-cli/pkg/setup" ) func TestValidateCanRunTargetArchTrivial(t *testing.T) { diff --git a/bib/internal/util/util.go b/pkg/util/util.go similarity index 100% rename from bib/internal/util/util.go rename to pkg/util/util.go diff --git a/bib/internal/util/util_test.go b/pkg/util/util_test.go similarity index 87% rename from bib/internal/util/util_test.go rename to pkg/util/util_test.go index f72c2a7..11e6ede 100644 --- a/bib/internal/util/util_test.go +++ b/pkg/util/util_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/osbuild/bootc-image-builder/bib/internal/util" + "github.com/osbuild/image-builder-cli/pkg/util" ) func TestOutputErrPassthrough(t *testing.T) {