task: move commands to more specific pkgs

Author: gssbzn

internal/cli/opsmanager/agents.go renamed to internal/cli/agents/agents.go

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package agents
 
 import (
 	"github.com/mongodb/mongocli/internal/description"
 	"github.com/spf13/cobra"
 )
 
-func AgentsBuilder() *cobra.Command {
+func Builder() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "agents",
 		Aliases: []string{"agent"},
 		Short:   description.Agents,
 	}
 
-	cmd.AddCommand(AgentsUpgradeBuilder())
+	cmd.AddCommand(UpgradeBuilder())
 	return cmd
 }

internal/cli/opsmanager/agents_upgrade.go renamed to internal/cli/agents/upgrade.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package agents
 
 import (
 	"github.com/mongodb/mongocli/internal/cli"
@@ -24,18 +24,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type AgentsUpgradeOpts struct {
+type UpgradeOpts struct {
 	cli.GlobalOpts
 	store store.AgentUpgrader
 }
 
-func (opts *AgentsUpgradeOpts) initStore() error {
+func (opts *UpgradeOpts) initStore() error {
 	var err error
 	opts.store, err = store.New(config.Default())
 	return err
 }
 
-func (opts *AgentsUpgradeOpts) Run() error {
+func (opts *UpgradeOpts) Run() error {
 	r, err := opts.store.UpgradeAgent(opts.ConfigProjectID())
 
 	if err != nil {
@@ -46,8 +46,8 @@ func (opts *AgentsUpgradeOpts) Run() error {
 }
 
 // mongocli ops-manager agents upgrade [--projectId projectId]
-func AgentsUpgradeBuilder() *cobra.Command {
-	opts := &AgentsUpgradeOpts{}
+func UpgradeBuilder() *cobra.Command {
+	opts := &UpgradeOpts{}
 	cmd := &cobra.Command{
 		Use:  "upgrade",
 		Args: cobra.NoArgs,

internal/cli/opsmanager/agents_upgrade_test.go renamed to internal/cli/agents/upgrade_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package agents
 
 import (
 	"testing"
@@ -30,7 +30,7 @@ func TestAgentsUpgradeOpts_Run(t *testing.T) {
 
 	expected := new(opsmngr.AutomationConfigAgent)
 
-	opts := &AgentsUpgradeOpts{
+	opts := &UpgradeOpts{
 		store: mockStore,
 	}
 

internal/cli/opsmanager/automation.go renamed to internal/cli/automation/automation.go

@@ -12,23 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"github.com/mongodb/mongocli/internal/description"
 	"github.com/spf13/cobra"
 )
 
-func AutomationBuilder() *cobra.Command {
+func Builder() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "automation",
 		Short: description.Automation,
 	}
 
-	cmd.AddCommand(AutomationStatusBuilder())
-	cmd.AddCommand(AutomationDescribeBuilder())
-	cmd.AddCommand(AutomationUpdateBuilder())
-	cmd.AddCommand(AutomationWatchBuilder())
+	cmd.AddCommand(StatusBuilder())
+	cmd.AddCommand(DescribeBuilder())
+	cmd.AddCommand(UpdateBuilder())
+	cmd.AddCommand(WatchBuilder())
 
 	return cmd
 }

internal/cli/opsmanager/automation_describe.go renamed to internal/cli/automation/describe.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"github.com/mongodb/mongocli/internal/cli"
@@ -24,18 +24,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type AutomationDescribeOpts struct {
+type DescribeOpts struct {
 	cli.GlobalOpts
 	store store.AutomationGetter
 }
 
-func (opts *AutomationDescribeOpts) initStore() error {
+func (opts *DescribeOpts) initStore() error {
 	var err error
 	opts.store, err = store.New(config.Default())
 	return err
 }
 
-func (opts *AutomationDescribeOpts) Run() error {
+func (opts *DescribeOpts) Run() error {
 	r, err := opts.store.GetAutomationConfig(opts.ConfigProjectID())
 
 	if err != nil {
@@ -46,8 +46,8 @@ func (opts *AutomationDescribeOpts) Run() error {
 }
 
 // mongocli ops-manager automation describe [--projectId projectId]
-func AutomationDescribeBuilder() *cobra.Command {
-	opts := &AutomationDescribeOpts{}
+func DescribeBuilder() *cobra.Command {
+	opts := &DescribeOpts{}
 	cmd := &cobra.Command{
 		Use:     "describe",
 		Aliases: []string{"show", "get"},

internal/cli/opsmanager/automation_describe_test.go renamed to internal/cli/automation/describe_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"testing"
@@ -30,7 +30,7 @@ func TestAutomationShowOpts_Run(t *testing.T) {
 
 	expected := fixture.AutomationConfig()
 
-	opts := &AutomationDescribeOpts{
+	opts := &DescribeOpts{
 		store: mockStore,
 	}
 

internal/cli/opsmanager/automation_status.go renamed to internal/cli/automation/status.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"github.com/mongodb/mongocli/internal/cli"
@@ -25,18 +25,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type AutomationStatusOpts struct {
+type StatusOpts struct {
 	cli.GlobalOpts
 	store store.AutomationStatusGetter
 }
 
-func (opts *AutomationStatusOpts) initStore() error {
+func (opts *StatusOpts) initStore() error {
 	var err error
 	opts.store, err = store.New(config.Default())
 	return err
 }
 
-func (opts *AutomationStatusOpts) Run() error {
+func (opts *StatusOpts) Run() error {
 	result, err := opts.store.GetAutomationStatus(opts.ConfigProjectID())
 
 	if err != nil {
@@ -47,8 +47,8 @@ func (opts *AutomationStatusOpts) Run() error {
 }
 
 // mongocli ops-manager automation status [--projectId projectId]
-func AutomationStatusBuilder() *cobra.Command {
-	opts := &AutomationStatusOpts{}
+func StatusBuilder() *cobra.Command {
+	opts := &StatusOpts{}
 	cmd := &cobra.Command{
 		Use:   "status",
 		Short: description.ShowAutomationStatus,

internal/cli/opsmanager/automation_status_test.go renamed to internal/cli/automation/status_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"testing"
@@ -30,7 +30,7 @@ func TestAutomationStatus_Run(t *testing.T) {
 
 	expected := fixture.AutomationStatus()
 
-	opts := &AutomationStatusOpts{
+	opts := &StatusOpts{
 		store: mockStore,
 	}
 

internal/cli/opsmanager/automation_update.go renamed to internal/cli/automation/update.go

@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"fmt"
 
 	"github.com/mongodb/mongocli/internal/cli"
-
 	"github.com/mongodb/mongocli/internal/config"
 	"github.com/mongodb/mongocli/internal/file"
 	"github.com/mongodb/mongocli/internal/flag"
@@ -29,20 +28,20 @@ import (
 	"go.mongodb.org/ops-manager/opsmngr"
 )
 
-type AutomationUpdateOpts struct {
+type UpdateOpts struct {
 	cli.GlobalOpts
 	filename string
 	fs       afero.Fs
 	store    store.AutomationUpdater
 }
 
-func (opts *AutomationUpdateOpts) initStore() error {
+func (opts *UpdateOpts) initStore() error {
 	var err error
 	opts.store, err = store.New(config.Default())
 	return err
 }
 
-func (opts *AutomationUpdateOpts) Run() error {
+func (opts *UpdateOpts) Run() error {
 	newConfig := new(opsmngr.AutomationConfig)
 	err := file.Load(opts.fs, opts.filename, newConfig)
 	if err != nil {
@@ -53,14 +52,14 @@ func (opts *AutomationUpdateOpts) Run() error {
 		return err
 	}
 
-	fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ConfigProjectID()))
+	fmt.Print(cli.DeploymentStatus(config.OpsManagerURL(), opts.ConfigProjectID()))
 
 	return nil
 }
 
 // mongocli om automation update --projectId projectId --file myfile.json
-func AutomationUpdateBuilder() *cobra.Command {
-	opts := &AutomationUpdateOpts{
+func UpdateBuilder() *cobra.Command {
+	opts := &UpdateOpts{
 		fs: afero.NewOsFs(),
 	}
 	cmd := &cobra.Command{

internal/cli/opsmanager/automation_update_test.go renamed to internal/cli/automation/update_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"testing"
@@ -40,7 +40,7 @@ func TestAutomationUpdate_Run(t *testing.T) {
 }`
 	fileName := "om_automation_test.json"
 	_ = afero.WriteFile(appFS, fileName, []byte(fileJSON), 0600)
-	createOpts := &AutomationUpdateOpts{
+	createOpts := &UpdateOpts{
 		store:    mockStore,
 		fs:       appFS,
 		filename: fileName,

internal/cli/opsmanager/automation_watch.go renamed to internal/cli/automation/watch.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"fmt"
@@ -28,18 +28,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type AutomationWatchOpts struct {
+type WatchOpts struct {
 	cli.GlobalOpts
 	store store.AutomationStatusGetter
 }
 
-func (opts *AutomationWatchOpts) initStore() error {
+func (opts *WatchOpts) initStore() error {
 	var err error
 	opts.store, err = store.New(config.Default())
 	return err
 }
 
-func (opts *AutomationWatchOpts) Run() error {
+func (opts *WatchOpts) Run() error {
 	for {
 		result, err := opts.store.GetAutomationStatus(opts.ConfigProjectID())
 		if err != nil {
@@ -63,8 +63,8 @@ func (opts *AutomationWatchOpts) Run() error {
 }
 
 // mongocli ops-manager automation watch [--projectId projectId]
-func AutomationWatchBuilder() *cobra.Command {
-	opts := &AutomationWatchOpts{}
+func WatchBuilder() *cobra.Command {
+	opts := &WatchOpts{}
 	cmd := &cobra.Command{
 		Use:   "watch",
 		Short: description.WatchAutomationStatus,

internal/cli/opsmanager/automation_watch_test.go renamed to internal/cli/automation/watch_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opsmanager
+package automation
 
 import (
 	"testing"
@@ -30,7 +30,7 @@ func TestAutomationWatch_Run(t *testing.T) {
 
 	expected := fixture.AutomationStatus()
 
-	opts := &AutomationWatchOpts{
+	opts := &WatchOpts{
 		store: mockStore,
 	}