CLOUDP-59267: upgrade all agents in Org (#143)

andreaangiolillo · web-flow · commit 2c3d49aa65a8 · 2020-04-30T11:41:52.000+01:00
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mongodb/go-client-mongodb-atlas v0.2.1-0.20200427191133-b5e334932f44
-	github.com/mongodb/go-client-mongodb-ops-manager v0.2.2-0.20200429114541-a82d7d125cfd
+	github.com/mongodb/go-client-mongodb-ops-manager v0.2.2
 	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/spf13/afero v1.2.2
 	github.com/spf13/cast v1.3.1 // indirect
diff --git a/go.sum b/go.sum
@@ -102,8 +102,8 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mongodb/go-client-mongodb-atlas v0.2.1-0.20200427191133-b5e334932f44 h1:PUOc5BwUVOqGVQqX5vs2MPiJJ6PEZ+jA7TYtna1gOLo=
 github.com/mongodb/go-client-mongodb-atlas v0.2.1-0.20200427191133-b5e334932f44/go.mod h1:LS8O0YLkA+sbtOb3fZLF10yY3tJM+1xATXMJ3oU35LU=
-github.com/mongodb/go-client-mongodb-ops-manager v0.2.2-0.20200429114541-a82d7d125cfd h1:vGYgslrNXKaZIkAIomQ83e6bpaByXIhwNXJgYN+yv8A=
-github.com/mongodb/go-client-mongodb-ops-manager v0.2.2-0.20200429114541-a82d7d125cfd/go.mod h1:RrXnfBx3CyKN64jXkXFEO07CnMBEYa5CdlHOQ/30a5A=
+github.com/mongodb/go-client-mongodb-ops-manager v0.2.2 h1:xQoyeLjRJmOjvCkjCwbnkzIvugpm6eNozDw4Auk84to=
+github.com/mongodb/go-client-mongodb-ops-manager v0.2.2/go.mod h1:RrXnfBx3CyKN64jXkXFEO07CnMBEYa5CdlHOQ/30a5A=
 github.com/mwielbut/pointy v1.1.0 h1:U5/YEfoIkaGCHv0St3CgjduqXID4FNRoyZgLM1kY9vg=
 github.com/mwielbut/pointy v1.1.0/go.mod h1:MvvO+uMFj9T5DMda33HlvogsFBX7pWWKAkFIn4teYwY=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
diff --git a/internal/cli/atlas_dbusers_list.go b/internal/cli/atlas_dbusers_list.go
@@ -36,7 +36,7 @@ func (opts *atlasDBUsersListOpts) initStore() error {
 
 func (opts *atlasDBUsersListOpts) Run() error {
 	listOpts := opts.newListOptions()
-	result, err := opts.store.DatabaseUsers(opts.projectID, listOpts)
+	result, err := opts.store.DatabaseUsers(opts.ProjectID(), listOpts)
 
 	if err != nil {
 		return err
diff --git a/internal/cli/ops_manager.go b/internal/cli/ops_manager.go
@@ -38,6 +38,7 @@ func OpsManagerBuilder() *cobra.Command {
 	cmd.AddCommand(OpsManagerProcessesBuilder())
 	cmd.AddCommand(OpsManagerMeasurementsBuilder())
 	cmd.AddCommand(OpsManagerLogsBuilder())
+	cmd.AddCommand(OpsManagerAgentsBuilder())
 
 	return cmd
 }
diff --git a/internal/cli/ops_manager_agents.go b/internal/cli/ops_manager_agents.go
@@ -0,0 +1,31 @@
+// Copyright 2020 MongoDB Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cli
+
+import (
+	"github.com/mongodb/mongocli/internal/description"
+	"github.com/spf13/cobra"
+)
+
+func OpsManagerAgentsBuilder() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "agents",
+		Aliases: []string{"agent"},
+		Short:   description.Agents,
+	}
+
+	cmd.AddCommand(OpsManagerAgentsUpgradeBuilder())
+	return cmd
+}
diff --git a/internal/cli/ops_manager_agents_upgrade.go b/internal/cli/ops_manager_agents_upgrade.go
@@ -0,0 +1,63 @@
+// Copyright 2020 MongoDB Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cli
+
+import (
+	"github.com/mongodb/mongocli/internal/flags"
+	"github.com/mongodb/mongocli/internal/json"
+	"github.com/mongodb/mongocli/internal/store"
+	"github.com/mongodb/mongocli/internal/usage"
+	"github.com/spf13/cobra"
+)
+
+type opsManagerAgentsUpgradeOpts struct {
+	globalOpts
+	store store.AgentUpgrader
+}
+
+func (opts *opsManagerAgentsUpgradeOpts) initStore() error {
+	var err error
+	opts.store, err = store.New()
+	return err
+}
+
+func (opts *opsManagerAgentsUpgradeOpts) Run() error {
+	r, err := opts.store.UpgradeAgent(opts.ProjectID())
+
+	if err != nil {
+		return err
+	}
+
+	return json.PrettyPrint(r)
+}
+
+// mongocli ops-manager agents upgrade [--projectId projectId]
+func OpsManagerAgentsUpgradeBuilder() *cobra.Command {
+	opts := &opsManagerAgentsUpgradeOpts{}
+	cmd := &cobra.Command{
+		Use:  "upgrade",
+		Args: cobra.NoArgs,
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			return opts.PreRunE(opts.initStore)
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return opts.Run()
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
+
+	return cmd
+}
diff --git a/internal/cli/ops_manager_agents_upgrade_test.go b/internal/cli/ops_manager_agents_upgrade_test.go
@@ -0,0 +1,47 @@
+// Copyright 2020 MongoDB Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cli
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	om "github.com/mongodb/go-client-mongodb-ops-manager/opsmngr"
+	"github.com/mongodb/mongocli/internal/mocks"
+)
+
+func TestOpsManagerAgentsUpgradeOpts_Run(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockStore := mocks.NewMockAgentUpgrader(ctrl)
+
+	defer ctrl.Finish()
+
+	expected := new(om.AutomationConfigAgent)
+
+	opts := &opsManagerAgentsUpgradeOpts{
+		store: mockStore,
+	}
+
+	mockStore.
+		EXPECT().
+		UpgradeAgent(opts.projectID).
+		Return(expected, nil).
+		Times(1)
+
+	err := opts.Run()
+	if err != nil {
+		t.Fatalf("Run() unexpected error: %v", err)
+	}
+}
diff --git a/internal/cli/ops_manager_automation_describe.go b/internal/cli/ops_manager_automation_describe.go
@@ -34,7 +34,7 @@ func (opts *opsManagerAutomationDescribeOpts) initStore() error {
 }
 
 func (opts *opsManagerAutomationDescribeOpts) Run() error {
-	r, err := opts.store.GetAutomationConfig(opts.projectID)
+	r, err := opts.store.GetAutomationConfig(opts.ProjectID())
 
 	if err != nil {
 		return err
diff --git a/internal/cli/ops_manager_processes_describe.go b/internal/cli/ops_manager_processes_describe.go
@@ -52,7 +52,6 @@ func OpsManagerProcessDescribeBuilder() *cobra.Command {
 		Use:     "describe [processID]",
 		Short:   description.ListProcesses,
 		Aliases: []string{"d"},
-		Hidden:  true,
 		Args:    cobra.ExactArgs(1),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			return opts.PreRunE(opts.initStore)
diff --git a/internal/cli/ops_manager_processes_list.go b/internal/cli/ops_manager_processes_list.go
@@ -62,7 +62,6 @@ func OpsManagerProcessListBuilder() *cobra.Command {
 		Use:     "list",
 		Short:   description.ListProcesses,
 		Aliases: []string{"ls"},
-		Hidden:  true,
 		Args:    cobra.NoArgs,
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			return opts.PreRunE(opts.initStore)
diff --git a/internal/description/description.go b/internal/description/description.go
@@ -87,6 +87,7 @@ const (
 	ListProjects           = "List projects."
 	DownloadLogs           = "Download logs from a log collection job."
 	OpsManager             = "Ops Manager operations."
+	Agents                 = "Manage Ops Manager agents."
 	ListGlobalAlerts       = "List global alerts."
 	Automation             = "Manage Ops Manager automation config."
 	ShowAutomationStatus   = "Show the current status of the automation config."
diff --git a/internal/mocks/mock_agents.go b/internal/mocks/mock_agents.go
diff --git a/internal/store/agents.go b/internal/store/agents.go
@@ -25,6 +25,10 @@ type AgentLister interface {
 	Agents(string, string) (*om.Agents, error)
 }
 
+type AgentUpgrader interface {
+	UpgradeAgent(string) (*om.AutomationConfigAgent, error)
+}
+
 // Agents encapsulate the logic to manage different cloud providers
 func (s *Store) Agents(projectID, agentType string) (*om.Agents, error) {
 	switch s.service {
@@ -35,3 +39,14 @@ func (s *Store) Agents(projectID, agentType string) (*om.Agents, error) {
 		return nil, fmt.Errorf("unsupported service: %s", s.service)
 	}
 }
+
+// UpgradeAgent encapsulate the logic to manage different cloud providers
+func (s *Store) UpgradeAgent(projectID string) (*om.AutomationConfigAgent, error) {
+	switch s.service {
+	case config.OpsManagerService, config.CloudManagerService:
+		result, _, err := s.client.(*om.Client).AutomationConfig.UpdateAgent(context.Background(), projectID)
+		return result, err
+	default:
+		return nil, fmt.Errorf("unsupported service: %s", s.service)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ func OpsManagerBuilder() *cobra.Command {`
`38`	`38`	`cmd.AddCommand(OpsManagerProcessesBuilder())`
`39`	`39`	`cmd.AddCommand(OpsManagerMeasurementsBuilder())`
`40`	`40`	`cmd.AddCommand(OpsManagerLogsBuilder())`
	`41`	`+ cmd.AddCommand(OpsManagerAgentsBuilder())`
`41`	`42`
`42`	`43`	`return cmd`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (opts *opsManagerAutomationDescribeOpts) initStore() error {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func (opts *opsManagerAutomationDescribeOpts) Run() error {`
`37`		`- r, err := opts.store.GetAutomationConfig(opts.projectID)`
	`37`	`+ r, err := opts.store.GetAutomationConfig(opts.ProjectID())`
`38`	`38`
`39`	`39`	`if err != nil {`
`40`	`40`	`return err`