chore: bump go to 1.22

fschade · May 28, 2024 · d61604d · d61604d
1 parent 62a2937
commit d61604d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/.drone.star b/.drone.star
@@ -1,5 +1,5 @@
 # images
-OC_CI_GOLANG = "owncloudci/golang:1.21"
+OC_CI_GOLANG = "owncloudci/golang:1.22"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
 OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0"
 REDIS = "redis:6-alpine"

diff --git a/Dockerfile.reva b/Dockerfile.reva
@@ -16,7 +16,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM golang:1.21-alpine3.18 as builder
+FROM golang:1.22-alpine3.20 as builder
 
 RUN apk --no-cache add \
   ca-certificates \

diff --git a/Dockerfile.revad b/Dockerfile.revad
@@ -16,7 +16,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM golang:1.21-alpine3.18 as builder
+FROM golang:1.22-alpine3.20 as builder
 
 RUN apk --no-cache add \
   ca-certificates \
@@ -36,7 +36,7 @@ RUN make build-revad-docker && \
 
 RUN mkdir -p /etc/revad/ && touch /etc/revad/revad.toml
 
-FROM golang:1.21-alpine3.18
+FROM golang:1.22-alpine3.20
 
 RUN apk --no-cache add \
   mailcap

diff --git a/Dockerfile.revad-ceph b/Dockerfile.revad-ceph
@@ -31,12 +31,12 @@ RUN dnf update --exclude=ceph-iscsi,chrony -y && dnf install -y \
   librbd-devel \
   librados-devel
 
-ADD https://go.dev/dl/go1.21.5.linux-amd64.tar.gz \
-  go1.21.5.linux-amd64.tar.gz
+ADD https://go.dev/dl/go1.22.3.linux-amd64.tar.gz \
+  go1.22.3.linux-amd64.tar.gz
 
 RUN rm -rf /usr/local/go && \
-  tar -C /usr/local -xzf go1.21.5.linux-amd64.tar.gz && \
-  rm go1.21.5.linux-amd64.tar.gz
+  tar -C /usr/local -xzf go1.22.3.linux-amd64.tar.gz && \
+  rm go1.22.3.linux-amd64.tar.gz
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go

diff --git a/Dockerfile.revad-eos b/Dockerfile.revad-eos
@@ -16,7 +16,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM golang:1.21-alpine3.18 as builder
+FROM golang:1.22-alpine3.20 as builder
 
 RUN apk --no-cache add \
   bash \

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cs3org/reva/v2
 
-go 1.21
+go 1.22
 
 require (
 	bou.ke/monkey v1.0.2
@@ -28,6 +28,7 @@ require (
 	github.com/go-micro/plugins/v4/events/natsjs v1.2.2-0.20231215124540-f7f8d3274bf9
 	github.com/go-micro/plugins/v4/server/http v1.2.2
 	github.com/go-micro/plugins/v4/store/nats-js v1.2.0
+	github.com/go-micro/plugins/v4/store/nats-js-kv v0.0.0-20231226212146-94a49ba3e06e
 	github.com/go-micro/plugins/v4/store/redis v1.2.1
 	github.com/go-playground/locales v0.14.1
 	github.com/go-playground/universal-translator v0.18.1
@@ -136,7 +137,6 @@ require (
 	github.com/go-micro/plugins/v4/registry/mdns v1.2.0 // indirect
 	github.com/go-micro/plugins/v4/registry/memory v1.2.0 // indirect
 	github.com/go-micro/plugins/v4/registry/nats v1.2.1 // indirect
-	github.com/go-micro/plugins/v4/store/nats-js-kv v0.0.0-20231226212146-94a49ba3e06e // indirect
 	github.com/go-openapi/errors v0.20.4 // indirect
 	github.com/go-openapi/strfmt v0.21.7 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect

diff --git a/go.sum b/go.sum
@@ -1328,8 +1328,6 @@ github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
 github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20231207143248-4d424e3ae348 h1:Czv6AW9Suj6npWd5BLZjobdD78c2RdzBeKBgkq3jYZk=
-github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20231207143248-4d424e3ae348/go.mod h1:Goi4eJ9SrKkxE6NsAVqBVNxfQFbwb7UbyII6743ldgM=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=

diff --git a/pkg/owncloud/ocs/capabilities.go b/pkg/owncloud/ocs/capabilities.go
@@ -298,7 +298,7 @@ type CapabilitiesTheme struct {
 
 // CapabilitiesThemeLogo holds theming logo capabilities
 type CapabilitiesThemeLogo struct {
-	PermittedFileTypes map[string]string `json:"permitted_file_types" xml:"permitted_file_types" mapstructure:"permitted_file_types"`
+	PermittedFileTypes map[string]interface{} `json:"permitted_file_types" xml:"permitted_file_types" mapstructure:"permitted_file_types"`
 }
 
 // Version holds version information