Skip to content

refactor: move shared library code from cmd/crossplane to pkg #455

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcogilvie wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: move shared library code from cmd/crossplane to pkg #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0329121
refactor: move common/crd to pkg/crd
jcogilvie Oct 27, 2026
b98e895
refactor: move common/load to pkg/load
jcogilvie Oct 27, 2026
f5ec994
refactor: move common/resource to pkg/resource
jcogilvie Oct 27, 2026
44f8b5c
refactor: move the render library to pkg/render
jcogilvie Oct 27, 2026
34afdae
refactor: move xr claim conversion to pkg/xr
jcogilvie Oct 27, 2026
c85bf8b
refactor(xr): keep the generate command in cmd
jcogilvie Oct 27, 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
2 changes: 1 addition & 1 deletion cmd/crossplane/project/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
xpkgv1beta1 "github.com/crossplane/crossplane/apis/v2/pkg/v1beta1"

devv1alpha1 "github.com/crossplane/cli/v2/apis/dev/v1alpha1"
"github.com/crossplane/cli/v2/cmd/crossplane/render"
"github.com/crossplane/cli/v2/internal/async"
"github.com/crossplane/cli/v2/internal/config"
"github.com/crossplane/cli/v2/internal/dependency"
Expand All @@ -53,6 +52,7 @@ import (
"github.com/crossplane/cli/v2/internal/schemas/runner"
"github.com/crossplane/cli/v2/internal/terminal"
clixpkg "github.com/crossplane/cli/v2/internal/xpkg"
"github.com/crossplane/cli/v2/pkg/render"

_ "embed"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/render/op/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
opsv1alpha1 "github.com/crossplane/crossplane/apis/v2/ops/v1alpha1"
pkgv1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"

"github.com/crossplane/cli/v2/cmd/crossplane/render"
"github.com/crossplane/cli/v2/cmd/crossplane/render/contextfn"
"github.com/crossplane/cli/v2/internal/async"
"github.com/crossplane/cli/v2/internal/config"
Expand All @@ -50,6 +49,7 @@ import (
"github.com/crossplane/cli/v2/internal/schemas/runner"
"github.com/crossplane/cli/v2/internal/terminal"
clixpkg "github.com/crossplane/cli/v2/internal/xpkg"
"github.com/crossplane/cli/v2/pkg/render"

_ "embed"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/render/op/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import (

pkgv1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"

"github.com/crossplane/cli/v2/cmd/crossplane/render"
"github.com/crossplane/cli/v2/internal/config"
"github.com/crossplane/cli/v2/internal/terminal"
"github.com/crossplane/cli/v2/pkg/render"
renderv1alpha1 "github.com/crossplane/cli/v2/proto/render/v1alpha1"

_ "embed"
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/render/xr/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import (
apiextensionsv1 "github.com/crossplane/crossplane/apis/v2/apiextensions/v1"
pkgv1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"

"github.com/crossplane/cli/v2/cmd/crossplane/render"
"github.com/crossplane/cli/v2/cmd/crossplane/render/contextfn"
"github.com/crossplane/cli/v2/internal/async"
"github.com/crossplane/cli/v2/internal/config"
Expand All @@ -57,6 +56,7 @@ import (
"github.com/crossplane/cli/v2/internal/schemas/runner"
"github.com/crossplane/cli/v2/internal/terminal"
clixpkg "github.com/crossplane/cli/v2/internal/xpkg"
"github.com/crossplane/cli/v2/pkg/render"
xrpkg "github.com/crossplane/cli/v2/pkg/xr"

_ "embed"
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/render/xr/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import (

pkgv1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"

"github.com/crossplane/cli/v2/cmd/crossplane/render"
"github.com/crossplane/cli/v2/internal/config"
"github.com/crossplane/cli/v2/internal/terminal"
"github.com/crossplane/cli/v2/pkg/render"
renderv1alpha1 "github.com/crossplane/cli/v2/proto/render/v1alpha1"

_ "embed"
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/simulate/simulate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ import (
pkgv1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"
pkgv1beta1 "github.com/crossplane/crossplane/apis/v2/pkg/v1beta1"

"github.com/crossplane/cli/v2/cmd/crossplane/common/load"
"github.com/crossplane/cli/v2/internal/async"
"github.com/crossplane/cli/v2/internal/containerruntime"
"github.com/crossplane/cli/v2/internal/diffserver"
Expand All @@ -61,6 +60,7 @@ import (
"github.com/crossplane/cli/v2/internal/project/projectfile"
"github.com/crossplane/cli/v2/internal/terminal"
clixpkg "github.com/crossplane/cli/v2/internal/xpkg"
"github.com/crossplane/cli/v2/pkg/load"

_ "embed"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/crossplane/trace/internal/printer/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
xpv2 "github.com/crossplane/crossplane/apis/v2/core/v2"
pkgv1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/cmd/crossplane/common/resource/xpkg"
"github.com/crossplane/cli/v2/pkg/resource"
"github.com/crossplane/cli/v2/pkg/resource/xpkg"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/default_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/crossplane/crossplane-runtime/v2/pkg/test"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

func TestDefaultPrinterPrint(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/crossplane/trace/internal/printer/dot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
xpv2 "github.com/crossplane/crossplane/apis/v2/core/v2"
v1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/cmd/crossplane/common/resource/xpkg"
"github.com/crossplane/cli/v2/pkg/resource"
"github.com/crossplane/cli/v2/pkg/resource/xpkg"
)

// DotPrinter defines the DotPrinter configuration.
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/dot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/crossplane/crossplane-runtime/v2/pkg/test"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

// Define a test for PrintDotGraph.
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/pkg/errors"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/crossplane/crossplane-runtime/v2/pkg/test"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

func TestJSONPrinterPrint(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/printer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/pkg/errors"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/printer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
xpv2 "github.com/crossplane/crossplane/apis/v2/core/v2"
v1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

// DummyManifestOpt can be passed to customize a dummy manifest.
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
"sigs.k8s.io/yaml"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/internal/printer/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/crossplane/crossplane-runtime/v2/pkg/test"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/pkg/resource"
)

func TestYAMLPrinterPrint(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/crossplane/trace/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ import (

"github.com/crossplane/crossplane/apis/v2/pkg"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/cmd/crossplane/common/resource/xpkg"
"github.com/crossplane/cli/v2/cmd/crossplane/common/resource/xrm"
"github.com/crossplane/cli/v2/cmd/crossplane/internal"
"github.com/crossplane/cli/v2/cmd/crossplane/trace/internal/printer"
"github.com/crossplane/cli/v2/internal/kube"
"github.com/crossplane/cli/v2/pkg/resource"
"github.com/crossplane/cli/v2/pkg/resource/xpkg"
"github.com/crossplane/cli/v2/pkg/resource/xrm"

_ "embed"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/trace/watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
"github.com/crossplane/crossplane-runtime/v2/pkg/logging"

"github.com/crossplane/cli/v2/cmd/crossplane/common/resource"
"github.com/crossplane/cli/v2/cmd/crossplane/trace/internal/printer"
"github.com/crossplane/cli/v2/pkg/resource"
)

// Bubble Tea messages for watch mode.
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/validate/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

"github.com/crossplane/crossplane-runtime/v2/pkg/errors"

"github.com/crossplane/cli/v2/cmd/crossplane/common/load"
"github.com/crossplane/cli/v2/pkg/load"
)

// Cache defines an interface for caching schemas.
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/validate/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
"github.com/crossplane/crossplane-runtime/v2/pkg/logging"

"github.com/crossplane/cli/v2/cmd/crossplane/common/load"
"github.com/crossplane/cli/v2/pkg/load"
pkgvalidate "github.com/crossplane/cli/v2/pkg/validate"
"github.com/crossplane/cli/v2/pkg/validate/output"

Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/validate/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (

"github.com/crossplane/crossplane-runtime/v2/pkg/errors"

"github.com/crossplane/cli/v2/cmd/crossplane/common/load"
"github.com/crossplane/cli/v2/pkg/load"
)

const maxDecompressedSize = 200 * 1024 * 1024 // 200 MB
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/xpkg/get_crds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
"github.com/crossplane/crossplane-runtime/v2/pkg/logging"

"github.com/crossplane/cli/v2/cmd/crossplane/common/load"
"github.com/crossplane/cli/v2/cmd/crossplane/validate"
"github.com/crossplane/cli/v2/internal/schemas/generator"
"github.com/crossplane/cli/v2/pkg/load"

_ "embed"
)
Expand Down
Loading
Loading