From 9e0de6cafc248ec130f188c6dbe05dd8e5bd93f5 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 17 Jul 2023 09:09:06 -0700 Subject: [PATCH 1/3] :bug: Fixes codeSnip bug in YAML v3. Signed-off-by: Jeff Ortel --- addon/application.go | 2 +- api/analysis.go | 24 ++++++++++++------------ api/base.go | 4 ++-- auth/role.go | 2 +- go.mod | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/addon/application.go b/addon/application.go index 99d6edac..170b25a1 100644 --- a/addon/application.go +++ b/addon/application.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin/binding" liberr "github.com/jortel/go-utils/error" "github.com/konveyor/tackle2-hub/api" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" "io" "net/http" "strconv" diff --git a/api/analysis.go b/api/analysis.go index 1ab7a1c2..bb7665f0 100644 --- a/api/analysis.go +++ b/api/analysis.go @@ -212,12 +212,12 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { // Analysis input, err := ctx.FormFile(FileField) if err != nil { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } reader, err := input.Open() if err != nil { - _ = ctx.Error(err) + _ = ctx.Error(&BadRequestError{err.Error()}) return } defer func() { @@ -226,25 +226,25 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { encoding := input.Header.Get(ContentType) d, err := h.Decoder(ctx, encoding, reader) if err != nil { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } r := Analysis{} err = d.Decode(&r) if err != nil { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } // // Issues input, err = ctx.FormFile(IssueField) if err != nil { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } reader, err = input.Open() if err != nil { - _ = ctx.Error(err) + _ = ctx.Error(&BadRequestError{err.Error()}) return } defer func() { @@ -253,7 +253,7 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { encoding = input.Header.Get(ContentType) d, err = h.Decoder(ctx, encoding, reader) if err != nil { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } for { @@ -263,7 +263,7 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { if errors.Is(err, io.EOF) { break } else { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } } @@ -280,12 +280,12 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { // Dependencies input, err = ctx.FormFile(DepField) if err != nil { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } reader, err = input.Open() if err != nil { - _ = ctx.Error(err) + _ = ctx.Error(&BadRequestError{err.Error()}) return } defer func() { @@ -294,7 +294,7 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { encoding = input.Header.Get(ContentType) d, err = h.Decoder(ctx, encoding, reader) if err != nil { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } for { @@ -304,7 +304,7 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { if errors.Is(err, io.EOF) { break } else { - h.Status(ctx, http.StatusBadRequest) + _ = ctx.Error(&BadRequestError{err.Error()}) return } } diff --git a/api/base.go b/api/base.go index f0a8056b..31a63eb9 100644 --- a/api/base.go +++ b/api/base.go @@ -8,11 +8,11 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/jortel/go-utils/logr" - reflect "github.com/konveyor/tackle2-hub/api/reflect" + "github.com/konveyor/tackle2-hub/api/reflect" "github.com/konveyor/tackle2-hub/api/sort" "github.com/konveyor/tackle2-hub/auth" "github.com/konveyor/tackle2-hub/model" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" "gorm.io/gorm" "io" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/auth/role.go b/auth/role.go index d2c3188e..01f805fe 100644 --- a/auth/role.go +++ b/auth/role.go @@ -3,7 +3,7 @@ package auth import ( liberr "github.com/jortel/go-utils/error" "github.com/konveyor/tackle2-hub/settings" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" "io" "os" ) diff --git a/go.mod b/go.mod index 39fb1655..d5cf332b 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/prometheus/client_golang v1.15.0 github.com/swaggo/swag v1.16.1 golang.org/x/sys v0.7.0 - gopkg.in/yaml.v3 v3.0.1 + gopkg.in/yaml.v2 v2.4.0 gorm.io/datatypes v1.2.0 gorm.io/driver/sqlite v1.5.2 gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 @@ -94,7 +94,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.4.7 // indirect k8s.io/component-base v0.25.0 // indirect k8s.io/klog/v2 v2.70.1 // indirect From 6198585a461c42d3b015e0d9c2afbcefd1dd2195 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 17 Jul 2023 09:13:01 -0700 Subject: [PATCH 2/3] checkpoint --- api/analysis.go | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/api/analysis.go b/api/analysis.go index bb7665f0..3c032bfd 100644 --- a/api/analysis.go +++ b/api/analysis.go @@ -212,12 +212,14 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { // Analysis input, err := ctx.FormFile(FileField) if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } reader, err := input.Open() if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } defer func() { @@ -226,25 +228,29 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { encoding := input.Header.Get(ContentType) d, err := h.Decoder(ctx, encoding, reader) if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } r := Analysis{} err = d.Decode(&r) if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } // // Issues input, err = ctx.FormFile(IssueField) if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } reader, err = input.Open() if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } defer func() { @@ -253,7 +259,8 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { encoding = input.Header.Get(ContentType) d, err = h.Decoder(ctx, encoding, reader) if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } for { @@ -263,7 +270,8 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { if errors.Is(err, io.EOF) { break } else { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } } @@ -280,12 +288,14 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { // Dependencies input, err = ctx.FormFile(DepField) if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } reader, err = input.Open() if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } defer func() { @@ -294,7 +304,8 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { encoding = input.Header.Get(ContentType) d, err = h.Decoder(ctx, encoding, reader) if err != nil { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } for { @@ -304,7 +315,8 @@ func (h AnalysisHandler) AppCreate(ctx *gin.Context) { if errors.Is(err, io.EOF) { break } else { - _ = ctx.Error(&BadRequestError{err.Error()}) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } } From 29669eacdae38f089c85d58cb1be37d615a5f78d Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 17 Jul 2023 09:19:32 -0700 Subject: [PATCH 3/3] checkpoint --- api/bucket.go | 14 ++++++++++---- api/file.go | 5 ++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/api/bucket.go b/api/bucket.go index a62bd316..c93e1683 100644 --- a/api/bucket.go +++ b/api/bucket.go @@ -314,12 +314,14 @@ func (h *BucketOwner) bucketDelete(ctx *gin.Context, id uint) { func (h *BucketOwner) putDir(ctx *gin.Context, output string) (err error) { file, err := ctx.FormFile(FileField) if err != nil { - h.Status(ctx, http.StatusBadRequest) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } fileReader, err := file.Open() if err != nil { - h.Status(ctx, http.StatusBadRequest) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } defer func() { @@ -327,7 +329,8 @@ func (h *BucketOwner) putDir(ctx *gin.Context, output string) (err error) { }() zipReader, err := gzip.NewReader(fileReader) if err != nil { - h.Status(ctx, http.StatusBadRequest) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } defer func() { @@ -468,11 +471,14 @@ func (h *BucketOwner) putFile(ctx *gin.Context, m *model.Bucket) (err error) { path := pathlib.Join(m.Path, ctx.Param(Wildcard)) input, err := ctx.FormFile(FileField) if err != nil { - h.Status(ctx, http.StatusBadRequest) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } reader, err := input.Open() if err != nil { + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } defer func() { diff --git a/api/file.go b/api/file.go index 2234a710..c585470c 100644 --- a/api/file.go +++ b/api/file.go @@ -74,7 +74,8 @@ func (h FileHandler) Create(ctx *gin.Context) { var err error input, err := ctx.FormFile(FileField) if err != nil { - h.Status(ctx, http.StatusBadRequest) + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } m := &model.File{} @@ -94,6 +95,8 @@ func (h FileHandler) Create(ctx *gin.Context) { }() reader, err := input.Open() if err != nil { + err = &BadRequestError{err.Error()} + _ = ctx.Error(err) return } defer func() {