From ff8645d7c5a906a7e5e0140742135b8e99c3a556 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sat, 24 Oct 2026 01:06:31 -0600 Subject: [PATCH] refactor(cmd): rename proflags import alias to platformflags --- cmd/pro/cluster/add.go | 6 +++--- cmd/pro/cluster/add_flags.go | 4 ++-- cmd/pro/cluster/cluster.go | 4 ++-- cmd/pro/cmdutil/cmdutil.go | 8 ++++---- cmd/pro/cmdutil/cmdutil_test.go | 6 +++--- cmd/pro/daemon/netcheck.go | 6 +++--- cmd/pro/daemon/start.go | 6 +++--- cmd/pro/daemon/status.go | 6 +++--- cmd/pro/list.go | 6 +++--- cmd/pro/login.go | 6 +++--- cmd/pro/login_test.go | 10 +++++----- cmd/pro/logout.go | 6 +++--- cmd/pro/pro.go | 6 +++--- cmd/pro/project/project.go | 4 ++-- cmd/pro/start.go | 6 +++--- cmd/pro/start_flags.go | 4 ++-- cmd/pro/template/template.go | 4 ++-- cmd/pro/user/user.go | 4 ++-- cmd/pro/workspace/import.go | 6 +++--- cmd/pro/workspace/workspace.go | 4 ++-- 20 files changed, 56 insertions(+), 56 deletions(-) diff --git a/cmd/pro/cluster/add.go b/cmd/pro/cluster/add.go index 42c9669137..bad282b197 100644 --- a/cmd/pro/cluster/add.go +++ b/cmd/pro/cluster/add.go @@ -11,7 +11,7 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/log" "github.com/devsy-org/devsy/pkg/platform" @@ -29,7 +29,7 @@ import ( ) type ClusterCmd struct { - *proflags.GlobalFlags + *platformflags.GlobalFlags Namespace string ServiceAccount string @@ -45,7 +45,7 @@ type ClusterCmd struct { } // NewAddCmd creates a new command. -func NewAddCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { +func NewAddCmd(globalFlags *platformflags.GlobalFlags) *cobra.Command { cmd := &ClusterCmd{ GlobalFlags: globalFlags, } diff --git a/cmd/pro/cluster/add_flags.go b/cmd/pro/cluster/add_flags.go index acdcadd1b5..e4a7841303 100644 --- a/cmd/pro/cluster/add_flags.go +++ b/cmd/pro/cluster/add_flags.go @@ -1,7 +1,7 @@ package cluster import ( - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" "github.com/spf13/cobra" @@ -92,5 +92,5 @@ func (cmd *ClusterCmd) registerClusterFlags(c *cobra.Command) { ), cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use"), ) - proflags.BindEnv(c.Flags(), names.Host) + platformflags.BindEnv(c.Flags(), names.Host) } diff --git a/cmd/pro/cluster/cluster.go b/cmd/pro/cluster/cluster.go index 00a6cdea8f..99ccb1ac82 100644 --- a/cmd/pro/cluster/cluster.go +++ b/cmd/pro/cluster/cluster.go @@ -1,13 +1,13 @@ package cluster import ( - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/spf13/cobra" ) // NewClusterCmd builds the 'devsy platform cluster' parent command for managing // Platform clusters. -func NewClusterCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { +func NewClusterCmd(globalFlags *platformflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "cluster", Short: "Manage Devsy Platform clusters", diff --git a/cmd/pro/cmdutil/cmdutil.go b/cmd/pro/cmdutil/cmdutil.go index c7b700addd..66d67a90cb 100644 --- a/cmd/pro/cmdutil/cmdutil.go +++ b/cmd/pro/cmdutil/cmdutil.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/devsy-org/devsy/cmd/pro/completion" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" @@ -57,7 +57,7 @@ var findPlatformProviderFn = FindPlatformProvider // HostRunE returns a RunE that resolves the provider for *host and passes it to // run. *host is read when the command runs, after flag parsing. func HostRunE( - globalFlags *proflags.GlobalFlags, + globalFlags *platformflags.GlobalFlags, host *string, run HostRunFunc, ) func(*cobra.Command, []string) error { @@ -77,14 +77,14 @@ func HostRunE( } type hostFlagOptions struct { - completionFlags *proflags.GlobalFlags + completionFlags *platformflags.GlobalFlags } // HostFlagOption configures AddHostFlag. type HostFlagOption func(*hostFlagOptions) // WithHostCompletion registers shell completion for --host listing platform instances. -func WithHostCompletion(globalFlags *proflags.GlobalFlags) HostFlagOption { +func WithHostCompletion(globalFlags *platformflags.GlobalFlags) HostFlagOption { return func(o *hostFlagOptions) { o.completionFlags = globalFlags } } diff --git a/cmd/pro/cmdutil/cmdutil_test.go b/cmd/pro/cmdutil/cmdutil_test.go index 8b59f3bac2..36946f51cc 100644 --- a/cmd/pro/cmdutil/cmdutil_test.go +++ b/cmd/pro/cmdutil/cmdutil_test.go @@ -7,7 +7,7 @@ import ( "testing" rootflags "github.com/devsy-org/devsy/cmd/flags" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" @@ -84,7 +84,7 @@ func (s *hostFlagSuite) TestHostRunEResolvesHostAtRunTime() { return devsyConfig, pCfg, nil } - gf := &proflags.GlobalFlags{ + gf := &platformflags.GlobalFlags{ GlobalFlags: &rootflags.GlobalFlags{Context: "ctx-a", Provider: "prov-b"}, } var host string @@ -128,7 +128,7 @@ func (s *hostFlagSuite) TestHostRunEPropagatesResolveErrorWithoutRunning() { } var host string - gf := &proflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}} + gf := &platformflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}} c := &cobra.Command{Use: testCmdName, RunE: HostRunE(gf, &host, run)} c.SetOut(io.Discard) c.SetErr(io.Discard) diff --git a/cmd/pro/daemon/netcheck.go b/cmd/pro/daemon/netcheck.go index 93dc2b10f9..300740933d 100644 --- a/cmd/pro/daemon/netcheck.go +++ b/cmd/pro/daemon/netcheck.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/devsy-org/devsy/cmd/pro/cmdutil" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" daemon "github.com/devsy-org/devsy/pkg/daemon/platform" providerpkg "github.com/devsy-org/devsy/pkg/provider" @@ -18,13 +18,13 @@ import ( // NetcheckCmd holds the Devsy daemon flags. type NetcheckCmd struct { - *proflags.GlobalFlags + *platformflags.GlobalFlags Host string } // NewNetcheckCmd creates a new command. -func NewNetcheckCmd(flags *proflags.GlobalFlags) *cobra.Command { +func NewNetcheckCmd(flags *platformflags.GlobalFlags) *cobra.Command { cmd := &NetcheckCmd{ GlobalFlags: flags, } diff --git a/cmd/pro/daemon/start.go b/cmd/pro/daemon/start.go index 92d274766a..03e60fdec3 100644 --- a/cmd/pro/daemon/start.go +++ b/cmd/pro/daemon/start.go @@ -11,7 +11,7 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" "github.com/devsy-org/devsy/cmd/pro/cmdutil" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" daemon "github.com/devsy-org/devsy/pkg/daemon/platform" "github.com/devsy-org/devsy/pkg/log" @@ -22,13 +22,13 @@ import ( // StartCmd holds the devsy daemon flags. type StartCmd struct { - *proflags.GlobalFlags + *platformflags.GlobalFlags Host string } // NewStartCmd creates a new command. -func NewStartCmd(flags *proflags.GlobalFlags) *cobra.Command { +func NewStartCmd(flags *platformflags.GlobalFlags) *cobra.Command { cmd := &StartCmd{ GlobalFlags: flags, } diff --git a/cmd/pro/daemon/status.go b/cmd/pro/daemon/status.go index 141f909109..d1f5e36b29 100644 --- a/cmd/pro/daemon/status.go +++ b/cmd/pro/daemon/status.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/devsy-org/devsy/cmd/pro/cmdutil" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" platformdaemon "github.com/devsy-org/devsy/pkg/daemon/platform" providerpkg "github.com/devsy-org/devsy/pkg/provider" @@ -15,13 +15,13 @@ import ( // StatusCmd holds the Devsy daemon flags. type StatusCmd struct { - *proflags.GlobalFlags + *platformflags.GlobalFlags Host string } // NewStatusCmd creates a new command. -func NewStatusCmd(flags *proflags.GlobalFlags) *cobra.Command { +func NewStatusCmd(flags *platformflags.GlobalFlags) *cobra.Command { cmd := &StatusCmd{ GlobalFlags: flags, } diff --git a/cmd/pro/list.go b/cmd/pro/list.go index 962b7a027f..d39668066f 100644 --- a/cmd/pro/list.go +++ b/cmd/pro/list.go @@ -7,7 +7,7 @@ import ( "sort" "time" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" @@ -21,13 +21,13 @@ import ( // ListCmd holds the list cmd flags. type ListCmd struct { - proflags.GlobalFlags + platformflags.GlobalFlags Login bool } // NewListCmd creates a new command. -func NewListCmd(flags *proflags.GlobalFlags) *cobra.Command { +func NewListCmd(flags *platformflags.GlobalFlags) *cobra.Command { cmd := &ListCmd{ GlobalFlags: *flags, } diff --git a/cmd/pro/login.go b/cmd/pro/login.go index 17cb043dbc..40121ba0bc 100644 --- a/cmd/pro/login.go +++ b/cmd/pro/login.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/blang/semver/v4" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" providercmd "github.com/devsy-org/devsy/cmd/provider" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -26,7 +26,7 @@ const PROVIDER_BINARY = "PRO_PROVIDER" // LoginCmd holds the login cmd flags. type LoginCmd struct { - proflags.GlobalFlags + platformflags.GlobalFlags AccessKey string Provider string @@ -41,7 +41,7 @@ type LoginCmd struct { } // NewLoginCmd creates a new command. -func NewLoginCmd(flags *proflags.GlobalFlags) *cobra.Command { +func NewLoginCmd(flags *platformflags.GlobalFlags) *cobra.Command { cmd := &LoginCmd{ GlobalFlags: *flags, } diff --git a/cmd/pro/login_test.go b/cmd/pro/login_test.go index 065436feae..9bd015ff50 100644 --- a/cmd/pro/login_test.go +++ b/cmd/pro/login_test.go @@ -6,7 +6,7 @@ import ( "time" rootflags "github.com/devsy-org/devsy/cmd/flags" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" "github.com/stretchr/testify/suite" @@ -45,7 +45,7 @@ func (s *loginSuite) TestConcurrentLoginFindsCreatedInstance() { s.Require().NoError(lock.Lock()) s.T().Cleanup(func() { _ = lock.Unlock() }) - cmd := &LoginCmd{GlobalFlags: proflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} + cmd := &LoginCmd{GlobalFlags: platformflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} result := make(chan error, 1) go func() { _, err := cmd.prepareProvider(context.Background(), "https://pro.example") @@ -76,7 +76,7 @@ func (s *loginSuite) TestDifferentHostDoesNotWaitForLoginLock() { Host: "second.example", })) - cmd := &LoginCmd{GlobalFlags: proflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} + cmd := &LoginCmd{GlobalFlags: platformflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} result := make(chan error, 1) go func() { _, err := cmd.prepareProvider(context.Background(), "https://second.example") @@ -117,7 +117,7 @@ func (s *loginSuite) TestEquivalentHostFindsExistingInstance() { Provider: testPlatformProviderName, Host: "Foo.Example.com", })) - cmd := &LoginCmd{GlobalFlags: proflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} + cmd := &LoginCmd{GlobalFlags: platformflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} _, err := cmd.prepareProvider(context.Background(), "https://foo.example.com") s.Require().NoError(err) s.Equal(testPlatformProviderName, cmd.Provider) @@ -128,7 +128,7 @@ func (s *loginSuite) TestDistinctHostsWithSameInstanceIDAreRejected() { Provider: testPlatformProviderName, Host: "foo.example.com", })) - cmd := &LoginCmd{GlobalFlags: proflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} + cmd := &LoginCmd{GlobalFlags: platformflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} _, err := cmd.prepareProvider(context.Background(), "https://foo-example.com") s.Require().ErrorContains(err, "conflicts with existing host") stored, err := provider.LoadPlatformInstanceConfig("default", "foo.example.com") diff --git a/cmd/pro/logout.go b/cmd/pro/logout.go index 39a9dddbd0..b363a22220 100644 --- a/cmd/pro/logout.go +++ b/cmd/pro/logout.go @@ -7,7 +7,7 @@ import ( "sync" "time" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" providercmd "github.com/devsy-org/devsy/cmd/provider" "github.com/devsy-org/devsy/pkg/client/clientimplementation" "github.com/devsy-org/devsy/pkg/config" @@ -24,13 +24,13 @@ import ( // LogoutCmd holds the logout cmd flags. type LogoutCmd struct { - *proflags.GlobalFlags + *platformflags.GlobalFlags IgnoreNotFound bool } // NewLogoutCmd creates a new command. -func NewLogoutCmd(flags *proflags.GlobalFlags) *cobra.Command { +func NewLogoutCmd(flags *platformflags.GlobalFlags) *cobra.Command { cmd := &LogoutCmd{ GlobalFlags: flags, } diff --git a/cmd/pro/pro.go b/cmd/pro/pro.go index 6d11d9f31b..d661a1e1c9 100644 --- a/cmd/pro/pro.go +++ b/cmd/pro/pro.go @@ -4,7 +4,7 @@ import ( "github.com/devsy-org/devsy/cmd/flags" procluster "github.com/devsy-org/devsy/cmd/pro/cluster" "github.com/devsy-org/devsy/cmd/pro/daemon" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" proproject "github.com/devsy-org/devsy/cmd/pro/project" "github.com/devsy-org/devsy/cmd/pro/provider" protemplate "github.com/devsy-org/devsy/cmd/pro/template" @@ -15,7 +15,7 @@ import ( // NewPlatformCmd returns a new command. func NewPlatformCmd(flags *flags.GlobalFlags) *cobra.Command { - globalFlags := &proflags.GlobalFlags{GlobalFlags: flags} + globalFlags := &platformflags.GlobalFlags{GlobalFlags: flags} platformCmd := &cobra.Command{ Use: "platform", Aliases: []string{"pro"}, @@ -24,7 +24,7 @@ func NewPlatformCmd(flags *flags.GlobalFlags) *cobra.Command { SilenceErrors: true, Args: cobra.NoArgs, PersistentPreRunE: func(c *cobra.Command, _ []string) error { - globalFlags = proflags.SetGlobalFlags(c.PersistentFlags()) + globalFlags = platformflags.SetGlobalFlags(c.PersistentFlags()) return nil }, } diff --git a/cmd/pro/project/project.go b/cmd/pro/project/project.go index 5323b9fc00..c6e9375857 100644 --- a/cmd/pro/project/project.go +++ b/cmd/pro/project/project.go @@ -1,13 +1,13 @@ package project import ( - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/spf13/cobra" ) // NewProjectCmd builds the 'devsy platform project' parent command for managing // Platform projects. -func NewProjectCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { +func NewProjectCmd(globalFlags *platformflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "project", Short: "Manage Devsy Platform projects", diff --git a/cmd/pro/start.go b/cmd/pro/start.go index 032cc632e0..8e4650651f 100644 --- a/cmd/pro/start.go +++ b/cmd/pro/start.go @@ -21,7 +21,7 @@ import ( storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" "github.com/devsy-org/api/pkg/auth" devsyclientset "github.com/devsy-org/api/pkg/clientset/versioned" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/log" devsyopen "github.com/devsy-org/devsy/pkg/open" @@ -57,7 +57,7 @@ var defaultDeploymentName = "loft" // Need to update helm chart if we change thi // StartCmd holds the login cmd flags. type StartCmd struct { - proflags.GlobalFlags + platformflags.GlobalFlags KubeClient kubernetes.Interface RestConfig *rest.Config @@ -86,7 +86,7 @@ type StartCmd struct { } // NewStartCmd creates a new command. -func NewStartCmd(flags *proflags.GlobalFlags) *cobra.Command { +func NewStartCmd(flags *platformflags.GlobalFlags) *cobra.Command { cmd := &StartCmd{ GlobalFlags: *flags, Product: config.PlatformReleaseName, diff --git a/cmd/pro/start_flags.go b/cmd/pro/start_flags.go index 9b8ad1b622..37694603c8 100644 --- a/cmd/pro/start_flags.go +++ b/cmd/pro/start_flags.go @@ -1,7 +1,7 @@ package pro import ( - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" @@ -53,7 +53,7 @@ func (cmd *StartCmd) registerClusterFlags(startCmd *cobra.Command) { ), ) - proflags.BindEnv(startCmd.Flags(), names.Host) + platformflags.BindEnv(startCmd.Flags(), names.Host) } func (cmd *StartCmd) registerChartFlags(startCmd *cobra.Command) { diff --git a/cmd/pro/template/template.go b/cmd/pro/template/template.go index 63b5a092ca..3d8e84da61 100644 --- a/cmd/pro/template/template.go +++ b/cmd/pro/template/template.go @@ -1,13 +1,13 @@ package template import ( - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/spf13/cobra" ) // NewTemplateCmd builds the 'devsy platform template' parent command for managing // Platform templates. -func NewTemplateCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { +func NewTemplateCmd(globalFlags *platformflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "template", Short: "Manage Devsy Platform templates", diff --git a/cmd/pro/user/user.go b/cmd/pro/user/user.go index 3450eb9edc..8acb6cc821 100644 --- a/cmd/pro/user/user.go +++ b/cmd/pro/user/user.go @@ -1,12 +1,12 @@ package user import ( - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/spf13/cobra" ) // NewUserCmd builds the 'devsy platform user' parent command for managing Platform users. -func NewUserCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { +func NewUserCmd(globalFlags *platformflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "user", Short: "Manage Devsy Platform users", diff --git a/cmd/pro/workspace/import.go b/cmd/pro/workspace/import.go index a6477baf62..7154c0d44a 100644 --- a/cmd/pro/workspace/import.go +++ b/cmd/pro/workspace/import.go @@ -7,7 +7,7 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/devsy-org/devsy/cmd/pro/provider/list" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -26,7 +26,7 @@ import ( ) type ImportCmd struct { - *proflags.GlobalFlags + *platformflags.GlobalFlags WorkspaceId string WorkspaceUid string @@ -36,7 +36,7 @@ type ImportCmd struct { } // NewImportCmd creates a new command. -func NewImportCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { +func NewImportCmd(globalFlags *platformflags.GlobalFlags) *cobra.Command { cmd := &ImportCmd{ GlobalFlags: globalFlags, } diff --git a/cmd/pro/workspace/workspace.go b/cmd/pro/workspace/workspace.go index 38d60d923f..354bb39b98 100644 --- a/cmd/pro/workspace/workspace.go +++ b/cmd/pro/workspace/workspace.go @@ -1,13 +1,13 @@ package workspace import ( - proflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/pro/flags" "github.com/spf13/cobra" ) // NewWorkspaceCmd builds the 'devsy platform workspace' parent command for managing // Platform workspaces. -func NewWorkspaceCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { +func NewWorkspaceCmd(globalFlags *platformflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "workspace", Short: "Manage Devsy Platform workspaces",