From 4721e7004be64656c693901ae87a236ee646cd51 Mon Sep 17 00:00:00 2001 From: Raffaele Di Fazio Date: Mon, 20 Sep 2021 11:10:44 +0200 Subject: [PATCH] add threshold to delete by repo Signed-off-by: Raffaele Di Fazio --- cmd/ghcs/delete.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/ghcs/delete.go b/cmd/ghcs/delete.go index 5aff182c5..b91962f92 100644 --- a/cmd/ghcs/delete.go +++ b/cmd/ghcs/delete.go @@ -37,7 +37,7 @@ func newDeleteCmd() *cobra.Command { case allCodespaces: return deleteAll(log, force, keepThresholdDays) case repo != "": - return deleteByRepo(log, repo) + return deleteByRepo(log, repo, keepThresholdDays) default: return delete_(log, codespace, force) } @@ -133,7 +133,7 @@ func deleteAll(log *output.Logger, force bool, keepThresholdDays int) error { return list(&listOptions{}) } -func deleteByRepo(log *output.Logger, repo string) error { +func deleteByRepo(log *output.Logger, repo string, keepThresholdDays int) error { apiClient := api.New(os.Getenv("GITHUB_TOKEN")) ctx := context.Background() @@ -147,6 +147,11 @@ func deleteByRepo(log *output.Logger, repo string) error { return fmt.Errorf("error getting codespaces: %w", err) } + codespaces, err = filterCodespacesToDelete(codespaces, keepThresholdDays) + if err != nil { + return err + } + delete := func(name string) error { token, err := apiClient.GetCodespaceToken(ctx, user.Login, name) if err != nil {