Bugbash fixes and refactoring (#14)
* Completed List cmd and added API calls * Minor comments and add delete code to pass linting * Typo in descriptions * Minor comments * Validations * Validations-1 * improved branch flag validation * removed build * working after refactory with bad names * Command working, test not working * Corrected creation of service * Finalized structure using service * Deleted tests * cleanup * cleanup * cleanup * removed space with tab * aligned types in model.go * Update model.go * resolved comments * Refactor * removed long descriptions * Working incomplete tests * Completed tests * cleanup * checks * PR comments * PR comments * minor comment issue * minor comment issue * Added test cases for Delete * updated tests to work with workflow * Added missing error condition * Updated tests to support new option service * Improved eror handling for list * Fixed test case * Improved error handling * Error handling and test cases for delete API calls * Added test case for user confirmation delete. * Removed unused import from test * Fixed test case for error scenario * Upgraded go-gh * reusing rest client error * Fix for failing windows test cases * help cmd removed when cache isnt present on delete * Pretty print ratio and space between cols modified * Error handling wrapping * Reverted back error message after silencing help * Bugbash fixes for int limit, zero cache list msg * Test case fixes for error message changes * Handling no cache list scenario with(out) key * Minor Refactoring and avoided code duplication * Removed unused inputs after resolving conflicts * Formatted test file * removed err5xx as they all have same value. * Removed err5xx from list as well * Help and error message enhancements for list. * changing commandname to avoid conflicts * Ran `go fmt` formatter against all .go files * Removed command from root.go * Updated version to 1.0.0 Co-authored-by: t-dedah <t-dedah@github.com> Co-authored-by: Deepak Dahiya <59823596+t-dedah@users.noreply.github.com>
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/url"
|
||||
"strings"
|
||||
@@ -10,14 +9,13 @@ import (
|
||||
"github.com/actions/gh-actions-cache/internal"
|
||||
"github.com/actions/gh-actions-cache/service"
|
||||
"github.com/actions/gh-actions-cache/types"
|
||||
"github.com/cli/go-gh/pkg/api"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var choice string = ""
|
||||
|
||||
func NewCmdDelete() *cobra.Command {
|
||||
COMMAND = "delete"
|
||||
deleteCommand := "delete"
|
||||
f := types.DeleteOptions{}
|
||||
|
||||
var deleteCmd = &cobra.Command{
|
||||
@@ -38,7 +36,7 @@ func NewCmdDelete() *cobra.Command {
|
||||
// This will silence the usage (help) message as they are not needed for errors beyond this point
|
||||
cmd.SilenceUsage = true
|
||||
|
||||
artifactCache, err := service.NewArtifactCache(repo, COMMAND, VERSION)
|
||||
artifactCache, err := service.NewArtifactCache(repo, deleteCommand, VERSION)
|
||||
if err != nil {
|
||||
return types.HandledError{Message: err.Error(), InnerError: err}
|
||||
}
|
||||
@@ -49,14 +47,7 @@ func NewCmdDelete() *cobra.Command {
|
||||
if !f.Confirm {
|
||||
matchedCaches, err := getCacheListWithExactMatch(f, artifactCache)
|
||||
if err != nil {
|
||||
var httpError api.HTTPError
|
||||
if errors.As(err, &httpError) && httpError.StatusCode == 404 {
|
||||
return types.HandledError{Message: "The given repo does not exist.", InnerError: err}
|
||||
} else if errors.As(err, &httpError) && httpError.StatusCode >= 400 && httpError.StatusCode < 500 {
|
||||
return types.HandledError{Message: httpError.Message, InnerError: err}
|
||||
} else {
|
||||
return types.HandledError{Message: "We could not process your request due to internal error.", InnerError: err}
|
||||
}
|
||||
return internal.HttpErrorHandler(err, "The given repo does not exist.")
|
||||
}
|
||||
matchedCachesLen := len(matchedCaches)
|
||||
if matchedCachesLen == 0 {
|
||||
@@ -81,14 +72,7 @@ func NewCmdDelete() *cobra.Command {
|
||||
if f.Confirm {
|
||||
cachesDeleted, err := artifactCache.DeleteCaches(queryParams)
|
||||
if err != nil {
|
||||
var httpError api.HTTPError
|
||||
if errors.As(err, &httpError) && httpError.StatusCode == 404 {
|
||||
return types.HandledError{Message: fmt.Sprintf("Cache with input key '%s' does not exist", f.Key), InnerError: err}
|
||||
} else if errors.As(err, &httpError) && httpError.StatusCode >= 400 && httpError.StatusCode < 500 {
|
||||
return types.HandledError{Message: httpError.Message, InnerError: err}
|
||||
} else {
|
||||
return types.HandledError{Message: "We could not process your request due to internal error.", InnerError: err}
|
||||
}
|
||||
return internal.HttpErrorHandler(err, fmt.Sprintf("Cache with input key '%s' does not exist", f.Key))
|
||||
}
|
||||
|
||||
if cachesDeleted > 0 {
|
||||
|
||||
Reference in New Issue
Block a user