mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-23 05:59:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ocs working

Browse Source
This commit is contained in:
A.Unger
2020-09-18 15:12:18 +02:00
parent f5ace5bc14
commit aff4396927
17 changed files with 435 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ocs/CHANGELOG.md
View File

@@ -92,18 +92,18 @@ The following sections list the changes in ocis-ocs 0.2.0.
## Summary
* Bugfix - Fix file descriptor leak: [#79](https://github.com/owncloud/ocis-accounts/issues/79)
* Bugfix - Fix file descriptor leak: [#79](https://github.com/owncloud/ocis/accounts/issues/79)
* Enhancement - Add Group management for OCS Povisioning API: [#25](https://github.com/owncloud/ocis/ocs/pull/25)
* Enhancement - Basic Support for the User Provisioning API: [#23](https://github.com/owncloud/ocis/ocs/pull/23)
## Details
* Bugfix - Fix file descriptor leak: [#79](https://github.com/owncloud/ocis-accounts/issues/79)
* Bugfix - Fix file descriptor leak: [#79](https://github.com/owncloud/ocis/accounts/issues/79)
Only use a single instance of go-micro's GRPC client as it already does connection pooling.
This prevents connection and file descriptor leaks.
https://github.com/owncloud/ocis-accounts/issues/79
https://github.com/owncloud/ocis/accounts/issues/79
https://github.com/owncloud/ocis/ocs/pull/29

2
ocs/changelog/0.2.0_2020-08-17/fix-file-descriptor-leak.md
View File

@@ -3,5 +3,5 @@ Bugfix: Fix file descriptor leak
Only use a single instance of go-micro's GRPC client as it already
does connection pooling. This prevents connection and file descriptor leaks.
https://github.com/owncloud/ocis-accounts/issues/79
https://github.com/owncloud/ocis/accounts/issues/79
https://github.com/owncloud/ocis/ocs/pull/29

17
ocs/go.mod
View File

@@ -7,20 +7,18 @@ require (
contrib.go.opencensus.io/exporter/ocagent v0.7.0
contrib.go.opencensus.io/exporter/zipkin v0.1.1
github.com/UnnoTed/fileb0x v1.1.4
github.com/cs3org/reva v1.1.0
github.com/cs3org/reva v1.2.1-0.20200826162318-c0f54e1f37ea
github.com/go-chi/chi v4.1.2+incompatible
github.com/go-chi/render v1.0.1
github.com/golang/protobuf v1.4.2
github.com/google/uuid v1.1.2 // indirect
github.com/mattn/go-colorable v0.1.2 // indirect
github.com/micro/cli/v2 v2.1.2
github.com/micro/go-micro/v2 v2.9.1
github.com/oklog/run v1.1.0
github.com/openzipkin/zipkin-go v0.2.2
github.com/owncloud/ocis-accounts v0.4.2-0.20200828150703-2ca83cf4ac20
github.com/owncloud/ocis-pkg/v2 v2.4.0
github.com/owncloud/ocis-settings v0.3.2-0.20200828130413-0cc0f5bf26fe
github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b
github.com/owncloud/ocis/accounts v0.0.0-20200918125107-fcca9faa81c8
github.com/owncloud/ocis/ocis-pkg v0.0.0-20200918114005-1a0ddd2190ee
github.com/owncloud/ocis/store v0.0.0-20200918125107-fcca9faa81c8
github.com/restic/calens v0.2.0
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.6.1
@@ -29,4 +27,9 @@ require (
google.golang.org/protobuf v1.25.0
)
replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
replace (
github.com/owncloud/ocis/accounts => ../accounts
github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
github.com/owncloud/ocis/settings => ../settings
google.golang.org/grpc => google.golang.org/grpc v1.26.0
)

399
ocs/go.sum
View File

File diff suppressed because it is too large Load Diff

2
ocs/pkg/command/root.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/flagset"
"github.com/owncloud/ocis/ocs/pkg/version"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/spf13/viper"
)

2
ocs/pkg/middleware/options.go
View File

@@ -2,7 +2,7 @@ package middleware
import (
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.

2
ocs/pkg/server/debug/option.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.

2
ocs/pkg/server/debug/server.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/version"
"github.com/owncloud/ocis-pkg/v2/service/debug"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
)
// Server initializes the debug service and server.

2
ocs/pkg/server/http/option.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/metrics"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.

4
ocs/pkg/server/http/server.go
View File

@@ -3,8 +3,8 @@ package http
import (
svc "github.com/owncloud/ocis/ocs/pkg/service/v0"
"github.com/owncloud/ocis/ocs/pkg/version"
"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"
)
// Server initializes the http service and server.

14
ocs/pkg/server/http/svc_test.go
View File

@@ -18,18 +18,18 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis/ocs/pkg/config"
svc "github.com/owncloud/ocis/ocs/pkg/service/v0"
ocisLog "github.com/owncloud/ocis-pkg/v2/log"
ocisLog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/stretchr/testify/assert"
"github.com/owncloud/ocis-pkg/v2/service/grpc"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
accountsCmd "github.com/owncloud/ocis-accounts/pkg/command"
accountsCfg "github.com/owncloud/ocis-accounts/pkg/config"
accountsProto "github.com/owncloud/ocis-accounts/pkg/proto/v0"
accountsSvc "github.com/owncloud/ocis-accounts/pkg/service/v0"
accountsCmd "github.com/owncloud/ocis/accounts/pkg/command"
accountsCfg "github.com/owncloud/ocis/accounts/pkg/config"
accountsProto "github.com/owncloud/ocis/accounts/pkg/proto/v0"
accountsSvc "github.com/owncloud/ocis/accounts/pkg/service/v0"
"github.com/micro/go-micro/v2/client"
settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
)
var service = grpc.Service{}

2
ocs/pkg/service/v0/groups.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/go-chi/render"
merrors "github.com/micro/go-micro/v2/errors"
accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/response"
)

2
ocs/pkg/service/v0/logging.go
View File

@@ -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.

2
ocs/pkg/service/v0/option.go
View File

@@ -4,7 +4,7 @@ import (
"net/http"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.

4
ocs/pkg/service/v0/service.go
View File

@@ -8,12 +8,12 @@ import (
"github.com/go-chi/render"
"github.com/micro/go-micro/v2/client/grpc"
accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/ocs/pkg/config"
ocsm "github.com/owncloud/ocis/ocs/pkg/middleware"
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/response"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
var defaultClient = grpc.NewClient()

2
ocs/pkg/service/v0/tracing.go
View File

@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/middleware"
"github.com/owncloud/ocis/ocis-pkg/middleware"
)
// NewTracing returns a service that instruments traces.

4
ocs/pkg/service/v0/users.go
View File

@@ -15,10 +15,10 @@ import (
"github.com/micro/go-micro/v2/client/grpc"
merrors "github.com/micro/go-micro/v2/errors"
accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/response"
storepb "github.com/owncloud/ocis-store/pkg/proto/v0"
storepb "github.com/owncloud/ocis/store/pkg/proto/v0"
)
// GetUser returns the currently logged in user