Skip to content

Commit 6420eb6

Browse files
fmenezesfmenezes
authored
CLOUDP-287343 Consolidate cli.ListOpts flags (#3466)
1 parent 577985a commit 6420eb6

File tree

45 files changed

+57
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+57
-137
lines changed

‎internal/cli/accesslists/list.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
2222
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
2323
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
24-
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
2524
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
2625
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
2726
"github.com/spf13/cobra"
@@ -80,9 +79,7 @@ func ListBuilder() *cobra.Command {
8079
},
8180
}
8281

83-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
84-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
85-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
82+
opts.AddListOptsFlags(cmd)
8683

8784
opts.AddProjectOptsFlags(cmd)
8885
opts.AddOutputOptFlags(cmd)

‎internal/cli/alerts/list.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ func ListBuilder() *cobra.Command {
9898
return opts.Run()
9999
},
100100
}
101-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
102-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
103-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
101+
opts.AddListOptsFlags(cmd)
104102

105103
cmd.Flags().StringVar(&opts.status, flag.Status, "", usage.Status)
106104
opts.AddProjectOptsFlags(cmd)

‎internal/cli/alerts/settings/list.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ func ListBuilder() *cobra.Command {
9292
},
9393
}
9494

95-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
96-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
95+
opts.AddListOptsFlagsWithoutOmitCount(cmd)
9796

9897
opts.AddProjectOptsFlags(cmd)
9998
opts.AddOutputOptFlags(cmd)

‎internal/cli/backup/exports/buckets/list.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
2222
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
2323
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
24-
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
2524
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
2625
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
2726
"github.com/spf13/cobra"
@@ -82,9 +81,7 @@ func ListBuilder() *cobra.Command {
8281
},
8382
}
8483

85-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
86-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
87-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
84+
opts.AddListOptsFlags(cmd)
8885

8986
opts.AddProjectOptsFlags(cmd)
9087
opts.AddOutputOptFlags(cmd)

‎internal/cli/backup/exports/jobs/list.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
2222
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
2323
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
24-
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
2524
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
2625
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
2726
"github.com/spf13/cobra"
@@ -86,9 +85,7 @@ func ListBuilder() *cobra.Command {
8685
},
8786
}
8887

89-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
90-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
91-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
88+
opts.AddListOptsFlags(cmd)
9289

9390
opts.AddProjectOptsFlags(cmd)
9491
opts.AddOutputOptFlags(cmd)

‎internal/cli/backup/restores/list.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
2222
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
2323
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
24-
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
2524
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
2625
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
2726
"github.com/spf13/cobra"
@@ -86,9 +85,7 @@ func ListBuilder() *cobra.Command {
8685
},
8786
}
8887

89-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
90-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
91-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
88+
opts.AddListOptsFlags(cmd)
9289

9390
opts.AddProjectOptsFlags(cmd)
9491
opts.AddOutputOptFlags(cmd)

‎internal/cli/backup/snapshots/list.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
2222
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
2323
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
24-
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
2524
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
2625
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
2726
"github.com/spf13/cobra"
@@ -86,9 +85,7 @@ func ListBuilder() *cobra.Command {
8685
},
8786
}
8887

89-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
90-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
91-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
88+
opts.AddListOptsFlags(cmd)
9289

9390
opts.AddProjectOptsFlags(cmd)
9491
opts.AddOutputOptFlags(cmd)

‎internal/cli/clusters/list.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
2222
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
2323
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
24-
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
2524
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
2625
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
2726
"github.com/spf13/cobra"
@@ -82,9 +81,7 @@ func ListBuilder() *cobra.Command {
8281
},
8382
}
8483

85-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
86-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
87-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
84+
opts.AddListOptsFlags(cmd)
8885

8986
opts.AddProjectOptsFlags(cmd)
9087
opts.AddOutputOptFlags(cmd)

‎internal/cli/clusters/onlinearchive/list.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ func ListBuilder() *cobra.Command {
8383
},
8484
}
8585

86-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
87-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
88-
cmd.Flags().BoolVar(&opts.OmitCount, flag.OmitCount, false, usage.OmitCount)
86+
opts.AddListOptsFlags(cmd)
8987

9088
cmd.Flags().StringVar(&opts.clusterName, flag.ClusterName, "", usage.ClusterName)
9189
opts.AddProjectOptsFlags(cmd)

‎internal/cli/customdbroles/list.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ func ListBuilder() *cobra.Command {
8080
},
8181
}
8282

83-
cmd.Flags().IntVar(&opts.PageNum, flag.Page, cli.DefaultPage, usage.Page)
84-
cmd.Flags().IntVar(&opts.ItemsPerPage, flag.Limit, cli.DefaultPageLimit, usage.Limit)
83+
opts.AddListOptsFlagsWithoutOmitCount(cmd)
8584
_ = cmd.Flags().MarkDeprecated(flag.Page, deprecatedFlagMessage)
8685
_ = cmd.Flags().MarkDeprecated(flag.Limit, deprecatedFlagMessage)
8786

0 commit comments

Comments
 (0)