chore: move cli formatters and version modules to machinery

Unix4ever · Unix4ever · commit 3c8f51d707b8 · 2024-03-07T16:29:15.000+03:00
To be used in the `go-talos-support` module without importing the whole
Talos repo.

Signed-off-by: Artem Chernyshev &lt;artem.chernyshev@talos-systems.com&gt;
diff --git a/cmd/installer/cmd/installer/install.go b/cmd/installer/cmd/installer/install.go
@@ -15,7 +15,7 @@ import (
 	"github.com/siderolabs/talos/cmd/installer/pkg/install"
 	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/platform"
 	"github.com/siderolabs/talos/pkg/machinery/config/configloader"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // installCmd represents the installation command.
diff --git a/cmd/installer/pkg/install/install.go b/cmd/installer/pkg/install/install.go
@@ -25,7 +25,7 @@ import (
 	"github.com/siderolabs/talos/internal/pkg/mount"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
 	"github.com/siderolabs/talos/pkg/machinery/kernel"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // Options represents the set of options available for an install.
diff --git a/cmd/installer/pkg/install/preflight.go b/cmd/installer/pkg/install/preflight.go
@@ -22,7 +22,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/constants"
 	"github.com/siderolabs/talos/pkg/machinery/resources/k8s"
 	"github.com/siderolabs/talos/pkg/machinery/role"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // PreflightChecks runs the preflight checks.
diff --git a/cmd/talosctl/cmd/mgmt/cluster/create.go b/cmd/talosctl/cmd/mgmt/cluster/create.go
@@ -45,10 +45,10 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/config/types/v1alpha1"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
 	"github.com/siderolabs/talos/pkg/machinery/nethelpers"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 	"github.com/siderolabs/talos/pkg/provision"
 	"github.com/siderolabs/talos/pkg/provision/access"
 	"github.com/siderolabs/talos/pkg/provision/providers"
-	"github.com/siderolabs/talos/pkg/version"
 )
 
 const (
diff --git a/cmd/talosctl/cmd/talos/inspect.go b/cmd/talosctl/cmd/talos/inspect.go
@@ -14,6 +14,7 @@ import (
 	"github.com/siderolabs/talos/cmd/talosctl/pkg/talos/helpers"
 	"github.com/siderolabs/talos/pkg/cli"
 	"github.com/siderolabs/talos/pkg/machinery/client"
+	"github.com/siderolabs/talos/pkg/machinery/formatters"
 )
 
 // inspectCmd represents the inspect command.
@@ -54,7 +55,7 @@ to render the graph:
 				cli.Warning("%s", err)
 			}
 
-			return cli.RenderGraph(ctx, c, resp, os.Stdout, inspectDependenciesCmdFlags.withResources)
+			return formatters.RenderGraph(ctx, c, resp, os.Stdout, inspectDependenciesCmdFlags.withResources)
 		})
 	},
 }
diff --git a/cmd/talosctl/cmd/talos/mounts.go b/cmd/talosctl/cmd/talos/mounts.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/siderolabs/talos/pkg/cli"
 	"github.com/siderolabs/talos/pkg/machinery/client"
+	"github.com/siderolabs/talos/pkg/machinery/formatters"
 )
 
 // mountsCmd represents the mounts command.
@@ -37,7 +38,7 @@ var mountsCmd = &cobra.Command{
 				cli.Warning("%s", err)
 			}
 
-			return cli.RenderMounts(resp, os.Stdout, &remotePeer)
+			return formatters.RenderMounts(resp, os.Stdout, &remotePeer)
 		})
 	},
 }
diff --git a/cmd/talosctl/cmd/talos/root.go b/cmd/talosctl/cmd/talos/root.go
@@ -20,12 +20,12 @@ import (
 	"google.golang.org/grpc/peer"
 
 	"github.com/siderolabs/talos/cmd/talosctl/pkg/talos/global"
-	"github.com/siderolabs/talos/pkg/cli"
 	_ "github.com/siderolabs/talos/pkg/grpc/codec" // register codec
 	"github.com/siderolabs/talos/pkg/machinery/api/common"
 	machineapi "github.com/siderolabs/talos/pkg/machinery/api/machine"
 	"github.com/siderolabs/talos/pkg/machinery/client"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/formatters"
 )
 
 var kubernetes bool
@@ -165,7 +165,7 @@ func getServiceFromNode() []string {
 
 			for _, msg := range resp.Messages {
 				for _, s := range msg.Services {
-					svc := cli.ServiceInfoWrapper{ServiceInfo: s}
+					svc := formatters.ServiceInfoWrapper{ServiceInfo: s}
 					svcIDs = append(svcIDs, svc.Id)
 				}
 			}
diff --git a/cmd/talosctl/cmd/talos/service.go b/cmd/talosctl/cmd/talos/service.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/siderolabs/talos/pkg/cli"
 	"github.com/siderolabs/talos/pkg/machinery/client"
+	"github.com/siderolabs/talos/pkg/machinery/formatters"
 )
 
 // serviceCmd represents the service command.
@@ -89,7 +90,7 @@ func serviceList(ctx context.Context, c *client.Client) error {
 
 	for _, msg := range resp.Messages {
 		for _, s := range msg.Services {
-			svc := cli.ServiceInfoWrapper{ServiceInfo: s}
+			svc := formatters.ServiceInfoWrapper{ServiceInfo: s}
 
 			node := defaultNode
 
@@ -122,7 +123,7 @@ func serviceInfo(ctx context.Context, c *client.Client, id string) error {
 		return fmt.Errorf("service %q is not registered on any nodes", id)
 	}
 
-	return cli.RenderServicesInfo(services, os.Stdout, defaultNode, true)
+	return formatters.RenderServicesInfo(services, os.Stdout, defaultNode, true)
 }
 
 func serviceStart(ctx context.Context, c *client.Client, id string) error {
diff --git a/cmd/talosctl/cmd/talos/upgrade.go b/cmd/talosctl/cmd/talos/upgrade.go
@@ -26,7 +26,7 @@ import (
 	"github.com/siderolabs/talos/pkg/images"
 	"github.com/siderolabs/talos/pkg/machinery/api/machine"
 	"github.com/siderolabs/talos/pkg/machinery/client"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 var upgradeCmdFlags struct {
diff --git a/cmd/talosctl/cmd/talos/version.go b/cmd/talosctl/cmd/talos/version.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/siderolabs/talos/pkg/cli"
 	"github.com/siderolabs/talos/pkg/machinery/client"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // versionCmdFlags represents the `talosctl version` command's flags.
diff --git a/cmd/talosctl/pkg/mgmt/helpers/image.go b/cmd/talosctl/pkg/mgmt/helpers/image.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // DefaultImage appends default image version.
diff --git a/cmd/talosctl/pkg/talos/helpers/checks.go b/cmd/talosctl/pkg/talos/helpers/checks.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/siderolabs/talos/pkg/machinery/api/common"
 	"github.com/siderolabs/talos/pkg/machinery/client"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // FailIfMultiNodes checks if ctx contains multi-node request metadata.
diff --git a/go.mod b/go.mod
@@ -56,7 +56,6 @@ require (
 	github.com/docker/go-connections v0.5.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/ecks/uefi v0.0.0-20221116212947-caef65d070eb
-	github.com/emicklei/dot v1.6.1
 	github.com/fatih/color v1.16.0
 	github.com/foxboron/go-uefi v0.0.0-20240128152106-48be911532c2
 	github.com/freddierice/go-losetup/v2 v2.0.1
@@ -215,6 +214,7 @@ require (
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/docker/go-units v0.5.0 // indirect
+	github.com/emicklei/dot v1.6.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
diff --git a/internal/app/apid/pkg/backend/apid_test.go b/internal/app/apid/pkg/backend/apid_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/config"
 	"github.com/siderolabs/talos/pkg/machinery/proto"
 	"github.com/siderolabs/talos/pkg/machinery/role"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 type APIDSuite struct {
diff --git a/internal/app/init/main.go b/internal/app/init/main.go
@@ -29,7 +29,7 @@ import (
 	"github.com/siderolabs/talos/internal/pkg/secureboot/tpm2"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
 	"github.com/siderolabs/talos/pkg/machinery/extensions"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 func init() {
diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go
@@ -87,7 +87,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/resources/network"
 	timeresource "github.com/siderolabs/talos/pkg/machinery/resources/time"
 	"github.com/siderolabs/talos/pkg/machinery/role"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // MinimumEtcdUpgradeLeaseLockSeconds indicates the minimum number of seconds for which we open a lease lock for upgrading Etcd nodes.
diff --git a/internal/app/machined/pkg/controllers/cluster/discovery_service.go b/internal/app/machined/pkg/controllers/cluster/discovery_service.go
@@ -30,7 +30,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/resources/kubespan"
 	"github.com/siderolabs/talos/pkg/machinery/resources/network"
 	"github.com/siderolabs/talos/pkg/machinery/resources/runtime"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 const defaultDiscoveryTTL = 30 * time.Minute
diff --git a/internal/app/machined/pkg/controllers/cluster/local_affiliate.go b/internal/app/machined/pkg/controllers/cluster/local_affiliate.go
@@ -25,7 +25,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/resources/k8s"
 	"github.com/siderolabs/talos/pkg/machinery/resources/kubespan"
 	"github.com/siderolabs/talos/pkg/machinery/resources/network"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // LocalAffiliateController builds Affiliate resource for the local node.
diff --git a/internal/app/machined/pkg/controllers/cluster/local_affiliate_test.go b/internal/app/machined/pkg/controllers/cluster/local_affiliate_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/resources/k8s"
 	"github.com/siderolabs/talos/pkg/machinery/resources/kubespan"
 	"github.com/siderolabs/talos/pkg/machinery/resources/network"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 type LocalAffiliateSuite struct {
diff --git a/internal/app/machined/pkg/controllers/siderolink/manager.go b/internal/app/machined/pkg/controllers/siderolink/manager.go
@@ -38,7 +38,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/resources/network"
 	"github.com/siderolabs/talos/pkg/machinery/resources/runtime"
 	"github.com/siderolabs/talos/pkg/machinery/resources/siderolink"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // ManagerController interacts with SideroLink API and brings up the SideroLink Wireguard interface.
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub.go b/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 
 	"github.com/siderolabs/talos/pkg/machinery/constants"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // Config represents a grub configuration file (grub.cfg).
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub_test.go b/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub_test.go
@@ -19,7 +19,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 var (
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go
@@ -78,8 +78,8 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/resources/k8s"
 	resourceruntime "github.com/siderolabs/talos/pkg/machinery/resources/runtime"
 	resourcev1alpha1 "github.com/siderolabs/talos/pkg/machinery/resources/v1alpha1"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 	"github.com/siderolabs/talos/pkg/minimal"
-	"github.com/siderolabs/talos/pkg/version"
 )
 
 // WaitForUSB represents the WaitForUSB task.
diff --git a/internal/app/maintenance/server.go b/internal/app/maintenance/server.go
@@ -35,7 +35,7 @@ import (
 	v1alpha1machine "github.com/siderolabs/talos/pkg/machinery/config/machine"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
 	"github.com/siderolabs/talos/pkg/machinery/role"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // Server implements [machine.MachineServiceServer], network.NetworkService, and [storage.StorageServiceServer].
diff --git a/internal/integration/cli/version.go b/internal/integration/cli/version.go
@@ -10,7 +10,7 @@ import (
 	"regexp"
 
 	"github.com/siderolabs/talos/internal/integration/base"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // VersionSuite verifies version command.
diff --git a/internal/integration/integration_test.go b/internal/integration/integration_test.go
@@ -25,9 +25,9 @@ import (
 	"github.com/siderolabs/talos/pkg/images"
 	clientconfig "github.com/siderolabs/talos/pkg/machinery/client/config"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 	"github.com/siderolabs/talos/pkg/provision"
 	"github.com/siderolabs/talos/pkg/provision/providers"
-	"github.com/siderolabs/talos/pkg/version"
 )
 
 // Accumulated list of all the suites to run.
diff --git a/internal/integration/k8s/tink.go b/internal/integration/k8s/tink.go
@@ -39,7 +39,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/config/generate"
 	"github.com/siderolabs/talos/pkg/machinery/config/machine"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // TinkSuite verifies Talos-in-Kubernetes.
diff --git a/internal/integration/provision/provision.go b/internal/integration/provision/provision.go
@@ -44,10 +44,10 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/config/types/v1alpha1"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
 	"github.com/siderolabs/talos/pkg/machinery/nethelpers"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 	"github.com/siderolabs/talos/pkg/provision"
 	"github.com/siderolabs/talos/pkg/provision/access"
 	"github.com/siderolabs/talos/pkg/provision/providers/qemu"
-	"github.com/siderolabs/talos/pkg/version"
 )
 
 var allSuites []suite.TestingSuite
diff --git a/internal/pkg/extensions/extensions_test.go b/internal/pkg/extensions/extensions_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/siderolabs/talos/internal/pkg/extensions"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 func TestLoadValidate(t *testing.T) {
diff --git a/internal/pkg/extensions/validate.go b/internal/pkg/extensions/validate.go
@@ -14,7 +14,7 @@ import (
 	"github.com/blang/semver/v4"
 
 	"github.com/siderolabs/talos/pkg/machinery/extensions"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // Validate the extension: compatibility, contents, etc.
diff --git a/internal/pkg/secureboot/uki/generate.go b/internal/pkg/secureboot/uki/generate.go
@@ -17,8 +17,8 @@ import (
 	"github.com/siderolabs/talos/internal/pkg/secureboot"
 	"github.com/siderolabs/talos/internal/pkg/secureboot/measure"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 	"github.com/siderolabs/talos/pkg/splash"
-	"github.com/siderolabs/talos/pkg/version"
 )
 
 func (builder *Builder) generateOSRel() error {
diff --git a/internal/pkg/tui/installer/installer.go b/internal/pkg/tui/installer/installer.go
@@ -18,7 +18,7 @@ import (
 	"github.com/siderolabs/talos/internal/pkg/tui/components"
 	machineapi "github.com/siderolabs/talos/pkg/machinery/api/machine"
 	clientconfig "github.com/siderolabs/talos/pkg/machinery/client/config"
-	"github.com/siderolabs/talos/pkg/version"
+	"github.com/siderolabs/talos/pkg/machinery/version"
 )
 
 // NewPage creates a new installer page.
diff --git a/pkg/cluster/sonobuoy/product.go b/pkg/cluster/sonobuoy/product.go
@@ -4,7 +4,7 @@
 
 package sonobuoy
 
-import "github.com/siderolabs/talos/pkg/version"
+import "github.com/siderolabs/talos/pkg/machinery/version"
 
 type product struct {
 	Vendor           string `yaml:"vendor"`
diff --git a/pkg/cluster/support.go b/pkg/cluster/support.go
diff --git a/pkg/imager/imager.go b/pkg/imager/imager.go
diff --git a/pkg/images/images.go b/pkg/images/images.go
diff --git a/pkg/images/list.go b/pkg/images/list.go
diff --git a/pkg/machinery/formatters/formatters.go b/pkg/machinery/formatters/formatters.go
diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod
diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum
diff --git a/pkg/machinery/version/osrelease.go b/pkg/machinery/version/osrelease.go
diff --git a/pkg/machinery/version/osrelease_test.go b/pkg/machinery/version/osrelease_test.go
diff --git a/pkg/machinery/version/version.go b/pkg/machinery/version/version.go

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/siderolabs/talos/cmd/installer/pkg/install"`
`16`	`16`	`"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/platform"`
`17`	`17`	`"github.com/siderolabs/talos/pkg/machinery/config/configloader"`
`18`		`- "github.com/siderolabs/talos/pkg/version"`
	`18`	`+ "github.com/siderolabs/talos/pkg/machinery/version"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// installCmd represents the installation command.`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"github.com/siderolabs/talos/internal/pkg/mount"`
`26`	`26`	`"github.com/siderolabs/talos/pkg/machinery/constants"`
`27`	`27`	`"github.com/siderolabs/talos/pkg/machinery/kernel"`
`28`		`- "github.com/siderolabs/talos/pkg/version"`
	`28`	`+ "github.com/siderolabs/talos/pkg/machinery/version"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`// Options represents the set of options available for an install.`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"github.com/siderolabs/talos/pkg/machinery/constants"`
`23`	`23`	`"github.com/siderolabs/talos/pkg/machinery/resources/k8s"`
`24`	`24`	`"github.com/siderolabs/talos/pkg/machinery/role"`
`25`		`- "github.com/siderolabs/talos/pkg/version"`
	`25`	`+ "github.com/siderolabs/talos/pkg/machinery/version"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// PreflightChecks runs the preflight checks.`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`"github.com/siderolabs/talos/cmd/talosctl/pkg/talos/helpers"`
`15`	`15`	`"github.com/siderolabs/talos/pkg/cli"`
`16`	`16`	`"github.com/siderolabs/talos/pkg/machinery/client"`
	`17`	`+ "github.com/siderolabs/talos/pkg/machinery/formatters"`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`// inspectCmd represents the inspect command.`
`@@ -54,7 +55,7 @@ to render the graph:`
`54`	`55`	`cli.Warning("%s", err)`
`55`	`56`	`}`
`56`	`57`
`57`		`- return cli.RenderGraph(ctx, c, resp, os.Stdout, inspectDependenciesCmdFlags.withResources)`
	`58`	`+ return formatters.RenderGraph(ctx, c, resp, os.Stdout, inspectDependenciesCmdFlags.withResources)`
`58`	`59`	`})`
`59`	`60`	`},`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`"github.com/siderolabs/talos/pkg/cli"`
`17`	`17`	`"github.com/siderolabs/talos/pkg/machinery/client"`
	`18`	`+ "github.com/siderolabs/talos/pkg/machinery/formatters"`
`18`	`19`	`)`
`19`	`20`
`20`	`21`	`// mountsCmd represents the mounts command.`
`@@ -37,7 +38,7 @@ var mountsCmd = &cobra.Command{`
`37`	`38`	`cli.Warning("%s", err)`
`38`	`39`	`}`
`39`	`40`
`40`		`- return cli.RenderMounts(resp, os.Stdout, &remotePeer)`
	`41`	`+ return formatters.RenderMounts(resp, os.Stdout, &remotePeer)`
`41`	`42`	`})`
`42`	`43`	`},`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ import (`
`20`	`20`	`"google.golang.org/grpc/peer"`
`21`	`21`
`22`	`22`	`"github.com/siderolabs/talos/cmd/talosctl/pkg/talos/global"`
`23`		`- "github.com/siderolabs/talos/pkg/cli"`
`24`	`23`	`_ "github.com/siderolabs/talos/pkg/grpc/codec" // register codec`
`25`	`24`	`"github.com/siderolabs/talos/pkg/machinery/api/common"`
`26`	`25`	`machineapi "github.com/siderolabs/talos/pkg/machinery/api/machine"`
`27`	`26`	`"github.com/siderolabs/talos/pkg/machinery/client"`
`28`	`27`	`"github.com/siderolabs/talos/pkg/machinery/constants"`
	`28`	`+ "github.com/siderolabs/talos/pkg/machinery/formatters"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`var kubernetes bool`
`@@ -165,7 +165,7 @@ func getServiceFromNode() []string {`
`165`	`165`
`166`	`166`	`for _, msg := range resp.Messages {`
`167`	`167`	`for _, s := range msg.Services {`
`168`		`- svc := cli.ServiceInfoWrapper{ServiceInfo: s}`
	`168`	`+ svc := formatters.ServiceInfoWrapper{ServiceInfo: s}`
`169`	`169`	`svcIDs = append(svcIDs, svc.Id)`
`170`	`170`	`}`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`
`17`	`17`	`"github.com/siderolabs/talos/pkg/cli"`
`18`	`18`	`"github.com/siderolabs/talos/pkg/machinery/client"`
	`19`	`+ "github.com/siderolabs/talos/pkg/machinery/formatters"`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`// serviceCmd represents the service command.`
`@@ -89,7 +90,7 @@ func serviceList(ctx context.Context, c *client.Client) error {`
`89`	`90`
`90`	`91`	`for _, msg := range resp.Messages {`
`91`	`92`	`for _, s := range msg.Services {`
`92`		`- svc := cli.ServiceInfoWrapper{ServiceInfo: s}`
	`93`	`+ svc := formatters.ServiceInfoWrapper{ServiceInfo: s}`
`93`	`94`
`94`	`95`	`node := defaultNode`
`95`	`96`
`@@ -122,7 +123,7 @@ func serviceInfo(ctx context.Context, c *client.Client, id string) error {`
`122`	`123`	`return fmt.Errorf("service %q is not registered on any nodes", id)`
`123`	`124`	`}`
`124`	`125`
`125`		`- return cli.RenderServicesInfo(services, os.Stdout, defaultNode, true)`
	`126`	`+ return formatters.RenderServicesInfo(services, os.Stdout, defaultNode, true)`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`func serviceStart(ctx context.Context, c *client.Client, id string) error {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/siderolabs/talos/pkg/images"`
`27`	`27`	`"github.com/siderolabs/talos/pkg/machinery/api/machine"`
`28`	`28`	`"github.com/siderolabs/talos/pkg/machinery/client"`
`29`		`- "github.com/siderolabs/talos/pkg/version"`
	`29`	`+ "github.com/siderolabs/talos/pkg/machinery/version"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`var upgradeCmdFlags struct {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`
`17`	`17`	`"github.com/siderolabs/talos/pkg/cli"`
`18`	`18`	`"github.com/siderolabs/talos/pkg/machinery/client"`
`19`		`- "github.com/siderolabs/talos/pkg/version"`
	`19`	`+ "github.com/siderolabs/talos/pkg/machinery/version"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	// versionCmdFlags represents the `talosctl version` command's flags.