Switch ocis-pkg to recent version

onlyoffice/go.mod

@@ -3,17 +3,19 @@ module github.com/owncloud/ocis/onlyoffice
 go 1.13
 
 require (
-	contrib.go.opencensus.io/exporter/jaeger v0.2.0
+	contrib.go.opencensus.io/exporter/jaeger v0.2.1
 	contrib.go.opencensus.io/exporter/ocagent v0.6.0
 	contrib.go.opencensus.io/exporter/zipkin v0.1.1
 	github.com/UnnoTed/fileb0x v1.1.4
-	github.com/go-chi/chi v4.1.0+incompatible
-	github.com/micro/cli/v2 v2.1.1
-	github.com/oklog/run v1.0.0
+	github.com/go-chi/chi v4.1.2+incompatible
+	github.com/micro/cli/v2 v2.1.2
+	github.com/oklog/run v1.1.0
 	github.com/openzipkin/zipkin-go v0.2.2
-	github.com/owncloud/ocis-pkg/v2 v2.2.0
+	github.com/owncloud/ocis/ocis-pkg v0.0.0-20200918114005-1a0ddd2190ee
 	github.com/restic/calens v0.2.0
-	github.com/spf13/viper v1.5.0
-	go.opencensus.io v0.22.2
-	golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
+	github.com/spf13/viper v1.7.0
+	go.opencensus.io v0.22.5
+	golang.org/x/net v0.0.0-20200822124328-c89045814202
 )
+
+replace github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg

onlyoffice/pkg/assets/assets.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/onlyoffice/pkg/config"
 )
 

onlyoffice/pkg/assets/option.go

@@ -1,7 +1,7 @@
 package assets
 
 import (
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/onlyoffice/pkg/config"
 )
 

onlyoffice/pkg/command/root.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/onlyoffice/pkg/config"
 	"github.com/owncloud/ocis/onlyoffice/pkg/flagset"
 	"github.com/owncloud/ocis/onlyoffice/pkg/version"

onlyoffice/pkg/config/config.go

@@ -20,6 +20,7 @@ type HTTP struct {
 	Addr      string
 	Namespace string
 	Root      string
+	CacheTTL  int
 }
 
 // Tracing defines the available tracing configuration.

onlyoffice/pkg/flagset/flagset.go

@@ -136,6 +136,13 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"ONLYOFFICE_HTTP_ROOT"},
 			Destination: &cfg.HTTP.Root,
 		},
+		&cli.IntFlag{
+			Name:        "http-cache-ttl",
+			Value:       604800, // 7 days
+			Usage:       "Set the static assets caching duration in seconds",
+			EnvVars:     []string{"ONLYOFFICE_CACHE_TTL"},
+			Destination: &cfg.HTTP.CacheTTL,
+		},
 		&cli.StringFlag{
 			Name:        "asset-path",
 			Value:       "",

onlyoffice/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/onlyoffice/pkg/config"
 )
 

onlyoffice/pkg/server/debug/server.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/service/debug"
+	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/onlyoffice/pkg/config"
 	"github.com/owncloud/ocis/onlyoffice/pkg/version"
 )

onlyoffice/pkg/server/http/option.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/onlyoffice/pkg/config"
 	"github.com/owncloud/ocis/onlyoffice/pkg/metrics"
 )

onlyoffice/pkg/server/http/server.go

@@ -1,8 +1,8 @@
 package http
 
 import (
-	"github.com/owncloud/ocis-pkg/v2/middleware"
-	"github.com/owncloud/ocis-pkg/v2/service/http"
+	"github.com/owncloud/ocis/ocis-pkg/middleware"
+	"github.com/owncloud/ocis/ocis-pkg/service/http"
 	"github.com/owncloud/ocis/onlyoffice/pkg/assets"
 	svc "github.com/owncloud/ocis/onlyoffice/pkg/service/v0"
 	"github.com/owncloud/ocis/onlyoffice/pkg/version"
@@ -28,7 +28,7 @@ func Server(opts ...Option) (http.Service, error) {
 		svc.Middleware(
 			middleware.RealIP,
 			middleware.RequestID,
-			middleware.Cache,
+			middleware.NoCache,
 			middleware.Cors,
 			middleware.Secure,
 			middleware.Version(
@@ -44,6 +44,7 @@ func Server(opts ...Option) (http.Service, error) {
 					assets.Logger(options.Logger),
 					assets.Config(options.Config),
 				),
+				options.Config.HTTP.CacheTTL,
 			),
 		),
 	)

onlyoffice/pkg/service/v0/logging.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
 // NewLogging returns a service that logs messages.

onlyoffice/pkg/service/v0/option.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/onlyoffice/pkg/config"
 )