Merge pull request #657 from butonic/rename-storages

update reva and refactor config
owncloud · Oct 21, 2020 · 8aec764 · 8aec764
2 parents d9d7272 + 8445996
commit 8aec764
Show file tree

Hide file tree

Showing 53 changed files with 645 additions and 2,514 deletions.
diff --git a/.drone.star b/.drone.star
@@ -343,8 +343,7 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo
         'environment' : {
           'TEST_SERVER_URL': 'https://ocis-server:9200',
           'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/data/' if storage == 'owncloud' else ''),
-          'STORAGE_DRIVER': '%s' % ('OWNCLOUD' if storage == 'owncloud' else 'OCIS'),
-          'DELETE_USER_DATA_CMD': '%s' % ('' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/*'),
+          'DELETE_USER_DATA_CMD': '%s' % ('' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*'),
           'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton',
           'OCIS_SKELETON_STRATEGY': '%s' % ('copy' if storage == 'owncloud' else 'upload'),
           'TEST_OCIS':'true',
@@ -398,8 +397,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n
         'environment' : {
           'TEST_SERVER_URL': 'https://ocis-server:9200',
           'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/data/' if storage == 'owncloud' else ''),
-          'STORAGE_DRIVER': '%s' % ('OWNCLOUD' if storage == 'owncloud' else 'OCIS'),
-          'DELETE_USER_DATA_CMD': '%s' % ('' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/*'),
+          'DELETE_USER_DATA_CMD': '%s' % ('' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*'),
           'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton',
           'OCIS_SKELETON_STRATEGY': '%s' % ('copy' if storage == 'owncloud' else 'upload'),
           'TEST_OCIS':'true',
@@ -548,22 +546,18 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommitId, storage):
         'detach': True,
         'environment' : {
           #'OCIS_LOG_LEVEL': 'debug',
-          'STORAGE_STORAGE_HOME_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_HOME_DATA_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_OC_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_OC_DATA_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
+          'STORAGE_HOME_DRIVER': '%s' % (storage),
           'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
           'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/reva/root',
           'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
-          'STORAGE_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
           'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
           'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
           'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
           'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
-          'STORAGE_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
-          'STORAGE_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
-          'STORAGE_FRONTEND_URL': 'https://ocis-server:9200',
+          'STORAGE_HOME_EXPOSE_DATA_SERVER': 'true',
+          'STORAGE_HOME_DATA_SERVER_URL': 'http://ocis-server:9155/data',
+          'STORAGE_DATAGATEWAY_PUBLIC_URL': 'https://ocis-server:9200/data',
+          'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200',
           'PHOENIX_WEB_CONFIG': '/drone/src/accounts/ui/tests/config/drone/ocis-config.json',
           'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/accounts/ui/tests/config/drone/identifier-registration.yml',
           'KONNECTD_ISS': 'https://ocis-server:9200',
@@ -1407,22 +1401,20 @@ def ocisServer(storage):
       'detach': True,
       'environment' : {
         #'OCIS_LOG_LEVEL': 'debug',
-        'STORAGE_STORAGE_HOME_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_HOME_DATA_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_OC_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_OC_DATA_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
+        'STORAGE_HOME_DRIVER': '%s' % (storage),
+        'STORAGE_USERS_DRIVER': '%s' % (storage),
         'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
         'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/local/root',
         'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
-        'STORAGE_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
+        'STORAGE_METADATA_ROOT': '/srv/app/tmp/ocis/metadata',
         'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
         'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
         'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
         'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
-        'STORAGE_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
-        'STORAGE_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
-        'STORAGE_FRONTEND_URL': 'https://ocis-server:9200',
+        'STORAGE_HOME_DATA_SERVER_URL': 'http://ocis-server:9155/data',
+        'STORAGE_DATAGATEWAY_PUBLIC_URL': 'https://ocis-server:9200/data',
+        'STORAGE_USERS_DATA_SERVER_URL': 'http://ocis-server:9158/data',
+        'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200',
         'PHOENIX_WEB_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json',
         'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ocis/tests/config/drone/identifier-registration.yml',
         'KONNECTD_ISS': 'https://ocis-server:9200',

diff --git a/accounts/pkg/storage/cs3.go b/accounts/pkg/storage/cs3.go
@@ -206,12 +206,11 @@ func (r CS3Repo) DeleteGroup(ctx context.Context, id string) (err error) {
 
 func (r CS3Repo) authenticate(ctx context.Context) (token string, err error) {
 	u := &user.User{
-		Id:     &user.UserId{},
+		Id: &user.UserId{
+			OpaqueId: r.cfg.ServiceUser.UUID,
+		},
 		Groups: []string{},
 	}
-	if r.cfg.ServiceUser.Username != "" {
-		u.Id.OpaqueId = r.cfg.ServiceUser.UUID
-	}
 	return r.tm.MintToken(ctx, u)
 }
 

diff --git a/docs/extensions/storage/_index.md b/docs/extensions/storage/_index.md
@@ -26,20 +26,12 @@ It uses the port range 9140-9179 to preconfigure several services.
 | 9149 | authbearer debug        |
 | 9150 | sharing        |
 | 9151 | sharing debug        |
-| 9152 | storage root        |
-| 9153 | storage root debug        |
 | 9154 | storage home        |
-| 9155 | storage home debug        |
-| 9156 | storage home data        |
-| 9157 | storage home data debug        |
-| 9158 | storage eos        |
-| 9159 | storage eos debug        |
-| 9160 | storage eos data        |
-| 9161 | storage eos data debug        |
-| 9162 | storage oc        |
-| 9163 | storage oc debug        |
-| 9164 | storage oc data        |
-| 9165 | storage oc data debug        |
+| 9155 | storage home data        |
+| 9156 | storage home debug        |
+| 9157 | storage users        |
+| 9158 | storage users data        |
+| 9159 | storage users debug        |
 | 9166-9177 | reserved for s3, wnd, custom + data providers |
 | 9178 | storage public link        |
-| 9179 | storage public link data        |
+| 9179 | storage public link debug        |