sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ocs import paths and module name

Browse Source
This commit is contained in:
A.Unger
2020-09-18 12:55:52 +02:00
parent adcfca1712
commit 7ffaa859b3
39 changed files with 110 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocs/pkg/command/health.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis-ocs/pkg/flagset"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/flagset"
)
// Health is the entrypoint for the health command.
ocs/pkg/command/root.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strings"
"github.com/micro/cli/v2"
"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/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/spf13/viper"
)
ocs/pkg/command/server.go
+5 -5
View File
@@ -14,11 +14,11 @@ import (
"github.com/oklog/run"
openzipkin "github.com/openzipkin/zipkin-go"
zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis-ocs/pkg/flagset"
"github.com/owncloud/ocis-ocs/pkg/metrics"
"github.com/owncloud/ocis-ocs/pkg/server/debug"
"github.com/owncloud/ocis-ocs/pkg/server/http"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/flagset"
"github.com/owncloud/ocis/ocs/pkg/metrics"
"github.com/owncloud/ocis/ocs/pkg/server/debug"
"github.com/owncloud/ocis/ocs/pkg/server/http"
"go.opencensus.io/stats/view"
"go.opencensus.io/trace"
)
ocs/pkg/flagset/flagset.go
+1 -1
View File
@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/config"
)
// RootWithConfig applies cfg to the root flagset
ocs/pkg/middleware/options.go
+1 -1
View File
@@ -1,7 +1,7 @@
package middleware
import (
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
)
ocs/pkg/server/debug/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package debug
import (
"context"
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
)
ocs/pkg/server/debug/server.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis-ocs/pkg/version"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/version"
"github.com/owncloud/ocis-pkg/v2/service/debug"
)
ocs/pkg/server/http/option.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"context"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis-ocs/pkg/metrics"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/metrics"
"github.com/owncloud/ocis-pkg/v2/log"
)
ocs/pkg/server/http/server.go
+2 -2
View File
@@ -1,8 +1,8 @@
package http
import (
svc "github.com/owncloud/ocis-ocs/pkg/service/v0"
"github.com/owncloud/ocis-ocs/pkg/version"
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"
)
ocs/pkg/server/http/svc_test.go
+11 -11
View File
@@ -16,8 +16,8 @@ import (
"testing"
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis-ocs/pkg/config"
svc "github.com/owncloud/ocis-ocs/pkg/service/v0"
"github.com/owncloud/ocis/ocs/pkg/config"
svc "github.com/owncloud/ocis/ocs/pkg/service/v0"
ocisLog "github.com/owncloud/ocis-pkg/v2/log"
"github.com/stretchr/testify/assert"
@@ -209,7 +209,7 @@ func assertUserSame(t *testing.T, expected, actual User, quotaAvailable bool) {
}
// FIXME: gidnumber and Uidnumber are always 0
// https://github.com/owncloud/ocis-ocs/issues/45
// https://github.com/owncloud/ocis/ocs/issues/45
assert.Equal(t, 0, actual.UIDNumber, "UidNumber doesn't match for user %v", expected.Username)
assert.Equal(t, 0, actual.GIDNumber, "GIDNumber doesn't match for user %v", expected.Username)
@@ -412,7 +412,7 @@ func TestCreateUser(t *testing.T) {
},
// User withoutl password
// https://github.com/owncloud/ocis-ocs/issues/50
// https://github.com/owncloud/ocis/ocs/issues/50
{
User{
Enabled: "true",
@@ -425,7 +425,7 @@ func TestCreateUser(t *testing.T) {
},
// User with special character in username
// https://github.com/owncloud/ocis-ocs/issues/49
// https://github.com/owncloud/ocis/ocs/issues/49
{
User{
Enabled: "true",
@@ -973,7 +973,7 @@ func TestUpdateUser(t *testing.T) {
nil,
},
// Invalid email doesn't gives error
// https://github.com/owncloud/ocis-ocs/issues/46
// https://github.com/owncloud/ocis/ocs/issues/46
{
"email",
"not_a_valid_email",
@@ -990,7 +990,7 @@ func TestUpdateUser(t *testing.T) {
nil,
},
// Empty values doesn't gives error
// https://github.com/owncloud/ocis-ocs/issues/51
// https://github.com/owncloud/ocis/ocs/issues/51
{
"email",
"",
@@ -1137,7 +1137,7 @@ func TestUpdateUser(t *testing.T) {
}
// This is a bug demonstration test for endpoint '/cloud/user'
// Link to the issue: https://github.com/owncloud/ocis-ocs/issues/52
// Link to the issue: https://github.com/owncloud/ocis/ocs/issues/52
func TestGetSingleUser(t *testing.T) {
user := User{
Enabled: "true",
@@ -1194,7 +1194,7 @@ func TestGetSingleUser(t *testing.T) {
}
// This is a bug demonstration test for endpoint '/cloud/user'
// Link to the issue: https://github.com/owncloud/ocis-ocs/issues/53
// Link to the issue: https://github.com/owncloud/ocis/ocs/issues/53
func TestGetUserSigningKey(t *testing.T) {
user := User{
@@ -1520,7 +1520,7 @@ func TestAddUsersToGroupsNewUsers(t *testing.T) {
}
}
// Issue: https://github.com/owncloud/ocis-ocs/issues/55 Incorrect message when adding user to non existing group
// Issue: https://github.com/owncloud/ocis/ocs/issues/55 Incorrect message when adding user to non existing group
func TestAddUsersToGroupInvalidGroup(t *testing.T) {
user := User{
Enabled: "true",
@@ -1583,7 +1583,7 @@ func TestAddUsersToGroupInvalidGroup(t *testing.T) {
cleanUp(t)
}
// Issue: https://github.com/owncloud/ocis-ocs/issues/57 - cannot remove user from group
// Issue: https://github.com/owncloud/ocis/ocs/issues/57 - cannot remove user from group
func TestRemoveUserFromGroup(t *testing.T) {
user := User{
Enabled: "true",
ocs/pkg/service/v0/config.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"net/http"
"github.com/go-chi/render"
"github.com/owncloud/ocis-ocs/pkg/service/v0/data"
"github.com/owncloud/ocis-ocs/pkg/service/v0/response"
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/response"
)
// GetConfig renders the ocs config endpoint
ocs/pkg/service/v0/groups.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
merrors "github.com/micro/go-micro/v2/errors"
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"
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/response"
)
// ListUserGroups lists a users groups
ocs/pkg/service/v0/instrument.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-ocs/pkg/metrics"
"github.com/owncloud/ocis/ocs/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
ocs/pkg/service/v0/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis/ocs/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
)
ocs/pkg/service/v0/response/response.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"reflect"
"github.com/go-chi/render"
"github.com/owncloud/ocis-ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
)
// Response is the top level response structure
ocs/pkg/service/v0/response/version.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/go-chi/chi"
"github.com/go-chi/render"
"github.com/owncloud/ocis-ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
)
type key int
ocs/pkg/service/v0/service.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"github.com/micro/go-micro/v2/client/grpc"
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/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"
)
ocs/pkg/service/v0/users.go
+2 -2
View File
@@ -16,8 +16,8 @@ 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"
"github.com/owncloud/ocis-ocs/pkg/service/v0/data"
"github.com/owncloud/ocis-ocs/pkg/service/v0/response"
"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"
)