Feature: support wave filtering by status

Signed-off-by: Volodymyr Khoroz <[email protected]>
foundriesio · Dec 22, 2023 · 7009824 · 7009824
1 parent 96cc6d7
commit 7009824
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/client/foundries.go b/client/foundries.go
@@ -1583,9 +1583,12 @@ func (a *Api) FactoryCreateWave(factory string, wave *WaveCreate) error {
 	return err
 }
 
-func (a *Api) FactoryListWaves(factory string, limit, page uint64, onlyActive bool) (*WaveList, error) {
-	url := fmt.Sprintf("%s/ota/factories/%s/waves/?limit=%d&page=%d&only-active=%t",
-		a.serverUrl, factory, limit, page, onlyActive)
+func (a *Api) FactoryListWaves(factory string, limit, page uint64, status string) (*WaveList, error) {
+	url := fmt.Sprintf("%s/ota/factories/%s/waves/?limit=%d&page=%d",
+		a.serverUrl, factory, limit, page)
+	if len(status) > 0 {
+		url += "&status=" + status
+	}
 	logrus.Debugf("Listing factory waves %s", url)
 
 	body, err := a.Get(url)

diff --git a/subcommands/waves/list.go b/subcommands/waves/list.go
@@ -18,17 +18,17 @@ func init() {
 	cmd.AddCommand(listCmd)
 	listCmd.Flags().Uint64P("limit", "n", 20, "Limit the number of results displayed.")
 	listCmd.Flags().Uint64P("page", "p", 1, "Page of waves to display when pagination is needed")
-	listCmd.Flags().BoolP("only-active", "", false, "Only show currently active waves")
+	listCmd.Flags().StringP("status", "S", "", "Only show waves with a given status; one of (active, complete, canceled)")
 }
 
 func doListWaves(cmd *cobra.Command, args []string) {
 	factory := viper.GetString("factory")
 	limit, _ := cmd.Flags().GetUint64("limit")
 	showPage, _ := cmd.Flags().GetUint64("page")
-	onlyActive, _ := cmd.Flags().GetBool("only-active")
+	status, _ := cmd.Flags().GetString("status")
 	logrus.Debugf("Showing a list of waves for %s", factory)
 
-	lst, err := api.FactoryListWaves(factory, limit, showPage, onlyActive)
+	lst, err := api.FactoryListWaves(factory, limit, showPage, status)
 	subcommands.DieNotNil(err)
 
 	t := tabby.New()