From 7c198bc6ea3fc2ed8d03d023d8101d676aa1bcf9 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Wed, 29 Apr 2020 12:15:29 +0100 Subject: [PATCH 1/3] Refactoring --- internal/cli/ops_manager_servers_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cli/ops_manager_servers_list.go b/internal/cli/ops_manager_servers_list.go index 7c742f0e52..03e6332e4a 100644 --- a/internal/cli/ops_manager_servers_list.go +++ b/internal/cli/ops_manager_servers_list.go @@ -38,7 +38,7 @@ func (opts *opsManagerServersListOpts) init() error { } func (opts *opsManagerServersListOpts) Run() error { - servers, err := opts.store.Agents(opts.projectID, agentType) + servers, err := opts.store.Agents(opts.ProjectID(), agentType) if err != nil { return err From 36b93edc0b99388b271688575c1e72dcbeaba0ee Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Thu, 7 May 2020 11:52:00 +0100 Subject: [PATCH 2/3] CLOUDP-62053: It is not possible to unack an alert --- internal/cli/atlas_alerts_acknowledge.go | 13 ++++++------- internal/flags/flags.go | 2 ++ internal/usage/usage.go | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/internal/cli/atlas_alerts_acknowledge.go b/internal/cli/atlas_alerts_acknowledge.go index abbda12ac1..0fa119b775 100644 --- a/internal/cli/atlas_alerts_acknowledge.go +++ b/internal/cli/atlas_alerts_acknowledge.go @@ -31,6 +31,7 @@ type atlasAlertsAcknowledgeOpts struct { alertID string until string comment string + forever bool store store.AlertAcknowledger } @@ -53,22 +54,19 @@ func (opts *atlasAlertsAcknowledgeOpts) Run() error { } func (opts *atlasAlertsAcknowledgeOpts) newAcknowledgeRequest() *atlas.AcknowledgeRequest { - - until := opts.until - // To acknowledge an alert “forever”, set the field value to 100 years in the future. - if until == "" { - until = time.Now().AddDate(100, 1, 1).Format(time.RFC3339) + if opts.forever { + opts.until = time.Now().AddDate(100, 1, 1).Format(time.RFC3339) } return &atlas.AcknowledgeRequest{ - AcknowledgedUntil: until, + AcknowledgedUntil: opts.until, AcknowledgementComment: opts.comment, } } -// mongocli atlas alerts acknowledge alertID --projectId projectId +// mongocli atlas alerts acknowledge alertID --projectId projectId --forever forever func AtlasAlertsAcknowledgeBuilder() *cobra.Command { opts := new(atlasAlertsAcknowledgeOpts) cmd := &cobra.Command{ @@ -85,6 +83,7 @@ func AtlasAlertsAcknowledgeBuilder() *cobra.Command { }, } + cmd.Flags().BoolVarP(&opts.forever, flags.Forever, flags.ForeverShort, false, usage.Forever) cmd.Flags().StringVar(&opts.until, flags.Until, "", usage.Until) cmd.Flags().StringVar(&opts.comment, flags.Comment, "", usage.Comment) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 7c2810e01e..271536fb74 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -27,6 +27,8 @@ const ( Members = "members" // Members flag MembersShort = "m" // MembersShort flag InstanceSize = "instanceSize" // InstanceSize flag + Forever = "forever" // Forever flag + ForeverShort = "F" // ForeverShort flag DiskSizeGB = "diskSizeGB" // DiskSizeGB flag MDBVersion = "mdbVersion" // MDBVersion flag Backup = "backup" // Backup flag diff --git a/internal/usage/usage.go b/internal/usage/usage.go index 54dc3d65d9..32f078eb39 100644 --- a/internal/usage/usage.go +++ b/internal/usage/usage.go @@ -26,6 +26,7 @@ const ( AuthDB = "Authentication database name." Granularity = "Duration in ISO 8601 notation that specifies the interval between measurement data points." Page = "Page number." + Forever = "Acknowledge an alert “forever”." Status = "Alert's status." Until = "Acknowledged until a date." Limit = "Number of items per page." From 81e9a68dbd025e9cd1ff6ec80e1a071b2b79eae9 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Thu, 7 May 2020 12:14:17 +0100 Subject: [PATCH 3/3] Updated comment --- internal/cli/atlas_alerts_acknowledge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cli/atlas_alerts_acknowledge.go b/internal/cli/atlas_alerts_acknowledge.go index 0fa119b775..08f2d67520 100644 --- a/internal/cli/atlas_alerts_acknowledge.go +++ b/internal/cli/atlas_alerts_acknowledge.go @@ -66,7 +66,7 @@ func (opts *atlasAlertsAcknowledgeOpts) newAcknowledgeRequest() *atlas.Acknowled } -// mongocli atlas alerts acknowledge alertID --projectId projectId --forever forever +// mongocli atlas alerts acknowledge alertID --projectId projectId --forever func AtlasAlertsAcknowledgeBuilder() *cobra.Command { opts := new(atlasAlertsAcknowledgeOpts) cmd := &cobra.Command{