Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-19 05:19:39 +02:00
Code Issues Releases Activity

chore(code): replace interface{} with any EE-6513 (#11986)

Browse source
This commit is contained in:
andres-portainer 2024-06-28 14:59:28 -03:00 • committed by GitHub
parent 9c4935286f
commit f0d43f941f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 231 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/libhttp/request/request.go
View file

@ -43,7 +43,7 @@ func RetrieveMultiPartFormFile(request *http.Request, requestParameter string) (
// RetrieveMultiPartFormJSONValue decodes the value of some form data as a JSON object into the target parameter.
// If optional is set to true, will not return an error when the form data value is not found.
func RetrieveMultiPartFormJSONValue(request *http.Request, name string, target interface{}, optional bool) error {
func RetrieveMultiPartFormJSONValue(request *http.Request, name string, target any, optional bool) error {
value, err := RetrieveMultiPartFormValue(request, name, optional)
if err != nil {
return err
@ -149,7 +149,7 @@ func RetrieveBooleanQueryParameter(request *http.Request, name string, optional
// RetrieveJSONQueryParameter decodes the value of a query parameter as a JSON object into the target parameter.
// If optional is set to true, will not return an error when the query parameter is not found.
func RetrieveJSONQueryParameter(request *http.Request, name string, target interface{}, optional bool) error {
func RetrieveJSONQueryParameter(request *http.Request, name string, target any, optional bool) error {
queryParameter, err := RetrieveQueryParameter(request, name, optional)
if err != nil {
return err

6
pkg/libhttp/response/response.go
View file

@ -13,13 +13,13 @@ import (
// JSON encodes data to rw in JSON format. Returns a pointer to a
// HandlerError if encoding fails.
func JSON(rw http.ResponseWriter, data interface{}) *httperror.HandlerError {
func JSON(rw http.ResponseWriter, data any) *httperror.HandlerError {
return JSONWithStatus(rw, data, http.StatusOK)
}
// JSONWithStatus encodes data to rw in JSON format with a specific status code.
// Returns a pointer to a HandlerError if encoding fails.
func JSONWithStatus(rw http.ResponseWriter, data interface{}, status int) *httperror.HandlerError {
func JSONWithStatus(rw http.ResponseWriter, data any, status int) *httperror.HandlerError {
rw.Header().Set("Content-Type", "application/json")
rw.WriteHeader(status)
@ -37,7 +37,7 @@ func JSONWithStatus(rw http.ResponseWriter, data interface{}, status int) *httpe
// JSON encodes data to rw in YAML format. Returns a pointer to a
// HandlerError if encoding fails.
func YAML(rw http.ResponseWriter, data interface{}) *httperror.HandlerError {
func YAML(rw http.ResponseWriter, data any) *httperror.HandlerError {
rw.Header().Set("Content-Type", "text/yaml")
strData, ok := data.(string)

8
pkg/libhttp/response/response_test.go
View file

@ -16,7 +16,7 @@ func TestJSONWithStatus(t *testing.T) {
tests := []struct {
name string
data interface{}
data any
status int
}{
{
@ -57,7 +57,7 @@ func TestJSON(t *testing.T) {
tests := []struct {
name string
data interface{}
data any
status int
}{
{
@ -88,7 +88,7 @@ func TestJSON(t *testing.T) {
func TestYAML(t *testing.T) {
tests := []struct {
name string
data interface{}
data any
expected string
invalid bool
}{
@ -105,7 +105,7 @@ func TestYAML(t *testing.T) {
},
{
name: "doesn't support an Object",
data: map[string]interface{}{
data: map[string]any{
"key": "value",
},
expected: "",