E2E delete command using list API (#4)
* Completed List cmd and added API calls * Minor comments and add delete code to pass linting * Typo in descriptions * Added delete functionality using existing list API * Updated limit param for list api to default 30 * Minor refactoring * Linting fixes for survey output * Implemented review comments * Handling 404 response when confirm flag is passed * Added COMMAND back to delete CLI * Minor comments * Check http err statuscode for 404 * Validations * Validations-1 * improved branch flag validation * removed build * String match made case insensitive * Added TODO for error handling * Updated error message when args are not provided * Worked on review comments * Argument length check updated * Separated direct and indirect dependencies * Used SPrintF for formatting strings * Updated lastAccessed time logic * Removed extra variable userConfirmation * Removed unnecessary computations * Printing and formatting changes * Passed key from input in queryparams * Scan List API iteratively to get exact matches * Added pretty print for trimmed list * Update page number instead of re-generating params * Added listAllCaches method and moved it to utils * Moved redTick to utils * Update internal/utils.go Co-authored-by: Bishal Prasad <bishal-pdmsft@github.com> * Limited scope of `sb` to `if` block * Fixed pretty print issue * Error type checked for httpError * Added PrintOneOrMore fn, moved listAll to service * Implemented `Goment` for last accessed time * Used percentage based on window size for printing * Removed stringbuilder and updated fn name * Made `ListAllCaches` member of `actions_cache.go` * Updated prettyPrint logic cover better content * Using PrettyPrint for List command as well. * Separated direct and indirect modules Co-authored-by: t-dedah <t-dedah@github.com> Co-authored-by: Deepak Dahiya <59823596+t-dedah@users.noreply.github.com> Co-authored-by: Bishal Prasad <bishal-pdmsft@github.com>
This commit is contained in:
101
cmd/delete.go
101
cmd/delete.go
@@ -1,35 +1,77 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
"github.com/AlecAivazis/survey/v2"
|
||||
"github.com/actions/gh-actions-cache/internal"
|
||||
"github.com/actions/gh-actions-cache/service"
|
||||
"github.com/actions/gh-actions-cache/types"
|
||||
"github.com/spf13/cobra"
|
||||
// "github.com/actions/gh-actions-cache/internal"
|
||||
// "github.com/actions/gh-actions-cache/client"
|
||||
)
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(deleteCmd)
|
||||
deleteCmd.Flags().StringP("repo", "R", "", "Select another repository for finding actions cache.")
|
||||
deleteCmd.Flags().StringP("branch", "B", "", "Filter by branch")
|
||||
func NewCmdDelete() *cobra.Command {
|
||||
COMMAND = "delete"
|
||||
f := types.InputFlags{}
|
||||
|
||||
var deleteCmd = &cobra.Command{
|
||||
Use: "delete",
|
||||
Short: "Delete cache by key",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
if len(args) != 1 {
|
||||
fmt.Printf("accepts 1 arg(s), received %d\n", len(args))
|
||||
return
|
||||
}
|
||||
key := args[0]
|
||||
|
||||
repo, err := internal.GetRepo(f.Repo)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
artifactCache := service.NewArtifactCache(repo, COMMAND, VERSION)
|
||||
queryParams := internal.GenerateQueryParams(f.Branch, 100, key, "", "", 1)
|
||||
|
||||
if !f.Confirm {
|
||||
var matchedCaches = getCacheListWithExactMatch(queryParams, key, artifactCache)
|
||||
matchedCachesLen := len(matchedCaches)
|
||||
if matchedCachesLen == 0 {
|
||||
fmt.Printf("Cache with input key '%s' does not exist\n", key)
|
||||
return
|
||||
}
|
||||
fmt.Printf("You're going to delete %s", internal.PrintSingularOrPlural(matchedCachesLen, "cache entry\n\n", "cache entries\n\n"))
|
||||
internal.PrettyPrintTrimmedCacheList(matchedCaches)
|
||||
choice := ""
|
||||
prompt := &survey.Select{
|
||||
Message: "Are you sure you want to delete the cache entries?",
|
||||
Options: []string{"Delete", "Cancel"},
|
||||
}
|
||||
err := survey.AskOne(prompt, &choice)
|
||||
if err != nil {
|
||||
fmt.Println("Error occured while taking input from user while trying to delete cache")
|
||||
return
|
||||
}
|
||||
f.Confirm = choice == "Delete"
|
||||
fmt.Println()
|
||||
}
|
||||
if f.Confirm {
|
||||
cachesDeleted := artifactCache.DeleteCaches(queryParams)
|
||||
if cachesDeleted > 0 {
|
||||
fmt.Printf("%s Deleted %s with key '%s'\n", internal.RedTick(), internal.PrintSingularOrPlural(cachesDeleted, "cache entry", "cache entries"), key)
|
||||
} else {
|
||||
fmt.Printf("Cache with input key '%s' does not exist\n", key)
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
deleteCmd.Flags().StringVarP(&f.Repo, "repo", "R", "", "Select another repository for finding actions cache.")
|
||||
deleteCmd.Flags().StringVarP(&f.Branch, "branch", "B", "", "Filter by branch")
|
||||
deleteCmd.Flags().BoolVar(&f.Confirm, "confirm", false, "Delete the cache without asking user for confirmation.")
|
||||
deleteCmd.SetHelpTemplate(getDeleteHelp())
|
||||
}
|
||||
|
||||
var deleteCmd = &cobra.Command{
|
||||
Use: "delete",
|
||||
Short: "Delete cache by key",
|
||||
Long: `Delete cache by key`,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
COMMAND = "delete"
|
||||
// r, _ := cmd.Flags().GetString("repo")
|
||||
// branch, _ := cmd.Flags().GetString("branch")
|
||||
|
||||
// repo, err := getRepo(r)
|
||||
// if err != nil {
|
||||
// log.Fatal(err)
|
||||
// }
|
||||
|
||||
// queryParams := generateQueryParams(branch, 30, "", "", "")
|
||||
// deleteCaches(repo, queryParams)
|
||||
},
|
||||
return deleteCmd
|
||||
}
|
||||
|
||||
func getDeleteHelp() string {
|
||||
@@ -54,3 +96,14 @@ EXAMPLES:
|
||||
$ gh actions-cache delete Linux-node-f5dbf39c9d11eba80242ac13
|
||||
`
|
||||
}
|
||||
|
||||
func getCacheListWithExactMatch(queryParams url.Values, key string, artifactCache service.ArtifactCacheService) []types.ActionsCache {
|
||||
caches := artifactCache.ListAllCaches(queryParams, key)
|
||||
var exactMatchedKeys []types.ActionsCache
|
||||
for _, cache := range caches {
|
||||
if strings.EqualFold(key, cache.Key) {
|
||||
exactMatchedKeys = append(exactMatchedKeys, cache)
|
||||
}
|
||||
}
|
||||
return exactMatchedKeys
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user