diff --git a/internal/cli/atlas_events_list.go b/internal/cli/atlas_events_list.go index 5184ea3ac7..67d4f3d91c 100644 --- a/internal/cli/atlas_events_list.go +++ b/internal/cli/atlas_events_list.go @@ -98,7 +98,7 @@ func AtlasEventsListBuilder() *cobra.Command { cmd.Flags().StringVar(&opts.eventType, flags.Type, "", usage.Event) cmd.Flags().StringVar(&opts.maxDate, flags.MaxDate, "", usage.MaxDate) - cmd.Flags().StringVar(&opts.minDate, flags.MinDate, "", usage.MaxDate) + cmd.Flags().StringVar(&opts.minDate, flags.MinDate, "", usage.MinDate) cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID) cmd.Flags().StringVar(&opts.orgID, flags.OrgID, "", usage.OrgID) diff --git a/internal/cli/cloud_manager.go b/internal/cli/cloud_manager.go index e12d16a37e..ce4791577e 100644 --- a/internal/cli/cloud_manager.go +++ b/internal/cli/cloud_manager.go @@ -33,6 +33,7 @@ func CloudManagerBuilder() *cobra.Command { cmd.AddCommand(OpsManagerAutomationBuilder()) cmd.AddCommand(OpsManagerSecurityBuilder()) cmd.AddCommand(OpsManagerDBUsersBuilder()) + cmd.AddCommand(AtlasEventsBuilder()) return cmd } diff --git a/internal/cli/ops_manager.go b/internal/cli/ops_manager.go index 52b896fab4..8c0e153121 100644 --- a/internal/cli/ops_manager.go +++ b/internal/cli/ops_manager.go @@ -34,6 +34,7 @@ func OpsManagerBuilder() *cobra.Command { cmd.AddCommand(OpsManagerSecurityBuilder()) cmd.AddCommand(OpsManagerDBUsersBuilder()) cmd.AddCommand(OpsManagerOwnerBuilder()) + cmd.AddCommand(AtlasEventsBuilder()) return cmd } diff --git a/internal/store/events.go b/internal/store/events.go index 1f0d8ed781..6d41b33f34 100644 --- a/internal/store/events.go +++ b/internal/store/events.go @@ -19,6 +19,7 @@ import ( "fmt" atlas "github.com/mongodb/go-client-mongodb-atlas/mongodbatlas" + om "github.com/mongodb/go-client-mongodb-ops-manager/opsmngr" "github.com/mongodb/mongocli/internal/config" ) @@ -41,16 +42,22 @@ func (s *Store) ProjectEvents(projectID string, opts *atlas.ListOptions) (*atlas case config.CloudService: result, _, err := s.client.(*atlas.Client).Events.ListProjectEvents(context.Background(), projectID, opts) return result, err + case config.OpsManagerService, config.CloudManagerService: + result, _, err := s.client.(*om.Client).Events.ListProjectEvents(context.Background(), projectID, opts) + return result, err default: return nil, fmt.Errorf("unsupported service: %s", s.service) } } // OrganizationEvents encapsulate the logic to manage different cloud providers -func (s *Store) OrganizationEvents(projectID string, opts *atlas.EventListOptions) (*atlas.EventResponse, error) { +func (s *Store) OrganizationEvents(orgID string, opts *atlas.EventListOptions) (*atlas.EventResponse, error) { switch s.service { case config.CloudService: - result, _, err := s.client.(*atlas.Client).Events.ListOrganizationEvents(context.Background(), projectID, opts) + result, _, err := s.client.(*atlas.Client).Events.ListOrganizationEvents(context.Background(), orgID, opts) + return result, err + case config.OpsManagerService, config.CloudManagerService: + result, _, err := s.client.(*om.Client).Events.ListOrganizationEvents(context.Background(), orgID, opts) return result, err default: return nil, fmt.Errorf("unsupported service: %s", s.service)