Skip to content

Commit 6421bcc

Browse files
gssbzngssbzn
authored
remove the messages package as we only had a method there so far (#117)
1 parent 9cbcddc commit 6421bcc

11 files changed

+26
-39
lines changed

‎internal/cli/cli.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ func validateObjectID(s string) error {
4545
return nil
4646
}
4747

48+
func deploymentStatus(baseURL, projectID string) string {
49+
return fmt.Sprintf("Changes are being applied, please check %s/v2/%s#deployment/topology for status\n", baseURL, projectID)
50+
}
51+
4852
// ProjectID returns the project id.
4953
// If the id is empty, it caches it after querying config.
5054
func (opts *globalOpts) ProjectID() string {

‎internal/cli/cli_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Copyright 2020 MongoDB Inc
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
package cli
216

317
import "testing"

‎internal/cli/ops_manager_clusters_apply.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/mongodb/mongocli/internal/description"
2323
"github.com/mongodb/mongocli/internal/file"
2424
"github.com/mongodb/mongocli/internal/flags"
25-
"github.com/mongodb/mongocli/internal/messages"
2625
"github.com/mongodb/mongocli/internal/store"
2726
"github.com/mongodb/mongocli/internal/usage"
2827
"github.com/spf13/afero"
@@ -64,7 +63,7 @@ func (opts *opsManagerClustersApplyOpts) Run() error {
6463
return err
6564
}
6665

67-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
66+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
6867

6968
return nil
7069
}

‎internal/cli/ops_manager_clusters_create.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/mongodb/mongocli/internal/description"
2323
"github.com/mongodb/mongocli/internal/file"
2424
"github.com/mongodb/mongocli/internal/flags"
25-
"github.com/mongodb/mongocli/internal/messages"
2625
"github.com/mongodb/mongocli/internal/search"
2726
"github.com/mongodb/mongocli/internal/store"
2827
"github.com/mongodb/mongocli/internal/usage"
@@ -69,7 +68,7 @@ func (opts *opsManagerClustersCreateOpts) Run() error {
6968
return err
7069
}
7170

72-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
71+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
7372

7473
return nil
7574
}

‎internal/cli/ops_manager_clusters_shutdown.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/mongodb/mongocli/internal/config"
2323
"github.com/mongodb/mongocli/internal/description"
2424
"github.com/mongodb/mongocli/internal/flags"
25-
"github.com/mongodb/mongocli/internal/messages"
2625
"github.com/mongodb/mongocli/internal/search"
2726
"github.com/mongodb/mongocli/internal/store"
2827
"github.com/mongodb/mongocli/internal/usage"
@@ -62,7 +61,7 @@ func (opts *opsManagerClustersShutdownOpts) Run() error {
6261
return err
6362
}
6463

65-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
64+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
6665

6766
return nil
6867
}

‎internal/cli/ops_manager_clusters_startup.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/mongodb/mongocli/internal/config"
2323
"github.com/mongodb/mongocli/internal/description"
2424
"github.com/mongodb/mongocli/internal/flags"
25-
"github.com/mongodb/mongocli/internal/messages"
2625
"github.com/mongodb/mongocli/internal/search"
2726
"github.com/mongodb/mongocli/internal/store"
2827
"github.com/mongodb/mongocli/internal/usage"
@@ -62,7 +61,7 @@ func (opts *opsManagerClustersStartupOpts) Run() error {
6261
return err
6362
}
6463

65-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
64+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
6665

6766
return nil
6867
}

‎internal/cli/ops_manager_clusters_update.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/mongodb/mongocli/internal/description"
2323
"github.com/mongodb/mongocli/internal/file"
2424
"github.com/mongodb/mongocli/internal/flags"
25-
"github.com/mongodb/mongocli/internal/messages"
2625
"github.com/mongodb/mongocli/internal/search"
2726
"github.com/mongodb/mongocli/internal/store"
2827
"github.com/mongodb/mongocli/internal/usage"
@@ -69,7 +68,7 @@ func (opts *opsManagerClustersUpdateOpts) Run() error {
6968
return err
7069
}
7170

72-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
71+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
7372

7473
return nil
7574
}

‎internal/cli/ops_manager_dbusers_create.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/mongodb/mongocli/internal/convert"
2525
"github.com/mongodb/mongocli/internal/description"
2626
"github.com/mongodb/mongocli/internal/flags"
27-
"github.com/mongodb/mongocli/internal/messages"
2827
"github.com/mongodb/mongocli/internal/store"
2928
"github.com/mongodb/mongocli/internal/usage"
3029
"github.com/spf13/cobra"
@@ -61,7 +60,7 @@ func (opts *opsManagerDBUsersCreateOpts) Run() error {
6160
return err
6261
}
6362

64-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
63+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
6564

6665
return nil
6766
}

‎internal/cli/ops_manager_dbusers_delete.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/mongodb/mongocli/internal/convert"
2323
"github.com/mongodb/mongocli/internal/description"
2424
"github.com/mongodb/mongocli/internal/flags"
25-
"github.com/mongodb/mongocli/internal/messages"
2625
"github.com/mongodb/mongocli/internal/store"
2726
"github.com/mongodb/mongocli/internal/usage"
2827
"github.com/spf13/cobra"
@@ -56,7 +55,7 @@ func (opts *opsManagerDBUsersDeleteOpts) Run() error {
5655
return err
5756
}
5857

59-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
58+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
6059

6160
return nil
6261
}

‎internal/cli/ops_manager_security_enable.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/mongodb/mongocli/internal/convert"
2222
"github.com/mongodb/mongocli/internal/description"
2323
"github.com/mongodb/mongocli/internal/flags"
24-
"github.com/mongodb/mongocli/internal/messages"
2524
"github.com/mongodb/mongocli/internal/store"
2625
"github.com/mongodb/mongocli/internal/usage"
2726
"github.com/spf13/cobra"
@@ -59,7 +58,7 @@ func (opts *opsManagerSecurityEnableOpts) Run() error {
5958
return err
6059
}
6160

62-
fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
61+
fmt.Print(deploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
6362

6463
return nil
6564
}

‎internal/messages/messages.go

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)