From 09b62e514eb36a4064f4f35b5525f94231df2b22 Mon Sep 17 00:00:00 2001 From: xiekeyang Date: Tue, 26 Jun 2018 08:48:43 +0800 Subject: [PATCH] Replace the hard-coded archive size from error message with actual value (#735) --- controller/packageApi.go | 8 ++++++-- glide.lock | 2 ++ glide.yaml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/controller/packageApi.go b/controller/packageApi.go index 2656bf7c..63d5737c 100644 --- a/controller/packageApi.go +++ b/controller/packageApi.go @@ -18,9 +18,11 @@ package controller import ( "encoding/json" + "fmt" "io/ioutil" "net/http" + "github.com/dustin/go-humanize" "github.com/gorilla/mux" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -64,12 +66,14 @@ func (a *API) PackageApiCreate(w http.ResponseWriter, r *http.Request) { // Ensure size limits if len(f.Spec.Source.Literal) > int(fission.ArchiveLiteralSizeLimit) { - err := fission.MakeError(fission.ErrorInvalidArgument, "Package literal larger than 256K") + err := fission.MakeError(fission.ErrorInvalidArgument, + fmt.Sprintf("Package literal larger than %s", humanize.Bytes(uint64(fission.ArchiveLiteralSizeLimit)))) a.respondWithError(w, err) return } if len(f.Spec.Deployment.Literal) > int(fission.ArchiveLiteralSizeLimit) { - err := fission.MakeError(fission.ErrorInvalidArgument, "Package literal larger than 256K") + err := fission.MakeError(fission.ErrorInvalidArgument, + fmt.Sprintf("Package literal larger than %s", humanize.Bytes(uint64(fission.ArchiveLiteralSizeLimit)))) a.respondWithError(w, err) return } diff --git a/glide.lock b/glide.lock index 86483f70..142d9d03 100644 --- a/glide.lock +++ b/glide.lock @@ -430,3 +430,5 @@ testImports: - difflib - name: github.com/stretchr/objx version: 8a3f7159479fbc75b30357fbc48f380b7320f08e +- name: github.com/dustin/go-humanize + version: 02af3965c54e8cacf948b97fef38925c4120652c diff --git a/glide.yaml b/glide.yaml index dd66ae0b..34ef59f1 100644 --- a/glide.yaml +++ b/glide.yaml @@ -63,4 +63,4 @@ import: - package: github.com/hashicorp/errwrap - package: github.com/prometheus/client_golang version: v0.8.0 - +- package: github.com/dustin/go-humanize