Skip to content

Commit

Permalink
Move internal/kptfile to pkg/kptfile to make it vendorable
Browse files Browse the repository at this point in the history
  • Loading branch information
@barney-s
barney-s committed Sep 14, 2020
1 parent 2eb256c commit e972dc0
Show file tree
Hide file tree
Showing 29 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion internal/cmddesc/cmddesc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"

"github.com/GoogleContainerTools/kpt/internal/cmddesc"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/testutil"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"gotest.tools/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmdget/cmdget_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"

"github.com/GoogleContainerTools/kpt/internal/cmdget"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/testutil"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/kustomize/kyaml/yaml"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmdinit/cmdinit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"text/template"

docs "github.com/GoogleContainerTools/kpt/internal/docs/generated/pkgdocs"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/util/cmdutil"
"github.com/GoogleContainerTools/kpt/internal/util/man"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/yaml"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmdsync/cmdsyncset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package cmdsync

import (
docs "github.com/GoogleContainerTools/kpt/internal/docs/generated/pkgdocs"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/util/cmdutil"
"github.com/GoogleContainerTools/kpt/internal/util/parse"
"github.com/GoogleContainerTools/kpt/internal/util/sync"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmdupdate/cmdupdate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/GoogleContainerTools/kpt/internal/cmdget"
"github.com/GoogleContainerTools/kpt/internal/cmdupdate"
"github.com/GoogleContainerTools/kpt/internal/gitutil"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/testutil"
"github.com/GoogleContainerTools/kpt/internal/util/update"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/kustomize/kyaml/yaml"
Expand Down
2 changes: 1 addition & 1 deletion internal/testutil/testutil.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"testing"

"github.com/GoogleContainerTools/kpt/internal/gitutil"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/stretchr/testify/assert"
assertnow "gotest.tools/assert"
"sigs.k8s.io/kustomize/kyaml/copyutil"
Expand Down
4 changes: 2 additions & 2 deletions internal/util/desc/desc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os"
"path/filepath"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"github.com/olekukonko/tablewriter"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/util/diff/diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"path/filepath"
"strings"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/internal/util/get"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"sigs.k8s.io/kustomize/kyaml/copyutil"
"sigs.k8s.io/kustomize/kyaml/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/util/diff/diff_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"strings"
"testing"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/testutil"
. "github.com/GoogleContainerTools/kpt/internal/util/diff"
"github.com/GoogleContainerTools/kpt/internal/util/get"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/kustomize/kyaml/copyutil"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/util/functions/functions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package functions
import (
"path/filepath"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"sigs.k8s.io/kustomize/kyaml/fn/runtime/container"
"sigs.k8s.io/kustomize/kyaml/fn/runtime/exec"
"sigs.k8s.io/kustomize/kyaml/fn/runtime/runtimeutil"
Expand Down
2 changes: 1 addition & 1 deletion internal/util/get/example_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package get_test
import (
"path/filepath"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"

"github.com/GoogleContainerTools/kpt/internal/util/get"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/util/get/get.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"path/filepath"
"strings"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/internal/util/git"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"sigs.k8s.io/kustomize/kyaml/copyutil"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/yaml"
Expand Down
2 changes: 1 addition & 1 deletion internal/util/get/get_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"path/filepath"
"testing"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/testutil"
. "github.com/GoogleContainerTools/kpt/internal/util/get"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/kustomize/kyaml/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/util/get/getioreader/getioreader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"path/filepath"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"sigs.k8s.io/kustomize/kyaml/kio"
"sigs.k8s.io/kustomize/kyaml/kio/filters"
"sigs.k8s.io/kustomize/kyaml/yaml"
Expand Down
2 changes: 1 addition & 1 deletion internal/util/man/man.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"path/filepath"
"strings"

"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"github.com/cpuguy83/go-md2man/v2/md2man"
"sigs.k8s.io/kustomize/kyaml/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/util/man/man_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path/filepath"
"testing"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
. "github.com/GoogleContainerTools/kpt/internal/util/man"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/util/parse/parse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"path/filepath"
"strings"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"sigs.k8s.io/kustomize/kyaml/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/util/setters/setters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"path/filepath"
"strings"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/go-openapi/spec"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/kyaml/fieldmeta"
Expand Down
2 changes: 1 addition & 1 deletion internal/util/sync/sync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"os"
"path/filepath"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/util/functions"
"github.com/GoogleContainerTools/kpt/internal/util/get"
"github.com/GoogleContainerTools/kpt/internal/util/setters"
"github.com/GoogleContainerTools/kpt/internal/util/update"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/util/sync/updatefile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package sync
import (
"io/ioutil"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/util/update"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"gopkg.in/yaml.v3"
"sigs.k8s.io/kustomize/kyaml/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/util/update/fastforward.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"
"os"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/util/get"
"github.com/GoogleContainerTools/kpt/internal/util/git"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"sigs.k8s.io/kustomize/kyaml/copyutil"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/sets"
Expand Down
2 changes: 1 addition & 1 deletion internal/util/update/gitpatch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"

"github.com/GoogleContainerTools/kpt/internal/gitutil"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"sigs.k8s.io/kustomize/kyaml/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/util/update/resource-merge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"path/filepath"
"strings"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/internal/util/get"
"github.com/GoogleContainerTools/kpt/internal/util/git"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"sigs.k8s.io/kustomize/kyaml/copyutil"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/kio"
Expand Down
4 changes: 2 additions & 2 deletions internal/util/update/update.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"strings"

"github.com/GoogleContainerTools/kpt/internal/gitutil"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"sigs.k8s.io/kustomize/kyaml/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/util/update/update_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"testing"

"github.com/GoogleContainerTools/kpt/internal/gitutil"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
"github.com/GoogleContainerTools/kpt/internal/testutil"
"github.com/GoogleContainerTools/kpt/internal/util/get"
. "github.com/GoogleContainerTools/kpt/internal/util/update"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/kustomize/kyaml/copyutil"
"sigs.k8s.io/kustomize/kyaml/yaml"
Expand Down
2 changes: 1 addition & 1 deletion internal/kptfile/kptfileutil/util.go → pkg/kptfile/kptfileutil/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"os"
"path/filepath"

"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/yaml"
)
Expand Down
0 internal/kptfile/pkgfile.go → pkg/kptfile/pkgfile.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/kptfile/pkgfile_test.go → pkg/kptfile/pkgfile_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"testing"

. "github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/kptfile/kptfileutil"
. "github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/GoogleContainerTools/kpt/pkg/kptfile/kptfileutil"

"github.com/GoogleContainerTools/kpt/internal/testutil"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion run/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
kptcommands "github.com/GoogleContainerTools/kpt/commands"
"github.com/GoogleContainerTools/kpt/internal/cmdcomplete"
"github.com/GoogleContainerTools/kpt/internal/docs/generated/overview"
"github.com/GoogleContainerTools/kpt/internal/kptfile"
"github.com/GoogleContainerTools/kpt/internal/util/cfgflags"
"github.com/GoogleContainerTools/kpt/internal/util/cmdutil"
kptopenapi "github.com/GoogleContainerTools/kpt/internal/util/openapi"
"github.com/GoogleContainerTools/kpt/pkg/kptfile"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/kubectl/pkg/cmd/util"
Expand Down

0 comments on commit e972dc0

Please sign in to comment.