Remove Staticcheck warnings (#5394)

* remove deprecated ioutil imports Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * remove duplicate imports Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * remove unused values Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * remove some unused types Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * remove deprecated ioutil import Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2023-01-13 15:29:14 +01:00
parent 544189b039
commit 3aa864aecc
17 changed files with 48 additions and 98 deletions
@@ -6,14 +6,13 @@ import (

 	pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/http"
-	svc "github.com/owncloud/ocis/v2/ocis-pkg/service/http"
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 	"go-micro.dev/v4"
 )

 // Server initializes the http service and server.
-func Server(opts ...Option) (svc.Service, error) {
+func Server(opts ...Option) (http.Service, error) {
 	options := newOptions(opts...)
 	l := options.Logger
 	httpCfg := options.Config.HTTP
@@ -33,19 +32,19 @@ func Server(opts ...Option) (svc.Service, error) {
 	}
 	chain := options.Middlewares.Then(options.Handler)

-	service, err := svc.NewService(
-		svc.Name(options.Config.Service.Name),
-		svc.Version(version.GetString()),
+	service, err := http.NewService(
+		http.Name(options.Config.Service.Name),
+		http.Version(version.GetString()),
 		http.TLSConfig(shared.HTTPServiceTLS{
 			Enabled: options.Config.HTTP.TLS,
 			Cert:    options.Config.HTTP.TLSCert,
 			Key:     options.Config.HTTP.TLSKey,
 		}),
-		svc.Logger(options.Logger),
-		svc.Address(options.Config.HTTP.Addr),
-		svc.Namespace(options.Config.HTTP.Namespace),
-		svc.Context(options.Context),
-		svc.Flags(options.Flags...),
+		http.Logger(options.Logger),
+		http.Address(options.Config.HTTP.Addr),
+		http.Namespace(options.Config.HTTP.Namespace),
+		http.Context(options.Context),
+		http.Flags(options.Flags...),
 	)
 	if err != nil {
 		options.Logger.Error().
@@ -55,7 +54,7 @@ func Server(opts ...Option) (svc.Service, error) {
 	}

 	if err := micro.RegisterHandler(service.Server(), chain); err != nil {
-		return svc.Service{}, err
+		return http.Service{}, err
 	}

 	return service, nil