Skip to content

Commit 2184c00

Browse files
authored
CLOUDP-57517: List Alert configuration, C/OM (#42)
1 parent 3344f66 commit 2184c00

File tree

8 files changed

+20
-11
lines changed

8 files changed

+20
-11
lines changed

internal/cli/atlas_alert_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func AtlasAlertConfigsBuilder() *cobra.Command {
2222
cmd := &cobra.Command{
2323
Use: "configs",
2424
Aliases: []string{"config"},
25-
Short: "Manage Atlas alert configurations for your project.",
25+
Short: "Manage alerts configuration for your project.",
2626
Long: "The configs command provides access to your alerts configurations. You can create, edit, and delete alert configurations.",
2727
}
2828

internal/cli/atlas_alert_config_create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func AtlasAlertConfigCreateBuilder() *cobra.Command {
191191
}
192192
cmd := &cobra.Command{
193193
Use: "create",
194-
Short: "Create an Atlas alert configuration for a project.",
194+
Short: "Create an alert configuration for a project.",
195195
Args: cobra.NoArgs,
196196
PreRunE: func(cmd *cobra.Command, args []string) error {
197197
return opts.init()

internal/cli/atlas_alert_config_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func AtlasAlertConfigListBuilder() *cobra.Command {
6565
}
6666
cmd := &cobra.Command{
6767
Use: "list",
68-
Short: "List Atlas alert configurations for a project.",
68+
Short: "List alert configurations for a project.",
6969
Aliases: []string{"ls"},
7070
Args: cobra.NoArgs,
7171
PreRunE: func(cmd *cobra.Command, args []string) error {

internal/cli/atlas_alerts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func AtlasAlertsBuilder() *cobra.Command {
2222
cmd := &cobra.Command{
2323
Use: "alerts",
2424
Aliases: []string{"alert"},
25-
Short: "Manage Atlas alerts for your project.",
25+
Short: "Manage alerts for your project.",
2626
}
2727

2828
cmd.AddCommand(AtlasAlertConfigsBuilder())

internal/cli/cloud_manager.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func CloudManagerBuilder() *cobra.Command {
2626
}
2727

2828
cmd.AddCommand(CloudManagerClustersBuilder())
29+
cmd.AddCommand(AtlasAlertsBuilder())
2930

3031
return cmd
3132
}

internal/cli/ops_manager.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func OpsManagerBuilder() *cobra.Command {
2626
}
2727

2828
cmd.AddCommand(CloudManagerClustersBuilder())
29+
cmd.AddCommand(AtlasAlertsBuilder())
2930
cmd.AddCommand(OpsManagerOwnerBuilder())
3031

3132
return cmd

internal/store/alert_configuration.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"fmt"
2020

2121
atlas "github.com/mongodb/go-client-mongodb-atlas/mongodbatlas"
22+
om "github.com/mongodb/go-client-mongodb-ops-manager/opsmngr"
2223
"github.com/mongodb/mongocli/internal/config"
2324
)
2425

@@ -46,6 +47,9 @@ func (s *Store) AlertConfigurations(projectID string, opts *atlas.ListOptions) (
4647
case config.CloudService:
4748
result, _, err := s.client.(*atlas.Client).AlertConfigurations.List(context.Background(), projectID, opts)
4849
return result, err
50+
case config.OpsManagerService, config.CloudManagerService:
51+
result, _, err := s.client.(*om.Client).AlertConfigurations.List(context.Background(), projectID, opts)
52+
return result, err
4953
default:
5054
return nil, fmt.Errorf("unsupported service: %s", s.service)
5155
}
@@ -55,10 +59,10 @@ func (s *Store) AlertConfigurations(projectID string, opts *atlas.ListOptions) (
5559
func (s *Store) CreateAlertConfiguration(alertConfig *atlas.AlertConfiguration) (*atlas.AlertConfiguration, error) {
5660
switch s.service {
5761
case config.CloudService:
58-
// TODO: fix me https://github.com/mongodb/go-client-mongodb-atlas/pull/56
59-
project := alertConfig.GroupID
60-
alertConfig.GroupID = ""
61-
result, _, err := s.client.(*atlas.Client).AlertConfigurations.Create(context.Background(), project, alertConfig)
62+
result, _, err := s.client.(*atlas.Client).AlertConfigurations.Create(context.Background(), alertConfig.GroupID, alertConfig)
63+
return result, err
64+
case config.OpsManagerService, config.CloudManagerService:
65+
result, _, err := s.client.(*om.Client).AlertConfigurations.Create(context.Background(), alertConfig.GroupID, alertConfig)
6266
return result, err
6367
default:
6468
return nil, fmt.Errorf("unsupported service: %s", s.service)
@@ -71,6 +75,9 @@ func (s *Store) DeleteAlertConfiguration(projectID, id string) error {
7175
case config.CloudService:
7276
_, err := s.client.(*atlas.Client).AlertConfigurations.Delete(context.Background(), projectID, id)
7377
return err
78+
case config.OpsManagerService, config.CloudManagerService:
79+
_, err := s.client.(*om.Client).AlertConfigurations.Delete(context.Background(), projectID, id)
80+
return err
7481
default:
7582
return fmt.Errorf("unsupported service: %s", s.service)
7683
}

internal/store/store.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func New() (*Store, error) {
6262
case config.CloudService:
6363
s.setAtlasClient(client)
6464
case config.CloudManagerService, config.OpsManagerService:
65-
s.setCloudManagerClient(client)
65+
s.setOpsManagerClient(client)
6666
default:
6767
return nil, errors.New("unsupported service")
6868
}
@@ -86,7 +86,7 @@ func NewUnauthenticated() (*Store, error) {
8686

8787
switch s.service {
8888
case config.OpsManagerService:
89-
s.setCloudManagerClient(nil)
89+
s.setOpsManagerClient(nil)
9090
default:
9191
return nil, errors.New("unsupported service")
9292
}
@@ -104,7 +104,7 @@ func (s *Store) setAtlasClient(client *http.Client) {
104104
s.client = atlasClient
105105
}
106106

107-
func (s *Store) setCloudManagerClient(client *http.Client) {
107+
func (s *Store) setOpsManagerClient(client *http.Client) {
108108
cmClient := om.NewClient(client)
109109
if s.baseURL != nil {
110110
cmClient.BaseURL = s.baseURL

0 commit comments

Comments
 (0)