Skip to content

Commit 449ad9a

Browse files
gssbzngssbzn
authored
CLOUDP-61291: Allow multiple measurements for measurements API (#121)
1 parent bace091 commit 449ad9a

9 files changed

+25
-20
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/golang/mock v1.4.3
1111
github.com/mattn/go-colorable v0.1.6 // indirect
1212
github.com/mitchellh/go-homedir v1.1.0
13-
github.com/mongodb/go-client-mongodb-atlas v0.2.0
13+
github.com/mongodb/go-client-mongodb-atlas v0.2.1-0.20200423095452-c3661e38ae5c
1414
github.com/mongodb/go-client-mongodb-ops-manager v0.2.0
1515
github.com/pelletier/go-toml v1.6.0 // indirect
1616
github.com/spf13/afero v1.2.2

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz
102102
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
103103
github.com/mongodb/go-client-mongodb-atlas v0.2.0 h1:UH02byrzAlboirAMgV0sMIJqXbEfmGXIBa5IniwUZNI=
104104
github.com/mongodb/go-client-mongodb-atlas v0.2.0/go.mod h1:LS8O0YLkA+sbtOb3fZLF10yY3tJM+1xATXMJ3oU35LU=
105+
github.com/mongodb/go-client-mongodb-atlas v0.2.1-0.20200423095452-c3661e38ae5c h1:k1l2qLwwy4eCOli7f3oRWDbtIvXQF5SpO7JAXXcW3qI=
106+
github.com/mongodb/go-client-mongodb-atlas v0.2.1-0.20200423095452-c3661e38ae5c/go.mod h1:LS8O0YLkA+sbtOb3fZLF10yY3tJM+1xATXMJ3oU35LU=
105107
github.com/mongodb/go-client-mongodb-ops-manager v0.2.0 h1:OfC6UXGJqivsMTNnxnZBu+e4Oz4s/9RdSwpv23eWBus=
106108
github.com/mongodb/go-client-mongodb-ops-manager v0.2.0/go.mod h1:IWna/sWCgLSOLUeOYLg2nYf6HJcQnnqNI73K5NEMq9Q=
107109
github.com/mwielbut/pointy v1.1.0 h1:U5/YEfoIkaGCHv0St3CgjduqXID4FNRoyZgLM1kY9vg=

‎internal/cli/atlas_logs_download.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ func AtlasLogsDownloadBuilder() *cobra.Command {
100100
},
101101
}
102102

103-
cmd.Flags().StringVarP(&opts.out, flags.Out, flags.OutShort, "", usage.End)
103+
cmd.Flags().StringVarP(&opts.out, flags.Out, flags.OutShort, "", usage.LogOut)
104104

105-
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.Start)
106-
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.End)
105+
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.LogStart)
106+
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.LogEnd)
107107
cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
108108

109109
return cmd

‎internal/cli/atlas_measurements.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type measurementsOpts struct {
2626
period string
2727
start string
2828
end string
29-
measurementType string
29+
measurementType []string
3030
}
3131

3232
func (opts *measurementsOpts) newProcessMeasurementListOptions() *atlas.ProcessMeasurementListOptions {

‎internal/cli/atlas_measurements_disks_describe.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ func AtlasMeasurementsDisksDescribeBuilder() *cobra.Command {
7575

7676
cmd.Flags().StringVar(&opts.granularity, flags.Granularity, "", usage.Granularity)
7777
cmd.Flags().StringVar(&opts.period, flags.Period, "", usage.Period)
78-
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.Start)
79-
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.End)
80-
cmd.Flags().StringVar(&opts.measurementType, flags.MeasurementType, "", usage.MeasurementType)
78+
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.MeasurementStart)
79+
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.MeasurementEnd)
80+
cmd.Flags().StringSliceVar(&opts.measurementType, flags.MeasurementType, nil, usage.MeasurementType)
8181

8282
cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
8383

‎internal/cli/atlas_measurements_processes.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ func AtlasMeasurementsProcessBuilder() *cobra.Command {
7474

7575
cmd.Flags().StringVar(&opts.granularity, flags.Granularity, "", usage.Granularity)
7676
cmd.Flags().StringVar(&opts.period, flags.Period, "", usage.Period)
77-
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.Start)
78-
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.End)
79-
cmd.Flags().StringVar(&opts.measurementType, flags.MeasurementType, "", usage.MeasurementType)
77+
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.MeasurementStart)
78+
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.MeasurementEnd)
79+
cmd.Flags().StringSliceVar(&opts.measurementType, flags.MeasurementType, nil, usage.MeasurementType)
8080

8181
cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
8282

‎internal/cli/ops_manager_measurements_disks_describe.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ func OpsManagerMeasurementsDisksDescribeBuilder() *cobra.Command {
7171

7272
cmd.Flags().StringVar(&opts.granularity, flags.Granularity, "", usage.Granularity)
7373
cmd.Flags().StringVar(&opts.period, flags.Period, "", usage.Period)
74-
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.Start)
75-
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.End)
76-
cmd.Flags().StringVar(&opts.measurementType, flags.MeasurementType, "", usage.MeasurementType)
74+
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.MeasurementStart)
75+
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.MeasurementEnd)
76+
cmd.Flags().StringSliceVar(&opts.measurementType, flags.MeasurementType, nil, usage.MeasurementType)
7777

7878
cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
7979

‎internal/cli/ops_manager_measurements_process.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ func OpsManagerMeasurementsProcessBuilder() *cobra.Command {
6666

6767
cmd.Flags().StringVar(&opts.granularity, flags.Granularity, "", usage.Granularity)
6868
cmd.Flags().StringVar(&opts.period, flags.Period, "", usage.Period)
69-
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.Start)
70-
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.End)
71-
cmd.Flags().StringVar(&opts.measurementType, flags.MeasurementType, "", usage.MeasurementType)
69+
cmd.Flags().StringVar(&opts.start, flags.Start, "", usage.MeasurementStart)
70+
cmd.Flags().StringVar(&opts.end, flags.End, "", usage.MeasurementEnd)
71+
cmd.Flags().StringSliceVar(&opts.measurementType, flags.MeasurementType, nil, usage.MeasurementType)
7272

7373
cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
7474

‎internal/usage/usage.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,17 @@ const (
3636
Comment = "Optional description or comment for the entry."
3737
Force = "Don't ask for confirmation."
3838
Email = "User’s email address."
39-
Start = "Description of the beginning of the period for which to retrieve measurements."
40-
End = "Description of the end of the period for which to retrieve measurements."
39+
LogOut = "Optional output filename, if none given will use the log name."
40+
LogStart = "Beginning of the period for which to retrieve logs."
41+
LogEnd = "End of the period for which to retrieve logs."
42+
MeasurementStart = "Beginning of the period for which to retrieve measurements."
43+
MeasurementEnd = "End of the period for which to retrieve measurements."
4144
MeasurementType = "Measurements to return. If it is not specified, all measurements are returned."
4245
FirstName = "User’s first name."
4346
LastName = "User’s last name."
4447
MaxDate = "Returns events whose created date is less than or equal to it."
4548
MinDate = "Returns events whose created date is greater than or equal to it."
46-
Filename = "Filename to use"
49+
Filename = "Filename to use, optional file with a json cluster configuration."
4750
WhitelistIps = "IP addresses to add to the new user’s whitelist."
4851
Event = "Type of event that will trigger an alert."
4952
Enabled = "If set to true, the alert configuration is enabled."

0 commit comments

Comments
 (0)