CLOUDP-60957: mongocli om logs delete (#131)

Author: andreaangiolillo

internal/cli/atlas_measurements_processes.go

@@ -52,7 +52,7 @@ func (opts *atlasMeasurementsProcessOpts) Run() error {
 func AtlasMeasurementsProcessBuilder() *cobra.Command {
 	opts := &atlasMeasurementsProcessOpts{}
 	cmd := &cobra.Command{
-		Use:     "processes",
+		Use:     "processes [host:port]",
 		Short:   description.ProcessMeasurements,
 		Aliases: []string{"process"},
 		Args:    cobra.ExactArgs(1),

internal/cli/ops_manager_logs.go

@@ -29,6 +29,7 @@ func OpsManagerLogsBuilder() *cobra.Command {
 	cmd.AddCommand(OpsManagerLogsCollectOptsBuilder())
 	cmd.AddCommand(OpsManagerLogsListOptsBuilder())
 	cmd.AddCommand(OpsManagerLogsDownloadOptsBuilder())
+	cmd.AddCommand(OpsManagerLogsDeleteOptsBuilder())
 
 	return cmd
 }

internal/cli/ops_manager_logs_delete.go

@@ -0,0 +1,71 @@
+// 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/mongodb/mongocli/internal/flags"
+	"github.com/mongodb/mongocli/internal/store"
+	"github.com/mongodb/mongocli/internal/usage"
+	"github.com/spf13/cobra"
+)
+
+type opsManagerLogsDeleteOpts struct {
+	globalOpts
+	deleteOpts
+	store store.LogJobDeleter
+}
+
+func (opts *opsManagerLogsDeleteOpts) initStore() error {
+	var err error
+	opts.store, err = store.New()
+	return err
+}
+
+func (opts *opsManagerLogsDeleteOpts) Run() error {
+	return opts.store.DeleteCollectionJob(opts.ProjectID(), opts.entry)
+}
+
+// mongocli om logs delete id [--projectId projectId] [--force]
+func OpsManagerLogsDeleteOptsBuilder() *cobra.Command {
+	opts := &opsManagerLogsDeleteOpts{
+		deleteOpts: deleteOpts{
+			successMessage: "Log collection entry '%s' deleted\n",
+			failMessage:    "Log collection entry not deleted",
+		},
+	}
+	cmd := &cobra.Command{
+		Use:     "delete [id]",
+		Aliases: []string{"rm"},
+		Args:    cobra.ExactArgs(1),
+		Short:   description.DeleteLogCollectionJob,
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			if err := opts.PreRunE(opts.initStore); err != nil {
+				return err
+			}
+			opts.entry = args[0]
+			return opts.Confirm()
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return opts.Run()
+		},
+	}
+
+	cmd.Flags().BoolVar(&opts.confirm, flags.Force, false, usage.Force)
+
+	cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
+
+	return cmd
+}

internal/cli/ops_manager_logs_delete_test.go

@@ -0,0 +1,49 @@
+// 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"
+	"github.com/mongodb/mongocli/internal/mocks"
+)
+
+func TestOpsManagerWhitelistDelete_Run(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockStore := mocks.NewMockLogJobDeleter(ctrl)
+
+	defer ctrl.Finish()
+
+	deleteOpts := &opsManagerLogsDeleteOpts{
+		deleteOpts: deleteOpts{
+			confirm:        true,
+			entry:          "test",
+			successMessage: "Project whitelist entry '%s' deleted\n",
+		},
+		store: mockStore,
+	}
+
+	mockStore.
+		EXPECT().
+		DeleteCollectionJob(deleteOpts.projectID, deleteOpts.entry).
+		Return(nil).
+		Times(1)
+
+	err := deleteOpts.Run()
+	if err != nil {
+		t.Fatalf("Run() unexpected error: %v", err)
+	}
+}

internal/cli/ops_manager_measurements_process.go

@@ -51,7 +51,7 @@ func (opts *opsManagerMeasurementsProcessOpts) Run() error {
 func OpsManagerMeasurementsProcessBuilder() *cobra.Command {
 	opts := &opsManagerMeasurementsProcessOpts{}
 	cmd := &cobra.Command{
-		Use:     "process",
+		Use:     "process [hostId]",
 		Short:   description.ProcessMeasurements,
 		Aliases: []string{"processes"},
 		Args:    cobra.ExactArgs(1),

internal/description/description.go

@@ -101,6 +101,7 @@ const (
 	LogCollection          = "Manage log collection jobs."
 	StartLogCollectionJob  = "Start a job to collect logs."
 	ListLogCollectionJobs  = "List log collection jobs."
+	DeleteLogCollectionJob = "Delete a log collection job."
 	DBUsersLong            = `The dbusers command retrieves, creates and modifies the MongoDB database users in your cluster.
 Each user has a set of roles that provide access to the project’s databases. 
 A user’s roles apply to all the clusters in the project.`

internal/mocks/mock_logs.go

@@ -40,6 +40,10 @@ type LogJobLister interface {
 	LogCollectionJobs(string, *om.LogListOptions) (*om.LogCollectionJobs, error)
 }
 
+type LogJobDeleter interface {
+	DeleteCollectionJob(string, string) error
+}
+
 // LogCollectionJobs encapsulate the logic to manage different cloud providers
 func (s *Store) LogCollectionJobs(groupID string, opts *om.LogListOptions) (*om.LogCollectionJobs, error) {
 	switch s.service {
@@ -51,6 +55,17 @@ func (s *Store) LogCollectionJobs(groupID string, opts *om.LogListOptions) (*om.
 	}
 }
 
+// DeleteCollectionJob encapsulate the logic to manage different cloud providers
+func (s *Store) DeleteCollectionJob(groupID, logID string) error {
+	switch s.service {
+	case config.OpsManagerService, config.CloudManagerService:
+		_, err := s.client.(*om.Client).LogCollections.Delete(context.Background(), groupID, logID)
+		return err
+	default:
+		return fmt.Errorf("unsupported service: %s", s.service)
+	}
+}
+
 // Collect encapsulate the logic to manage different cloud providers
 func (s *Store) Collect(groupID string, newLog *om.LogCollectionJob) (*om.LogCollectionJob, error) {
 	switch s.service {