mirror of
https://github.com/rancher/norman.git
synced 2025-08-18 07:16:55 +00:00
Update to golangci-lint and fix linting errors discovered by the updated version. (#602)
This commit is contained in:
parent
2d7ba46c7d
commit
489e557d5f
@ -7,7 +7,7 @@ RUN zypper -n up && \
|
|||||||
zypper -n in git docker vim curl wget gawk
|
zypper -n in git docker vim curl wget gawk
|
||||||
RUN rm -rf /go/src /go/pkg
|
RUN rm -rf /go/src /go/pkg
|
||||||
RUN if [ "${ARCH}" == "amd64" ]; then \
|
RUN if [ "${ARCH}" == "amd64" ]; then \
|
||||||
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.54.0; \
|
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.63.4; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ENV DAPPER_ENV REPO TAG DRONE_TAG
|
ENV DAPPER_ENV REPO TAG DRONE_TAG
|
||||||
|
@ -11,7 +11,7 @@ import (
|
|||||||
func Create(context *types.APIContext, version *types.APIVersion, typeName string, data map[string]interface{}, into interface{}) error {
|
func Create(context *types.APIContext, version *types.APIVersion, typeName string, data map[string]interface{}, into interface{}) error {
|
||||||
schema := context.Schemas.Schema(version, typeName)
|
schema := context.Schemas.Schema(version, typeName)
|
||||||
if schema == nil {
|
if schema == nil {
|
||||||
return fmt.Errorf("failed to find schema " + typeName)
|
return fmt.Errorf("failed to find schema %s", typeName)
|
||||||
}
|
}
|
||||||
|
|
||||||
item, err := schema.Store.Create(context, schema, data)
|
item, err := schema.Store.Create(context, schema, data)
|
||||||
@ -37,7 +37,7 @@ func Create(context *types.APIContext, version *types.APIVersion, typeName strin
|
|||||||
func ByID(context *types.APIContext, version *types.APIVersion, typeName string, id string, into interface{}) error {
|
func ByID(context *types.APIContext, version *types.APIVersion, typeName string, id string, into interface{}) error {
|
||||||
schema := context.Schemas.Schema(version, typeName)
|
schema := context.Schemas.Schema(version, typeName)
|
||||||
if schema == nil {
|
if schema == nil {
|
||||||
return fmt.Errorf("failed to find schema " + typeName)
|
return fmt.Errorf("failed to find schema %s", typeName)
|
||||||
}
|
}
|
||||||
|
|
||||||
item, err := schema.Store.ByID(context, schema, id)
|
item, err := schema.Store.ByID(context, schema, id)
|
||||||
@ -63,7 +63,7 @@ func ByID(context *types.APIContext, version *types.APIVersion, typeName string,
|
|||||||
func List(context *types.APIContext, version *types.APIVersion, typeName string, opts *types.QueryOptions, into interface{}) error {
|
func List(context *types.APIContext, version *types.APIVersion, typeName string, opts *types.QueryOptions, into interface{}) error {
|
||||||
schema := context.Schemas.Schema(version, typeName)
|
schema := context.Schemas.Schema(version, typeName)
|
||||||
if schema == nil {
|
if schema == nil {
|
||||||
return fmt.Errorf("failed to find schema " + typeName)
|
return fmt.Errorf("failed to find schema %s", typeName)
|
||||||
}
|
}
|
||||||
|
|
||||||
data, err := schema.Store.List(context, schema, opts)
|
data, err := schema.Store.List(context, schema, opts)
|
||||||
|
@ -298,7 +298,7 @@ func Body(req *http.Request) (map[string]interface{}, error) {
|
|||||||
return valuesToBody(req.MultipartForm.Value), nil
|
return valuesToBody(req.MultipartForm.Value), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.PostForm != nil && len(req.PostForm) > 0 {
|
if len(req.PostForm) > 0 {
|
||||||
return valuesToBody(map[string][]string(req.Form)), nil
|
return valuesToBody(map[string][]string(req.Form)), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user