Skip to content

Move more code out of internal #4515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mozesl-nokia wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Move more code out of internal #4515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2c7229
move internal/types and internal/pkg to pkg/lib
mozesl-nokia May 6, 2026
706f191
move alpha/printers, builtins, util/update, merge util/merge into uti…
mozesl-nokia May 6, 2026
73a391f
move more things from internal/util
mozesl-nokia May 7, 2026
5f6d1c6
eliminate internal/util completely, move some other packages as well
mozesl-nokia May 7, 2026
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
4 changes: 2 additions & 2 deletions commands/alpha/live/plan/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"strings"

"github.com/kptdev/kpt/internal/util/argutil"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/live"
kptplanner "github.com/kptdev/kpt/pkg/live/planner"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -112,7 +112,7 @@ func (r *Runner) RunE(c *cobra.Command, args []string) error {
path := args[0]
var err error
if args[0] != "-" {
path, err = argutil.ResolveSymlink(r.ctx, path)
path, err = argsutil.ResolveSymlink(r.ctx, path)
if err != nil {
return err
}
Expand Down
12 changes: 6 additions & 6 deletions commands/fn/render/cmdrender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"os"

docs "github.com/kptdev/kpt/internal/docs/generated/fndocs"
"github.com/kptdev/kpt/internal/util/argutil"
"github.com/kptdev/kpt/internal/util/pathutil"
"github.com/kptdev/kpt/internal/util/render"
"github.com/kptdev/kpt/pkg/lib/kptops"
"github.com/kptdev/kpt/pkg/lib/runneroptions"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
"github.com/kptdev/kpt/pkg/lib/util/path"
"github.com/kptdev/kpt/pkg/printer"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/kyaml/filesys"
Expand Down Expand Up @@ -100,7 +100,7 @@ func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
r.pkgPath = args[0]
}
var err error
r.pkgPath, err = argutil.ResolveSymlink(r.ctx, r.pkgPath)
r.pkgPath, err = argsutil.ResolveSymlink(r.ctx, r.pkgPath)
if err != nil {
return err
}
Expand All @@ -126,11 +126,11 @@ func (r *Runner) runE(_ *cobra.Command, _ []string) error {
// capture the content to be written
output = &outContent
}
absPkgPath, _, err := pathutil.ResolveAbsAndRelPaths(r.pkgPath)
absPkgPath, _, err := path.ResolveAbsAndRelPaths(r.pkgPath)
if err != nil {
return err
}
executor := render.Renderer{
executor := kptops.Renderer{
PkgPath: absPkgPath,
ResultsDirPath: r.resultsDirPath,
Output: output,
Expand Down
8 changes: 4 additions & 4 deletions commands/live/apply/cmdapply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"os"
"time"

alphaprinterstable "github.com/kptdev/kpt/internal/alpha/printers/table"
"github.com/kptdev/kpt/internal/docs/generated/livedocs"
"github.com/kptdev/kpt/internal/util/argutil"
"github.com/kptdev/kpt/internal/util/strings"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
"github.com/kptdev/kpt/pkg/lib/util/strings"
"github.com/kptdev/kpt/pkg/live"
alphaprinterstable "github.com/kptdev/kpt/pkg/printer/table"
"github.com/kptdev/kpt/pkg/status"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -174,7 +174,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
path := args[0]
var err error
if args[0] != "-" {
path, err = argutil.ResolveSymlink(r.ctx, path)
path, err = argsutil.ResolveSymlink(r.ctx, path)
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions commands/live/destroy/cmddestroy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"os"

"github.com/kptdev/kpt/internal/docs/generated/livedocs"
"github.com/kptdev/kpt/internal/util/argutil"
"github.com/kptdev/kpt/internal/util/strings"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/lib/util/strings"
"github.com/kptdev/kpt/pkg/live"
"github.com/kptdev/kpt/pkg/status"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -133,7 +133,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
path := args[0]
var err error
if args[0] != "-" {
path, err = argutil.ResolveSymlink(r.ctx, path)
path, err = argsutil.ResolveSymlink(r.ctx, path)
if err != nil {
return err
}
Expand Down
10 changes: 5 additions & 5 deletions commands/live/init/cmdliveinit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ import (
"time"

"github.com/kptdev/kpt/internal/docs/generated/livedocs"
"github.com/kptdev/kpt/internal/pkg"
"github.com/kptdev/kpt/internal/types"
"github.com/kptdev/kpt/internal/util/attribution"
"github.com/kptdev/kpt/internal/util/pathutil"
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1"
"github.com/kptdev/kpt/pkg/kptfile/kptfileutil"
"github.com/kptdev/kpt/pkg/lib/errors"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/lib/types"
"github.com/kptdev/kpt/pkg/lib/util/attribution"
"github.com/kptdev/kpt/pkg/lib/util/path"
"github.com/kptdev/kpt/pkg/printer"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
Expand Down Expand Up @@ -140,7 +140,7 @@ func (r *Runner) runE(_ *cobra.Command, args []string) error {
return errors.E(op, err)
}

absPath, _, err := pathutil.ResolveAbsAndRelPaths(dir)
absPath, _, err := path.ResolveAbsAndRelPaths(dir)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion commands/live/init/cmdliveinit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"testing"
"time"

"github.com/kptdev/kpt/internal/pkg"
"github.com/kptdev/kpt/internal/testutil"
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1"
"github.com/kptdev/kpt/pkg/kptfile/kptfileutil"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/printer/fake"
"github.com/stretchr/testify/assert"
"k8s.io/cli-runtime/pkg/genericclioptions"
Expand Down
14 changes: 7 additions & 7 deletions commands/live/migrate/migratecmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (

initialization "github.com/kptdev/kpt/commands/live/init"
"github.com/kptdev/kpt/internal/docs/generated/livedocs"
"github.com/kptdev/kpt/internal/pkg"
"github.com/kptdev/kpt/internal/types"
"github.com/kptdev/kpt/internal/util/argutil"
"github.com/kptdev/kpt/internal/util/pathutil"
rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1"
"github.com/kptdev/kpt/pkg/kptfile/kptfileutil"
"github.com/kptdev/kpt/pkg/lib/errors"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/lib/types"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/lib/util/path"
"github.com/kptdev/kpt/pkg/live"
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -251,7 +251,7 @@ func (mr *Runner) migrateObjs(rgInvClient inventory.Client,
path := args[0]
var err error
if args[0] != "-" {
path, err = argutil.ResolveSymlink(mr.ctx, path)
path, err = argsutil.ResolveSymlink(mr.ctx, path)
if err != nil {
return err
}
Expand Down Expand Up @@ -363,7 +363,7 @@ func (mr *Runner) migrateKptfileToRG(args []string) error {
klog.V(4).Infoln("attempting to migrate from Kptfile inventory")
fmt.Fprint(mr.ioStreams.Out, " reading existing Kptfile...")
if !mr.dryRun {
dir, _, err := pathutil.ResolveAbsAndRelPaths(args[0])
dir, _, err := path.ResolveAbsAndRelPaths(args[0])
if err != nil {
return err
}
Expand Down Expand Up @@ -459,7 +459,7 @@ func (mr *Runner) migrateCMToRG(stdinBytes []byte, args []string) error {
func (mr *Runner) createRGfile(ctx context.Context, args []string, prevID string) error {
fmt.Fprint(mr.ioStreams.Out, " creating ResourceGroup object file...")
if !mr.dryRun {
dir, _, err := pathutil.ResolveAbsAndRelPaths(args[0])
dir, _, err := path.ResolveAbsAndRelPaths(args[0])
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion commands/live/migrate/migratecmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"strings"
"testing"

"github.com/kptdev/kpt/internal/pkg"
rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1"
"github.com/kptdev/kpt/pkg/kptfile/kptfileutil"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/printer/fake"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
4 changes: 2 additions & 2 deletions commands/live/status/cmdstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"os"

"github.com/kptdev/kpt/internal/docs/generated/livedocs"
"github.com/kptdev/kpt/internal/util/argutil"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/live"
kptstatus "github.com/kptdev/kpt/pkg/status"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -74,7 +74,7 @@ func (rir *RGInventoryLoader) GetInvInfo(cmd *cobra.Command, args []string) (inv
path := args[0]
var err error
if args[0] != "-" {
path, err = argutil.ResolveSymlink(rir.ctx, path)
path, err = argsutil.ResolveSymlink(rir.ctx, path)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions commands/live/status/fake-loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"os"

"github.com/kptdev/kpt/internal/util/argutil"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/live"
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/cmd/util"
Expand Down Expand Up @@ -56,7 +56,7 @@ func (r *FakeLoader) GetInvInfo(cmd *cobra.Command, args []string) (inventory.In
path := args[0]
var err error
if args[0] != "-" {
path, err = argutil.ResolveSymlink(r.ctx, path)
path, err = argsutil.ResolveSymlink(r.ctx, path)
if err != nil {
return nil, err
}
Expand Down
14 changes: 7 additions & 7 deletions commands/pkg/diff/cmddiff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"os"

"github.com/kptdev/kpt/internal/docs/generated/pkgdocs"
"github.com/kptdev/kpt/internal/pkg"
"github.com/kptdev/kpt/internal/util/argutil"
"github.com/kptdev/kpt/internal/util/diff"
"github.com/kptdev/kpt/internal/util/pathutil"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/lib/pkg/diff"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
"github.com/kptdev/kpt/pkg/lib/util/path"
"github.com/kptdev/kpt/pkg/printer"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/kyaml/filesys"
Expand Down Expand Up @@ -80,7 +80,7 @@ func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
args = append(args, pkg.CurDir)
}
dirVer := args[0]
dir, version, err := argutil.ParseDirVersion(dirVer)
dir, version, err := argsutil.ParseDirVersion(dirVer)
if err != nil {
return err
}
Expand All @@ -96,12 +96,12 @@ func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
r.DiffType = diff.Type(r.diffType)
}

resolvedPath, err := argutil.ResolveSymlink(r.ctx, dir)
resolvedPath, err := argsutil.ResolveSymlink(r.ctx, dir)
if err != nil {
return err
}

absResolvedPath, _, err := pathutil.ResolveAbsAndRelPaths(resolvedPath)
absResolvedPath, _, err := path.ResolveAbsAndRelPaths(resolvedPath)
if err != nil {
return err
}
Expand Down
14 changes: 7 additions & 7 deletions commands/pkg/get/cmdget.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (
"strings"

docs "github.com/kptdev/kpt/internal/docs/generated/pkgdocs"
"github.com/kptdev/kpt/internal/pkg"
"github.com/kptdev/kpt/internal/types"
"github.com/kptdev/kpt/internal/util/argutil"
"github.com/kptdev/kpt/internal/util/get"
"github.com/kptdev/kpt/internal/util/pathutil"
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
"github.com/kptdev/kpt/pkg/lib/errors"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/lib/types"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
"github.com/kptdev/kpt/pkg/lib/util/get"
"github.com/kptdev/kpt/pkg/lib/util/parse"
"github.com/kptdev/kpt/pkg/lib/util/path"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/kyaml/filesys"
)
Expand Down Expand Up @@ -84,7 +84,7 @@ func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
} else if filepath.Clean(args[1]) != "." {
_, err := os.Lstat(args[1])
if err == nil || os.IsExist(err) {
resolvedPath, err := argutil.ResolveSymlink(r.ctx, args[1])
resolvedPath, err := argsutil.ResolveSymlink(r.ctx, args[1])
if err != nil {
return errors.E(op, err)
}
Expand All @@ -97,7 +97,7 @@ func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
}

r.Get.Git = &t.Git
absDestPath, _, err := pathutil.ResolveAbsAndRelPaths(t.Destination)
absDestPath, _, err := path.ResolveAbsAndRelPaths(t.Destination)
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions commands/pkg/init/cmdinit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"context"

docs "github.com/kptdev/kpt/internal/docs/generated/pkgdocs"
"github.com/kptdev/kpt/internal/pkg"
"github.com/kptdev/kpt/internal/util/pathutil"
"github.com/kptdev/kpt/pkg/kptpkg"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
"github.com/kptdev/kpt/pkg/lib/util/path"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/kyaml/filesys"
)
Expand Down Expand Up @@ -67,7 +67,7 @@ func (r *Runner) runE(_ *cobra.Command, args []string) error {
args = append(args, pkg.CurDir)
}

absPath, _, err := pathutil.ResolveAbsAndRelPaths(args[0])
absPath, _, err := path.ResolveAbsAndRelPaths(args[0])
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions commands/pkg/init/cmdinit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"testing"

initialization "github.com/kptdev/kpt/commands/pkg/init"
"github.com/kptdev/kpt/internal/builtins"
"github.com/kptdev/kpt/internal/testutil"
"github.com/kptdev/kpt/internal/util/man"
builtintypes "github.com/kptdev/kpt/pkg/lib/builtins/builtintypes"
"github.com/kptdev/kpt/pkg/lib/builtins"
"github.com/kptdev/kpt/pkg/lib/builtins/builtintypes"
"github.com/kptdev/kpt/pkg/lib/util/man"
"github.com/kptdev/kpt/pkg/printer/fake"
"github.com/stretchr/testify/assert"
)
Expand Down
14 changes: 7 additions & 7 deletions commands/pkg/update/cmdupdate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"strings"

docs "github.com/kptdev/kpt/internal/docs/generated/pkgdocs"
"github.com/kptdev/kpt/internal/pkg"
"github.com/kptdev/kpt/internal/types"
"github.com/kptdev/kpt/internal/util/argutil"
"github.com/kptdev/kpt/internal/util/pathutil"
"github.com/kptdev/kpt/internal/util/update"
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
"github.com/kptdev/kpt/pkg/lib/errors"
"github.com/kptdev/kpt/pkg/lib/pkg"
"github.com/kptdev/kpt/pkg/lib/types"
"github.com/kptdev/kpt/pkg/lib/update"
argsutil "github.com/kptdev/kpt/pkg/lib/util/args"
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
"github.com/kptdev/kpt/pkg/lib/util/path"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/kyaml/filesys"
)
Expand Down Expand Up @@ -91,11 +91,11 @@ func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
return errors.E(op, errors.InvalidParam, fmt.Errorf("at most 1 version permitted"))
}

resolvedPath, err := argutil.ResolveSymlink(r.ctx, parts[0])
resolvedPath, err := argsutil.ResolveSymlink(r.ctx, parts[0])
if err != nil {
return err
}
absResolvedPath, _, err := pathutil.ResolveAbsAndRelPaths(resolvedPath)
absResolvedPath, _, err := path.ResolveAbsAndRelPaths(resolvedPath)
if err != nil {
return err
}
Expand Down
Loading
Loading